diff --git a/tests/test-notify.t b/tests/test-notify.t --- a/tests/test-notify.t +++ b/tests/test-notify.t @@ -1,3 +1,8 @@ + $ cat > $TESTTMP/filter.py < from __future__ import print_function + > import sys, re + > print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="") + > EOF $ cat <> $HGRCPATH > [extensions] @@ -175,8 +180,7 @@ of the very long subject line pull (minimal config) - $ hg --traceback --cwd b pull ../a | \ - > $PYTHON -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -205,6 +209,7 @@ @@ -1,1 +1,2 @@ a +a (run 'hg update' to get a working copy) + $ cat <> $HGRCPATH > [notify] > config = `pwd`/.notify.conf @@ -228,8 +233,7 @@ $ hg --cwd b rollback repository tip rolled back to revision 0 (undo pull) - $ hg --traceback --cwd b pull ../a | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -254,8 +258,7 @@ 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 @@ - a + @@ -1,1 +1,2 @@ a +a (run 'hg update' to get a working copy) @@ -272,8 +275,7 @@ $ hg --cwd b rollback repository tip rolled back to revision 0 (undo pull) - $ hg --traceback --cwd b pull ../a | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -294,17 +296,14 @@ 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 @@ - a + @@ -1,1 +1,2 @@ a +a (run 'hg update' to get a working copy) @@ -321,8 +320,7 @@ (branch merge, don't forget to commit) $ hg ci -m merge -d '3 0' $ cd .. - $ hg --traceback --cwd b pull ../a | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -343,17 +341,14 @@ 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 @@ - a + @@ -1,1 +1,2 @@ a +a Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 @@ -380,7 +375,7 @@ $ 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 @@ -401,18 +396,14 @@ 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 @@ - a - a + @@ -1,2 +1,3 @@ a a +a (run 'hg update' to get a working copy) @@ -435,7 +426,7 @@ 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 @@ -451,19 +442,14 @@ 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 @@ - a - a - a + @@ -1,3 +1,4 @@ a a a +nonononononononononononononononononononononononononononononononononononono= nononononononononononononononononononononononononononononononononononononon= ononononononononononononononononononononononononononononononononononononono= @@ -500,8 +486,7 @@ (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 | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -530,8 +515,7 @@ 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 | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py pulling from ../a searching for changes adding changesets @@ -559,8 +543,7 @@ $ mv "$HGRCPATH.new" $HGRCPATH $ echo a >> a/a $ hg --cwd a commit -m 'default template' - $ hg --cwd b pull ../a -q | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit @@ -589,8 +572,7 @@ > EOF $ echo a >> a/a $ hg --cwd a commit -m 'with style' - $ hg --cwd b pull ../a -q | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit @@ -613,8 +595,7 @@ > EOF $ echo a >> a/a $ hg --cwd a commit -m 'with template' - $ hg --cwd b pull ../a -q | \ - > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit