tests: cleanup of echo statements left over from test conversion

tests/test-convert-filemap.t

@@ -86,7 +86,6 b' final file versions in this repo:'
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ hg debugrename copied
   copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
-  $ echo
   
   $ cd ..
   $ splitrepo()

tests/test-convert-git.t

@@ -198,8 +198,6 b' full conversion'
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   88dfeab657e8cf2cef3dec67b914f49791ae76b1 644   quux
-  $ echo
-  
 
 test binary conversion (issue 1359)
 
@@ -226,8 +224,6 b' convert binary file'
   $ python -c 'print len(file("b", "rb").read())'
   4096
   $ cd ..
-  $ echo
-  
 
 test author vs committer
 

tests/test-convert-svn-sink.t

@@ -219,8 +219,9 b' Copy'
   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

tests/test-diff-color.t

@@ -94,7 +94,6 b' record'
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
-  $ echo
   
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
@@ -123,5 +122,3 b' qrecord'
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
-  $ echo
-  

tests/test-fetch.t

@@ -155,8 +155,6 b' test fetch with named branches'
   $ 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 b' parent should be 2 (no automatic update)'
   $ 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 b' parent should be 4 (fast forward)'
   $ 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 b' test issue1726'
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd i1726r2 heads default --template '{rev}\n'
   3
-  $ echo
-  
 
 test issue2047
 

tests/test-highlight.t

@@ -520,8 +520,6 b' hgweb fileannotate, raw'
   $ echo "" >> b
   $ echo "" >> b
   $ diff -u b a
-  $ echo
-  
 
 hgweb filerevision, raw
 
@@ -531,8 +529,6 b' hgweb filerevision, raw'
   $ echo "" >> b
   $ hg cat primes.py >> b
   $ diff -u b a
-  $ echo
-  
 
 hgweb highlightcss friendly
 

tests/test-mactext.t

@@ -19,12 +19,10 b''
   [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

tests/test-merge-tools.t

@@ -31,7 +31,6 b' revision 3 - simple to merge'
   $ hg commit -Am "revision 3"
   created new head
   $ echo "[merge-tools]" > .hg/hgrc
-  $ echo
   
   $ beforemerge() {
   >   cat .hg/hgrc
@@ -44,7 +43,6 b' revision 3 - simple to merge'
   >   echo "# hg stat"
   >   hg stat
   >   rm -f f.orig
-  >   echo
   > }
   $ domerge() {
   >   beforemerge
@@ -52,14 +50,9 b' revision 3 - simple to merge'
   >   hg merge $*
   >   aftermerge
   > }
-  $ echo
-  
 
 Tool selection
 
-  $ echo
-  
-
 default is internal merge:
 
   $ beforemerge
@@ -89,7 +82,6 b' running from a devel copy, not a temp in'
   M f
   ? f.orig
   
-
 simplest hgrc using false for merge:
 
   $ echo "false.whatever=" >> .hg/hgrc
@@ -109,7 +101,6 b' simplest hgrc using false for merge:'
   M f
   ? f.orig
   
-
 true with higher .priority gets precedence:
 
   $ echo "true.priority=1" >> .hg/hgrc
@@ -128,7 +119,6 b' true with higher .priority gets preceden'
   # hg stat
   M f
   
-
 unless lowered on command line:
 
   $ domerge -r 2 --config merge-tools.true.priority=-7
@@ -148,7 +138,6 b' unless lowered on command line:'
   M f
   ? f.orig
   
-
 or false set higher on command line:
 
   $ domerge -r 2 --config merge-tools.false.priority=117
@@ -168,7 +157,6 b' or false set higher on command line:'
   M f
   ? f.orig
   
-
 or true.executable not found in PATH:
 
   $ domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool
@@ -188,7 +176,6 b' or true.executable not found in PATH:'
   M f
   ? f.orig
   
-
 or true.executable with bogus path:
 
   $ domerge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
@@ -208,7 +195,6 b' or true.executable with bogus path:'
   M f
   ? f.orig
   
-
 but true.executable set to cat found in PATH works:
 
   $ echo "true.executable=cat" >> .hg/hgrc
@@ -234,7 +220,6 b' but true.executable set to cat found in '
   # hg stat
   M f
   
-
 and true.executable set to cat with path works:
 
   $ domerge -r 2 --config merge-tools.true.executable=cat
@@ -259,14 +244,8 b' and true.executable set to cat with path'
   # 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
@@ -287,7 +266,6 b' merge-patterns specifies new tool false:'
   M f
   ? f.orig
   
-
 merge-patterns specifies executable not found in PATH and gets warning:
 
   $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
@@ -309,7 +287,6 b' merge-patterns specifies executable not '
   M f
   ? f.orig
   
-
 merge-patterns specifies executable with bogus path and gets warning:
 
   $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
@@ -331,14 +308,8 b' merge-patterns specifies executable with'
   M f
   ? f.orig
   
-  $ echo
-  
-
 ui.merge overrules priority
 
-  $ echo
-  
-
 ui.merge specifies false:
 
   $ domerge -r 2 --config ui.merge=false
@@ -359,7 +330,6 b' ui.merge specifies false:'
   M f
   ? f.orig
   
-
 ui.merge specifies internal:fail:
 
   $ domerge -r 2 --config ui.merge=internal:fail
@@ -377,7 +347,6 b' ui.merge specifies internal:fail:'
   # hg stat
   M f
   
-
 ui.merge specifies internal:local:
 
   $ domerge -r 2 --config ui.merge=internal:local
@@ -395,7 +364,6 b' ui.merge specifies internal:local:'
   # hg stat
   M f
   
-
 ui.merge specifies internal:other:
 
   $ domerge -r 2 --config ui.merge=internal:other
@@ -413,7 +381,6 b' ui.merge specifies internal:other:'
   # hg stat
   M f
   
-
 ui.merge specifies internal:prompt:
 
   $ domerge -r 2 --config ui.merge=internal:prompt
@@ -433,7 +400,6 b' ui.merge specifies internal:prompt:'
   # hg stat
   M f
   
-
 ui.merge specifies internal:dump:
 
   $ domerge -r 2 --config ui.merge=internal:dump
@@ -456,7 +422,6 b' ui.merge specifies internal:dump:'
   ? f.orig
   ? f.other
   
-
 f.base:
 
   $ cat f.base
@@ -475,8 +440,6 b' f.other:'
   revision 2
   space
   $ rm f.base f.local f.other
-  $ echo
-  
 
 ui.merge specifies internal:other but is overruled by pattern for false:
 
@@ -498,14 +461,8 b' ui.merge specifies internal:other but is'
   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
@@ -568,7 +525,6 b' Default is silent simplemerge:'
   # hg stat
   M f
   
-
 .premerge=True is same:
 
   $ domerge -r 3 --config merge-tools.true.premerge=True
@@ -588,7 +544,6 b' Default is silent simplemerge:'
   # hg stat
   M f
   
-
 .premerge=False executes merge-tool:
 
   $ domerge -r 3 --config merge-tools.true.premerge=False
@@ -614,15 +569,10 b' Default is silent simplemerge:'
   # hg stat
   M f
   
-  $ echo
-  
-
 Tool execution
 
-  $ echo
+set tools.args explicit to include $base $local $other $output:
   
-  $ 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:
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -656,8 +606,8 b' Tool execution'
   # 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=
@@ -674,8 +624,8 b' Tool execution'
   # 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=
@@ -692,8 +642,8 b' Tool execution'
   # 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=
@@ -710,7 +660,6 b' Tool execution'
   # hg stat
   M f
   
-
 Merge using tool with a path that must be quoted:
 
   $ beforemerge
@@ -740,14 +689,8 b' Merge using tool with a path that must b'
   # 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 b" cat is a bad merge-tool and doesn't chan"
   # hg stat
   M f
   ? f.orig
-  

tests/test-merge1.t

@@ -110,8 +110,7 b' merge fails'
   $ 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)

