Fix up release scripts for Hg

diff --git a/ChangeLog b/ChangeLog
index 67ec8a5a5766ff254f16876239d88f67b8d7c0bb..a26a71310ae0a6738859ee0fcde626a9b37e85f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
-2007-04-05 18:52 -0700  Brendan Cully  <brendan@kublai.com>  (94d3441e86d0)
+2007-04-06 12:54 -0700  Brendan Cully  <brendan@kublai.com>  (bd9401de2690)
+
+       * lib.c: safe_rename: fall back to rename on ENOSYS and EPERM as well
+       as EXDEV. sshfs returns ENOSYS when attempting cross-directory
+       links. vfat returns EPERM.
+
+       * lib.c: Make safe_open with O_EXCL friendlier for NFS. Per #2707,
+       when an open file is moved into a different directory over NFS, it
+       may leave a .nfsXXX hardlink behind. This causes the rmdir in
+       safe_open to fail, leaving tempdir droppings around. This patch
+       works around the problem by closing the file after creating it and
+       reopening it after rename.
+
+2007-04-05 21:38 -0700  Michael Elkins  <me@mutt.org>  (177c060504bb)
+
+       * configure.ac, hcache.c: Fixup to detect qdbm includes in
+       /usr/include/qdbm.
+
+       Remove HAVE_QDBM_VILLA_H because it is redundant.
+
+2007-04-05 19:22 -0700  Brendan Cully  <brendan@kublai.com>  (ee0fabbde466)
+
+       * configure.ac, hcache.c: Fix up QDBM autoconf test for arguments
+       and includes in subdirectories
 
        * imap/message.c: Fix logic error introduced in [efbcef81ac49]
 

diff --git a/Makefile.am b/Makefile.am
index b3c905298d01a237d08890c2fa6f3c2b05976b5a..e97073645e5f2221ab127d0d32ba2f99cf7f3ed2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,8 +186,7 @@ commit: pclean check-security commit-real update-changelog commit-changelog
 
 update-changelog:
        (cd $(top_srcdir); \
-       cvs update ChangeLog; \
-       sh ./mkchangelog.sh | fmt -c | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
+       sh ./mkchangelog.sh | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
        $${VISUAL:-vi} ChangeLog)
 
 # kluge around automake problems.

diff --git a/build-release b/build-release
index bfbba17990b30310a5d8abd89bef7b6e49c5d998..7a46eb453922e8a444ef966883f8b1d45bf52ad2 100755 (executable)
--- a/build-release
+++ b/build-release
@@ -23,9 +23,16 @@ fi
 
 devel="devel/" # comment out for the stable branch
 
+# test for uncommitted changes
+if hg id | grep -q '+'
+then
+  echo "Uncommitted changes"
+  exit 1
+fi
+
 # update the source
 
-#cvs update
+hg update
 
 # Do automated security checks
 
@@ -66,12 +73,13 @@ make dist
 
 #cvs commit -m "automatic post-release commit for mutt-${VERSION}"
 #make commit-changelog 
-#cvs tag ${TAG}
+hg tag ${TAG}
 
 # build the diff between the two releases
 
-if test "$diff" = yes ; then
-       cvs rdiff -u -r ${OTAG} -r ${TAG} mutt | gzip -9 \
+if test "$diff" = yes
+then
+  hg diff -r ${OTAG} -r ${TAG} | gzip -9 \
                > diff-${OVERSION}-${VERSION}.gz
 fi
 
@@ -101,7 +109,8 @@ for f in $DISTFILES ; do
        scp $f $f.asc trithemius.gnupg.org:/home/ftp/mutt/${devel}
 done
 
-cvs update
+hg update
+gpg sign
 
 # Finally, announce the new mutt to the public
 

diff --git a/mkchangelog.sh b/mkchangelog.sh
index ce909dcf42314ff2eca7abf42479de8d6a751b7f..435f8ba0a4cc81190de7b39f930e01c2b6c3b6a5 100755 (executable)
--- a/mkchangelog.sh
+++ b/mkchangelog.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 TZ=GMT; export TZ
-date="`head -1 ChangeLog | awk '{print $1, $2}'`"
-test -n "$date" || exit 1
-cvs -z9 log -d ">$date" | perl ./cvslog2changelog.pl
+lrev=$(hg log --limit 1 --template '{rev}' ChangeLog)
+
+hg log --style=./hg-changelog-map -r tip:$lrev