# HG changeset patch # User Patrick Mezard # Date 1180883928 -7200 # Node ID fc20fa9f2dfdc6ff2e4f7d39fab5f48848cb60c0 # Parent 649dd2492ae55e4b8007aa1e60c583788bf9ed17# Parent 28cbe9e01f174a041aa9039fefcc1e6d401429b6 Merge with crew-stable diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py @@ -210,6 +210,8 @@ class notifier(object): del msg['From'] msg['From'] = sender + msg['Date'] = util.datestr(date=util.makedate(), + format="%a, %d %b %Y %H:%M:%S", timezone=True) fix_subject() fix_sender() diff --git a/tests/test-notify b/tests/test-notify --- a/tests/test-notify +++ b/tests/test-notify @@ -34,7 +34,8 @@ hg --traceback --cwd a commit -Amb -d '1 echo '% pull (minimal config)' hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \ - -e 's/^details: .*test-notify/details: test-notify/' + -e 's/^details: .*test-notify/details: test-notify/' \ + -e 's/^Date:.*/Date:/' cat <> $HGRCPATH [notify] @@ -50,5 +51,6 @@ EOF echo % pull hg --cwd b rollback hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ - -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' + -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ + -e 's/^Date:.*/Date:/' diff --git a/tests/test-notify.out b/tests/test-notify.out --- a/tests/test-notify.out +++ b/tests/test-notify.out @@ -13,6 +13,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +Date: Subject: changeset in test-notify/b: b From: test X-Hg-Notification: changeset 0647d048b600 @@ -41,6 +42,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +Date: Subject: b From: test@test.com X-Hg-Notification: changeset 0647d048b600