This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3402

notify: add maxdiffstat option to truncate long file lists
ClosedPublic

Authored by joerg.sonnenberger on Apr 17 2018, 7:47 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa4cac7b0ea4f: notify: add maxdiffstat option to truncate long file lists
Summary

Large scale changes like a new GCC version can easily result in 1MB+
emails due to diffstat alone. The new maxdiffstat option truncates the
list similar to what maxdiff already provides for the diffs.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 accepted this revision.Apr 18 2018, 1:50 PM
This revision is now accepted and ready to land.Apr 18 2018, 1:50 PM
Closed by commit rHGa4cac7b0ea4f: notify: add maxdiffstat option to truncate long file lists (authored by joerg.sonnenberger). · Explain WhyApr 18 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/notify.py (16 lines)
Mtests/test-notify.t (149 lines)

Diff 8380

hgext/notify.py

notify.changegroup notify.changegroup
Template to use when running as a changegroup hook, overriding Template to use when running as a changegroup hook, overriding
``notify.template``. ``notify.template``.
notify.maxdiff notify.maxdiff
Maximum number of diff lines to include in notification email. Set to 0 Maximum number of diff lines to include in notification email. Set to 0
to disable the diff, or -1 to include all of it. Default: 300. to disable the diff, or -1 to include all of it. Default: 300.
notify.maxdiffstat
Maximum number of diffstat lines to include in notification email. Set to -1
to include all of it. Default: -1.
notify.maxsubject notify.maxsubject
Maximum number of characters in email's subject line. Default: 67. Maximum number of characters in email's subject line. Default: 67.
notify.diffstat notify.diffstat
Set to True to include a diffstat before diff content. Default: True. Set to True to include a diffstat before diff content. Default: True.
notify.merge notify.merge
If True, send notifications for merge changesets. Default: True. If True, send notifications for merge changesets. Default: True.
default=None, default=None,
) )
configitem('notify', 'incoming', configitem('notify', 'incoming',
default=None, default=None,
) )
configitem('notify', 'maxdiff', configitem('notify', 'maxdiff',
default=300, default=300,
) )
configitem('notify', 'maxdiffstat',
default=-1,
)
configitem('notify', 'maxsubject', configitem('notify', 'maxsubject',
default=67, default=67,
) )
configitem('notify', 'mbox', configitem('notify', 'mbox',
default=None, default=None,
) )
configitem('notify', 'merge', configitem('notify', 'merge',
default=True, default=True,
ref = ref.node() ref = ref.node()
else: else:
ref = ctx.node() ref = ctx.node()
chunks = patch.diff(self.repo, prev, ref, chunks = patch.diff(self.repo, prev, ref,
opts=patch.diffallopts(self.ui)) opts=patch.diffallopts(self.ui))
difflines = ''.join(chunks).splitlines() difflines = ''.join(chunks).splitlines()
if self.ui.configbool('notify', 'diffstat'): if self.ui.configbool('notify', 'diffstat'):
maxdiffstat = int(self.ui.config('notify', 'maxdiffstat'))
s = patch.diffstat(difflines) s = patch.diffstat(difflines)
# s may be nil, don't include the header if it is # s may be nil, don't include the header if it is
if s: if s:
if maxdiffstat >= 0 and s.count("\n") > maxdiffstat + 1:
s = s.split("\n")
msg = _('\ndiffstat (truncated from %d to %d lines):\n\n')
self.ui.write(msg % (len(s) - 2, maxdiffstat))
self.ui.write("\n".join(s[:maxdiffstat] + s[-2:]))
else:
self.ui.write(_('\ndiffstat:\n\n%s') % s) self.ui.write(_('\ndiffstat:\n\n%s') % s)
if maxdiff == 0: if maxdiff == 0:
return return
elif maxdiff > 0 and len(difflines) > maxdiff: elif maxdiff > 0 and len(difflines) > maxdiff:
msg = _('\ndiffs (truncated from %d to %d lines):\n\n') msg = _('\ndiffs (truncated from %d to %d lines):\n\n')
self.ui.write(msg % (len(difflines), maxdiff)) self.ui.write(msg % (len(difflines), maxdiff))
difflines = difflines[:maxdiff] difflines = difflines[:maxdiff]
elif difflines: elif difflines:

tests/test-notify.t

notify.changegroup notify.changegroup
Template to use when running as a changegroup hook, overriding Template to use when running as a changegroup hook, overriding
"notify.template". "notify.template".
notify.maxdiff notify.maxdiff
Maximum number of diff lines to include in notification email. Set to 0 to Maximum number of diff lines to include in notification email. Set to 0 to
disable the diff, or -1 to include all of it. Default: 300. disable the diff, or -1 to include all of it. Default: 300.
notify.maxdiffstat
Maximum number of diffstat lines to include in notification email. Set to -1
to include all of it. Default: -1.
notify.maxsubject notify.maxsubject
Maximum number of characters in email's subject line. Default: 67. Maximum number of characters in email's subject line. Default: 67.
notify.diffstat notify.diffstat
Set to True to include a diffstat before diff content. Default: True. Set to True to include a diffstat before diff content. Default: True.
notify.merge notify.merge
If True, send notifications for merge changesets. Default: True. If True, send notifications for merge changesets. Default: True.
web.baseurl web.baseurl
Root repository URL to combine with repository paths when making references. Root repository URL to combine with repository paths when making references.
See also "notify.strip". See also "notify.strip".
no commands defined no commands defined
$ hg init a $ hg init a
$ echo a > a/a $ echo a > a/a
$ echo b > a/b
commit commit
$ hg --cwd a commit -Ama -d '0 0' $ hg --cwd a commit -Ama -d '0 0'
adding a adding a
adding b
clone clone
$ hg --traceback clone a b $ hg --traceback clone a b
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a/a $ echo a >> a/a
$ echo b >> a/b
commit commit
$ hg --traceback --cwd a commit -Amb -d '1 0' $ hg --traceback --cwd a commit -Amb -d '1 0'
on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [notify] > [notify]
> maxsubject = 200 > maxsubject = 200
> EOF > EOF
the python call below wraps continuation lines, which appear on Mac OS X 10.5 because the python call below wraps continuation lines, which appear on Mac OS X 10.5 because
of the very long subject line of the very long subject line
pull (minimal config) pull (minimal config)
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 2 changes to 2 files
new changesets 0647d048b600 new changesets 00a13f371396
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: changeset in $TESTTMP/b: b Subject: changeset in $TESTTMP/b: b
From: test From: test
X-Hg-Notification: changeset 0647d048b600 X-Hg-Notification: changeset 00a13f371396
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz, foo@bar To: baz, foo@bar
changeset 0647d048b600 in $TESTTMP/b changeset 00a13f371396 in $TESTTMP/b
details: $TESTTMP/b?cmd=changeset;node=0647d048b600 details: $TESTTMP/b?cmd=changeset;node=00a13f371396
description: b description: b
diffs (6 lines): diffs (12 lines):
diff -r cb9a9f314b8b -r 0647d048b600 a diff -r 0cd96de13884 -r 00a13f371396 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ a @@ -1,1 +1,2 @@ a
+a +a
diff -r 0cd96de13884 -r 00a13f371396 b
--- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ b
+b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [notify] > [notify]
> config = `pwd`/.notify.conf > config = `pwd`/.notify.conf
> domain = test.com > domain = test.com
> strip = 42 > strip = 42
> template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip} > template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
$ hg --cwd b rollback $ hg --cwd b rollback
repository tip rolled back to revision 0 (undo pull) repository tip rolled back to revision 0 (undo pull)
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 2 changes to 2 files
new changesets 0647d048b600 new changesets 00a13f371396
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: b Subject: b
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 0647d048b600 X-Hg-Notification: changeset 00a13f371396
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 0647d048b600 in b changeset 00a13f371396 in b
description: b description: b
diffs (6 lines): diffs (12 lines):
diff -r cb9a9f314b8b -r 0647d048b600 a diff -r 0cd96de13884 -r 00a13f371396 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ a @@ -1,1 +1,2 @@ a
+a +a
diff -r 0cd96de13884 -r 00a13f371396 b
--- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ b
+b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [hooks] > [hooks]
> incoming.notify = python:hgext.notify.hook > incoming.notify = python:hgext.notify.hook
> >
> [notify] > [notify]
> sources = pull > sources = pull
> diffstat = True > diffstat = True
> EOF > EOF
pull pull
$ hg --cwd b rollback $ hg --cwd b rollback
repository tip rolled back to revision 0 (undo pull) repository tip rolled back to revision 0 (undo pull)
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --config notify.maxdiffstat=1 --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 2 changes to 2 files
new changesets 0647d048b600 new changesets 00a13f371396
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: b Subject: b
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 0647d048b600 X-Hg-Notification: changeset 00a13f371396
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 0647d048b600 in b changeset 00a13f371396 in b
description: b description: b
diffstat: diffstat (truncated from 2 to 1 lines):
a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) a | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diffs (6 lines): diffs (12 lines):
diff -r cb9a9f314b8b -r 0647d048b600 a diff -r 0cd96de13884 -r 00a13f371396 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ a @@ -1,1 +1,2 @@ a
+a +a
diff -r 0cd96de13884 -r 00a13f371396 b
--- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@ b
+b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
test merge test merge
$ cd a $ cd a
$ hg up -C 0 $ hg up -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a $ echo a >> a
$ hg ci -Am adda2 -d '2 0' $ hg ci -Am adda2 -d '2 0'
created new head created new head
$ hg merge $ hg merge
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m merge -d '3 0' $ hg ci -m merge -d '3 0'
$ cd .. $ cd ..
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 0 files added 2 changesets with 0 changes to 0 files
new changesets 0a184ce6067f:6a0cf76b2701 new changesets 3332653e1f3c:fccf66cd0c35
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: adda2 Subject: adda2
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 0a184ce6067f X-Hg-Notification: changeset 3332653e1f3c
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 0a184ce6067f in b changeset 3332653e1f3c in b
description: adda2 description: adda2
diffstat: diffstat:
a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diffs (6 lines): diffs (6 lines):
diff -r cb9a9f314b8b -r 0a184ce6067f a diff -r 0cd96de13884 -r 3332653e1f3c a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:02 1970 +0000 +++ b/a Thu Jan 01 00:00:02 1970 +0000
@@ -1,1 +1,2 @@ a @@ -1,1 +1,2 @@ a
+a +a
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: merge Subject: merge
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 6a0cf76b2701 X-Hg-Notification: changeset fccf66cd0c35
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 6a0cf76b2701 in b changeset fccf66cd0c35 in b
description: merge description: merge
diffstat:
b | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diffs (6 lines):
diff -r 3332653e1f3c -r fccf66cd0c35 b
--- a/b Thu Jan 01 00:00:02 1970 +0000
+++ b/b Thu Jan 01 00:00:03 1970 +0000
@@ -1,1 +1,2 @@ b
+b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
non-ascii content and truncation of multi-byte subject non-ascii content and truncation of multi-byte subject
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [notify] > [notify]
> maxsubject = 4 > maxsubject = 4
> EOF > EOF
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \
> -m `$PYTHON -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` > -m `$PYTHON -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'`
$ hg --traceback --cwd b --encoding utf-8 pull ../a | \ $ hg --traceback --cwd b --encoding utf-8 pull ../a | \
> $PYTHON $TESTTMP/filter.py > $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 7ea05ad269dc new changesets 0f25f9c22b4c
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: \xc3\xa0... (esc) Subject: \xc3\xa0... (esc)
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 7ea05ad269dc X-Hg-Notification: changeset 0f25f9c22b4c
Message-Id: <*> (glob) Message-Id: <*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 7ea05ad269dc in b changeset 0f25f9c22b4c in b
description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc)
diffstat: diffstat:
a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diffs (7 lines): diffs (7 lines):
diff -r 6a0cf76b2701 -r 7ea05ad269dc a diff -r fccf66cd0c35 -r 0f25f9c22b4c a
--- a/a Thu Jan 01 00:00:03 1970 +0000 --- a/a Thu Jan 01 00:00:03 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@ a a @@ -1,2 +1,3 @@ a a
+a +a
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
long lines long lines
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [notify] > [notify]
> maxsubject = 67 > maxsubject = 67
> test = False > test = False
> mbox = mbox > mbox = mbox
> EOF > EOF
$ $PYTHON -c 'open("a/a", "ab").write("no" * 500 + "\xd1\x84" + "\n")' $ $PYTHON -c 'open("a/a", "ab").write("no" * 500 + "\xd1\x84" + "\n")'
$ hg --cwd a commit -A -m "long line" $ hg --cwd a commit -A -m "long line"
$ hg --traceback --cwd b pull ../a $ hg --traceback --cwd b pull ../a
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets a323cae54f6e new changesets a846b5f6ebb7
notify: sending 2 subscribers 1 changes notify: sending 2 subscribers 1 changes
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ $PYTHON $TESTTMP/filter.py < b/mbox $ $PYTHON $TESTTMP/filter.py < b/mbox
From test@test.com ... ... .. ..:..:.. .... (re) From test@test.com ... ... .. ..:..:.. .... (re)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="*" (glob) Content-Type: text/plain; charset="*" (glob)
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: long line Subject: long line
From: test@test.com From: test@test.com
X-Hg-Notification: changeset a323cae54f6e X-Hg-Notification: changeset a846b5f6ebb7
Message-Id: <hg.a323cae54f6e.*.*@*> (glob) Message-Id: <hg.a846b5f6ebb7.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset a323cae54f6e in b changeset a846b5f6ebb7 in b
description: long line description: long line
diffstat: diffstat:
a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diffs (8 lines): diffs (8 lines):
diff -r 7ea05ad269dc -r a323cae54f6e a diff -r 0f25f9c22b4c -r a846b5f6ebb7 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@ a a a @@ -1,3 +1,4 @@ a a a
+nonononononononononononononononononononononononononononononononononononono= +nonononononononononononononononononononononononononononononononononononono=
nononononononononononononononononononononononononononononononononononononon= nononononononononononononononononononononononononononononononononononononon=
ononononononononononononononononononononononononononononononononononononono= ononononononononononononononononononononononononononononononononononononono=
nononononononononononononononononononononononononononononononononononononon= nononononononononononononononononononononononononononononononononononononon=
ononononononononononononononononononononononononononononononononononononono= ononononononononononononononononononononononononononononononononononononono=
$ hg --cwd a ci -m test -d '1 0' $ hg --cwd a ci -m test -d '1 0'
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets b7cf10b2bdec new changesets f7e5aaed4080
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: test Subject: test
From: test@test.com From: test@test.com
X-Hg-Notification: changeset b7cf10b2bdec X-Hg-Notification: changeset f7e5aaed4080
Message-Id: <hg.b7cf10b2bdec.*.*@*> (glob) Message-Id: <hg.f7e5aaed4080.*.*@*> (glob)
To: baz@test.com, foo@bar, notify@example.com To: baz@test.com, foo@bar, notify@example.com
changeset b7cf10b2bdec in b changeset f7e5aaed4080 in b
description: test description: test
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
revset selection: don't send to address that waits for mails revset selection: don't send to address that waits for mails
from different branch from different branch
$ hg --cwd a update default $ hg --cwd a update default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a ci -m test -d '1 0' $ hg --cwd a ci -m test -d '1 0'
$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets 5a07df312a79 new changesets 645eb6690ecf
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: test Subject: test
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 5a07df312a79 X-Hg-Notification: changeset 645eb6690ecf
Message-Id: <hg.5a07df312a79.*.*@*> (glob) Message-Id: <hg.645eb6690ecf.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 5a07df312a79 in b changeset 645eb6690ecf in b
description: test description: test
(run 'hg heads' to see heads) (run 'hg heads' to see heads)
default template: default template:
$ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new" $ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new"
$ mv "$HGRCPATH.new" $HGRCPATH $ mv "$HGRCPATH.new" $HGRCPATH
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a commit -m 'default template' $ hg --cwd a commit -m 'default template'
$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: changeset in b: default template Subject: changeset in b: default template
From: test@test.com From: test@test.com
X-Hg-Notification: changeset f5e8ec95bf59 X-Hg-Notification: changeset 5cd4346eed47
Message-Id: <hg.f5e8ec95bf59.*.*@*> (glob) Message-Id: <hg.5cd4346eed47.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset f5e8ec95bf59 in $TESTTMP/b changeset 5cd4346eed47 in $TESTTMP/b
details: http://test/b?cmd=changeset;node=f5e8ec95bf59 details: http://test/b?cmd=changeset;node=5cd4346eed47
description: default template description: default template
with style: with style:
$ cat <<EOF > notifystyle.map $ cat <<EOF > notifystyle.map
> changeset = "Subject: {desc|firstline|strip} > changeset = "Subject: {desc|firstline|strip}
> From: {author} > From: {author}
> {""} > {""}
> changeset {node|short}" > changeset {node|short}"
> EOF > EOF
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [notify] > [notify]
> style = $TESTTMP/notifystyle.map > style = $TESTTMP/notifystyle.map
> EOF > EOF
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a commit -m 'with style' $ hg --cwd a commit -m 'with style'
$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: with style Subject: with style
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 9e2c3a8e9c43 X-Hg-Notification: changeset ec8d9d852f56
Message-Id: <hg.9e2c3a8e9c43.*.*@*> (glob) Message-Id: <hg.ec8d9d852f56.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 9e2c3a8e9c43 changeset ec8d9d852f56
with template (overrides style): with template (overrides style):
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> template = Subject: {node|short}: {desc|firstline|strip} > template = Subject: {node|short}: {desc|firstline|strip}
> From: {author} > From: {author}
> {""} > {""}
> {desc} > {desc}
> EOF > EOF
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a commit -m 'with template' $ hg --cwd a commit -m 'with template'
$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: e2cbf5bf18a7: with template Subject: 14721b538ae3: with template
From: test@test.com From: test@test.com
X-Hg-Notification: changeset e2cbf5bf18a7 X-Hg-Notification: changeset 14721b538ae3
Message-Id: <hg.e2cbf5bf18a7.*.*@*> (glob) Message-Id: <hg.14721b538ae3.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
with template with template