From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 15 Dec 2017 00:16:27 +0000 (-0800)
Subject: Update mkchangelog.sh to use git.
X-Git-Tag: mutt-1-9-2-rel~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=841f7101c653c54f51dc1001768d1dae0f79fbbd;p=mutt

Update mkchangelog.sh to use git.

The output isn't quite as nice as the hg generated version, but is
close.

With Mercurial, and now Git, I'm not sure of the usefulness of
maintaining a ChangeLog file in the repos, but that is another
discussion.
---

diff --git a/hg-changelog-map b/hg-changelog-map
deleted file mode 100644
index 27bdc7a8..00000000
--- a/hg-changelog-map
+++ /dev/null
@@ -1,5 +0,0 @@
-header = '{date|isodate}  {author|person}  <{author|email}>  ({node|short})\n\n'
-changeset = '\t* {files|stringify|fill68|tabindent|strip}\n\n'
-file = '{file}, '
-last_file = '{file}: {desc}\n\t'
-no_files = '{desc}'
diff --git a/mkchangelog.sh b/mkchangelog.sh
index 2b610da8..fc03a6f4 100755
--- a/mkchangelog.sh
+++ b/mkchangelog.sh
@@ -1,5 +1,17 @@
 #!/bin/sh
+#
+# Generates the ChangeLog since the last release.
 
-lrev=$(hg log --limit 1 --template '{rev}' ChangeLog)
+# This would generate based on the last update of the ChangeLog, instead:
+# lrev=$(git log -1 --pretty=format:"%H" ChangeLog)
 
-hg log --style=./hg-changelog-map -r "reverse($lrev::.)"
+lrev=$(git tag --merged=HEAD --list 'mutt-*-rel' | tr - . | sort -Vr | head -n1 | tr . -)
+
+# This is a rough approximation of the official ChangeLog format
+# previously generated by hg.  Git doesn't provide enough formatting
+# tools to produce this more accurately.  We could post-format it with
+# a script, but I'm not sure enough people care about this file
+# anymore to make it worth the effort.
+git log --name-status \
+    --pretty=format:"%ai  %an  <%ae> (%h)%n%n%w(,8,8)* %s%n%+b" \
+    ${lrev}^..