Mercurial > hg
changeset 4495:fc20fa9f2dfd
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 03 Jun 2007 17:18:48 +0200 |
| parents | 649dd2492ae5 (current diff) 28cbe9e01f17 (diff) |
| children | b79cdb7f0597 |
| files | hgext/notify.py |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/notify.py Sat Jun 02 09:04:23 2007 -0700 +++ b/hgext/notify.py Sun Jun 03 17:18:48 2007 +0200 @@ -210,6 +210,8 @@ 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()
--- a/tests/test-notify Sat Jun 02 09:04:23 2007 -0700 +++ b/tests/test-notify Sun Jun 03 17:18:48 2007 +0200 @@ -34,7 +34,8 @@ 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 <<EOF >> $HGRCPATH [notify] @@ -50,5 +51,6 @@ 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:/'
--- a/tests/test-notify.out Sat Jun 02 09:04:23 2007 -0700 +++ b/tests/test-notify.out Sun Jun 03 17:18:48 2007 +0200 @@ -13,6 +13,7 @@ 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 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