Commits

Dan Villiom Podlaski Christiansen  committed f6851ee

Better.

  • Participants
  • Parent commits ecea335

Comments (0)

Files changed (1)

File fix-test-dollar.diff

              else:
                  if needescape(lout):
                      lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
+diff --git a/tests/test-alias.t b/tests/test-alias.t
+--- a/tests/test-alias.t
++++ b/tests/test-alias.t
+@@ -318,7 +318,7 @@ shell aliases with escaped $ chars
+   $ hg escaped3 HGFOO
+   HGFOO is BAR
+   $ hg escaped4 test
+-  $0 $@
++ \$0 $@
+ 
+ 
+ invalid arguments
+diff --git a/tests/test-clone.t b/tests/test-clone.t
+--- a/tests/test-clone.t
++++ b/tests/test-clone.t
+@@ -92,7 +92,7 @@ Check that path aliases are expanded:
+ 
+   $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
+   $ hg -R f showconfig paths.default
+-  $TESTTMP/a#0 (glob)
++ \$TESTTMP/a#0 (glob)
+ 
+ Use --pull:
+ 
+diff --git a/tests/test-convert-bzr.t b/tests/test-convert-bzr.t
+--- a/tests/test-convert-bzr.t
++++ b/tests/test-convert-bzr.t
+@@ -88,7 +88,7 @@ convert from lightweight checkout
+   $ hg convert -s bzr source-light source-light-hg
+   initializing destination source-light-hg repository
+   warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.
+-  $TESTTMP/test-createandrename/source-light does not look like a Bazaar repository
++ \$TESTTMP/test-createandrename/source-light does not look like a Bazaar repository
+   abort: source-light: missing or unsupported repository
+   [255]
+ 
+diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
+--- a/tests/test-hgignore.t
++++ b/tests/test-hgignore.t
+@@ -88,7 +88,7 @@ Check it does not ignore the current dir
+ 
+   $ echo "syntax: invalid" > .hgignore
+   $ hg status
+-  $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
++ \$TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
+   A dir/b.o
+   ? .hgignore
+   ? a.c
+diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t
+--- a/tests/test-hgrc.t
++++ b/tests/test-hgrc.t
+@@ -140,17 +140,17 @@ customized hgrc
+ 
+   $ hg showconfig
+   read config from: $TESTTMP/hgrc
+-  $TESTTMP/hgrc:13: alias.log=log -g
++ \$TESTTMP/hgrc:13: alias.log=log -g
+   none: bundle.mainreporoot=$TESTTMP
+-  $TESTTMP/hgrc:11: defaults.identify=-n
+-  $TESTTMP/hgrc:2: ui.debug=true
+-  $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
+-  $TESTTMP/hgrc:4: ui.quiet=true
+-  $TESTTMP/hgrc:5: ui.slash=true
+-  $TESTTMP/hgrc:6: ui.traceback=true
+-  $TESTTMP/hgrc:7: ui.verbose=true
+-  $TESTTMP/hgrc:8: ui.style=~/.hgstyle
+-  $TESTTMP/hgrc:9: ui.logtemplate={node}
++ \$TESTTMP/hgrc:11: defaults.identify=-n
++ \$TESTTMP/hgrc:2: ui.debug=true
++ \$TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
++ \$TESTTMP/hgrc:4: ui.quiet=true
++ \$TESTTMP/hgrc:5: ui.slash=true
++ \$TESTTMP/hgrc:6: ui.traceback=true
++ \$TESTTMP/hgrc:7: ui.verbose=true
++ \$TESTTMP/hgrc:8: ui.style=~/.hgstyle
++ \$TESTTMP/hgrc:9: ui.logtemplate={node}
+ 
+ plain hgrc
+ 
+@@ -176,7 +176,7 @@ plain mode with exceptions
+   plain: True
+   read config from: $TESTTMP/hgrc
+   none: bundle.mainreporoot=$TESTTMP
+-  $TESTTMP/hgrc:15: extensions.plain=./plain.py
++ \$TESTTMP/hgrc:15: extensions.plain=./plain.py
+   none: ui.traceback=True
+   none: ui.verbose=False
+   none: ui.debug=True
+@@ -186,7 +186,7 @@ plain mode with exceptions
+   plain: True
+   read config from: $TESTTMP/hgrc
+   none: bundle.mainreporoot=$TESTTMP
+-  $TESTTMP/hgrc:15: extensions.plain=./plain.py
++ \$TESTTMP/hgrc:15: extensions.plain=./plain.py
+   none: ui.traceback=True
+   none: ui.verbose=False
+   none: ui.debug=True
+@@ -196,7 +196,7 @@ plain mode with exceptions
+   plain: True
+   read config from: $TESTTMP/hgrc
+   none: bundle.mainreporoot=$TESTTMP
+-  $TESTTMP/hgrc:15: extensions.plain=./plain.py
++ \$TESTTMP/hgrc:15: extensions.plain=./plain.py
+   none: ui.traceback=True
+   none: ui.verbose=False
+   none: ui.debug=True
+diff --git a/tests/test-keyword.t b/tests/test-keyword.t
+--- a/tests/test-keyword.t
++++ b/tests/test-keyword.t
+@@ -31,14 +31,14 @@ as it would succeed without uisetup othe
+   RCSfile = {file|basename},v
+   Revision = {node|short}
+   Source = {root}/{file},v
+-  $Author: test $
+-  $Date: ????/??/?? ??:??:?? $ (glob)
+-  $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
+-  $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
+-  $RCSFile: demo.txt,v $
+-  $RCSfile: demo.txt,v $
+-  $Revision: ???????????? $ (glob)
+-  $Source: */demo.txt,v $ (glob)
++ \$Author: test $
++ \$Date: ????/??/?? ??:??:?? $ (glob)
++ \$Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
++ \$Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
++ \$RCSFile: demo.txt,v $
++ \$RCSfile: demo.txt,v $
++ \$Revision: ???????????? $ (glob)
++ \$Source: */demo.txt,v $ (glob)
+ 
+   $ hg --quiet kwdemo "Branch = {branches}"
+   [extensions]
+@@ -49,7 +49,7 @@ as it would succeed without uisetup othe
+   svn = False
+   [keywordmaps]
+   Branch = {branches}
+-  $Branch: demobranch $
++ \$Branch: demobranch $
+ 
+   $ cat <<EOF >> $HGRCPATH
+   > [keyword]
+@@ -322,7 +322,7 @@ compare changenodes in a and c
+   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
+   do not process $Id:
+   xxx $
+-  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
++ \$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
+   tests for different changenodes
+ 
+ record
+@@ -443,7 +443,7 @@ rollback and revert expansion
+   $ hg add y
+   $ hg commit -Am "rollback only" z
+   $ cat z
+-  $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
++ \$Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
+   $ hg --verbose rollback
+   repository tip rolled back to revision 2 (undo commit)
+   working directory now based on revision 2
+@@ -456,7 +456,7 @@ Only z should be overwritten
+   A y
+   A z
+   $ cat z
+-  $Id$
++ \$Id$
+   $ hg forget y z
+   $ rm y z
+ 
+@@ -495,7 +495,7 @@ record added keyword ignored file
+   i
+   committed changeset 3:9f40ceb5a072
+   $ cat i
+-  $Id$
++ \$Id$
+   $ hg -q rollback
+   $ hg forget i
+   $ rm i
+@@ -549,16 +549,16 @@ qgoto, implying qpush, should expand
+   applying mqtest.diff
+   now at: mqtest.diff
+   $ cat c
+-  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
++ \$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
+   tests for different changenodes
+   $ hg cat c
+-  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
++ \$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
+   tests for different changenodes
+ 
+ Keywords should not be expanded in filelog
+ 
+   $ hg --config 'extensions.keyword=!' cat c
+-  $Id$
++ \$Id$
+   tests for different changenodes
+ 
+ qpop and move on
+@@ -705,7 +705,7 @@ Custom keywordmaps as argument to kwdemo
+   svn = False
+   [keywordmaps]
+   Xinfo = {author}: {desc}
+-  $Xinfo: test: hg keyword configuration and expansion example $
++ \$Xinfo: test: hg keyword configuration and expansion example $
+ 
+ Configure custom keywordmaps
+ 
+@@ -783,13 +783,13 @@ Stat, verify and show custom expansion (
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+   ignore $Id$
+   $ hg cat sym a b && echo
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+   ignore $Id$
+   a
+ 
+@@ -823,7 +823,7 @@ Rollback, revert, and check expansion
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+ 
+ Clone to test global and local configurations
+ 
+@@ -836,7 +836,7 @@ Expansion in destination with global con
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+ 
+ No expansion in destination with local configuration in origin only
+ 
+@@ -845,7 +845,7 @@ No expansion in destination with local c
+   expand $Id$
+   do not process $Id:
+   xxx $
+-  $Xinfo$
++ \$Xinfo$
+ 
+ Clone to test incoming
+ 
+@@ -887,7 +887,7 @@ Imported patch should not be rejected
+   expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
+   do not process $Id: rejecttest
+   xxx $
+-  $Xinfo: User Name <user@example.com>: rejects? $
++ \$Xinfo: User Name <user@example.com>: rejects? $
+   ignore $Id$
+ 
+   $ hg rollback
+@@ -924,7 +924,7 @@ kwexpand x/a should abort
+   expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: xa $
++ \$Xinfo: User Name <user@example.com>: xa $
+ 
+ kwshrink a inside directory x
+ 
+@@ -934,7 +934,7 @@ kwshrink a inside directory x
+   expand $Id$
+   do not process $Id:
+   xxx $
+-  $Xinfo$
++ \$Xinfo$
+   $ cd ..
+ 
+ kwexpand nonexistent
+@@ -957,7 +957,7 @@ hg serve
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'annotate/tip/a/?style=raw'
+   200 Script output follows
+   
+@@ -1029,7 +1029,7 @@ simplemerge
+   (branch merge, don't forget to commit)
+   $ hg commit -m simplemerge
+   $ cat m
+-  $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
++ \$Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
+   foo
+ 
+ conflict: keyword should stay outside conflict zone
+@@ -1047,7 +1047,7 @@ conflict: keyword should stay outside co
+   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+   [1]
+   $ cat m
+-  $Id$
++ \$Id$
+   <<<<<<< local
+   bar
+   =======
+@@ -1059,7 +1059,7 @@ resolve to local
+   $ HGMERGE=internal:local hg resolve -a
+   $ hg commit -m localresolve
+   $ cat m
+-  $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
++ \$Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
+   bar
+ 
+ Test restricted mode with transplant -b
+@@ -1124,13 +1124,13 @@ Keywords shrunk in working directory, bu
+   expand $Id$
+   do not process $Id:
+   xxx $
+-  $Xinfo$
++ \$Xinfo$
+   ignore $Id$
+   $ hg cat sym a b && echo
+   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
+   do not process $Id:
+   xxx $
+-  $Xinfo: User Name <user@example.com>: firstline $
++ \$Xinfo: User Name <user@example.com>: firstline $
+   ignore $Id$
+   a
+ 
+@@ -1141,13 +1141,13 @@ Now disable keyword expansion
+   expand $Id$
+   do not process $Id:
+   xxx $
+-  $Xinfo$
++ \$Xinfo$
+   ignore $Id$
+   $ hg cat sym a b && echo
+   expand $Id$
+   do not process $Id:
+   xxx $
+-  $Xinfo$
++ \$Xinfo$
+   ignore $Id$
+   a
+ 
+diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
+--- a/tests/test-largefiles.t
++++ b/tests/test-largefiles.t
+@@ -1188,7 +1188,7 @@ revert some files to an older revision
+ 
+ - Where Do We Come From? What Are We? Where Are We Going?
+   $ pwd
+-  $TESTTMP/e
++ \$TESTTMP/e
+   $ hg paths
+   default = $TESTTMP/d (glob)
+ 
+diff --git a/tests/test-paths.t b/tests/test-paths.t
+--- a/tests/test-paths.t
++++ b/tests/test-paths.t
+@@ -35,7 +35,7 @@
+   dupe
+   expand
+   $ hg paths dupe
+-  $TESTTMP/b (glob)
++ \$TESTTMP/b (glob)
+   $ hg paths -q dupe
+   $ hg paths unknown
+   not found!
 diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
 --- a/tests/test-run-tests.t
 +++ b/tests/test-run-tests.t
  Multi-line command:
  
    $ foo() {
+diff --git a/tests/test-share.t b/tests/test-share.t
+--- a/tests/test-share.t
++++ b/tests/test-share.t
+@@ -27,14 +27,14 @@ share shouldn't have a store dir
+ Some sed versions appends newline, some don't, and some just fails
+ 
+   $ cat .hg/sharedpath; echo
+-  $TESTTMP/repo1/.hg (glob)
++ \$TESTTMP/repo1/.hg (glob)
+ 
+ trailing newline on .hg/sharedpath is ok
+   $ hg tip -q
+   0:d3873e73d99e
+   $ echo '' >> .hg/sharedpath
+   $ cat .hg/sharedpath
+-  $TESTTMP/repo1/.hg (glob)
++ \$TESTTMP/repo1/.hg (glob)
+   $ hg tip -q
+   0:d3873e73d99e
+