tests/test-mq-qimport-fail-cleanup.t

@@ -16,14 +16,10 b' imported patches in series file.'
   >  a
   > +b
   > EOF
-  $ echo
-  
 
 empty series
 
   $ hg qseries
-  $ echo
-  
 
 qimport valid patch followed by invalid patch
 
@@ -31,8 +27,6 b' qimport valid patch followed by invalid '
   adding b.patch to series file
   abort: unable to read file fakepatch
   [255]
-  $ echo
-  
 
 valid patches before fail added to series
 

tests/test-tags.t

@@ -135,8 +135,6 b' Add invalid tags:'
   $ echo >> .hgtags
   $ echo "foo bar" >> .hgtags
   $ echo "a5a5 invalid" >> .hg/localtags
-  $ echo "committing .hgtags:"
-  committing .hgtags:
   $ cat .hgtags 
   acb14030fe0a21b60322c440ad2d20cf7685a376 first
   spam

tests/test-win32text.t

@@ -16,7 +16,6 b''
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
-  $ echo
   
   $ echo hello > f
   $ hg add f
@@ -24,7 +23,6 b''
 commit should succeed
 
   $ hg ci -m 1
-  $ echo
   
   $ hg clone . ../zoz
   updating to branch default
@@ -41,7 +39,6 b' commit should fail'
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
-  $ echo
   
   $ mv .hg/hgrc .hg/hgrc.bak
 
@@ -50,8 +47,6 b' commits should succeed'
   $ hg ci -m 2
   $ hg cp f g
   $ hg ci -m 2.2
-  $ echo
-  
 
 push should fail
 
@@ -84,7 +79,6 b' push should fail'
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
-  $ echo
   
   $ mv .hg/hgrc.bak .hg/hgrc
   $ echo hello > f
@@ -93,8 +87,6 b' push should fail'
 commit should succeed
 
   $ hg ci -m 2.3
-  $ echo
-  
 
 push should succeed
 
@@ -105,8 +97,6 b' push should succeed'
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
-  $ echo
-  
 
 and now for something completely different
 
@@ -124,11 +114,9 b' and now for something completely differe'
   $ 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
@@ -183,12 +171,9 b' and now for something completely differe'
   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
@@ -274,8 +259,6 b' and now for something completely differe'
   1
   
   
-  $ echo
-  
   $ hg pull dupe
   pulling from dupe
   searching for changes
@@ -306,7 +289,6 b' and now for something completely differe'
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
-  $ echo
   
   $ hg log -v
   changeset:   5:f0b1c8d75fce
@@ -358,8 +340,6 b' and now for something completely differe'
   1
   
   
-  $ echo
-  
   $ rm .hg/hgrc
   $ (echo some; echo text) > f3
   $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
@@ -372,7 +352,6 b' and now for something completely differe'
   text
   $ cat f4.bat
   rem empty\r (esc)
-  $ echo
   
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
@@ -415,7 +394,6 b' Disable warning:'
   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