mercurial: comparison tests/test-notify.t

equal deleted inserted replaced

-:65de152ba375
+:fa9f7b5d4397
+$ cat > $TESTTMP/filter.py <<EOF
+> from __future__ import print_function
+> import sys, re
+> print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="")
+> EOF
 $ cat <<EOF >> $HGRCPATH
 > [extensions]
 > notify=
 >
 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because
 of the very long subject line
 pull (minimal config)
-$ hg --traceback --cwd b pull ../a | \
+$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -1,1 +1,2 @@ a
 +a
 (run 'hg update' to get a working copy)
 $ cat <<EOF >> $HGRCPATH
 > [notify]
 > config = `pwd`/.notify.conf
 > domain = test.com
 > strip = 42
 pull
 $ hg --cwd b rollback
 repository tip rolled back to revision 0 (undo pull)
-$ hg --traceback --cwd b pull ../a  | \
+$ hg --traceback --cwd b pull ../a  | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 diffs (6 lines):
 diff -r cb9a9f314b8b -r 0647d048b600 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
-@@ -1,1 +1,2 @@
+@@ -1,1 +1,2 @@ a
-a
 +a
 (run 'hg update' to get a working copy)
 $ cat << EOF >> $HGRCPATH
 > [hooks]
 pull
 $ hg --cwd b rollback
 repository tip rolled back to revision 0 (undo pull)
-$ hg --traceback --cwd b pull ../a | \
+$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 To: baz@test.com, foo@bar
 changeset 0647d048b600 in b
 description: b
 diffstat:
+a |  1 + 1 files changed, 1 insertions(+), 0 deletions(-)
-a |  1 +
-1 files changed, 1 insertions(+), 0 deletions(-)
 diffs (6 lines):
 diff -r cb9a9f314b8b -r 0647d048b600 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
-@@ -1,1 +1,2 @@
+@@ -1,1 +1,2 @@ a
-a
 +a
 (run 'hg update' to get a working copy)
 test merge
 $ hg merge
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ hg ci -m merge -d '3 0'
 $ cd ..
-$ hg --traceback --cwd b pull ../a | \
+$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 To: baz@test.com, foo@bar
 changeset 0a184ce6067f in b
 description: adda2
 diffstat:
+a |  1 + 1 files changed, 1 insertions(+), 0 deletions(-)
-a |  1 +
-1 files changed, 1 insertions(+), 0 deletions(-)
 diffs (6 lines):
 diff -r cb9a9f314b8b -r 0a184ce6067f a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
-@@ -1,1 +1,2 @@
+@@ -1,1 +1,2 @@ a
-a
 +a
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 X-Test: foo
 > EOF
 $ echo a >> a/a
 $ 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"'`
 $ hg --traceback --cwd b --encoding utf-8 pull ../a | \
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
+>   $PYTHON $TESTTMP/filter.py
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 To: baz@test.com, foo@bar
 changeset 7ea05ad269dc in b
 description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc)
 diffstat:
+a |  1 + 1 files changed, 1 insertions(+), 0 deletions(-)
-a |  1 +
-1 files changed, 1 insertions(+), 0 deletions(-)
 diffs (7 lines):
 diff -r 6a0cf76b2701 -r 7ea05ad269dc a
 --- a/a	Thu Jan 01 00:00:03 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,2 +1,3 @@
+@@ -1,2 +1,3 @@ a a
-a
-a
 +a
 (run 'hg update' to get a working copy)
 long lines
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 notify: sending 2 subscribers 1 changes
 (run 'hg update' to get a working copy)
-$ $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", file("b/mbox").read()),'
+$ $PYTHON $TESTTMP/filter.py < b/mbox
 From test@test.com ... ... .. ..:..:.. .... (re)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 X-Test: foo
 To: baz@test.com, foo@bar
 changeset e0be44cf638b in b
 description: long line
 diffstat:
+a |  1 + 1 files changed, 1 insertions(+), 0 deletions(-)
-a |  1 +
-1 files changed, 1 insertions(+), 0 deletions(-)
 diffs (8 lines):
 diff -r 7ea05ad269dc -r e0be44cf638b a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,4 @@ a a a
-a
-a
-a
 +nonononononononononononononononononononononononononononononononononononono=
 nononononononononononononononononononononononononononononononononononononon=
 ononononononononononononononononononononononononononononononononononononono=
 nononononononononononononononononononononononononononononononononononononon=
 ononononononononononononononononononononononononononononononononononononono=
 $ hg --cwd a branch test
 marked working directory as branch test
 (branches are permanent and global, did you want a bookmark?)
 $ echo a >> a/a
 $ hg --cwd a ci -m test -d '1 0'
-$ hg --traceback --cwd b pull ../a | \
+$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 $ hg --cwd a update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ echo a >> a/a
 $ hg --cwd a ci -m test -d '1 0'
-$ hg --traceback --cwd b pull ../a | \
+$ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 $ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new"
 $ mv "$HGRCPATH.new" $HGRCPATH
 $ echo a >> a/a
 $ hg --cwd a commit -m 'default template'
-$ hg --cwd b pull ../a -q | \
+$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Date: * (glob)
 Subject: changeset in b: default template
 > [notify]
 > style = $TESTTMP/notifystyle.map
 > EOF
 $ echo a >> a/a
 $ hg --cwd a commit -m 'with style'
-$ hg --cwd b pull ../a -q | \
+$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Date: * (glob)
 Subject: with style
 >            {""}
 >            {desc}
 > EOF
 $ echo a >> a/a
 $ hg --cwd a commit -m 'with template'
-$ hg --cwd b pull ../a -q | \
+$ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py
->   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Date: * (glob)
 Subject: a09743fd3edd: with template

changeset 33718	fa9f7b5d4397
parent 29102	22c53b3a390d
child 33969	cefad71d1a45