--- a/tests/test-convert-filemap.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-convert-filemap.t Thu Oct 13 04:27:49 2011 +0200
@@ -86,8 +86,7 @@
bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
$ hg debugrename copied
copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
- $ echo
-
+
$ cd ..
$ splitrepo()
> {
--- a/tests/test-convert-git.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-convert-git.t Thu Oct 13 04:27:49 2011 +0200
@@ -198,8 +198,6 @@
354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux
- $ echo
-
test binary conversion (issue 1359)
@@ -226,8 +224,6 @@
$ python -c 'print len(file("b", "rb").read())'
4096
$ cd ..
- $ echo
-
test author vs committer
--- a/tests/test-convert-svn-sink.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-convert-svn-sink.t Thu Oct 13 04:27:49 2011 +0200
@@ -219,8 +219,9 @@
newlink
$ hg --cwd a rm b
- $ echo % remove
- % remove
+
+Remove
+
$ hg --cwd a ci -d '4 0' -m 'remove a file'
$ hg --cwd a tip -q
4:07b2e34a5b17
--- a/tests/test-diff-color.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-diff-color.t Thu Oct 13 04:27:49 2011 +0200
@@ -94,8 +94,7 @@
a
c
\x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc)
- $ echo
-
+
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg rollback
@@ -123,5 +122,3 @@
a
c
\x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc)
- $ echo
-
--- a/tests/test-fetch.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-fetch.t Thu Oct 13 04:27:49 2011 +0200
@@ -155,8 +155,6 @@
$ echo b > nbase/b
$ hg -R nbase ci -Ad '3 0' -m b
adding b
- $ echo
-
pull in change on foreign branch
@@ -185,8 +183,6 @@
$ hg -R n2 parents --template '{rev}\n'
2
$ rm -fr n1 n2
- $ echo
-
pull in changes on both foreign and local branches
@@ -220,8 +216,6 @@
$ hg -R n2 parents --template '{rev}\n'
4
$ rm -fr n1 n2
- $ echo
-
pull changes on foreign (2 new heads) and local (1 new head) branches
with a local change
@@ -393,8 +387,6 @@
new changeset 3:* merges remote changes with local (glob)
$ hg --cwd i1726r2 heads default --template '{rev}\n'
3
- $ echo
-
test issue2047
--- a/tests/test-highlight.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-highlight.t Thu Oct 13 04:27:49 2011 +0200
@@ -520,8 +520,6 @@
$ echo "" >> b
$ echo "" >> b
$ diff -u b a
- $ echo
-
hgweb filerevision, raw
@@ -531,8 +529,6 @@
$ echo "" >> b
$ hg cat primes.py >> b
$ diff -u b a
- $ echo
-
hgweb highlightcss friendly
--- a/tests/test-mactext.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-mactext.t Thu Oct 13 04:27:49 2011 +0200
@@ -19,13 +19,11 @@
[hooks]
pretxncommit.cr = python:hgext.win32text.forbidcr
pretxnchangegroup.cr = python:hgext.win32text.forbidcr
- $ echo
-
+
$ echo hello > f
$ hg add f
$ hg ci -m 1
- $ echo
-
+
$ python unix2mac.py f
$ hg ci -m 2
Attempt to commit or push text file(s) using CR line endings
--- a/tests/test-merge-tools.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-merge-tools.t Thu Oct 13 04:27:49 2011 +0200
@@ -31,8 +31,7 @@
$ hg commit -Am "revision 3"
created new head
$ echo "[merge-tools]" > .hg/hgrc
- $ echo
-
+
$ beforemerge() {
> cat .hg/hgrc
> echo "# hg update -C 1"
@@ -44,7 +43,6 @@
> echo "# hg stat"
> hg stat
> rm -f f.orig
- > echo
> }
$ domerge() {
> beforemerge
@@ -52,14 +50,9 @@
> hg merge $*
> aftermerge
> }
- $ echo
-
Tool selection
- $ echo
-
-
default is internal merge:
$ beforemerge
@@ -88,7 +81,6 @@
# hg stat
M f
? f.orig
-
simplest hgrc using false for merge:
@@ -108,7 +100,6 @@
# hg stat
M f
? f.orig
-
true with higher .priority gets precedence:
@@ -127,7 +118,6 @@
space
# hg stat
M f
-
unless lowered on command line:
@@ -147,7 +137,6 @@
# hg stat
M f
? f.orig
-
or false set higher on command line:
@@ -167,7 +156,6 @@
# hg stat
M f
? f.orig
-
or true.executable not found in PATH:
@@ -187,7 +175,6 @@
# hg stat
M f
? f.orig
-
or true.executable with bogus path:
@@ -207,7 +194,6 @@
# hg stat
M f
? f.orig
-
but true.executable set to cat found in PATH works:
@@ -233,7 +219,6 @@
space
# hg stat
M f
-
and true.executable set to cat with path works:
@@ -258,15 +243,9 @@
space
# hg stat
M f
-
- $ echo
-
Tool selection and merge-patterns
- $ echo
-
-
merge-patterns specifies new tool false:
$ domerge -r 2 --config merge-patterns.f=false
@@ -286,7 +265,6 @@
# hg stat
M f
? f.orig
-
merge-patterns specifies executable not found in PATH and gets warning:
@@ -308,7 +286,6 @@
# hg stat
M f
? f.orig
-
merge-patterns specifies executable with bogus path and gets warning:
@@ -330,15 +307,9 @@
# hg stat
M f
? f.orig
-
- $ echo
-
ui.merge overrules priority
- $ echo
-
-
ui.merge specifies false:
$ domerge -r 2 --config ui.merge=false
@@ -358,7 +329,6 @@
# hg stat
M f
? f.orig
-
ui.merge specifies internal:fail:
@@ -376,7 +346,6 @@
space
# hg stat
M f
-
ui.merge specifies internal:local:
@@ -394,7 +363,6 @@
space
# hg stat
M f
-
ui.merge specifies internal:other:
@@ -412,7 +380,6 @@
space
# hg stat
M f
-
ui.merge specifies internal:prompt:
@@ -432,7 +399,6 @@
space
# hg stat
M f
-
ui.merge specifies internal:dump:
@@ -455,7 +421,6 @@
? f.local
? f.orig
? f.other
-
f.base:
@@ -475,8 +440,6 @@
revision 2
space
$ rm f.base f.local f.other
- $ echo
-
ui.merge specifies internal:other but is overruled by pattern for false:
@@ -497,15 +460,9 @@
# hg stat
M f
? f.orig
-
- $ echo
-
Premerge
- $ echo
-
-
ui.merge specifies internal:other but is overruled by --tool=false
$ domerge -r 2 --config ui.merge=internal:other --tool=false
@@ -525,7 +482,7 @@
# hg stat
M f
? f.orig
-
+
HGMERGE specifies internal:other but is overruled by --tool=false
$ HGMERGE=internal:other ; export HGMERGE
@@ -546,7 +503,7 @@
# hg stat
M f
? f.orig
-
+
$ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
Default is silent simplemerge:
@@ -567,7 +524,6 @@
revision 3
# hg stat
M f
-
.premerge=True is same:
@@ -587,7 +543,6 @@
revision 3
# hg stat
M f
-
.premerge=False executes merge-tool:
@@ -613,16 +568,11 @@
space
# hg stat
M f
-
- $ echo
-
Tool execution
- $ echo
-
- $ echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other'
- # set tools.args explicit to include $base $local $other $output:
+set tools.args explicit to include $base $local $other $output:
+
$ beforemerge
[merge-tools]
false.whatever=
@@ -655,9 +605,9 @@
space
# hg stat
M f
-
- $ echo '# Merge with "echo mergeresult > $local":'
- # Merge with "echo mergeresult > $local":
+
+Merge with "echo mergeresult > $local":
+
$ beforemerge
[merge-tools]
false.whatever=
@@ -673,9 +623,9 @@
mergeresult
# hg stat
M f
-
- $ echo '# - and $local is the file f:'
- # - and $local is the file f:
+
+- and $local is the file f:
+
$ beforemerge
[merge-tools]
false.whatever=
@@ -691,9 +641,9 @@
mergeresult
# hg stat
M f
-
- $ echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:'
- # Merge with "echo mergeresult > $output" - the variable is a bit magic:
+
+Merge with "echo mergeresult > $output" - the variable is a bit magic:
+
$ beforemerge
[merge-tools]
false.whatever=
@@ -709,7 +659,6 @@
mergeresult
# hg stat
M f
-
Merge using tool with a path that must be quoted:
@@ -739,15 +688,9 @@
space
# hg stat
M f
-
- $ echo
-
Merge post-processing
- $ echo
-
-
cat is a bad merge-tool and doesn't change:
$ domerge -y -r 2 --config merge-tools.true.checkchanged=1
@@ -775,4 +718,3 @@
# hg stat
M f
? f.orig
-
--- a/tests/test-merge1.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-merge1.t Thu Oct 13 04:27:49 2011 +0200
@@ -110,8 +110,7 @@
$ hg merge 2
abort: outstanding uncommitted changes (use 'hg status' to list changes)
[255]
- $ echo %% merge expected!
- %% merge expected!
+merge expected!
$ hg merge -f 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-mq-qimport-fail-cleanup.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-mq-qimport-fail-cleanup.t Thu Oct 13 04:27:49 2011 +0200
@@ -16,14 +16,10 @@
> a
> +b
> EOF
- $ echo
-
empty series
$ hg qseries
- $ echo
-
qimport valid patch followed by invalid patch
@@ -31,8 +27,6 @@
adding b.patch to series file
abort: unable to read file fakepatch
[255]
- $ echo
-
valid patches before fail added to series
--- a/tests/test-tags.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-tags.t Thu Oct 13 04:27:49 2011 +0200
@@ -135,8 +135,6 @@
$ echo >> .hgtags
$ echo "foo bar" >> .hgtags
$ echo "a5a5 invalid" >> .hg/localtags
- $ echo "committing .hgtags:"
- committing .hgtags:
$ cat .hgtags
acb14030fe0a21b60322c440ad2d20cf7685a376 first
spam
--- a/tests/test-win32text.t Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-win32text.t Thu Oct 13 04:27:49 2011 +0200
@@ -16,16 +16,14 @@
[hooks]
pretxncommit.crlf = python:hgext.win32text.forbidcrlf
pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
- $ echo
-
+
$ echo hello > f
$ hg add f
commit should succeed
$ hg ci -m 1
- $ echo
-
+
$ hg clone . ../zoz
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -41,8 +39,7 @@
rollback completed
abort: pretxncommit.crlf hook failed
[255]
- $ echo
-
+
$ mv .hg/hgrc .hg/hgrc.bak
commits should succeed
@@ -50,8 +47,6 @@
$ hg ci -m 2
$ hg cp f g
$ hg ci -m 2.2
- $ echo
-
push should fail
@@ -84,8 +79,7 @@
rollback completed
abort: pretxnchangegroup.crlf hook failed
[255]
- $ echo
-
+
$ mv .hg/hgrc.bak .hg/hgrc
$ echo hello > f
$ hg rm g
@@ -93,8 +87,6 @@
commit should succeed
$ hg ci -m 2.3
- $ echo
-
push should succeed
@@ -105,8 +97,6 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files
- $ echo
-
and now for something completely different
@@ -124,12 +114,10 @@
$ hg revert -a
forgetting d/f2
$ rm d/f2
- $ echo
-
+
$ hg rem f
$ hg ci -m 4
- $ echo
-
+
$ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
$ hg add bin
$ hg ci -m 5
@@ -183,13 +171,10 @@
1
- $ echo
-
$ hg clone . dupe
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ echo
-
+
$ for x in a b c d; do echo content > dupe/$x; done
$ hg -R dupe add
adding dupe/a
@@ -274,8 +259,6 @@
1
- $ echo
-
$ hg pull dupe
pulling from dupe
searching for changes
@@ -306,8 +289,7 @@
rollback completed
abort: pretxnchangegroup.crlf hook failed
[255]
- $ echo
-
+
$ hg log -v
changeset: 5:f0b1c8d75fce
tag: tip
@@ -358,8 +340,6 @@
1
- $ echo
-
$ rm .hg/hgrc
$ (echo some; echo text) > f3
$ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
@@ -372,8 +352,7 @@
text
$ cat f4.bat
rem empty\r (esc)
- $ echo
-
+
$ echo '[extensions]' >> .hg/hgrc
$ echo 'win32text = ' >> .hg/hgrc
$ echo '[decode]' >> .hg/hgrc
@@ -415,8 +394,7 @@
text\r (esc)
$ cat f4.bat
rem empty\r (esc)
- $ echo
-
+
$ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
$ hg add f5.sh
$ hg ci -m 7