tests: remove (glob) annotations that were only for '\' matches
# skip-blame because this was mechanically rewritten the following script. I
ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.
import argparse
import os
import re
ap = argparse.ArgumentParser()
ap.add_argument('path', nargs='+')
opts = ap.parse_args()
globre = re.compile(r'^(.*) \(glob\)(.*)$')
for p in opts.path:
tmp = p + '.tmp'
with open(p, 'rb') as src, open(tmp, 'wb') as dst:
for line in src:
m = globre.match(line)
if not m or '$LOCALIP' in line or '*' in line:
dst.write(line)
continue
if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
dst.write(line)
continue
dst.write(m.group(1) + m.group(2) + '\n')
os.unlink(p)
os.rename(tmp, p)
--- a/tests/test-add.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-add.t Sun Dec 10 22:50:57 2017 -0500
@@ -197,17 +197,17 @@
$ echo def > CapsDir1/CapsDir/SubDir/Def.txt
$ hg add capsdir1/capsdir
- adding CapsDir1/CapsDir/AbC.txt (glob)
- adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ adding CapsDir1/CapsDir/AbC.txt
+ adding CapsDir1/CapsDir/SubDir/Def.txt
$ hg forget capsdir1/capsdir/abc.txt
$ hg forget capsdir1/capsdir
- removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ removing CapsDir1/CapsDir/SubDir/Def.txt
$ hg add capsdir1
- adding CapsDir1/CapsDir/AbC.txt (glob)
- adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ adding CapsDir1/CapsDir/AbC.txt
+ adding CapsDir1/CapsDir/SubDir/Def.txt
$ hg ci -m "AbCDef" capsdir1/capsdir
@@ -216,14 +216,14 @@
C CapsDir1/CapsDir/SubDir/Def.txt
$ hg files capsdir1/capsdir
- CapsDir1/CapsDir/AbC.txt (glob)
- CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ CapsDir1/CapsDir/AbC.txt
+ CapsDir1/CapsDir/SubDir/Def.txt
$ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
$ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
$ hg revert -r '.^' capsdir1/capsdir
- reverting CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ reverting CapsDir1/CapsDir/SubDir/Def.txt
The conditional tests above mean the hash on the diff line differs on Windows
and OS X
@@ -244,8 +244,8 @@
$ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
$ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
- removing CapsDir1/CapsDir/ABC.txt (glob)
- removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
+ removing CapsDir1/CapsDir/ABC.txt
+ removing CapsDir1/CapsDir/SubDir/Def.txt
#endif
$ cd ..
--- a/tests/test-addremove-similar.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-addremove-similar.t Sun Dec 10 22:50:57 2017 -0500
@@ -153,7 +153,7 @@
$ hg addremove -s80
removing d/a
adding d/b
- recording removal of d/a as rename to d/b (100% similar) (glob)
+ recording removal of d/a as rename to d/b (100% similar)
$ hg debugstate
r 0 0 1970-01-01 00:00:00 d/a
a 0 -1 unset d/b
@@ -163,12 +163,12 @@
no copies found here (since the target isn't in d
$ hg addremove -s80 d
- removing d/b (glob)
+ removing d/b
copies here
$ hg addremove -s80
adding c
- recording removal of d/a as rename to c (100% similar) (glob)
+ recording removal of d/a as rename to c (100% similar)
$ cd ..
--- a/tests/test-amend-subrepo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-amend-subrepo.t Sun Dec 10 22:50:57 2017 -0500
@@ -58,7 +58,7 @@
$ echo a >> s/a
$ hg add -R s
- adding s/a (glob)
+ adding s/a
$ hg amend
abort: uncommitted changes in subrepository "s"
(use --subrepos for recursive commit)
--- a/tests/test-amend.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-amend.t Sun Dec 10 22:50:57 2017 -0500
@@ -29,7 +29,7 @@
$ echo 2 >> B
$ hg amend
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-7e959a55-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-7e959a55-amend.hg (obsstore-off !)
#if obsstore-off
$ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n'
@ 1 be169c7e8dbe B
@@ -99,13 +99,13 @@
$ echo 4 > D
$ hg add C D
$ hg amend -m NEWMESSAGE -I C
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc} {files}\n'
c7ba14d9075b NEWMESSAGE B C
$ echo 5 > E
$ rm C
$ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n'
14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000
@@ -119,11 +119,11 @@
$ chmod +x $TESTTMP/prefix.sh
$ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend --edit
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/14f6c4bcc865-6591f15d-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/14f6c4bcc865-6591f15d-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n'
298f085230c3 EDITED: NEWMESSAGE
$ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n'
974f07f28537 EDITED: MSG
@@ -132,7 +132,7 @@
abort: options --message and --logfile are mutually exclusive
[255]
$ hg amend -l $TESTTMP/msg
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n'
507be9bdac71 FOO
@@ -152,7 +152,7 @@
new file mode 100644
examine changes to 'G'? [Ynesfdaq?] n
- saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (obsstore-off !)
$ hg log -r . -T '{files}\n'
B D F
@@ -227,7 +227,7 @@
> EOS
$ hg update -q C
$ hg amend -m FOO
- saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/a35c07e8a2a4-15ff4612-amend.hg (glob) (obsstore-off !)
+ saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/a35c07e8a2a4-15ff4612-amend.hg (obsstore-off !)
$ rm .hg/localtags
$ hg log -G -T '{desc}\n'
@ FOO
--- a/tests/test-archive.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-archive.t Sun Dec 10 22:50:57 2017 -0500
@@ -32,7 +32,7 @@
sharing subrepo subrepo from $TESTTMP/test/subrepo
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat shared1/subrepo/.hg/sharedpath
- $TESTTMP/test/subrepo/.hg (no-eol) (glob)
+ $TESTTMP/test/subrepo/.hg (no-eol)
hg subrepos are shared into existence on demand if the parent was shared
@@ -45,7 +45,7 @@
sharing subrepo subrepo from $TESTTMP/test/subrepo
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat share2/subrepo/.hg/sharedpath
- $TESTTMP/test/subrepo/.hg (no-eol) (glob)
+ $TESTTMP/test/subrepo/.hg (no-eol)
$ echo 'mod' > share2/subrepo/sub
$ hg -R share2 ci -Sqm 'subrepo mod'
$ hg -R clone1 update -C tip
@@ -79,7 +79,7 @@
$ hg -R shared3 archive --config ui.archivemeta=False -r tip -S archive
sharing subrepo subrepo from $TESTTMP/test/subrepo
$ cat shared3/subrepo/.hg/sharedpath
- $TESTTMP/test/subrepo/.hg (no-eol) (glob)
+ $TESTTMP/test/subrepo/.hg (no-eol)
$ diff -r archive test
Only in test: .hg
Common subdirectories: archive/baz and test/baz (?)
--- a/tests/test-audit-path.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-audit-path.t Sun Dec 10 22:50:57 2017 -0500
@@ -3,7 +3,7 @@
audit of .hg
$ hg add .hg/00changelog.i
- abort: path contains illegal component: .hg/00changelog.i (glob)
+ abort: path contains illegal component: .hg/00changelog.i
[255]
#if symlink
@@ -17,14 +17,14 @@
$ ln -s a b
$ echo b > a/b
$ hg add b/b
- abort: path 'b/b' traverses symbolic link 'b' (glob)
+ abort: path 'b/b' traverses symbolic link 'b'
[255]
$ hg add b
should still fail - maybe
$ hg add b/b
- abort: path 'b/b' traverses symbolic link 'b' (glob)
+ abort: path 'b/b' traverses symbolic link 'b'
[255]
$ hg commit -m 'add symlink b'
@@ -86,7 +86,7 @@
$ hg manifest -r0
.hg/test
$ hg update -Cr0
- abort: path contains illegal component: .hg/test (glob)
+ abort: path contains illegal component: .hg/test
[255]
attack foo/.hg/test
@@ -94,7 +94,7 @@
$ hg manifest -r1
foo/.hg/test
$ hg update -Cr1
- abort: path 'foo/.hg/test' is inside nested repo 'foo' (glob)
+ abort: path 'foo/.hg/test' is inside nested repo 'foo'
[255]
attack back/test where back symlinks to ..
@@ -121,7 +121,7 @@
$ mkdir ../test
$ echo data > ../test/file
$ hg update -Cr3
- abort: path contains illegal component: ../test (glob)
+ abort: path contains illegal component: ../test
[255]
$ cat ../test/file
data
@@ -131,7 +131,7 @@
$ hg manifest -r4
/tmp/test
$ hg update -Cr4
- abort: path contains illegal component: /tmp/test (glob)
+ abort: path contains illegal component: /tmp/test
[255]
$ cd ..
--- a/tests/test-audit-subrepo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-audit-subrepo.t Sun Dec 10 22:50:57 2017 -0500
@@ -9,7 +9,7 @@
$ hg init sub/.hg
$ echo 'sub/.hg = sub/.hg' >> .hgsub
$ hg ci -qAm 'add subrepo "sub/.hg"'
- abort: path 'sub/.hg' is inside nested repo 'sub' (glob)
+ abort: path 'sub/.hg' is inside nested repo 'sub'
[255]
prepare tampered repo (including the commit above):
@@ -33,7 +33,7 @@
on clone (and update):
$ hg clone -q hgname hgname2
- abort: path 'sub/.hg' is inside nested repo 'sub' (glob)
+ abort: path 'sub/.hg' is inside nested repo 'sub'
[255]
Test direct symlink traversal
--- a/tests/test-basic.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-basic.t Sun Dec 10 22:50:57 2017 -0500
@@ -4,8 +4,8 @@
devel.all-warnings=true
devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !)
- largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
- lfs.usercache=$TESTTMP/.cache/lfs (glob)
+ largefiles.usercache=$TESTTMP/.cache/largefiles
+ lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True
ui.interactive=False
ui.mergemarkers=detailed
--- a/tests/test-blackbox.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-blackbox.t Sun Dec 10 22:50:57 2017 -0500
@@ -60,7 +60,7 @@
adding c
$ cd ../blackboxtest2
$ hg pull
- pulling from $TESTTMP/blackboxtest (glob)
+ pulling from $TESTTMP/blackboxtest
searching for changes
adding changesets
adding manifests
@@ -85,7 +85,7 @@
$ mkdir .hg/blackbox.log
$ hg --debug incoming
warning: cannot write to blackbox.log: * (glob)
- comparing with $TESTTMP/blackboxtest (glob)
+ comparing with $TESTTMP/blackboxtest
query 1; heads
searching for changes
all local heads known remotely
@@ -104,7 +104,7 @@
$ hg pull
- pulling from $TESTTMP/blackboxtest (glob)
+ pulling from $TESTTMP/blackboxtest
searching for changes
adding changesets
adding manifests
@@ -133,7 +133,7 @@
saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
$ hg blackbox -l 6
1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip
- 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg (glob)
+ 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated base branch cache in * seconds (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote base branch cache with 1 labels and 2 nodes
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob)
--- a/tests/test-bookmarks-pushpull.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bookmarks-pushpull.t Sun Dec 10 22:50:57 2017 -0500
@@ -409,7 +409,7 @@
* foobar 1:9b140be10808
$ hg pull --config paths.foo=../a foo --config "$TESTHOOK"
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -485,7 +485,7 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark X)
$ hg pull --config paths.foo=../a foo -B . --config "$TESTHOOK"
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
no changes found
divergent bookmark @ stored as @foo
importing bookmark X
@@ -840,12 +840,12 @@
be exchanged)
$ hg -R repo1 incoming -B
- comparing with $TESTTMP/bmcomparison/source (glob)
+ comparing with $TESTTMP/bmcomparison/source
searching for changed bookmarks
no changed bookmarks found
[1]
$ hg -R repo1 outgoing -B
- comparing with $TESTTMP/bmcomparison/source (glob)
+ comparing with $TESTTMP/bmcomparison/source
searching for changed bookmarks
no changed bookmarks found
[1]
@@ -989,7 +989,7 @@
$ echo 2 > f2
$ hg ci -qAmr
$ hg push -B X
- pushing to $TESTTMP/addmarks (glob)
+ pushing to $TESTTMP/addmarks
searching for changes
remote has heads on branch 'default' that are not known locally: a2a606d9ff1b
abort: push creates new remote head 54694f811df9 with bookmark 'X'!
@@ -1072,7 +1072,7 @@
#if b2-pushkey
$ hg push -B @ local
- pushing to $TESTTMP/issue4455-dest (glob)
+ pushing to $TESTTMP/issue4455-dest
searching for changes
no changes found
pushkey-abort: prepushkey hook exited with status 1
@@ -1083,7 +1083,7 @@
#if b2-binary
$ hg push -B @ local
- pushing to $TESTTMP/issue4455-dest (glob)
+ pushing to $TESTTMP/issue4455-dest
searching for changes
no changes found
abort: prepushkey hook exited with status 1
--- a/tests/test-bookmarks-rebase.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bookmarks-rebase.t Sun Dec 10 22:50:57 2017 -0500
@@ -38,7 +38,7 @@
$ hg rebase -s two -d one
rebasing 3:2ae46b1d99a7 "3" (two tip)
- saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
$ hg log
changeset: 3:42e5ed2cdcf4
--- a/tests/test-bookmarks.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bookmarks.t Sun Dec 10 22:50:57 2017 -0500
@@ -736,7 +736,7 @@
Z 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
- pulling from $TESTTMP/repo (glob)
+ pulling from $TESTTMP/repo
searching for changes
adding changesets
adding manifests
--- a/tests/test-bugzilla.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bugzilla.t Sun Dec 10 22:50:57 2017 -0500
@@ -61,7 +61,7 @@
$ cat bzmock.log && rm bzmock.log
update bugid=123, newstate={}, committer='test'
----
- changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123. (glob)
+ changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123.
details:
Fixes bug 123
----
--- a/tests/test-bundle.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bundle.t Sun Dec 10 22:50:57 2017 -0500
@@ -856,7 +856,7 @@
$ hg bundle --base 1 -r 3 ../update2bundled.hg
1 changesets found
$ hg strip -r 3
- saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg (glob)
+ saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg
$ hg merge -R ../update2bundled.hg -r 3
setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-bundle2-exchange.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bundle2-exchange.t Sun Dec 10 22:50:57 2017 -0500
@@ -106,7 +106,7 @@
postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
$ hg -R other pull -r 24b6387c8c8c
- pulling from $TESTTMP/main (glob)
+ pulling from $TESTTMP/main
searching for changes
adding changesets
adding manifests
@@ -137,7 +137,7 @@
postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
$ hg -R other pull -r 24b6387c8c8c
- pulling from $TESTTMP/main (glob)
+ pulling from $TESTTMP/main
no changes found
pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public
@@ -157,7 +157,7 @@
pull empty
$ hg -R other pull -r 24b6387c8c8c
- pulling from $TESTTMP/main (glob)
+ pulling from $TESTTMP/main
no changes found
pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public
--- a/tests/test-bundle2-multiple-changegroups.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-bundle2-multiple-changegroups.t Sun Dec 10 22:50:57 2017 -0500
@@ -74,7 +74,7 @@
Pull the new commits in the clone
$ hg pull
- pulling from $TESTTMP/repo (glob)
+ pulling from $TESTTMP/repo
searching for changes
remote: changegroup1
adding changesets
@@ -145,7 +145,7 @@
$ cd ../clone
$ hg pull
- pulling from $TESTTMP/repo (glob)
+ pulling from $TESTTMP/repo
searching for changes
remote: changegroup1
adding changesets
@@ -219,7 +219,7 @@
$ cd ../clone
$ hg pull
- pulling from $TESTTMP/repo (glob)
+ pulling from $TESTTMP/repo
searching for changes
remote: changegroup1
adding changesets
--- a/tests/test-casefolding.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-casefolding.t Sun Dec 10 22:50:57 2017 -0500
@@ -178,8 +178,8 @@
$ echo 'foo' > a/B/c/D/E
$ hg ci -m 'e content change'
$ hg revert --all -r 0
- removing a/B/c/D/E (glob)
- adding a/B/c/D/e (glob)
+ removing a/B/c/D/E
+ adding a/B/c/D/e
$ find * | sort
a
a/B
--- a/tests/test-cat.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-cat.t Sun Dec 10 22:50:57 2017 -0500
@@ -66,9 +66,9 @@
Test template output
$ hg --cwd tmp cat ../b ../c -T '== {path} ({abspath}) ==\n{data}'
- == ../b (b) == (glob)
+ == ../b (b) ==
1
- == ../c (c) == (glob)
+ == ../c (c) ==
3
$ hg cat b c -Tjson --output -
--- a/tests/test-censor.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-censor.t Sun Dec 10 22:50:57 2017 -0500
@@ -353,7 +353,7 @@
checking files
2 files, 1 changesets, 2 total revisions
$ hg pull -r $H1 -r $H2
- pulling from $TESTTMP/r (glob)
+ pulling from $TESTTMP/r
searching for changes
adding changesets
adding manifests
@@ -398,7 +398,7 @@
$ hg cat -r $CLEANREV target
Re-sanitized; nothing to see here
$ hg push -f -r $H2
- pushing to $TESTTMP/r (glob)
+ pushing to $TESTTMP/r
searching for changes
adding changesets
adding manifests
--- a/tests/test-check-config.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-check-config.t Sun Dec 10 22:50:57 2017 -0500
@@ -33,7 +33,7 @@
$ $PYTHON contrib/check-config.py < $TESTTMP/files
foo = ui.configint('ui', 'intdefault', default=42)
conflict on ui.intdefault: ('int', '42') != ('int', '1')
- at $TESTTMP/testfile.py:12: (glob)
+ at $TESTTMP/testfile.py:12:
undocumented: ui.doesnotexist (str)
undocumented: ui.intdefault (int) [42]
undocumented: ui.intdefault2 (int) [42]
--- a/tests/test-clone.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-clone.t Sun Dec 10 22:50:57 2017 -0500
@@ -138,7 +138,7 @@
$ hg clone -q -U --config 'paths.foobar=a#0' foobar f
$ hg -R f showconfig paths.default
- $TESTTMP/a#0 (glob)
+ $TESTTMP/a#0
Use --pull:
@@ -808,7 +808,7 @@
The destination should point to it
$ cat share-dest1a/.hg/sharedpath; echo
- $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg (glob)
+ $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg
The destination should have bookmarks
@@ -818,7 +818,7 @@
The default path should be the remote, not the share
$ hg -R share-dest1a config paths.default
- $TESTTMP/source1a (glob)
+ $TESTTMP/source1a
Clone with existing share dir should result in pull + share
@@ -839,7 +839,7 @@
b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1
$ cat share-dest1b/.hg/sharedpath; echo
- $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg (glob)
+ $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg
We only get bookmarks from the remote, not everything in the share
@@ -850,7 +850,7 @@
Default path should be source, not share.
$ hg -R share-dest1b config paths.default
- $TESTTMP/source1b (glob)
+ $TESTTMP/source1b
Checked out revision should be head of default branch
--- a/tests/test-commit-amend.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-commit-amend.t Sun Dec 10 22:50:57 2017 -0500
@@ -41,7 +41,7 @@
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
43f1ba15f28a tip
- saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg
$ echo 'pretxncommit.foo = ' >> $HGRCPATH
$ hg diff -c .
diff -r ad120869acf0 -r 43f1ba15f28a a
@@ -99,7 +99,7 @@
Add new file along with modified existing file:
$ hg ci --amend -m 'amend base1 new file'
- saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg
Remove file that was added in amended commit:
(and test logfile option)
@@ -108,7 +108,7 @@
$ hg rm b
$ echo 'amend base1 remove new file' > ../logfile
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
- saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg
$ hg cat b
b: no such file in rev 47343646fa3d
@@ -128,7 +128,7 @@
254 (changelog)
163 (manifests)
131 a
- saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
1 changesets found
uncompressed size of bundle content:
250 (changelog)
@@ -175,10 +175,10 @@
> EOF
$ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'
HGEDITFORM=commit.amend.normal
- saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg
$ echo a >> a
$ hg ci --amend -u foo -d '1 0'
- saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
$ hg log -r .
changeset: 1:a9a13940fc03
tag: tip
@@ -272,7 +272,7 @@
249 (changelog)
163 (manifests)
133 a
- saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
1 changesets found
uncompressed size of bundle content:
257 (changelog)
@@ -308,7 +308,7 @@
257 (changelog)
163 (manifests)
133 a
- saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
1 changesets found
uncompressed size of bundle content:
257 (changelog)
@@ -335,13 +335,13 @@
$ hg book book1
$ hg book book2
$ hg ci --amend -m 'move bookmarks'
- saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg
$ hg book
book1 1:8311f17e2616
* book2 1:8311f17e2616
$ echo a >> a
$ hg ci --amend -m 'move bookmarks'
- saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
$ hg book
book1 1:a3b65065808c
* book2 1:a3b65065808c
@@ -375,7 +375,7 @@
$ hg branch default -f
marked working directory as branch default
$ hg ci --amend -m 'back to default'
- saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
$ hg branches
default 2:9c07515f2650
@@ -391,7 +391,7 @@
$ echo b >> b
$ hg ci -mb
$ hg ci --amend --close-branch -m 'closing branch foo'
- saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
Same thing, different code path:
@@ -400,7 +400,7 @@
reopening closed branch head 4
$ echo b >> b
$ hg ci --amend --close-branch
- saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg
$ hg branches
default 2:9c07515f2650
@@ -421,7 +421,7 @@
$ hg ci -m 'b -> c'
$ hg mv c d
$ hg ci --amend -m 'b -> d'
- saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
$ hg st --rev '.^' --copies d
A d
b
@@ -429,7 +429,7 @@
$ hg ci -m 'e = d'
$ hg cp e f
$ hg ci --amend -m 'f = d'
- saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
$ hg st --rev '.^' --copies f
A f
d
@@ -440,7 +440,7 @@
$ hg cp a f
$ mv f.orig f
$ hg ci --amend -m replacef
- saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
$ hg st --change . --copies
$ hg log -r . --template "{file_copies}\n"
@@ -452,7 +452,7 @@
adding g
$ hg mv g h
$ hg ci --amend
- saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
$ hg st --change . --copies h
A h
$ hg log -r . --template "{file_copies}\n"
@@ -472,11 +472,11 @@
$ echo a >> a
$ hg ci -ma
$ hg ci --amend -m "a'"
- saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
$ hg log -r . --template "{branch}\n"
a
$ hg ci --amend -m "a''"
- saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
$ hg log -r . --template "{branch}\n"
a
@@ -493,7 +493,7 @@
$ hg graft 12
grafting 12:2647734878ef "fork" (tip)
$ hg ci --amend -m 'graft amend'
- saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
$ hg log -r . --debug | grep extra
extra: amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
extra: branch=a
@@ -1112,7 +1112,7 @@
marked working directory as branch newdirname
(branches are permanent and global, did you want a bookmark?)
$ hg mv olddirname newdirname
- moving olddirname/commonfile.py to newdirname/commonfile.py (glob)
+ moving olddirname/commonfile.py to newdirname/commonfile.py
$ hg ci -m rename
$ hg update default
@@ -1130,7 +1130,7 @@
$ hg ci -m add
$
$ hg debugrename newdirname/newfile.py
- newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
+ newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
$ hg status -C --change .
A newdirname/newfile.py
$ hg status -C --rev 1
@@ -1149,7 +1149,7 @@
$ echo a >> newdirname/commonfile.py
$ hg ci --amend -m bug
$ hg debugrename newdirname/newfile.py
- newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
+ newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
$ hg debugindex newdirname/newfile.py
rev offset length delta linkrev nodeid p1 p2
0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000
--- a/tests/test-commit-interactive-curses.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-commit-interactive-curses.t Sun Dec 10 22:50:57 2017 -0500
@@ -206,7 +206,7 @@
> X
> EOF
$ hg commit -i -m "newly added file" -d "0 0"
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg
$ hg diff -c .
diff -r a6735021574d -r c1d239d165ae x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-commit.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-commit.t Sun Dec 10 22:50:57 2017 -0500
@@ -61,7 +61,7 @@
$ mkdir dir
$ echo boo > dir/file
$ hg add
- adding dir/file (glob)
+ adding dir/file
$ hg -v commit -m commit-9 dir
committing files:
dir/file
@@ -180,8 +180,8 @@
$ mkdir bar
$ echo bar > bar/bar
$ hg add
- adding bar/bar (glob)
- adding foo/foo (glob)
+ adding bar/bar
+ adding foo/foo
$ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo
commit-subdir-1
@@ -680,7 +680,7 @@
> EOF
$ $PYTHON evil-commit.py
$ hg co --clean tip
- abort: path contains illegal component: HG~1/hgrc (glob)
+ abort: path contains illegal component: HG~1/hgrc
[255]
$ hg rollback -f
@@ -699,7 +699,7 @@
> EOF
$ $PYTHON evil-commit.py
$ hg co --clean tip
- abort: path contains illegal component: HG8B6C~2/hgrc (glob)
+ abort: path contains illegal component: HG8B6C~2/hgrc
[255]
# test that an unmodified commit template message aborts
--- a/tests/test-config.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-config.t Sun Dec 10 22:50:57 2017 -0500
@@ -7,7 +7,7 @@
> novaluekey
> EOF
$ hg showconfig
- hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey (glob)
+ hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey
[255]
Invalid syntax: no key
@@ -16,7 +16,7 @@
> =nokeyvalue
> EOF
$ hg showconfig
- hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue (glob)
+ hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue
[255]
Test hint about invalid syntax from leading white space
@@ -25,7 +25,7 @@
> key=value
> EOF
$ hg showconfig
- hg: parse error at $TESTTMP/.hg/hgrc:1: key=value (glob)
+ hg: parse error at $TESTTMP/.hg/hgrc:1: key=value
unexpected leading whitespace
[255]
@@ -34,7 +34,7 @@
> key=value
> EOF
$ hg showconfig
- hg: parse error at $TESTTMP/.hg/hgrc:1: [section] (glob)
+ hg: parse error at $TESTTMP/.hg/hgrc:1: [section]
unexpected leading whitespace
[255]
--- a/tests/test-convert-authormap.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert-authormap.t Sun Dec 10 22:50:57 2017 -0500
@@ -27,7 +27,7 @@
sorting...
converting...
0 foo
- writing author map file $TESTTMP/new/.hg/authormap (glob)
+ writing author map file $TESTTMP/new/.hg/authormap
$ cat new/.hg/authormap
user name=Long User Name
$ hg -Rnew log
@@ -44,7 +44,7 @@
$ hg init new
$ mv authormap.txt new/.hg/authormap
$ hg convert orig new
- ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
+ ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
scanning source...
sorting...
converting...
--- a/tests/test-convert-filemap.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert-filemap.t Sun Dec 10 22:50:57 2017 -0500
@@ -637,7 +637,7 @@
$ cd namedbranch
$ hg --config extensions.mq= strip tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg (glob)
+ saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg
$ hg up foo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge default
--- a/tests/test-convert-git.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert-git.t Sun Dec 10 22:50:57 2017 -0500
@@ -936,7 +936,7 @@
$ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd
$ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp
$ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'
- abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git (glob)
+ abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git
$ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ
damage git repository by renaming a blob object
--- a/tests/test-convert-svn-sink.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert-svn-sink.t Sun Dec 10 22:50:57 2017 -0500
@@ -48,8 +48,8 @@
0 modify a file
$ svnupanddisplay a-hg-wc 2
2 1 test d1
- 2 1 test d1/d2 (glob)
- 2 1 test d1/d2/b (glob)
+ 2 1 test d1/d2
+ 2 1 test d1/d2/b
2 2 test .
2 2 test a
revision: 2
@@ -89,8 +89,8 @@
0 rename a file
$ svnupanddisplay a-hg-wc 1
3 1 test d1
- 3 1 test d1/d2 (glob)
- 3 1 test d1/d2/b (glob)
+ 3 1 test d1/d2
+ 3 1 test d1/d2/b
3 3 test .
3 3 test b
revision: 3
@@ -124,8 +124,8 @@
0 copy a file
$ svnupanddisplay a-hg-wc 1
4 1 test d1
- 4 1 test d1/d2 (glob)
- 4 1 test d1/d2/b (glob)
+ 4 1 test d1/d2
+ 4 1 test d1/d2/b
4 3 test b
4 4 test .
4 4 test c
@@ -161,8 +161,8 @@
0 remove a file
$ svnupanddisplay a-hg-wc 1
5 1 test d1
- 5 1 test d1/d2 (glob)
- 5 1 test d1/d2/b (glob)
+ 5 1 test d1/d2
+ 5 1 test d1/d2/b
5 4 test c
5 5 test .
revision: 5
@@ -203,8 +203,8 @@
0 make a file executable
$ svnupanddisplay a-hg-wc 1
6 1 test d1
- 6 1 test d1/d2 (glob)
- 6 1 test d1/d2/b (glob)
+ 6 1 test d1/d2
+ 6 1 test d1/d2/b
6 6 test .
6 6 test c
revision: 6
@@ -256,7 +256,7 @@
$ hg --cwd a up 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg --cwd a --config extensions.strip= strip -r 6
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg
#endif
@@ -312,7 +312,7 @@
$ svnupanddisplay a-hg-wc 1
1 1 test .
1 1 test d1
- 1 1 test d1/a (glob)
+ 1 1 test d1/a
revision: 1
author: test
msg: add executable file in new directory
@@ -337,10 +337,10 @@
0 copy file to new directory
$ svnupanddisplay a-hg-wc 1
2 1 test d1
- 2 1 test d1/a (glob)
+ 2 1 test d1/a
2 2 test .
2 2 test d2
- 2 2 test d2/a (glob)
+ 2 2 test d2/a
revision: 2
author: test
msg: copy file to new directory
--- a/tests/test-convert-svn-source.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert-svn-source.t Sun Dec 10 22:50:57 2017 -0500
@@ -32,8 +32,8 @@
$ cd ..
$ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" | filter_svn_output | sort
- Adding projB/mytrunk (glob)
- Adding projB/tags (glob)
+ Adding projB/mytrunk
+ Adding projB/tags
Committed revision 1.
Update svn repository
--- a/tests/test-convert.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-convert.t Sun Dec 10 22:50:57 2017 -0500
@@ -476,7 +476,7 @@
assuming destination emptydir-hg
initializing destination emptydir-hg repository
emptydir does not look like a CVS checkout
- $TESTTMP/emptydir does not look like a Git repository (glob)
+ $TESTTMP/emptydir does not look like a Git repository
emptydir does not look like a Subversion repository
emptydir is not a local Mercurial repository
emptydir does not look like a darcs repository
--- a/tests/test-copy-move-merge.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-copy-move-merge.t Sun Dec 10 22:50:57 2017 -0500
@@ -82,7 +82,7 @@
$ hg strip -r . --config extensions.strip=
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob)
+ saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg
$ hg up -qC 2
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
> c
@@ -122,7 +122,7 @@
$ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.copytrace=off
rebasing 2:6adcf8c12e7d "copy b->x"
- saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg
$ hg up -q 3
$ hg log -f x -T '{rev} {desc}\n'
3 copy b->x
@@ -155,7 +155,7 @@
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
- saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg
$ hg log -G -f b
@ changeset: 3:76024fb4b05b
--- a/tests/test-copytrace-heuristics.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-copytrace-heuristics.t Sun Dec 10 22:50:57 2017 -0500
@@ -55,7 +55,7 @@
rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)
merging b and a to b
merging dir2/file.txt and dir/file.txt to dir2/file.txt
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg
$ cd ..
$ rm -rf repo
@@ -125,7 +125,7 @@
$ hg rebase -s . -d 2
rebasing 3:9d5cf99c3d9f "mod a" (tip)
merging b and a to b
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg
$ cd ..
$ rm -rf repo
@@ -160,7 +160,7 @@
$ hg rebase -s . -d 0
rebasing 3:fbe97126b396 "mod b" (tip)
merging a and b to a
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg
$ cd ..
$ rm -rf repo
@@ -197,7 +197,7 @@
$ hg rebase -s . -d 2
rebasing 3:6b2f4cece40f "mod dir/a" (tip)
merging dir/b and dir/a to dir/b
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg
$ cd ..
$ rm -rf repo
@@ -255,7 +255,7 @@
$ hg rebase -s 2 -d 1
rebasing 2:ef716627c70b "mod a" (tip)
merging foo and a to foo
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ cd ..
$ rm -rf repo
@@ -286,7 +286,7 @@
$ hg rebase -s 1 -d 2
rebasing 1:472e38d57782 "mv a b"
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg
$ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
$ ls
b
@@ -320,7 +320,7 @@
$ hg rebase -s . -d 1
rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
merging dir/a and dir2/a to dir2/a
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg
$ cd ..
$ rm -rf server
$ rm -rf repo
@@ -355,7 +355,7 @@
$ hg rebase -s . -d 2
rebasing 3:d41316942216 "mod a" (tip)
merging c and a to c
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg
$ cd ..
$ rm -rf repo
@@ -391,7 +391,7 @@
merging a and b to b
rebasing 2:d3efd280421d "mv b c"
merging b and c to c
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg
$ cd ..
$ rm -rf repo
@@ -428,7 +428,7 @@
$ hg rebase -s . -d 2
rebasing 3:ef716627c70b "mod a" (tip)
merging b and a to b
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls
b
c
@@ -500,7 +500,7 @@
rebasing 2:ef716627c70b "mod a" (tip)
merging b and a to b
merging c and a to c
- saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls
b
c
@@ -624,7 +624,7 @@
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
rebasing 2:6207d2d318e7 "mod a" (tip)
merging dir2/b and dir1/a to dir2/b
- saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg
$ cat dir2/b
a
b
@@ -661,7 +661,7 @@
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
- saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg
$ ls dir2
a
dummy
@@ -711,6 +711,6 @@
$ hg rebase -s 8b6e13696 -d . --config experimental.copytrace.sourcecommitlimit=100
rebasing 1:8b6e13696c38 "added more things to a"
merging foo/bar and a to foo/bar
- saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg
$ cd ..
$ rm -rf repo
--- a/tests/test-default-push.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-default-push.t Sun Dec 10 22:50:57 2017 -0500
@@ -27,7 +27,7 @@
Push should push to 'default' when 'default-push' not set:
$ hg --cwd b push
- pushing to $TESTTMP/a (glob)
+ pushing to $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -39,7 +39,7 @@
$ echo '[paths]' >> b/.hg/hgrc
$ echo 'default-push = ../c' >> b/.hg/hgrc
$ hg --cwd b push
- pushing to $TESTTMP/c (glob)
+ pushing to $TESTTMP/c
searching for changes
adding changesets
adding manifests
@@ -49,7 +49,7 @@
But push should push to 'default' if explicitly specified (issue5000):
$ hg --cwd b push default
- pushing to $TESTTMP/a (glob)
+ pushing to $TESTTMP/a
searching for changes
no changes found
[1]
@@ -63,7 +63,7 @@
$ touch foo
$ hg -q commit -A -m 'add foo'
$ hg --config paths.default-push=../a push
- pushing to $TESTTMP/a (glob)
+ pushing to $TESTTMP/a
searching for changes
adding changesets
adding manifests
--- a/tests/test-diffstat.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-diffstat.t Sun Dec 10 22:50:57 2017 -0500
@@ -100,7 +100,7 @@
1 files changed, 1 insertions(+), 0 deletions(-)
$ hg diff --stat --root ../dir1 ../dir2
- warning: ../dir2 not inside relative root . (glob)
+ warning: ../dir2 not inside relative root .
$ hg diff --stat --root . -I old
--- a/tests/test-dirstate-race.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-dirstate-race.t Sun Dec 10 22:50:57 2017 -0500
@@ -45,7 +45,7 @@
#endif
$ hg add b dir1 d e
- adding dir1/c (glob)
+ adding dir1/c
$ hg commit -m test2
$ cat >> $TESTTMP/dirstaterace.py << EOF
--- a/tests/test-dirstate.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-dirstate.t Sun Dec 10 22:50:57 2017 -0500
@@ -11,9 +11,9 @@
adding a/b/c/d/y
adding a/b/c/d/z
$ hg mv a z
- moving a/b/c/d/x to z/b/c/d/x (glob)
- moving a/b/c/d/y to z/b/c/d/y (glob)
- moving a/b/c/d/z to z/b/c/d/z (glob)
+ moving a/b/c/d/x to z/b/c/d/x
+ moving a/b/c/d/y to z/b/c/d/y
+ moving a/b/c/d/z to z/b/c/d/z
Test name collisions
--- a/tests/test-dispatch.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-dispatch.t Sun Dec 10 22:50:57 2017 -0500
@@ -90,7 +90,7 @@
$ mkdir -p badrepo/.hg
$ echo 'invalid-syntax' > badrepo/.hg/hgrc
$ hg log -b -Rbadrepo default
- hg: parse error at badrepo/.hg/hgrc:1: invalid-syntax (glob)
+ hg: parse error at badrepo/.hg/hgrc:1: invalid-syntax
[255]
$ hg log -b --cwd=inexistent default
--- a/tests/test-drawdag.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-drawdag.t Sun Dec 10 22:50:57 2017 -0500
@@ -261,12 +261,12 @@
a
FILE B
b
- FILE dir1/a (glob)
+ FILE dir1/a
1
2
- FILE dir1/c (glob)
+ FILE dir1/c
5
- FILE dir2/b (glob)
+ FILE dir2/b
34
- FILE dir2/c (glob)
+ FILE dir2/c
6
--- a/tests/test-extension.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-extension.t Sun Dec 10 22:50:57 2017 -0500
@@ -180,7 +180,7 @@
> EOF
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
ambigabs.s=libroot/ambig.py
- $TESTTMP/a (glob)
+ $TESTTMP/a
#if no-py3k
$ cat > $TESTTMP/libroot/mod/ambigrel.py <<EOF
@@ -194,7 +194,7 @@
> EOF
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
ambigrel.s=libroot/mod/ambig.py
- $TESTTMP/a (glob)
+ $TESTTMP/a
#endif
Check absolute/relative import of extension specific modules
@@ -245,7 +245,7 @@
(extroot) import extroot: this is extroot.__init__
(extroot) from extroot.bar import s: this is extroot.bar
(extroot) import extroot.bar in func(): this is extroot.bar
- $TESTTMP/a (glob)
+ $TESTTMP/a
#if no-py3k
$ rm "$TESTTMP"/extroot/foo.*
@@ -277,7 +277,7 @@
(extroot) import sub1: this is extroot.sub1.__init__
(extroot) from bar import s: this is extroot.bar
(extroot) import bar in func(): this is extroot.bar
- $TESTTMP/a (glob)
+ $TESTTMP/a
#endif
#if demandimport
@@ -1225,7 +1225,7 @@
> cmdtable = None
> EOF
$ hg --config extensions.path=./path.py help foo > /dev/null
- warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
+ warning: error finding commands in $TESTTMP/hgext/forest.py
abort: no such help topic: foo
(try 'hg help --keyword foo')
[255]
@@ -1503,17 +1503,17 @@
$ echo '# enable extension locally' >> src/.hg/hgrc
$ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> src/.hg/hgrc
$ hg -R src status
- reposetup() for $TESTTMP/reposetup-test/src (glob)
- reposetup() for $TESTTMP/reposetup-test/src (glob) (chg !)
+ reposetup() for $TESTTMP/reposetup-test/src
+ reposetup() for $TESTTMP/reposetup-test/src (chg !)
$ hg clone -U src clone-dst1
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ hg init push-dst1
$ hg -q -R src push push-dst1
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ hg init pull-src1
$ hg -q -R pull-src1 pull src
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ cat <<EOF >> $HGRCPATH
> [extensions]
@@ -1521,13 +1521,13 @@
> reposetuptest = !
> EOF
$ hg clone -U src clone-dst2
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ hg init push-dst2
$ hg -q -R src push push-dst2
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ hg init pull-src2
$ hg -q -R pull-src2 pull src
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
$ cat <<EOF >> $HGRCPATH
> [extensions]
@@ -1535,32 +1535,32 @@
> reposetuptest = $TESTTMP/reposetuptest.py
> EOF
$ hg clone -U src clone-dst3
- reposetup() for $TESTTMP/reposetup-test/src (glob)
- reposetup() for $TESTTMP/reposetup-test/clone-dst3 (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
+ reposetup() for $TESTTMP/reposetup-test/clone-dst3
$ hg init push-dst3
- reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
+ reposetup() for $TESTTMP/reposetup-test/push-dst3
$ hg -q -R src push push-dst3
- reposetup() for $TESTTMP/reposetup-test/src (glob)
- reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
+ reposetup() for $TESTTMP/reposetup-test/src
+ reposetup() for $TESTTMP/reposetup-test/push-dst3
$ hg init pull-src3
- reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
+ reposetup() for $TESTTMP/reposetup-test/pull-src3
$ hg -q -R pull-src3 pull src
- reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
- reposetup() for $TESTTMP/reposetup-test/src (glob)
+ reposetup() for $TESTTMP/reposetup-test/pull-src3
+ reposetup() for $TESTTMP/reposetup-test/src
$ echo '[extensions]' >> src/.hg/hgrc
$ echo '# disable extension locally' >> src/.hg/hgrc
$ echo 'reposetuptest = !' >> src/.hg/hgrc
$ hg clone -U src clone-dst4
- reposetup() for $TESTTMP/reposetup-test/clone-dst4 (glob)
+ reposetup() for $TESTTMP/reposetup-test/clone-dst4
$ hg init push-dst4
- reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
+ reposetup() for $TESTTMP/reposetup-test/push-dst4
$ hg -q -R src push push-dst4
- reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
+ reposetup() for $TESTTMP/reposetup-test/push-dst4
$ hg init pull-src4
- reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
+ reposetup() for $TESTTMP/reposetup-test/pull-src4
$ hg -q -R pull-src4 pull src
- reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
+ reposetup() for $TESTTMP/reposetup-test/pull-src4
disabling in command line overlays with all configuration
$ hg --config extensions.reposetuptest=! clone -U src clone-dst5
@@ -1605,8 +1605,8 @@
$ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> parent/.hg/hgrc
$ cp parent/.hg/hgrc parent/sub2/.hg/hgrc
$ hg -R parent status -S -A
- reposetup() for $TESTTMP/reposetup-test/parent (glob)
- reposetup() for $TESTTMP/reposetup-test/parent/sub2 (glob)
+ reposetup() for $TESTTMP/reposetup-test/parent
+ reposetup() for $TESTTMP/reposetup-test/parent/sub2
C .hgsub
C .hgsubstate
C sub1/1
--- a/tests/test-flagprocessor.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-flagprocessor.t Sun Dec 10 22:50:57 2017 -0500
@@ -81,7 +81,7 @@
# Push to the server
$ hg push
- pushing to $TESTTMP/server (glob)
+ pushing to $TESTTMP/server
searching for changes
adding changesets
adding manifests
@@ -101,7 +101,7 @@
# Pull from server and update to latest revision
$ hg pull default
- pulling from $TESTTMP/server (glob)
+ pulling from $TESTTMP/server
requesting all changes
adding changesets
adding manifests
--- a/tests/test-fncache.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-fncache.t Sun Dec 10 22:50:57 2017 -0500
@@ -14,7 +14,7 @@
$ mkdir a.i
$ echo "some other text" > a.i/b
$ hg add
- adding a.i/b (glob)
+ adding a.i/b
$ hg ci -m second
$ cat .hg/store/fncache | sort
data/a.i
@@ -25,7 +25,7 @@
$ mkdir a.i.hg
$ echo "yet another text" > a.i.hg/c
$ hg add
- adding a.i.hg/c (glob)
+ adding a.i.hg/c
$ hg ci -m third
$ cat .hg/store/fncache | sort
data/a.i
--- a/tests/test-generaldelta.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-generaldelta.t Sun Dec 10 22:50:57 2017 -0500
@@ -154,7 +154,7 @@
Test that strip bundle use bundle2
$ hg --config extensions.strip= strip .
0 files updated, 0 files merged, 5 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg (glob)
+ saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
$ hg debugbundle .hg/strip-backup/*
Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02}
--- a/tests/test-git-export.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-git-export.t Sun Dec 10 22:50:57 2017 -0500
@@ -99,7 +99,7 @@
warning: dir2 not inside relative root dir1
$ hg diff --git --root dir1 -r 1:tip 'dir2/{copy}'
- warning: dir2/{copy} not inside relative root dir1 (glob)
+ warning: dir2/{copy} not inside relative root dir1
$ cd dir1
$ hg diff --git --root .. -r 1:tip
@@ -161,7 +161,7 @@
new
+copy1
$ hg diff --git --root . -r 1:tip ../dir2
- warning: ../dir2 not inside relative root . (glob)
+ warning: ../dir2 not inside relative root .
$ hg diff --git --root . -r 1:tip '../dir2/*'
warning: ../dir2/* not inside relative root . (glob)
$ cd ..
--- a/tests/test-globalopts.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-globalopts.t Sun Dec 10 22:50:57 2017 -0500
@@ -88,7 +88,7 @@
abort: no repository found in '$TESTTMP' (.hg not found)!
[255]
$ hg -R b ann a/a
- abort: a/a not under root '$TESTTMP/b' (glob)
+ abort: a/a not under root '$TESTTMP/b'
(consider using '--cwd b')
[255]
$ hg log
--- a/tests/test-graft.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-graft.t Sun Dec 10 22:50:57 2017 -0500
@@ -811,7 +811,7 @@
$ hg up -qC 7
$ hg tag -l -r 13 tmp
$ hg --config extensions.strip= strip 2
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg
$ hg graft tmp
skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
[255]
--- a/tests/test-hardlinks.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-hardlinks.t Sun Dec 10 22:50:57 2017 -0500
@@ -155,7 +155,7 @@
$ cd r3
$ hg push
- pushing to $TESTTMP/r1 (glob)
+ pushing to $TESTTMP/r1
searching for changes
adding changesets
adding manifests
--- a/tests/test-hgignore.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-hgignore.t Sun Dec 10 22:50:57 2017 -0500
@@ -59,9 +59,9 @@
I dir/c.o
$ hg debugignore dir/c.o dir/missing.o
- dir/c.o is ignored (glob)
+ dir/c.o is ignored
(ignore rule in $TESTTMP/ignorerepo/.hgignore, line 1: 'dir/.*\.o') (glob)
- dir/missing.o is ignored (glob)
+ dir/missing.o is ignored
(ignore rule in $TESTTMP/ignorerepo/.hgignore, line 1: 'dir/.*\.o') (glob)
$ cd dir
$ hg debugignore c.o missing.o
@@ -164,7 +164,7 @@
$ echo "syntax: invalid" > .hgignore
$ hg status
- $TESTTMP/ignorerepo/.hgignore: ignoring invalid syntax 'invalid' (glob)
+ $TESTTMP/ignorerepo/.hgignore: ignoring invalid syntax 'invalid'
A dir/b.o
? .hgignore
? a.c
@@ -236,7 +236,7 @@
$ hg debugignore a.c
a.c is not ignored
$ hg debugignore dir/c.o
- dir/c.o is ignored (glob)
+ dir/c.o is ignored
(ignore rule in $TESTTMP/ignorerepo/.hgignore, line 2: 'dir/**/c.o') (glob)
Check using 'include:' in ignore file
@@ -322,7 +322,7 @@
$ hg status | grep file2
[1]
$ hg debugignore dir1/file2
- dir1/file2 is ignored (glob)
+ dir1/file2 is ignored
(ignore rule in dir2/.hgignore, line 1: 'file*2')
#if windows
--- a/tests/test-hgrc.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-hgrc.t Sun Dec 10 22:50:57 2017 -0500
@@ -30,7 +30,7 @@
$ cat .hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/foo%bar (glob)
+ default = $TESTTMP/foo%bar
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
@@ -43,10 +43,10 @@
# name and email (local to this repository, optional), e.g.
# username = Jane Doe <jdoe@example.com>
$ hg paths
- default = $TESTTMP/foo%bar (glob)
+ default = $TESTTMP/foo%bar
$ hg showconfig
- bundle.mainreporoot=$TESTTMP/foobar (glob)
- paths.default=$TESTTMP/foo%bar (glob)
+ bundle.mainreporoot=$TESTTMP/foobar
+ paths.default=$TESTTMP/foo%bar
$ cd ..
issue1829: wrong indentation
@@ -242,4 +242,4 @@
$ hg showconfig --debug paths
plain: True
read config from: $TESTTMP/hgrc
- $TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar (glob)
+ $TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar
--- a/tests/test-hgweb-bundle.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-hgweb-bundle.t Sun Dec 10 22:50:57 2017 -0500
@@ -18,7 +18,7 @@
$ hg strip -r 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg (glob)
+ saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg
Serve from a bundle file
--- a/tests/test-histedit-arguments.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-arguments.t Sun Dec 10 22:50:57 2017 -0500
@@ -148,7 +148,7 @@
$ mv .hg/histedit-state.back .hg/histedit-state
$ hg histedit --continue
- saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg
$ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
@ 4 f5ed five
|
@@ -265,7 +265,7 @@
HG: user: test
HG: branch 'default'
HG: changed alpha
- saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-63d8b8d8-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-63d8b8d8-histedit.hg
$ hg update -q 2
$ echo x > x
--- a/tests/test-histedit-bookmark-motion.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-bookmark-motion.t Sun Dec 10 22:50:57 2017 -0500
@@ -88,7 +88,7 @@
> fold e860deea161a 4 e
> pick 652413bf663e 5 f
> EOF
- saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-45c027ab-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-45c027ab-histedit.hg
$ hg log --graph
@ changeset: 3:cacdfd884a93
| bookmark: five
@@ -143,7 +143,7 @@
> pick cacdfd884a93 3 f
> pick 59d9f330561f 2 d
> EOF
- saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-073008af-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-073008af-histedit.hg
We expect 'five' to stay at tip, since the tipmost bookmark is most
likely the useful signal.
--- a/tests/test-histedit-commute.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-commute.t Sun Dec 10 22:50:57 2017 -0500
@@ -420,7 +420,7 @@
> EOF
$ HGEDITOR="sh ./editor.sh" hg histedit 0
- saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/b0f4233702ca-4cf5af69-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/b0f4233702ca-4cf5af69-histedit.hg
$ hg --config diff.git=yes export 0
# HG changeset patch
--- a/tests/test-histedit-edit.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-edit.t Sun Dec 10 22:50:57 2017 -0500
@@ -273,7 +273,7 @@
HG: user: test
HG: branch 'default'
HG: added f
- saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-histedit.hg
$ hg status
@@ -437,7 +437,7 @@
(hg histedit --continue to resume)
[1]
$ HGEDITOR=true hg histedit --continue
- saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg
$ hg log -G
@ changeset: 0:0efcea34f18a
--- a/tests/test-histedit-fold.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-fold.t Sun Dec 10 22:50:57 2017 -0500
@@ -317,7 +317,7 @@
continue: hg histedit --continue
$ hg histedit --continue
251d831eeec5: empty changeset
- saved backup bundle to $TESTTMP/fold-to-empty-test/.hg/strip-backup/888f9082bf99-daa0b8b3-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/fold-to-empty-test/.hg/strip-backup/888f9082bf99-daa0b8b3-histedit.hg
$ hg logt --graph
@ 1:617f94f13c0f +4
|
@@ -394,7 +394,7 @@
HG: user: test
HG: branch 'default'
HG: changed file
- saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-histedit.hg (glob)
+ saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-histedit.hg
$ hg logt -G
@ 1:10c647b2cdd5 +4
|
--- a/tests/test-histedit-obsolete.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-histedit-obsolete.t Sun Dec 10 22:50:57 2017 -0500
@@ -526,7 +526,7 @@
$ hg histedit --abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg (glob)
+ saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg
$ hg log -G
@ 18:ee118ab9fa44 (secret) k
--- a/tests/test-hook.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-hook.t Sun Dec 10 22:50:57 2017 -0500
@@ -792,7 +792,7 @@
$ echo aa >> from/a
$ hg --cwd from ci -mb
$ hg --cwd from push
- pushing to $TESTTMP/to (glob)
+ pushing to $TESTTMP/to
searching for changes
changeset: 0:cb9a9f314b8b
tag: tip
--- a/tests/test-import-git.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-import-git.t Sun Dec 10 22:50:57 2017 -0500
@@ -648,8 +648,8 @@
d
dddd
$ hg revert -aC
- forgetting dir/a (glob)
- reverting dir/d (glob)
+ forgetting dir/a
+ reverting dir/d
$ rm dir/a
prefix with default strip
@@ -673,8 +673,8 @@
d
dd
$ hg revert -aC
- forgetting dir/a (glob)
- reverting dir/d (glob)
+ forgetting dir/a
+ reverting dir/d
$ rm dir/a
(test that prefixes are relative to the cwd)
$ mkdir tmpdir
@@ -714,11 +714,11 @@
Renames, similarity and git diff
$ hg revert -aC
- forgetting dir/a (glob)
- undeleting dir/d (glob)
- undeleting dir/dir2/b (glob)
- forgetting dir/dir2/b2 (glob)
- reverting dir/dir2/c (glob)
+ forgetting dir/a
+ undeleting dir/d
+ undeleting dir/dir2/b
+ forgetting dir/dir2/b2
+ reverting dir/dir2/c
$ rm dir/a dir/dir2/b2
$ hg import --similarity 90 --no-commit - <<EOF
> diff --git a/a b/b
--- a/tests/test-import.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-import.t Sun Dec 10 22:50:57 2017 -0500
@@ -938,7 +938,7 @@
> rename to bar
> EOF
applying patch from stdin
- abort: path contains illegal component: ../outside/foo (glob)
+ abort: path contains illegal component: ../outside/foo
[255]
$ cd ..
--- a/tests/test-issue1089.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-issue1089.t Sun Dec 10 22:50:57 2017 -0500
@@ -7,7 +7,7 @@
adding a/b
$ hg rm a
- removing a/b (glob)
+ removing a/b
$ hg ci -m m a
$ mkdir a b
@@ -16,7 +16,7 @@
adding a/b
$ hg rm a
- removing a/b (glob)
+ removing a/b
$ cd b
Relative delete:
--- a/tests/test-issue1502.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-issue1502.t Sun Dec 10 22:50:57 2017 -0500
@@ -13,7 +13,7 @@
$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
$ hg -R foo1 pull
- pulling from $TESTTMP/foo (glob)
+ pulling from $TESTTMP/foo
searching for changes
adding changesets
adding manifests
@@ -30,7 +30,7 @@
$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
$ hg -R foo1 pull
- pulling from $TESTTMP/foo (glob)
+ pulling from $TESTTMP/foo
searching for changes
adding changesets
adding manifests
--- a/tests/test-issue612.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-issue612.t Sun Dec 10 22:50:57 2017 -0500
@@ -7,7 +7,7 @@
adding src/a.c
$ hg mv src source
- moving src/a.c to source/a.c (glob)
+ moving src/a.c to source/a.c
$ hg ci -Ammove
--- a/tests/test-issue660.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-issue660.t Sun Dec 10 22:50:57 2017 -0500
@@ -67,9 +67,9 @@
$ hg revert --all
undeleting a
- forgetting a/a (glob)
+ forgetting a/a
forgetting b
- undeleting b/b (glob)
+ undeleting b/b
$ hg st
--- a/tests/test-keyword.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-keyword.t Sun Dec 10 22:50:57 2017 -0500
@@ -272,7 +272,7 @@
Message-Id: <hg.a2392c293916*> (glob)
To: Test
- changeset a2392c293916 in $TESTTMP/Test (glob)
+ changeset a2392c293916 in $TESTTMP/Test
details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
description:
addsym
@@ -295,7 +295,7 @@
Message-Id: <hg.ef63ca68695b*> (glob)
To: Test
- changeset ef63ca68695b in $TESTTMP/Test (glob)
+ changeset ef63ca68695b in $TESTTMP/Test
details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
description:
absym
@@ -929,7 +929,7 @@
> default = ../Test
> EOF
$ hg incoming
- comparing with $TESTTMP/Test (glob)
+ comparing with $TESTTMP/Test
searching for changes
changeset: 2:bb948857c743
tag: tip
--- a/tests/test-largefiles-cache.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-largefiles-cache.t Sun Dec 10 22:50:57 2017 -0500
@@ -207,7 +207,7 @@
$ echo corruption > .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
$ hg up -C
getting changed largefiles
- large: data corruption in $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 with hash 6a7bb2556144babe3899b25e5428123735bb1e27 (glob)
+ large: data corruption in $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 with hash 6a7bb2556144babe3899b25e5428123735bb1e27
0 largefiles updated, 0 removed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "cd24c147f45c: modified"
@@ -228,7 +228,7 @@
$ hg push http://localhost:$HGPORT1 -f --config files.usercache=nocache
pushing to http://localhost:$HGPORT1/
searching for changes
- abort: remotestore: could not open file $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020: HTTP Error 403: ssl required (glob)
+ abort: remotestore: could not open file $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020: HTTP Error 403: ssl required
[255]
$ rm .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
--- a/tests/test-largefiles-misc.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-largefiles-misc.t Sun Dec 10 22:50:57 2017 -0500
@@ -66,8 +66,8 @@
./dirb/largefile
$ cd ..
$ hg mv dira dirc
- moving .hglf/dira/baz/largefile to .hglf/dirc/baz/largefile (glob)
- moving .hglf/dira/dirb/largefile to .hglf/dirc/dirb/largefile (glob)
+ moving .hglf/dira/baz/largefile to .hglf/dirc/baz/largefile
+ moving .hglf/dira/dirb/largefile to .hglf/dirc/dirb/largefile
$ find * | sort
dirc
dirc/baz
@@ -292,9 +292,9 @@
? subrepo/renamed-large.txt
$ hg addremove --dry-run subrepo
- removing subrepo/large.txt (glob)
- adding subrepo/normal.txt (glob)
- adding subrepo/renamed-large.txt (glob)
+ removing subrepo/large.txt
+ adding subrepo/normal.txt
+ adding subrepo/renamed-large.txt
$ hg status -S
! subrepo/large.txt
? large.dat
@@ -303,9 +303,9 @@
$ cd ..
$ hg -R statusmatch addremove --dry-run statusmatch/subrepo
- removing statusmatch/subrepo/large.txt (glob)
- adding statusmatch/subrepo/normal.txt (glob)
- adding statusmatch/subrepo/renamed-large.txt (glob)
+ removing statusmatch/subrepo/large.txt
+ adding statusmatch/subrepo/normal.txt
+ adding statusmatch/subrepo/renamed-large.txt
$ hg -R statusmatch status -S
! subrepo/large.txt
? large.dat
@@ -321,7 +321,7 @@
$ mv subrepo/renamed-large.txt subrepo/large.txt
$ hg addremove subrepo
- adding subrepo/normal.txt (glob)
+ adding subrepo/normal.txt
$ hg forget subrepo/normal.txt
$ hg addremove -S
@@ -393,7 +393,7 @@
Forget doesn't change the content of the file
$ echo 'pre-forget content' > subrepo/large.txt
$ hg forget -v subrepo/large.txt
- removing subrepo/large.txt (glob)
+ removing subrepo/large.txt
$ cat subrepo/large.txt
pre-forget content
@@ -403,7 +403,7 @@
C subrepo/large.txt
$ hg rm -v subrepo/large.txt
- removing subrepo/large.txt (glob)
+ removing subrepo/large.txt
$ hg revert -R subrepo subrepo/large.txt
$ rm subrepo/large.txt
$ hg addremove -S
@@ -532,10 +532,10 @@
Test orig files go where we want them
$ echo moremore >> anotherlarge
$ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups'
- creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub (glob)
- saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge (glob)
- reverting ../.hglf/sub/anotherlarge (glob)
- creating directory: $TESTTMP/addrm2/.hg/origbackups/sub (glob)
+ creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub
+ saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge
+ reverting ../.hglf/sub/anotherlarge
+ creating directory: $TESTTMP/addrm2/.hg/origbackups/sub
found 90c622cf65cebe75c5842f9136c459333faf392e in store
found 90c622cf65cebe75c5842f9136c459333faf392e in store
$ ls ../.hg/origbackups/sub
@@ -608,7 +608,7 @@
$ hg -q clone src clone2
$ hg -R clone2 paths | grep default
- default = $TESTTMP/issue3651/src (glob)
+ default = $TESTTMP/issue3651/src
$ hg -R clone2 summary --large
parent: 0:fc0bd45326d3 tip
@@ -619,14 +619,14 @@
phases: 1 draft
largefiles: (no files to upload)
$ hg -R clone2 outgoing --large
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
no changes found
largefiles: no files to upload
[1]
$ hg -R clone2 outgoing --large --graph --template "{rev}"
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
no changes found
largefiles: no files to upload
@@ -647,7 +647,7 @@
phases: 2 draft
largefiles: 1 entities for 1 files to upload
$ hg -R clone2 outgoing --large
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
changeset: 1:1acbe71ce432
tag: tip
@@ -659,7 +659,7 @@
b
$ hg -R clone2 outgoing --large --graph --template "{rev}"
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
@ 1
@@ -683,7 +683,7 @@
phases: 3 draft
largefiles: 1 entities for 3 files to upload
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
1:1acbe71ce432
2:6095d0695d70
@@ -695,7 +695,7 @@
$ hg -R clone2 cat -r 1 clone2/.hglf/b
89e6c98d92887913cadf06b2adb97f26cde4849b
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
query 1; heads
searching for changes
all remote heads known locally
@@ -733,7 +733,7 @@
phases: 6 draft
largefiles: 3 entities for 3 files to upload
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
1:1acbe71ce432
2:6095d0695d70
@@ -750,7 +750,7 @@
$ hg -R clone2 cat -r 4 clone2/.hglf/b
13f9ed0898e315bf59dc2973fec52037b6f441a2
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
query 1; heads
searching for changes
all remote heads known locally
@@ -792,7 +792,7 @@
phases: 6 draft
largefiles: 2 entities for 1 files to upload
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
searching for changes
2:6095d0695d70
3:7983dce246cc
@@ -802,7 +802,7 @@
b
$ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
- comparing with $TESTTMP/issue3651/src (glob)
+ comparing with $TESTTMP/issue3651/src
query 1; heads
searching for changes
all remote heads known locally
@@ -843,7 +843,7 @@
A d1/g
$ hg up -qr0
$ hg mv d1 d2
- moving d1/f to d2/f (glob)
+ moving d1/f to d2/f
$ hg ci -qm2
Invoking status precommit hook
A d2/f
@@ -962,7 +962,7 @@
> largefiles=
> EOF
$ hg -R enabledlocally root
- $TESTTMP/individualenabling/enabledlocally (glob)
+ $TESTTMP/individualenabling/enabledlocally
$ hg -R notenabledlocally root
abort: repository requires features unknown to this Mercurial: largefiles!
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
@@ -1088,9 +1088,9 @@
*/no-largefiles/normal1 */no-largefiles/normal1 (glob) (no-windows !)
[1]
$ hg -R subrepo-root revert --all
- reverting subrepo-root/.hglf/large (glob)
+ reverting subrepo-root/.hglf/large
reverting subrepo no-largefiles
- reverting subrepo-root/no-largefiles/normal1 (glob)
+ reverting subrepo-root/no-largefiles/normal1
Move (and then undo) a directory move with only largefiles.
@@ -1108,7 +1108,7 @@
large.orig
$ hg mv dir/subdir dir/subdir2
- moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin (glob)
+ moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin
$ $PYTHON $TESTDIR/list-tree.py .hglf dir* large*
.hglf/
@@ -1135,8 +1135,8 @@
? large.orig
$ hg revert --all
- undeleting .hglf/dir/subdir/large.bin (glob)
- forgetting .hglf/dir/subdir2/large.bin (glob)
+ undeleting .hglf/dir/subdir/large.bin
+ forgetting .hglf/dir/subdir2/large.bin
reverting subrepo no-largefiles
$ hg status -C
@@ -1169,7 +1169,7 @@
'subdir' should not be in the destination. It would be if the subdir2 directory
existed under .hglf/.
$ hg mv dir/subdir dir/subdir2
- moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin (glob)
+ moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin
$ hg status -C
A dir/subdir2/large.bin
@@ -1195,7 +1195,7 @@
$ hg --config extensions.purge= purge
$ hg mv dir/subdir dir2/subdir
- moving .hglf/dir/subdir/large.bin to .hglf/dir2/subdir/large.bin (glob)
+ moving .hglf/dir/subdir/large.bin to .hglf/dir2/subdir/large.bin
$ hg status -C
A dir2/subdir/large.bin
@@ -1214,8 +1214,8 @@
large
$ hg revert --all
- undeleting .hglf/dir/subdir/large.bin (glob)
- forgetting .hglf/dir2/subdir/large.bin (glob)
+ undeleting .hglf/dir/subdir/large.bin
+ forgetting .hglf/dir2/subdir/large.bin
reverting subrepo no-largefiles
$ hg status -C
@@ -1257,7 +1257,7 @@
> largefiles=
> EOF
$ hg -R dst pull --rebase
- pulling from $TESTTMP/issue3861/src (glob)
+ pulling from $TESTTMP/issue3861/src
requesting all changes
adding changesets
adding manifests
--- a/tests/test-largefiles-update.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-largefiles-update.t Sun Dec 10 22:50:57 2017 -0500
@@ -440,7 +440,7 @@
$ hg update -q -C 2
$ hg strip 3 4
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg
$ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP
(internal linear merging at "hg pull --update")
@@ -448,7 +448,7 @@
$ echo 'large1 for linear merge (conflict)' > large1
$ echo 'large2 for linear merge (conflict with normal file)' > large2
$ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
- pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg (glob)
+ pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg
searching for changes
adding changesets
adding manifests
--- a/tests/test-largefiles-wireproto.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-largefiles-wireproto.t Sun Dec 10 22:50:57 2017 -0500
@@ -181,7 +181,7 @@
pushing to http://localhost:$HGPORT1/
searching for changes
remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
- abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
+ abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
[255]
$ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
--- a/tests/test-largefiles.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-largefiles.t Sun Dec 10 22:50:57 2017 -0500
@@ -343,8 +343,8 @@
$ echo large6 > sub2/large6
$ echo large7 > sub2/large7
$ hg add --large sub2
- adding sub2/large6 as a largefile (glob)
- adding sub2/large7 as a largefile (glob)
+ adding sub2/large6 as a largefile
+ adding sub2/large7 as a largefile
$ hg st
M large3
A large5
@@ -661,7 +661,7 @@
Test that outgoing --large works (with revsets too)
$ hg outgoing --rev '.^' --large
- comparing with $TESTTMP/a (glob)
+ comparing with $TESTTMP/a
searching for changes
changeset: 8:c02fd3b77ec4
user: test
@@ -1098,7 +1098,7 @@
$ rm "${USERCACHE}"/*
$ cd a-backup
$ hg pull --all-largefiles --config paths.default-push=bogus/path
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -1113,7 +1113,7 @@
$ hg rollback
repository tip rolled back to revision 1 (undo pull)
$ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
all local heads known remotely
6 changesets found
@@ -1199,7 +1199,7 @@
$ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
$ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
- pulling from $TESTTMP/b (glob)
+ pulling from $TESTTMP/b
searching for changes
adding changesets
adding manifests
@@ -1210,7 +1210,7 @@
Invoking status precommit hook
M sub/normal4
M sub2/large6
- saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg
0 largefiles cached
$ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
@@ -1270,7 +1270,7 @@
Invoking status precommit hook
M sub/normal4
M sub2/large6
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
9:598410d3eb9a modify normal file largefile in repo d
8:a381d2c8c80e modify normal file and largefile in repo b
@@ -1500,8 +1500,8 @@
# XXX we don't really want to report that we're reverting the standin;
# that's just an implementation detail. But I don't see an obvious fix. ;-(
$ hg revert sub
- reverting .hglf/sub/large4 (glob)
- reverting sub/normal4 (glob)
+ reverting .hglf/sub/large4
+ reverting sub/normal4
$ hg status
M normal3
A sub2/large8
@@ -1513,8 +1513,8 @@
$ cat sub/large4
large4-modified
$ hg revert -a --no-backup
- undeleting .hglf/sub2/large6 (glob)
- forgetting .hglf/sub2/large8 (glob)
+ undeleting .hglf/sub2/large6
+ forgetting .hglf/sub2/large8
reverting normal3
$ hg status
? sub/large4.orig
@@ -1528,12 +1528,12 @@
revert some files to an older revision
$ hg revert --no-backup -r 8 sub2
- reverting .hglf/sub2/large6 (glob)
+ reverting .hglf/sub2/large6
$ cat sub2/large6
large6
$ hg revert --no-backup -C -r '.^' sub2
$ hg revert --no-backup sub2
- reverting .hglf/sub2/large6 (glob)
+ reverting .hglf/sub2/large6
$ hg status
"verify --large" actually verifies largefiles
@@ -1542,7 +1542,7 @@
$ pwd
$TESTTMP/e
$ hg paths
- default = $TESTTMP/d (glob)
+ default = $TESTTMP/d
$ hg verify --large
checking changesets
@@ -1565,14 +1565,14 @@
checking files
10 files, 10 changesets, 28 total revisions
searching 1 changesets for largefiles
- changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
+ changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
verified existence of 3 revisions of 3 largefiles
[1]
- introduce corruption and make sure that it is caught when checking content:
$ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
$ hg verify -q --large --lfc
- changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
+ changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
[1]
- cleanup
@@ -1582,16 +1582,16 @@
- verifying all revisions will fail because we didn't clone all largefiles to d:
$ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
$ hg verify -q --lfa --lfc
- changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
- changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
- changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
- changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
- changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
- changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
- changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
- changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
- changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
- changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
+ changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64
+ changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d
+ changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f
+ changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+ changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+ changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+ changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+ changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c
+ changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9
+ changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0
[1]
- cleanup
@@ -1655,7 +1655,7 @@
Pulling 0 revisions with --all-largefiles should not fetch for all revisions
$ hg pull --all-largefiles
- pulling from $TESTTMP/d (glob)
+ pulling from $TESTTMP/d
searching for changes
no changes found
@@ -1752,8 +1752,8 @@
- revert should be able to revert files introduced in a pending merge
$ hg revert --all -r .
- removing .hglf/large (glob)
- undeleting .hglf/sub2/large6 (glob)
+ removing .hglf/large
+ undeleting .hglf/sub2/large6
Test that a normal file and a largefile with the same name and path cannot
coexist.
@@ -1761,7 +1761,7 @@
$ rm sub2/large7
$ echo "largeasnormal" > sub2/large7
$ hg add sub2/large7
- sub2/large7 already a largefile (glob)
+ sub2/large7 already a largefile
Test that transplanting a largefile change works correctly.
@@ -1832,7 +1832,7 @@
$ hg cat .hglf/sub/large4
e166e74c7303192238d60af5a9c4ce9bef0b7928
$ hg cat .hglf/normal3
- .hglf/normal3: no such file in rev 598410d3eb9a (glob)
+ .hglf/normal3: no such file in rev 598410d3eb9a
[1]
Test that renaming a largefile results in correct output for status
--- a/tests/test-lfconvert.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-lfconvert.t Sun Dec 10 22:50:57 2017 -0500
@@ -215,7 +215,7 @@
$ hg share -q -U bigfile-repo shared
$ printf 'bogus' > shared/.hg/sharedpath
$ hg lfconvert shared foo
- abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
+ abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus!
[255]
$ hg lfconvert bigfile-repo largefiles-repo
initializing destination largefiles-repo
@@ -340,12 +340,12 @@
checking files
9 files, 8 changesets, 13 total revisions
searching 7 changesets for largefiles
- changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
- changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
- changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
- changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
- changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
- changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
+ changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7
+ changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
+ changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
+ changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
+ changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
+ changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
verified existence of 6 revisions of 4 largefiles
[1]
$ hg -R largefiles-repo-hg showconfig paths
--- a/tests/test-lfs.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-lfs.t Sun Dec 10 22:50:57 2017 -0500
@@ -46,7 +46,7 @@
# Push changes to the server
$ hg push
- pushing to $TESTTMP/server (glob)
+ pushing to $TESTTMP/server
searching for changes
abort: lfs.url needs to be configured
[255]
@@ -57,7 +57,7 @@
> EOF
$ hg push -v | egrep -v '^(uncompressed| )'
- pushing to $TESTTMP/server (glob)
+ pushing to $TESTTMP/server
searching for changes
2 changesets found
adding changesets
@@ -83,7 +83,7 @@
# Pull from server
$ hg pull default
- pulling from $TESTTMP/server (glob)
+ pulling from $TESTTMP/server
requesting all changes
adding changesets
adding manifests
--- a/tests/test-locate.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-locate.t Sun Dec 10 22:50:57 2017 -0500
@@ -90,16 +90,16 @@
$ hg rm t/b
$ hg locate 't/**'
- t/b (glob)
- t/e.h (glob)
- t/x (glob)
+ t/b
+ t/e.h
+ t/x
$ hg files
b
- dir.h/foo (glob)
+ dir.h/foo
t.h
- t/e.h (glob)
- t/x (glob)
+ t/e.h
+ t/x
$ hg files b
b
@@ -107,47 +107,47 @@
$ cd otherdir
$ hg files path:
- ../b (glob)
- ../dir.h/foo (glob)
- ../t.h (glob)
- ../t/e.h (glob)
- ../t/x (glob)
+ ../b
+ ../dir.h/foo
+ ../t.h
+ ../t/e.h
+ ../t/x
$ hg files path:.
- ../b (glob)
- ../dir.h/foo (glob)
- ../t.h (glob)
- ../t/e.h (glob)
- ../t/x (glob)
+ ../b
+ ../dir.h/foo
+ ../t.h
+ ../t/e.h
+ ../t/x
$ hg locate b
- ../b (glob)
- ../t/b (glob)
+ ../b
+ ../t/b
$ hg locate '*.h'
- ../t.h (glob)
- ../t/e.h (glob)
+ ../t.h
+ ../t/e.h
$ hg locate path:t/x
- ../t/x (glob)
+ ../t/x
$ hg locate 're:.*\.h$'
- ../t.h (glob)
- ../t/e.h (glob)
+ ../t.h
+ ../t/e.h
$ hg locate -r 0 b
- ../b (glob)
- ../t/b (glob)
+ ../b
+ ../t/b
$ hg locate -r 0 '*.h'
- ../t.h (glob)
- ../t/e.h (glob)
+ ../t.h
+ ../t/e.h
$ hg locate -r 0 path:t/x
- ../t/x (glob)
+ ../t/x
$ hg locate -r 0 're:.*\.h$'
- ../t.h (glob)
- ../t/e.h (glob)
+ ../t.h
+ ../t/e.h
$ hg files
- ../b (glob)
- ../dir.h/foo (glob)
- ../t.h (glob)
- ../t/e.h (glob)
- ../t/x (glob)
+ ../b
+ ../dir.h/foo
+ ../t.h
+ ../t/e.h
+ ../t/x
$ hg files .
[1]
--- a/tests/test-manifest.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-manifest.t Sun Dec 10 22:50:57 2017 -0500
@@ -26,7 +26,7 @@
$ hg files -vr .
2 a
- 2 x b/a (glob)
+ 2 x b/a
1 l l
$ hg files -r . -X b
a
--- a/tests/test-merge-criss-cross.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-merge-criss-cross.t Sun Dec 10 22:50:57 2017 -0500
@@ -116,11 +116,11 @@
$ f --dump --recurse *
d2: directory with 2 files
- d2/f3: (glob)
+ d2/f3:
>>>
0 base
<<<
- d2/f4: (glob)
+ d2/f4:
>>>
0 base
<<<
@@ -222,11 +222,11 @@
$ f --dump --recurse *
d2: directory with 2 files
- d2/f3: (glob)
+ d2/f3:
>>>
0 base
<<<
- d2/f4: (glob)
+ d2/f4:
>>>
0 base
<<<
@@ -308,11 +308,11 @@
$ f --dump --recurse *
d2: directory with 2 files
- d2/f3: (glob)
+ d2/f3:
>>>
0 base
<<<
- d2/f4: (glob)
+ d2/f4:
>>>
0 base
<<<
--- a/tests/test-merge-subrepos.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-merge-subrepos.t Sun Dec 10 22:50:57 2017 -0500
@@ -122,7 +122,7 @@
$ hg files -R subrepo
[1]
$ hg files -R subrepo -r '.'
- subrepo/b (glob)
+ subrepo/b
$ hg bookmark -r tip @other
$ echo xyz > subrepo/c
--- a/tests/test-mq-merge.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mq-merge.t Sun Dec 10 22:50:57 2017 -0500
@@ -58,7 +58,7 @@
Save the patch queue so we can merge it later:
$ hg qsave -c -e
- copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob)
+ copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1
$ checkundo
Update b and commit in an "update" changeset:
@@ -78,7 +78,7 @@
b
$ hg qpush -a -m
- merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
+ merging with queue at: $TESTTMP/t/.hg/patches.1
applying rm_a
now at: rm_a
@@ -117,14 +117,14 @@
Create the reference queue:
$ hg qsave -c -e -n refqueue
- copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob)
+ copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue
$ hg up -C 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Merge:
$ HGMERGE=internal:other hg qpush -a -m -n refqueue
- merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)
+ merging with queue at: $TESTTMP/t2/.hg/refqueue
applying patcha
patching file a
Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
--- a/tests/test-mq-qnew.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mq-qnew.t Sun Dec 10 22:50:57 2017 -0500
@@ -117,7 +117,7 @@
abort: patch name cannot begin or end with whitespace
abort: patch name cannot begin or end with whitespace
% qnew with name containing slash
- abort: path ends in directory separator: foo/ (glob)
+ abort: path ends in directory separator: foo/
abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch
@@ -187,7 +187,7 @@
abort: patch name cannot begin or end with whitespace
abort: patch name cannot begin or end with whitespace
% qnew with name containing slash
- abort: path ends in directory separator: foo/ (glob)
+ abort: path ends in directory separator: foo/
abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch
--- a/tests/test-mq-safety.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mq-safety.t Sun Dec 10 22:50:57 2017 -0500
@@ -68,7 +68,7 @@
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qpop -n patches
- using patch queue: $TESTTMP/repo/.hg/patches (glob)
+ using patch queue: $TESTTMP/repo/.hg/patches
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qrefresh
--- a/tests/test-mq-subrepo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mq-subrepo.t Sun Dec 10 22:50:57 2017 -0500
@@ -247,7 +247,7 @@
[255]
$ hg revert sub
reverting subrepo sub
- adding sub/a (glob)
+ adding sub/a
$ hg qpop
popping 1
now at: 0
@@ -266,7 +266,7 @@
[255]
$ hg revert sub
reverting subrepo sub
- adding sub/a (glob)
+ adding sub/a
$ hg qpush
applying 1
subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba)
--- a/tests/test-mq.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mq.t Sun Dec 10 22:50:57 2017 -0500
@@ -154,7 +154,7 @@
guards
$ cat .hg/patches/series
$ hg qinit -c
- abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
+ abort: repository $TESTTMP/d/.hg/patches already exists!
[255]
$ cd ..
@@ -177,8 +177,8 @@
$ echo status >> .hg/patches/.hgignore
$ echo bleh >> .hg/patches/.hgignore
$ hg qinit -c
- adding .hg/patches/A (glob)
- adding .hg/patches/B (glob)
+ adding .hg/patches/A
+ adding .hg/patches/B
$ hg -R .hg/patches status
A .hgignore
A A
@@ -800,7 +800,7 @@
$ hg strip -f tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg
$ cd ..
@@ -1247,7 +1247,7 @@
$ cd qclonesource
$ hg qinit -c
- adding .hg/patches/patch1 (glob)
+ adding .hg/patches/patch1
$ hg qci -m checkpoint
$ qlog
main repo:
@@ -1388,8 +1388,8 @@
$ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups'
applying empty
- creating directory: $TESTTMP/forcepush/.hg/origbackups (glob)
- saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt (glob)
+ creating directory: $TESTTMP/forcepush/.hg/origbackups
+ saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt
patching file hello.txt
committing files:
hello.txt
--- a/tests/test-mv-cp-st-diff.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-mv-cp-st-diff.t Sun Dec 10 22:50:57 2017 -0500
@@ -1339,7 +1339,7 @@
% hg ci -m t0
created new head
% hg mv x y
- moving x/x to y/x (glob)
+ moving x/x to y/x
% hg ci -m t1
% add y/x x1
% hg ci -m t2
--- a/tests/test-nested-repo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-nested-repo.t Sun Dec 10 22:50:57 2017 -0500
@@ -14,16 +14,16 @@
Should fail:
$ hg st b/x
- abort: path 'b/x' is inside nested repo 'b' (glob)
+ abort: path 'b/x' is inside nested repo 'b'
[255]
$ hg add b/x
- abort: path 'b/x' is inside nested repo 'b' (glob)
+ abort: path 'b/x' is inside nested repo 'b'
[255]
Should fail:
$ hg add b b/x
- abort: path 'b/x' is inside nested repo 'b' (glob)
+ abort: path 'b/x' is inside nested repo 'b'
[255]
$ hg st
@@ -37,7 +37,7 @@
Should fail:
$ hg mv a b
- abort: path 'b/a' is inside nested repo 'b' (glob)
+ abort: path 'b/a' is inside nested repo 'b'
[255]
$ hg st
--- a/tests/test-notify-changegroup.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-notify-changegroup.t Sun Dec 10 22:50:57 2017 -0500
@@ -56,11 +56,11 @@
Message-Id: <*> (glob)
To: baz, foo@bar
- changeset cb9a9f314b8b in $TESTTMP/a (glob)
+ changeset cb9a9f314b8b in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
- changeset ba677d0156c1 in $TESTTMP/a (glob)
+ changeset ba677d0156c1 in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
@@ -109,11 +109,11 @@
Message-Id: <*> (glob)
To: baz, foo@bar
- changeset cb9a9f314b8b in $TESTTMP/a (glob)
+ changeset cb9a9f314b8b in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
- changeset ba677d0156c1 in $TESTTMP/a (glob)
+ changeset ba677d0156c1 in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
@@ -186,19 +186,19 @@
Message-Id: <*> (glob)
To: baz, foo@bar
- changeset 84e487dddc58 in $TESTTMP/a (glob)
+ changeset 84e487dddc58 in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
summary: newfile
- changeset b29c7a2b6b0c in $TESTTMP/a (glob)
+ changeset b29c7a2b6b0c in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
summary: x
- changeset 0957c7d64886 in $TESTTMP/a (glob)
+ changeset 0957c7d64886 in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
summary: y
- changeset 485b4e6b0249 in $TESTTMP/a (glob)
+ changeset 485b4e6b0249 in $TESTTMP/a
details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
summary: merged
--- a/tests/test-notify.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-notify.t Sun Dec 10 22:50:57 2017 -0500
@@ -199,7 +199,7 @@
Message-Id: <*> (glob)
To: baz, foo@bar
- changeset 0647d048b600 in $TESTTMP/b (glob)
+ changeset 0647d048b600 in $TESTTMP/b
details: $TESTTMP/b?cmd=changeset;node=0647d048b600
description: b
@@ -563,7 +563,7 @@
Message-Id: <hg.f5e8ec95bf59.*.*@*> (glob)
To: baz@test.com, foo@bar
- changeset f5e8ec95bf59 in $TESTTMP/b (glob)
+ changeset f5e8ec95bf59 in $TESTTMP/b
details: http://test/b?cmd=changeset;node=f5e8ec95bf59
description: default template
--- a/tests/test-obsmarker-template.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsmarker-template.t Sun Dec 10 22:50:57 2017 -0500
@@ -1419,7 +1419,7 @@
$ cd $TESTTMP/templates-local-remote-markers-2
$ hg pull
- pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
+ pulling from $TESTTMP/templates-local-remote-markers-1
searching for changes
adding changesets
adding manifests
--- a/tests/test-obsolete-bundle-strip.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete-bundle-strip.t Sun Dec 10 22:50:57 2017 -0500
@@ -158,7 +158,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg
### Backup markers ###
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### diff <relevant> <backed-up> ###
@@ -189,7 +189,7 @@
### Exclusive markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -229,7 +229,7 @@
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -324,7 +324,7 @@
#################################
### Exclusive markers ###
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg
### Backup markers ###
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### diff <relevant> <backed-up> ###
@@ -356,7 +356,7 @@
#################################
### Exclusive markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg
### Backup markers ###
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -417,7 +417,7 @@
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg
### Backup markers ###
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -489,7 +489,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -520,7 +520,7 @@
#################################
### Exclusive markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -558,7 +558,7 @@
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -641,7 +641,7 @@
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg
### Backup markers ###
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -721,7 +721,7 @@
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg
### Backup markers ###
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -820,7 +820,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg
### Backup markers ###
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### diff <relevant> <backed-up> ###
@@ -847,7 +847,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg
### Backup markers ###
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -875,7 +875,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg
### Backup markers ###
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -903,7 +903,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg
### Backup markers ###
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -951,7 +951,7 @@
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg
### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1000,7 +1000,7 @@
### diff <relevant> <bundled> ###
#################################
### Exclusive markers ###
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg
### Backup markers ###
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1052,7 +1052,7 @@
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg
### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1120,7 +1120,7 @@
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg
### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1188,7 +1188,7 @@
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg
### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1262,7 +1262,7 @@
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg
### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1352,7 +1352,7 @@
#################################
### Exclusive markers ###
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg
### Backup markers ###
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### diff <relevant> <backed-up> ###
@@ -1380,7 +1380,7 @@
#################################
### Exclusive markers ###
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg (glob)
+ # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg
### Backup markers ###
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### diff <relevant> <backed-up> ###
--- a/tests/test-obsolete-changeset-exchange.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete-changeset-exchange.t Sun Dec 10 22:50:57 2017 -0500
@@ -142,7 +142,7 @@
$ cd pull-hidden-common-client
$ hg pull --debug
- pulling from $TESTTMP/pull-hidden-common (glob)
+ pulling from $TESTTMP/pull-hidden-common
query 1; heads
searching for changes
taking quick initial sample
--- a/tests/test-obsolete-checkheads.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete-checkheads.t Sun Dec 10 22:50:57 2017 -0500
@@ -37,7 +37,7 @@
$ mkcommit old
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -61,7 +61,7 @@
Push should not warn about creating new head
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -77,7 +77,7 @@
$ cp -R ../backup1 ../remote
$ hg -R ../remote phase --public c70b08862e08
$ hg pull -v
- pulling from $TESTTMP/remote (glob)
+ pulling from $TESTTMP/remote
searching for changes
no changes found
$ hg log -G --hidden
@@ -91,7 +91,7 @@
Abort: old will still be an head because it's public.
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
abort: push creates new remote head 71e3228bffe1!
(merge or see 'hg help push' for details about pushing new heads)
@@ -151,7 +151,7 @@
Push should abort on new head
$ hg push -r 'desc("other")'
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
abort: push creates new remote head d7d41ccbd4de!
(merge or see 'hg help push' for details about pushing new heads)
@@ -178,7 +178,7 @@
$ mkcommit new
created new head
$ hg push -f
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -214,7 +214,7 @@
one anyway.
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -260,7 +260,7 @@
We do not have enought data to take the right decision, we should fail
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
remote has heads on branch 'default' that are not known locally: c70b08862e08
abort: push creates new remote head 71e3228bffe1!
@@ -270,7 +270,7 @@
Pulling the missing data makes it work
$ hg pull
- pulling from $TESTTMP/remote (glob)
+ pulling from $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -278,7 +278,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads)
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@@ -309,7 +309,7 @@
$ hg push
- pushing to $TESTTMP/remote (glob)
+ pushing to $TESTTMP/remote
searching for changes
abort: push creates new remote head 350a93b716be!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-obsolete-distributed.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete-distributed.t Sun Dec 10 22:50:57 2017 -0500
@@ -136,7 +136,7 @@
$ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pull
- pulling from $TESTTMP/distributed-chain-building/server (glob)
+ pulling from $TESTTMP/distributed-chain-building/server
searching for changes
adding changesets
adding manifests
@@ -174,7 +174,7 @@
$ hg rollback
repository tip rolled back to revision 3 (undo pull)
$ hg push -f
- pushing to $TESTTMP/distributed-chain-building/server (glob)
+ pushing to $TESTTMP/distributed-chain-building/server
searching for changes
adding changesets
adding manifests
@@ -362,7 +362,7 @@
However using a central server seems more common)
$ hg push
- pushing to $TESTTMP/distributed-chain-building/distributed-chain-building/server (glob)
+ pushing to $TESTTMP/distributed-chain-building/distributed-chain-building/server
searching for changes
adding changesets
adding manifests
@@ -380,7 +380,7 @@
$ hg up 'desc(ROOT)'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg pull
- pulling from $TESTTMP/distributed-chain-building/distributed-chain-building/server (glob)
+ pulling from $TESTTMP/distributed-chain-building/distributed-chain-building/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-obsolete.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-obsolete.t Sun Dec 10 22:50:57 2017 -0500
@@ -1083,15 +1083,15 @@
o 0:d20a80d4def3 (draft) [ ] base
$ hg incoming
- comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+ comparing with $TESTTMP/tmpe/repo-issue3805
searching for changes
2:323a9c3ddd91 (draft) [tip ] A
$ hg incoming --bundle ../issue3805.hg
- comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+ comparing with $TESTTMP/tmpe/repo-issue3805
searching for changes
2:323a9c3ddd91 (draft) [tip ] A
$ hg outgoing
- comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+ comparing with $TESTTMP/tmpe/repo-issue3805
searching for changes
1:29f0c6921ddd (draft) [tip ] A
@@ -1369,7 +1369,7 @@
$ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no
- saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob)
+ saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
$ hg debugobsolete
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
$ hg log -G
@@ -1418,7 +1418,7 @@
$ hg strip -r 1 --config extensions.strip=
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob)
+ saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
$ hg debugobsolete
$ hg log -G
@ 0:a78f55e5508c (draft) [tip ] 0
@@ -1525,7 +1525,7 @@
$ getid .
$ hg --config extensions.strip= strip -r .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
$ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
$ hg unbundle ../bundle-2.hg
adding changesets
--- a/tests/test-origbackup-conflict.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-origbackup-conflict.t Sun Dec 10 22:50:57 2017 -0500
@@ -30,7 +30,7 @@
resolving manifests
b/c: replacing untracked file
getting b/c
- creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups/b
getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1)
@@ -54,7 +54,7 @@
resolving manifests
b: replacing untracked file
getting b
- removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob)
+ removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b
getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark b1)
@@ -69,8 +69,8 @@
resolving manifests
b/c: replacing untracked file
getting b/c
- creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
- removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups/b
+ removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1)
@@ -107,8 +107,8 @@
b/c: replacing untracked file
d: replacing untracked file
getting b/c
- creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
- removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups/b
+ removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1)
@@ -128,8 +128,8 @@
resolving manifests
b/c: replacing untracked file
getting b/c
- creating directory: $TESTTMP/repo/.hg/badorigbackups/b (glob)
- abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b' (glob)
+ creating directory: $TESTTMP/repo/.hg/badorigbackups/b
+ abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b'
[255]
$ cat .hg/badorigbackups
data
--- a/tests/test-parents.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-parents.t Sun Dec 10 22:50:57 2017 -0500
@@ -71,7 +71,7 @@
$ hg parents -r 2 ../a
- abort: ../a not under root '$TESTTMP/repo' (glob)
+ abort: ../a not under root '$TESTTMP/repo'
[255]
--- a/tests/test-pathconflicts-merge.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-pathconflicts-merge.t Sun Dec 10 22:50:57 2017 -0500
@@ -48,7 +48,7 @@
a/b: path conflict - a file or link has the same name as a directory
the local file has been renamed to a/b~0ed027b96f31
resolve manually then use 'hg resolve --mark a/b'
- moving a/b to a/b~0ed027b96f31 (glob)
+ moving a/b to a/b~0ed027b96f31
getting a/b/c/d
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
--- a/tests/test-paths.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-paths.t Sun Dec 10 22:50:57 2017 -0500
@@ -20,35 +20,35 @@
$ echo 'dupe = ../b#tip' >> .hg/hgrc
$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
$ hg in dupe
- comparing with $TESTTMP/b (glob)
+ comparing with $TESTTMP/b
no changes found
[1]
$ cd ..
$ hg -R a in dupe
- comparing with $TESTTMP/b (glob)
+ comparing with $TESTTMP/b
no changes found
[1]
$ cd a
$ hg paths
- dupe = $TESTTMP/b#tip (glob)
- expand = $TESTTMP/a/$SOMETHING/bar (glob)
+ dupe = $TESTTMP/b#tip
+ expand = $TESTTMP/a/$SOMETHING/bar
$ SOMETHING=foo hg paths
- dupe = $TESTTMP/b#tip (glob)
- expand = $TESTTMP/a/foo/bar (glob)
+ dupe = $TESTTMP/b#tip
+ expand = $TESTTMP/a/foo/bar
#if msys
$ SOMETHING=//foo hg paths
- dupe = $TESTTMP/b#tip (glob)
+ dupe = $TESTTMP/b#tip
expand = /foo/bar
#else
$ SOMETHING=/foo hg paths
- dupe = $TESTTMP/b#tip (glob)
+ dupe = $TESTTMP/b#tip
expand = /foo/bar
#endif
$ hg paths -q
dupe
expand
$ hg paths dupe
- $TESTTMP/b#tip (glob)
+ $TESTTMP/b#tip
$ hg paths -q dupe
$ hg paths unknown
not found!
@@ -64,11 +64,11 @@
{
"name": "dupe",
"pushurl": "https://example.com/dupe",
- "url": "$TESTTMP/b#tip" (glob)
+ "url": "$TESTTMP/b#tip"
},
{
"name": "expand",
- "url": "$TESTTMP/a/$SOMETHING/bar" (glob)
+ "url": "$TESTTMP/a/$SOMETHING/bar"
}
]
$ hg paths -Tjson dupe | sed 's|\\\\|\\|g'
@@ -76,7 +76,7 @@
{
"name": "dupe",
"pushurl": "https://example.com/dupe",
- "url": "$TESTTMP/b#tip" (glob)
+ "url": "$TESTTMP/b#tip"
}
]
$ hg paths -Tjson -q unknown
@@ -89,21 +89,21 @@
(behaves as a {name: path-string} dict by default)
$ hg log -rnull -T '{peerurls}\n'
- dupe=$TESTTMP/b#tip expand=$TESTTMP/a/$SOMETHING/bar (glob)
+ dupe=$TESTTMP/b#tip expand=$TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{join(peerurls, "\n")}\n'
- dupe=$TESTTMP/b#tip (glob)
- expand=$TESTTMP/a/$SOMETHING/bar (glob)
+ dupe=$TESTTMP/b#tip
+ expand=$TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{peerurls % "{name}: {url}\n"}'
- dupe: $TESTTMP/b#tip (glob)
- expand: $TESTTMP/a/$SOMETHING/bar (glob)
+ dupe: $TESTTMP/b#tip
+ expand: $TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{get(peerurls, "dupe")}\n'
- $TESTTMP/b#tip (glob)
+ $TESTTMP/b#tip
(sub options can be populated by map/dot operation)
$ hg log -rnull \
> -T '{get(peerurls, "dupe") % "url: {url}\npushurl: {pushurl}\n"}'
- url: $TESTTMP/b#tip (glob)
+ url: $TESTTMP/b#tip
pushurl: https://example.com/dupe
$ hg log -rnull -T '{peerurls.dupe.pushurl}\n'
https://example.com/dupe
@@ -132,9 +132,9 @@
zeroconf wraps ui.configitems(), which shouldn't crash at least:
$ hg paths --config extensions.zeroconf=
- dupe = $TESTTMP/b#tip (glob)
+ dupe = $TESTTMP/b#tip
dupe:pushurl = https://example.com/dupe
- expand = $TESTTMP/a/$SOMETHING/bar (glob)
+ expand = $TESTTMP/a/$SOMETHING/bar
insecure = http://foo:***@example.com/
$ cd ..
--- a/tests/test-profile.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-profile.t Sun Dec 10 22:50:57 2017 -0500
@@ -143,12 +143,12 @@
$ hg root
otherextension: loaded
fooprof: loaded
- $TESTTMP/b (glob)
+ $TESTTMP/b
$ HGPROF=fooprof hg root --profile
fooprof: loaded
fooprof: start profile
otherextension: loaded
- $TESTTMP/b (glob)
+ $TESTTMP/b
fooprof: end profile
$ HGPROF=other hg root --profile 2>&1 | head -n 2
--- a/tests/test-pull-r.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-pull-r.t Sun Dec 10 22:50:57 2017 -0500
@@ -43,7 +43,7 @@
2:effea6de0384
1:ed1b79f46b9a
$ hg pull
- pulling from $TESTTMP/repo2 (glob)
+ pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests
--- a/tests/test-pull-update.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-pull-update.t Sun Dec 10 22:50:57 2017 -0500
@@ -100,7 +100,7 @@
* active-before-pull 3:483b76ad4309
$ hg pull -u -r active-after-pull
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -129,7 +129,7 @@
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#active-after-pull
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -168,7 +168,7 @@
* active-before-pull 3:483b76ad4309
$ hg pull -u -r b5e4babfaaa7
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -195,7 +195,7 @@
* active-before-pull 3:483b76ad4309
$ hg pull -u -b bar
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -222,7 +222,7 @@
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#bar
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-partial-C1.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-partial-C1.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/C1/server (glob)
+ pulling from $TESTTMP/C1/server
searching for changes
adding changesets
adding manifests
@@ -75,7 +75,7 @@
--------------
$ hg push
- pushing to $TESTTMP/C1/server (glob)
+ pushing to $TESTTMP/C1/server
searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-partial-C2.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-partial-C2.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/C2/server (glob)
+ pulling from $TESTTMP/C2/server
searching for changes
adding changesets
adding manifests
@@ -75,7 +75,7 @@
--------------
$ hg push --rev 'desc(A1)'
- pushing to $TESTTMP/C2/server (glob)
+ pushing to $TESTTMP/C2/server
searching for changes
abort: push creates new remote head f6082bc4ffef!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-partial-C3.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-partial-C3.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/C3/server (glob)
+ pulling from $TESTTMP/C3/server
searching for changes
adding changesets
adding manifests
@@ -75,7 +75,7 @@
--------------
$ hg push
- pushing to $TESTTMP/C3/server (glob)
+ pushing to $TESTTMP/C3/server
searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-partial-C4.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-partial-C4.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/C4/server (glob)
+ pulling from $TESTTMP/C4/server
searching for changes
adding changesets
adding manifests
@@ -75,7 +75,7 @@
--------------
$ hg push --rev 'desc(C0)'
- pushing to $TESTTMP/C4/server (glob)
+ pushing to $TESTTMP/C4/server
searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-pruned-B1.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B1.t Sun Dec 10 22:50:57 2017 -0500
@@ -62,7 +62,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B1/server (glob)
+ pushing to $TESTTMP/B1/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B2.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B2.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/B2/server (glob)
+ pulling from $TESTTMP/B2/server
searching for changes
adding changesets
adding manifests
@@ -77,7 +77,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B2/server (glob)
+ pushing to $TESTTMP/B2/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B3.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B3.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/B3/server (glob)
+ pulling from $TESTTMP/B3/server
searching for changes
adding changesets
adding manifests
@@ -77,7 +77,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B3/server (glob)
+ pushing to $TESTTMP/B3/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B4.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B4.t Sun Dec 10 22:50:57 2017 -0500
@@ -48,7 +48,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/B4/server (glob)
+ pulling from $TESTTMP/B4/server
searching for changes
adding changesets
adding manifests
@@ -78,7 +78,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B4/server (glob)
+ pushing to $TESTTMP/B4/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B5.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B5.t Sun Dec 10 22:50:57 2017 -0500
@@ -51,7 +51,7 @@
$ mkcommit C0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/B5/server (glob)
+ pulling from $TESTTMP/B5/server
searching for changes
adding changesets
adding manifests
@@ -85,7 +85,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B5/server (glob)
+ pushing to $TESTTMP/B5/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B6.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B6.t Sun Dec 10 22:50:57 2017 -0500
@@ -69,7 +69,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B6/server (glob)
+ pushing to $TESTTMP/B6/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B7.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B7.t Sun Dec 10 22:50:57 2017 -0500
@@ -68,7 +68,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B7/server (glob)
+ pushing to $TESTTMP/B7/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-pruned-B8.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-pruned-B8.t Sun Dec 10 22:50:57 2017 -0500
@@ -49,7 +49,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/B8/server (glob)
+ pulling from $TESTTMP/B8/server
searching for changes
adding changesets
adding manifests
@@ -92,7 +92,7 @@
--------------
$ hg push
- pushing to $TESTTMP/B8/server (glob)
+ pushing to $TESTTMP/B8/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A1.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A1.t Sun Dec 10 22:50:57 2017 -0500
@@ -59,7 +59,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A1/server (glob)
+ pushing to $TESTTMP/A1/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A2.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A2.t Sun Dec 10 22:50:57 2017 -0500
@@ -46,7 +46,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/A2/server (glob)
+ pulling from $TESTTMP/A2/server
searching for changes
adding changesets
adding manifests
@@ -79,7 +79,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A2/server (glob)
+ pushing to $TESTTMP/A2/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A3.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A3.t Sun Dec 10 22:50:57 2017 -0500
@@ -49,7 +49,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/A3/server (glob)
+ pulling from $TESTTMP/A3/server
searching for changes
adding changesets
adding manifests
@@ -82,7 +82,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A3/server (glob)
+ pushing to $TESTTMP/A3/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A4.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A4.t Sun Dec 10 22:50:57 2017 -0500
@@ -64,7 +64,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A4/server (glob)
+ pushing to $TESTTMP/A4/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A5.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A5.t Sun Dec 10 22:50:57 2017 -0500
@@ -64,7 +64,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A5/server (glob)
+ pushing to $TESTTMP/A5/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A6.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A6.t Sun Dec 10 22:50:57 2017 -0500
@@ -53,7 +53,7 @@
created new head
$ cd ../client
$ hg pull
- pulling from $TESTTMP/A6/server (glob)
+ pulling from $TESTTMP/A6/server
searching for changes
adding changesets
adding manifests
@@ -90,7 +90,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A6/server (glob)
+ pushing to $TESTTMP/A6/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A7.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A7.t Sun Dec 10 22:50:57 2017 -0500
@@ -53,7 +53,7 @@
created new head
$ cd ../client
$ hg pull
- pulling from $TESTTMP/A7/server (glob)
+ pulling from $TESTTMP/A7/server
searching for changes
adding changesets
adding manifests
@@ -90,7 +90,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A7/server (glob)
+ pushing to $TESTTMP/A7/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-superceed-A8.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-superceed-A8.t Sun Dec 10 22:50:57 2017 -0500
@@ -70,7 +70,7 @@
--------------
$ hg push
- pushing to $TESTTMP/A8/server (glob)
+ pushing to $TESTTMP/A8/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-unpushed-D1.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D1.t Sun Dec 10 22:50:57 2017 -0500
@@ -68,7 +68,7 @@
--------------
$ hg push -r 'desc(B0)'
- pushing to $TESTTMP/D1/server (glob)
+ pushing to $TESTTMP/D1/server
searching for changes
abort: push creates new remote head 74ff5441d343!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-unpushed-D2.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D2.t Sun Dec 10 22:50:57 2017 -0500
@@ -51,7 +51,7 @@
$ mkcommit B0
$ cd ../client
$ hg pull
- pulling from $TESTTMP/D2/server (glob)
+ pulling from $TESTTMP/D2/server
searching for changes
adding changesets
adding manifests
@@ -87,7 +87,7 @@
--------------
$ hg push --rev 'desc(C0)'
- pushing to $TESTTMP/D2/server (glob)
+ pushing to $TESTTMP/D2/server
searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-unpushed-D3.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D3.t Sun Dec 10 22:50:57 2017 -0500
@@ -50,7 +50,7 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ cd ../client
$ hg pull
- pulling from $TESTTMP/D3/server (glob)
+ pulling from $TESTTMP/D3/server
searching for changes
adding changesets
adding manifests
@@ -86,13 +86,13 @@
--------------
$ hg push --rev 'desc(A1)'
- pushing to $TESTTMP/D3/server (glob)
+ pushing to $TESTTMP/D3/server
searching for changes
abort: push creates new remote head f6082bc4ffef!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg push --rev 'desc(B1)'
- pushing to $TESTTMP/D3/server (glob)
+ pushing to $TESTTMP/D3/server
searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
@@ -104,7 +104,7 @@
In this case, even a bare push is creating more heads
$ hg push
- pushing to $TESTTMP/D3/server (glob)
+ pushing to $TESTTMP/D3/server
searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-unpushed-D4.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D4.t Sun Dec 10 22:50:57 2017 -0500
@@ -67,7 +67,7 @@
created new head
$ cd ../client
$ hg pull
- pulling from $TESTTMP/D4/server (glob)
+ pulling from $TESTTMP/D4/server
searching for changes
adding changesets
adding manifests
@@ -104,7 +104,7 @@
--------------------------------
$ hg push --rev 'desc(A1)'
- pushing to $TESTTMP/D4/server (glob)
+ pushing to $TESTTMP/D4/server
searching for changes
abort: push creates new remote head f6082bc4ffef!
(merge or see 'hg help push' for details about pushing new heads)
@@ -114,7 +114,7 @@
------------------------------------
$ hg push --rev 'desc(B1)'
- pushing to $TESTTMP/D4/server (glob)
+ pushing to $TESTTMP/D4/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-unpushed-D5.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D5.t Sun Dec 10 22:50:57 2017 -0500
@@ -56,7 +56,7 @@
created new head
$ cd ../client
$ hg pull
- pulling from $TESTTMP/D5/server (glob)
+ pulling from $TESTTMP/D5/server
searching for changes
adding changesets
adding manifests
@@ -93,13 +93,13 @@
--------------
$ hg push --rev 'desc(B1)'
- pushing to $TESTTMP/D5/server (glob)
+ pushing to $TESTTMP/D5/server
searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg push --rev 'desc(A1)'
- pushing to $TESTTMP/D5/server (glob)
+ pushing to $TESTTMP/D5/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push-checkheads-unpushed-D6.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D6.t Sun Dec 10 22:50:57 2017 -0500
@@ -75,7 +75,7 @@
--------------
$ hg push --rev 'desc(C0)'
- pushing to $TESTTMP/D6/server (glob)
+ pushing to $TESTTMP/D6/server
searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
--- a/tests/test-push-checkheads-unpushed-D7.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push-checkheads-unpushed-D7.t Sun Dec 10 22:50:57 2017 -0500
@@ -88,7 +88,7 @@
--------------
$ hg push --rev 'desc(C0)'
- pushing to $TESTTMP/D7/server (glob)
+ pushing to $TESTTMP/D7/server
searching for changes
adding changesets
adding manifests
--- a/tests/test-push.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-push.t Sun Dec 10 22:50:57 2017 -0500
@@ -199,7 +199,7 @@
[1]
$ hg push
- pushing to $TESTTMP/test-validation (glob)
+ pushing to $TESTTMP/test-validation
searching for changes
adding changesets
adding manifests
@@ -234,7 +234,7 @@
[1]
$ hg push
- pushing to $TESTTMP/test-validation (glob)
+ pushing to $TESTTMP/test-validation
searching for changes
adding changesets
adding manifests
--- a/tests/test-pushvars.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-pushvars.t Sun Dec 10 22:50:57 2017 -0500
@@ -24,7 +24,7 @@
$ echo b > a
$ hg commit -Aqm a
$ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
- pushing to $TESTTMP/repo (glob)
+ pushing to $TESTTMP/repo
searching for changes
adding changesets
adding manifests
@@ -38,7 +38,7 @@
$ echo b >> a
$ hg commit -Aqm a
$ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
- pushing to $TESTTMP/repo (glob)
+ pushing to $TESTTMP/repo
searching for changes
adding changesets
adding manifests
@@ -52,7 +52,7 @@
$ echo b >> a
$ hg commit -Aqm a
$ hg push --pushvars "DEBUG="
- pushing to $TESTTMP/repo (glob)
+ pushing to $TESTTMP/repo
searching for changes
adding changesets
adding manifests
@@ -65,7 +65,7 @@
$ echo b >> a
$ hg commit -Aqm b
$ hg push --pushvars "DEBUG"
- pushing to $TESTTMP/repo (glob)
+ pushing to $TESTTMP/repo
searching for changes
abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format
[255]
--- a/tests/test-rebase-abort.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-abort.t Sun Dec 10 22:50:57 2017 -0500
@@ -115,7 +115,7 @@
Abort (should clear out unsupported merge state):
$ hg rebase --abort
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg
rebase aborted
$ hg debugmergestate
no merge state found
@@ -377,7 +377,7 @@
abort: ^C
[255]
$ hg rebase --abort
- saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob)
+ saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a
--- a/tests/test-rebase-bookmarks.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-bookmarks.t Sun Dec 10 22:50:57 2017 -0500
@@ -76,7 +76,7 @@
$ hg rebase -s Y -d 3
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg
$ hg tglog
@ 3: 17fb3faba63c 'C' bookmarks: Y Z
@@ -98,7 +98,7 @@
$ hg rebase -s W -d .
rebasing 3:41acb9dca9eb "D" (W tip)
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
$ hg bookmarks
W 3:0d3554f74897
@@ -117,7 +117,7 @@
$ hg rebase -s 1 -d 3
rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog
@ 3: 3d5fa227f4b5 'C' bookmarks: Y Z
@@ -140,7 +140,7 @@
$ hg rebase -d W
rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog
o 3: 3d5fa227f4b5 'C' bookmarks: Y Z
@@ -180,7 +180,7 @@
continue: hg rebase --continue
$ hg rebase --continue
rebasing 3:3d5fa227f4b5 "C" (Y Z)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
$ hg tglog
@ 4: 45c0f0ec1203 'C' bookmarks: Y Z
|
@@ -210,7 +210,7 @@
rebasing 5:345c90f326a4 "bisect"
rebasing 6:f677a2907404 "bisect2"
rebasing 7:325c16001345 "bisect3" (bisect tip)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
Bookmark and working parent get moved even if --keep is set (issue5682)
--- a/tests/test-rebase-cache.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-cache.t Sun Dec 10 22:50:57 2017 -0500
@@ -104,7 +104,7 @@
$ hg rebase -s 5 -d 8
rebasing 5:635859577d0b "D"
rebasing 6:5097051d331d "E"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg
$ hg branches
branch3 8:466cdfb14b62
@@ -166,7 +166,7 @@
$ hg rebase -s 8 -d 6
rebasing 8:4666b71e8e32 "F" (tip)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg
$ hg branches
branch2 8:6b4bdc1b5ac0
@@ -233,7 +233,7 @@
rebasing 7:653b9feb4616 "branch3"
note: rebase of 7:653b9feb4616 created no changes to commit
rebasing 8:4666b71e8e32 "F" (tip)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
$ hg branches
branch2 7:6b4bdc1b5ac0
@@ -270,7 +270,7 @@
$ hg strip 2
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg
$ hg tglog
o 3: 'C' branch2
@@ -329,7 +329,7 @@
$ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg
$ hg theads
1: 'branch2' branch2
@@ -374,14 +374,14 @@
$ hg strip 3 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg
$ hg theads
2: 'C'
$ hg strip 2 1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg
$ hg theads
0: 'A'
@@ -480,4 +480,4 @@
HGEDITFORM=rebase.merge
rebasing 8:326cfedc031c "I" (tip)
HGEDITFORM=rebase.normal
- saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg
--- a/tests/test-rebase-check-restore.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-check-restore.t Sun Dec 10 22:50:57 2017 -0500
@@ -138,7 +138,7 @@
continue: hg rebase --continue
$ hg rebase --continue
rebasing 5:01e6ebbd8272 "F" (tip)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg
$ hg tglog
@ 5:draft 'F' notdefault
--- a/tests/test-rebase-collapse.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-collapse.t Sun Dec 10 22:50:57 2017 -0500
@@ -79,7 +79,7 @@
HG: added C
HG: added D
====
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglogp
@ 5: 30882080ba93 secret 'Collapsed revision
@@ -119,7 +119,7 @@
$ hg rebase --source 4 --collapse --dest 7
rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
$ hg tglog
o 6: 7dd333a2d1e4 'Collapsed revision
@@ -162,7 +162,7 @@
rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G"
HGEDITFORM=rebase.collapse
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
$ hg tglog
o 6: 38ed6a6b026b 'custom message'
@@ -272,7 +272,7 @@
rebasing 4:8a5212ebc852 "E"
rebasing 5:7f219660301f "F"
rebasing 6:c772a8b2dc17 "G"
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg
$ hg tglog
o 5: f97c4725bd99 'Collapsed revision
@@ -321,7 +321,7 @@
c65502d4178782309ce0574c5ae6ee9485a9bafa o default
$ hg strip 4
- saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg
$ cat $TESTTMP/b2/.hg/cache/branch2-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 4
@@ -425,7 +425,7 @@
merging E
rebasing 6:55a44ad28289 "G"
rebasing 7:417d3b648079 "H"
- saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg
$ hg tglog
o 5: 340b34a63b39 'Collapsed revision
@@ -518,7 +518,7 @@
rebasing 2:f838bfaca5c7 "C"
rebasing 3:7bbcd6078bcc "D"
rebasing 4:0a42590ed746 "E"
- saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg
$ hg tglog
o 2: b72eaccb283f 'Collapsed revision
@@ -603,7 +603,7 @@
$ hg rebase -s 5 -d 4
rebasing 5:fbfb97b1089a "E" (tip)
note: rebase of 5:fbfb97b1089a created no changes to commit
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
$ hg tglog
@ 4: f338eb3c2c7c 'E'
|
@@ -662,7 +662,7 @@
rebasing 3:338e84e2e558 "move2" (tip)
merging f and c to c
merging e and g to g
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg
$ hg st
$ hg st --copies --change tip
A d
@@ -703,7 +703,7 @@
$ hg rebase --collapse -b . -d 0
rebasing 1:1352765a01d4 "change"
rebasing 2:64b456429f67 "Collapsed revision" (tip)
- saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg
$ hg st --change tip --copies
M a
M c
@@ -762,7 +762,7 @@
$ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg
$ hg tglog
o 1: 27547f69f254 'B'
@@ -795,7 +795,7 @@
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed
rebasing 1:6d8d9f24eec3 "a"
rebasing 2:1cc73eca5ecc "b" (foo tip)
- saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg
$ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo
|
@@ -836,7 +836,7 @@
continue: hg rebase --continue
$ hg rebase --continue
rebasing 2:b8d8db2b242d "a-dev" (tip)
- saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg
$ hg log
changeset: 2:45ba1d1a8665
tag: tip
--- a/tests/test-rebase-conflicts.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-conflicts.t Sun Dec 10 22:50:57 2017 -0500
@@ -102,7 +102,7 @@
already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
rebasing 4:46f0b057b5c0 "L2"
rebasing 5:8029388f38dc "L3" (mybook)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg
$ hg tglog
@ 5:secret 'L3' mybook
@@ -300,7 +300,7 @@
bundle2-output-bundle: "HG20", (1 params) 2 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload
- saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
3 changesets found
list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
@@ -413,7 +413,7 @@
rebasing 1:112478962961 "B" (B)
rebasing 3:f585351a92f8 "D" (D)
warning: orphaned descendants detected, not stripping 112478962961
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg
$ rm .hg/localtags
$ hg tglog
--- a/tests/test-rebase-dest.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-dest.t Sun Dec 10 22:50:57 2017 -0500
@@ -21,15 +21,15 @@
[255]
$ hg rebase -d 1
rebasing 2:5db65b93a12b "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg
$ hg rebase -d 0 -r . -q
$ HGPLAIN=1 hg rebase
rebasing 2:889b0bc6a730 "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg
$ hg rebase -d 0 -r . -q
$ hg --config commands.rebase.requiredest=False rebase
rebasing 2:279de9495438 "cc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg
Requiring dest should not break continue or other rebase options
$ hg up 1 -q
@@ -56,7 +56,7 @@
continue: hg rebase --continue
$ hg rebase --continue
rebasing 3:0537f6b50def "dc" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg
$ cd ..
--- a/tests/test-rebase-detach.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-detach.t Sun Dec 10 22:50:57 2017 -0500
@@ -25,7 +25,7 @@
$ hg rebase -s D -d B
rebasing 3:e7b3f00ed42e "D" (D tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 3:secret 'D'
@@ -62,7 +62,7 @@
$ hg rebase -s D -d B
rebasing 3:e7b3f00ed42e "D" (D)
rebasing 4:69a34c08022a "E" (E tip)
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
$ hg tglog
o 4: ee79e0744528 'E'
@@ -99,7 +99,7 @@
$ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C)
rebasing 3:e7b3f00ed42e "D" (D tip)
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg
$ hg tglog
o 3: 7375f3dbfb0f 'D'
@@ -138,7 +138,7 @@
$ hg rebase --collapse -s D -d B
rebasing 3:e7b3f00ed42e "D" (D)
rebasing 4:69a34c08022a "E" (E tip)
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 3:secret 'Collapsed revision
@@ -176,7 +176,7 @@
rebasing 2:dc0947a82db8 "C" (C)
rebasing 3:e7b3f00ed42e "D" (D)
rebasing 4:69a34c08022a "E" (E tip)
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg
$ hg tglog
o 4: e3d0c70d606d 'E'
@@ -192,7 +192,7 @@
$ hg rebase -d 1 -s 3
rebasing 3:e9153d36a1af "D"
rebasing 4:e3d0c70d606d "E" (tip)
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg
$ hg tglog
o 4: 2c24e540eccd 'E'
|
@@ -251,7 +251,7 @@
rebasing 5:b92d164ad3cb "I" (I)
rebasing 6:0cfbc7e8faaf "Merge"
rebasing 7:c6aaf0d259c0 "J" (tip)
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg
$ hg tglog
@ 5: 65079693dac4 'Collapsed revision
@@ -305,7 +305,7 @@
$ hg rebase -c
rebasing 3:17b4880d2402 "B2" (tip)
note: rebase of 3:17b4880d2402 created no changes to commit
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 2:draft 'C'
|
--- a/tests/test-rebase-emptycommit.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-emptycommit.t Sun Dec 10 22:50:57 2017 -0500
@@ -88,7 +88,7 @@
rebasing 4:69a34c08022a "E" (BOOK-E)
note: rebase of 4:69a34c08022a created no changes to commit
rebasing 5:6b2aeab91270 "F" (BOOK-F F)
- saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 5 F BOOK-F
|
@@ -136,7 +136,7 @@
note: rebase of 3:b18e25de2cf5 created no changes to commit
rebasing 4:86a1f6686812 "E" (BOOK-E E)
note: rebase of 4:86a1f6686812 created no changes to commit
- saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 4 H BOOK-C BOOK-D BOOK-E
@@ -186,7 +186,7 @@
rebasing 5:ad6717a6a58e "F" (BOOK-F)
note: rebase of 5:ad6717a6a58e created no changes to commit
rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
- saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 7 G BOOK-G
--- a/tests/test-rebase-interruptions.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-interruptions.t Sun Dec 10 22:50:57 2017 -0500
@@ -311,7 +311,7 @@
$ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F"
- saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
$ hg tglogp
@ 6: 6e92a149ac6b secret 'F'
|
@@ -366,7 +366,7 @@
$ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F"
- saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
$ hg tglogp
@ 6: 6e92a149ac6b secret 'F'
|
@@ -416,7 +416,7 @@
$ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F"
- saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
$ hg tglogp
@ 6: 6e92a149ac6b secret 'F'
|
@@ -459,7 +459,7 @@
$ hg rebase --continue
rebasing 1:fdaca8533b86 "b"
note: rebase of 1:fdaca8533b86 created no changes to commit
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg resolve --list
$ test -f .hg/merge
[1]
--- a/tests/test-rebase-issue-noparam-single-rev.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-issue-noparam-single-rev.t Sun Dec 10 22:50:57 2017 -0500
@@ -53,7 +53,7 @@
$ hg rebase
rebasing 2:87c180a611f2 "l1"
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg
$ hg tglog
@ 4: b1152cc99655 'l1'
@@ -113,7 +113,7 @@
$ hg rebase
rebasing 2:87c180a611f2 "l1"
rebasing 3:1ac923b736ef "l2"
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg
$ hg tglog
@ 4: 023181307ed0 'l2'
--- a/tests/test-rebase-legacy.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-legacy.t Sun Dec 10 22:50:57 2017 -0500
@@ -47,7 +47,7 @@
rebasing 7:d2fa1c02b240 "G" (G)
rebasing 9:6582e6951a9c "H" (H tip)
warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
- saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg
$ hg log -G -T '{rev}:{node|short} {desc}\n'
o 11:721b8da0a708 H
--- a/tests/test-rebase-mq-skip.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-mq-skip.t Sun Dec 10 22:50:57 2017 -0500
@@ -67,14 +67,14 @@
note: rebase of 3:148775c71080 created no changes to commit
rebase merging completed
updating mq patch p0.patch to 5:9ecc820b1737
- $TESTTMP/a/.hg/patches/p0.patch (glob)
+ $TESTTMP/a/.hg/patches/p0.patch
2 changesets found
uncompressed size of bundle content:
348 (changelog)
324 (manifests)
129 p0
129 p1
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg
2 changesets found
uncompressed size of bundle content:
403 (changelog)
@@ -166,7 +166,7 @@
rebasing 5:681a378595ba "r5" (r5)
rebasing 6:512a1f24768b "r6" (qtip r6)
note: rebase of 6:512a1f24768b created no changes to commit
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
$ hg tglog
@ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
--- a/tests/test-rebase-mq.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-mq.t Sun Dec 10 22:50:57 2017 -0500
@@ -88,7 +88,7 @@
$ hg rebase -c
already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
rebasing 3:929394423cd3 "P1" (f2.patch qtip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg
$ hg tglog
@ 3: 462012cf340c 'P1' tags: f2.patch qtip tip
@@ -205,7 +205,7 @@
$ hg rebase -s 2 -d 1
rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg
$ hg qci -m 'save patch state'
--- a/tests/test-rebase-named-branches.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-named-branches.t Sun Dec 10 22:50:57 2017 -0500
@@ -73,7 +73,7 @@
rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H"
rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg
$ hg tglog
@ 9: 9e70cd31750f 'dev-two named branch' dev-two
@@ -102,7 +102,7 @@
rebasing 7:4b988a958030 "G"
rebasing 8:31d0e4ba75e6 "H"
rebasing 9:9e70cd31750f "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg
$ hg tglog
@ 9: 59c2e59309fe 'dev-two named branch' dev-two
@@ -162,7 +162,7 @@
rebasing 7:1a1e6f72ec38 "G"
rebasing 8:904590360559 "H"
rebasing 9:59c2e59309fe "dev-two named branch"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg
$ hg tglog
o 9: 71325f8bc082 'dev-two named branch' dev-two
@@ -191,7 +191,7 @@
rebasing 7:549f007a9f5f "G"
rebasing 8:12b2bc666e20 "H"
rebasing 9:71325f8bc082 "dev-two named branch" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg
$ hg tglog
o 9: 3944801ae4ea 'dev-two named branch' dev-two
@@ -222,7 +222,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
o 9: e9f862ce8bad 'D'
@@ -254,7 +254,7 @@
rebasing 7:3bdb949809d9 "B"
rebasing 8:a0d543090fa4 "C"
rebasing 9:e9f862ce8bad "D" (tip)
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg
$ hg tglog
o 9: e522577ccdbd 'D'
@@ -291,7 +291,7 @@
rebasing 7:160b0930ccc6 "B"
rebasing 8:810110211f50 "C"
rebasing 9:e522577ccdbd "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg
$ cd ..
@@ -330,7 +330,7 @@
$ hg rebase
rebasing 2:792845bb77ee "b2"
note: rebase of 2:792845bb77ee created no changes to commit
- saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg
$ hg tglog
o 2: c062e3ecd6c6 'c1' c
|
@@ -345,7 +345,7 @@
$ hg up -qr 1
$ hg rebase
rebasing 1:40039acb7ca5 "b1"
- saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg
$ hg tglog
@ 3: 76abc1c6f8c7 'b1' b
|
@@ -396,7 +396,7 @@
rebasing 3:76abc1c6f8c7 "b1"
rebasing 4:8427af5d86f2 "c2 closed" (tip)
note: rebase of 4:8427af5d86f2 created no changes to commit
- saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
$ hg tglog
o 3: 117b0ed08075 'b1' x
|
--- a/tests/test-rebase-newancestor.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-newancestor.t Sun Dec 10 22:50:57 2017 -0500
@@ -44,7 +44,7 @@
merging a
rebasing 2:30ae917c0e4f "C"
merging a
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg
$ hg tglog
o 3: 25773bc4b4b0 'C'
@@ -138,7 +138,7 @@
other [source] changed f-default which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
- saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg
$ hg tglog
o 6: fbc098e72227 'dev: merge default'
|
@@ -167,7 +167,7 @@
other [source] changed f-default which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
- saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg
$ hg tglog
o 7: fbc098e72227 'dev: merge default'
|
@@ -239,7 +239,7 @@
$ hg rebase -r 4 -d 2
rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg
$ hg tip
changeset: 5:cca50676b1c5
tag: tip
@@ -251,7 +251,7 @@
$ hg rebase -r 4 -d 2
rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside"
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg
$ hg tip
changeset: 5:f9daf77ffe76
tag: tip
@@ -307,7 +307,7 @@
199 (changelog)
216 (manifests)
182 other
- saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg
1 changesets found
uncompressed size of bundle content:
254 (changelog)
@@ -374,7 +374,7 @@
rebasing 3:c1e6b162678d "B" (B)
rebasing 4:d6003a550c2c "C" (C)
rebasing 5:c8f78076273e "D" (D tip)
- saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
$ hg manifest -r 'desc(D)'
B
C
@@ -395,7 +395,7 @@
$ hg rebase -r D+F -d Z
rebasing 3:004dc1679908 "D" (D)
rebasing 5:4be4cbf6f206 "F" (F tip)
- saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
$ hg manifest -r 'desc(F)'
C
D
@@ -416,7 +416,7 @@
$ hg rebase -r E+F -d Z
rebasing 4:974e4943c210 "E" (E)
rebasing 5:4be4cbf6f206 "F" (F tip)
- saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
$ hg manifest -r 'desc(F)'
B
D
--- a/tests/test-rebase-obsolete.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-obsolete.t Sun Dec 10 22:50:57 2017 -0500
@@ -753,7 +753,7 @@
$ hg add D
$ hg commit -m D
$ hg --hidden strip -r 'desc(B1)'
- saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob)
+ saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
$ hg log -G
@ 5:1a79b7535141 D
|
--- a/tests/test-rebase-parameters.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-parameters.t Sun Dec 10 22:50:57 2017 -0500
@@ -135,7 +135,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 6: ed65089c18f8 'D'
@@ -169,7 +169,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 6: ed65089c18f8 'D'
@@ -198,7 +198,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 8: ed65089c18f8 'D'
@@ -230,7 +230,7 @@
$ hg rebase --source 'desc("C")'
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 6: 7726e9fd58f7 'D'
@@ -259,7 +259,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 8: 8eeb3c33ad33 'D'
@@ -292,7 +292,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
o 6: ed65089c18f8 'D'
@@ -320,7 +320,7 @@
$ hg rebase --source 2 --dest 7
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 8: 668acadedd30 'D'
@@ -353,7 +353,7 @@
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
o 8: 287cc92ba5a4 'D'
@@ -385,7 +385,7 @@
$ hg rebase --rev 'desc("C")::'
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 6: 7726e9fd58f7 'D'
@@ -411,7 +411,7 @@
$ hg rebase -r 3 -r 6 --dest 8
rebasing 3:32af7686d403 "D"
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg
$ cd ..
Test --tool parameter:
@@ -441,7 +441,7 @@
$ hg rebase -s 2 -d 1 --tool internal:local
rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 created no changes to commit
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2
c2
@@ -454,7 +454,7 @@
$ hg rebase -s 2 -d 1 --tool internal:other
rebasing 2:e4e3f3546619 "c2b" (tip)
- saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2
c2b
@@ -494,7 +494,7 @@
$ hg rebase -c --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 created no changes to commit
- saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
--- a/tests/test-rebase-pull.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-pull.t Sun Dec 10 22:50:57 2017 -0500
@@ -48,7 +48,7 @@
Now b has one revision to be pulled from a:
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -56,7 +56,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 77ae9631bcca
rebasing 2:ff8d69a621f9 "L1"
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg
$ hg tglog
@ 3: d80cc2da061e 'L1'
@@ -70,7 +70,7 @@
Re-run:
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
@@ -138,7 +138,7 @@
$ hg book norebase
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -157,7 +157,7 @@
pull --rebase --update should ignore --update:
$ hg pull --rebase --update
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
@@ -166,7 +166,7 @@
$ hg up -q 1
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
@@ -206,7 +206,7 @@
adding L1
created new head
$ hg pull --rev tip --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -214,7 +214,7 @@
added 2 changesets with 2 changes to 2 files
new changesets 31cd3a05214e:770a61882ace
rebasing 3:ff8d69a621f9 "L1"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg
$ hg tglog
@ 5: 518d153c0ba3 'L1'
|
@@ -249,7 +249,7 @@
$ cd ../c
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -257,7 +257,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 00e3b7781125
rebasing 5:518d153c0ba3 "L1"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg
$ hg tglog
@ 6: 0d0727eb7ce0 'L1'
|
@@ -302,7 +302,7 @@
$ hg up 'desc(L1)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -311,7 +311,7 @@
new changesets 88dd24261747
rebasing 6:0d0727eb7ce0 "L1"
rebasing 7:c1f58876e3bf "L2"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg
$ hg tglog
o 8: 6dc0ea5dcf55 'L2'
|
@@ -344,7 +344,7 @@
$ hg up 'desc(R5)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -394,7 +394,7 @@
$ hg up 'desc(L2)'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -421,7 +421,7 @@
$ hg up 'desc(L2)'
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg pull --rebase
- pulling from $TESTTMP/a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -430,7 +430,7 @@
new changesets f7d3e42052f9
rebasing 7:864e0a2d2614 "L1"
rebasing 8:6dc0ea5dcf55 "L2"
- saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg
$ hg tglog
@ 12: 3603a865eea0 'L2'
|
--- a/tests/test-rebase-rename.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-rename.t Sun Dec 10 22:50:57 2017 -0500
@@ -21,7 +21,7 @@
adding d/b
$ hg mv d d-renamed
- moving d/b to d-renamed/b (glob)
+ moving d/b to d-renamed/b
$ hg ci -m 'rename B'
$ hg up -q -C 1
@@ -61,7 +61,7 @@
$ hg rebase -s 3 -d 2
rebasing 3:73a3ee40125d "rename A" (tip)
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg
$ hg tglog
@ 3: 032a9b75e83b 'rename A'
@@ -152,7 +152,7 @@
$ hg rebase -s 3 -d 2
rebasing 3:0a8162ff18a8 "copy A" (tip)
- saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg
$ hg tglog
@ 3: 98f6e6dbf45a 'copy A'
@@ -236,7 +236,7 @@
$ hg rebase -s 4 -d 3
rebasing 4:b918d683b091 "Another unrelated change" (tip)
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg
$ hg diff --stat -c .
unrelated.txt | 1 +
@@ -287,7 +287,7 @@
rebasing 1:79d255d24ad2 "File b created as copy of a and modified"
rebasing 2:327f772bc074 "File c created as copy of b and modified"
rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg
$ hg update 4
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -314,7 +314,7 @@
merging b and c to c
rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
merging c and d to d
- saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg
$ hg co tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-scenario-global.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rebase-scenario-global.t Sun Dec 10 22:50:57 2017 -0500
@@ -66,7 +66,7 @@
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
HG: branch 'default'
HG: added D
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg
$ cat D.orig
collide
$ rm D.orig
@@ -101,7 +101,7 @@
$ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg
$ cat D.orig
collide
$ rm D.orig
@@ -139,7 +139,7 @@
rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a created no changes to commit
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
$ f E.orig
E.orig: file not found
@@ -171,7 +171,7 @@
rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a created no changes to commit
rebasing 7:02de42196ebe "H" (tip)
- saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
$ hg tglog
@ 6: e9240aeaa6ad 'H'
@@ -198,7 +198,7 @@
$ hg rebase -s 6 -d 7
rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg
$ hg tglog
o 7: 397834907a90 'G'
@@ -229,7 +229,7 @@
rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" (tip)
- saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
$ hg tglog
@ 7: c87be72f9641 'H'
@@ -302,7 +302,7 @@
$ hg rebase -d 0 -s 2
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 7: c9659aac0000 'D'
|
@@ -346,31 +346,31 @@
5
$ hg rebase -s9 -d0
rebasing 9:2b23e52411f4 "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg
$ hg id -n # check we updated back to parent
5
$ hg log --template "{phase}\n" -r 9
draft
$ hg rebase -s9 -d1
rebasing 9:2cb10d0cfc6c "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg
$ hg log --template "{phase}\n" -r 9
draft
$ hg phase --force --secret 9
$ hg rebase -s9 -d0
rebasing 9:c5b12b67163a "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg
$ hg log --template "{phase}\n" -r 9
secret
$ hg rebase -s9 -d1
rebasing 9:2a0524f868ac "D" (tip)
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg
$ hg log --template "{phase}\n" -r 9
secret
Source phase lower than destination phase: new changeset get the phase of destination:
$ hg rebase -s8 -d9
rebasing 8:6d4f22462821 "C"
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg
$ hg log --template "{phase}\n" -r 'rev(9)'
secret
@@ -399,7 +399,7 @@
$ hg rebase -s 1 -d 2
rebasing 1:d2ae7f538514 "b"
- saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg
$ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n'
o 2:c882 draft b
|
@@ -632,7 +632,7 @@
rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip)
- saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg
$ hg tglog
o 8: fcb52e68a694 'I'
|
@@ -667,7 +667,7 @@
rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip)
- saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg
$ hg tglog
o 8: 9136df9a87cf 'I'
|
@@ -736,7 +736,7 @@
$ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
rebasing 8:e7ec4e813ba6 "I"
rebasing 10:23a4ace37988 "K" (tip)
- saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg
$ hg log --rev 'children(desc(G))'
changeset: 9:adb617877056
parent: 6:eea13746799a
@@ -803,7 +803,7 @@
current directory was removed (rmcwd !)
(consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !)
rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
- saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg
Get back to the root of cwd-vanish. Note that even though `cd ..`
works on most systems, it does not work on FreeBSD 10, so we use an
@@ -854,7 +854,7 @@
rebasing 4:82ae8dc7a9b7 "E"
rebasing 3:ab709c9f7171 "D"
rebasing 5:412b391de760 "F"
- saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg
$ hg tglog
o 6: 31884cfb735e 'F'
--- a/tests/test-relink.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-relink.t Sun Dec 10 22:50:57 2017 -0500
@@ -43,7 +43,7 @@
don't sit forever trying to double-lock the source repo
$ hg relink .
- relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
+ relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
there is nothing to relink
--- a/tests/test-remove.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-remove.t Sun Dec 10 22:50:57 2017 -0500
@@ -322,8 +322,8 @@
\r (no-eol) (esc)
deleting [===========================================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
- removing test/foo (glob)
+ removing test/bar
+ removing test/foo
exit code: 0
R test/bar
R test/foo
@@ -346,8 +346,8 @@
\r (no-eol) (esc)
deleting [===========================================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
- removing test/foo (glob)
+ removing test/bar
+ removing test/foo
exit code: 0
R test/bar
R test/foo
@@ -370,8 +370,8 @@
\r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
- not removing test/foo: file still exists (glob)
+ removing test/bar
+ not removing test/foo: file still exists
exit code: 1
R test/bar
./foo
@@ -393,7 +393,7 @@
\r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
+ removing test/bar
exit code: 1
R test/bar
./foo
@@ -413,7 +413,7 @@
\r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
+ removing test/bar
exit code: 1
R test/bar
./foo
@@ -436,8 +436,8 @@
\r (no-eol) (esc)
deleting [===========================================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
- removing test/bar (glob)
- removing test/foo (glob)
+ removing test/bar
+ removing test/foo
exit code: 0
R test/bar
R test/foo
@@ -463,7 +463,7 @@
\r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
- removing issue1861/b/c/y (glob)
+ removing issue1861/b/c/y
$ hg ci -m remove
$ ls issue1861
x
@@ -497,7 +497,7 @@
\r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
- removing d1/a (glob)
+ removing d1/a
$ hg rm --after nosuch
nosuch: * (glob)
--- a/tests/test-rename-dir-merge.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rename-dir-merge.t Sun Dec 10 22:50:57 2017 -0500
@@ -11,8 +11,8 @@
$ hg co -C 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv a b
- moving a/a to b/a (glob)
- moving a/b to b/b (glob)
+ moving a/a to b/a
+ moving a/b to b/b
$ hg ci -m "1 mv a/ b/"
$ hg co -C 0
@@ -48,7 +48,7 @@
b/b: remote created -> g
getting b/b
b/c: remote directory rename - move from a/c -> dm
- moving a/c to b/c (glob)
+ moving a/c to b/c
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -65,7 +65,7 @@
? a/d
$ hg ci -m "3 merge 2+1"
$ hg debugrename b/c
- b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
+ b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
$ hg co -C 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -100,7 +100,7 @@
$ hg ci -m "4 merge 1+2"
created new head
$ hg debugrename b/c
- b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
+ b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
Local directory rename with conflicting file added in remote source directory
and untracked in local target directory.
@@ -191,7 +191,7 @@
$ mkdir a
$ echo foo > a/f
$ hg add a
- adding a/f (glob)
+ adding a/f
$ hg ci -m "a/f == foo"
$ cd ..
@@ -200,7 +200,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r2
$ hg mv a b
- moving a/f to b/f (glob)
+ moving a/f to b/f
$ echo foo1 > b/f
$ hg ci -m" a -> b, b/f == foo1"
$ cd ..
@@ -209,7 +209,7 @@
$ mkdir a/aa
$ echo bar > a/aa/g
$ hg add a/aa
- adding a/aa/g (glob)
+ adding a/aa/g
$ hg ci -m "a/aa/g"
$ hg pull ../r2
pulling from ../r2
--- a/tests/test-rename.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-rename.t Sun Dec 10 22:50:57 2017 -0500
@@ -70,7 +70,7 @@
rename --after a single file to a nonexistent target filename
$ hg rename --after d1/a dummy
- d1/a: not recording move - dummy does not exist (glob)
+ d1/a: not recording move - dummy does not exist
move a single file to an existing directory
@@ -120,10 +120,10 @@
rename directory d1 as d3
$ hg rename d1/ d3
- moving d1/a to d3/a (glob)
- moving d1/b to d3/b (glob)
- moving d1/ba to d3/ba (glob)
- moving d1/d11/a1 to d3/d11/a1 (glob)
+ moving d1/a to d3/a
+ moving d1/b to d3/b
+ moving d1/ba to d3/ba
+ moving d1/d11/a1 to d3/d11/a1
$ hg status -C
A d3/a
d1/a
@@ -145,10 +145,10 @@
$ mv d1 d3
$ hg rename --after d1 d3
- moving d1/a to d3/a (glob)
- moving d1/b to d3/b (glob)
- moving d1/ba to d3/ba (glob)
- moving d1/d11/a1 to d3/d11/a1 (glob)
+ moving d1/a to d3/a
+ moving d1/b to d3/b
+ moving d1/ba to d3/ba
+ moving d1/d11/a1 to d3/d11/a1
$ hg status -C
A d3/a
d1/a
@@ -169,7 +169,7 @@
move a directory using a relative path
$ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
- moving ../d1/d11/a1 to d3/d11/a1 (glob)
+ moving ../d1/d11/a1 to d3/d11/a1
$ hg status -C
A d2/d3/d11/a1
d1/d11/a1
@@ -181,7 +181,7 @@
move --after a directory using a relative path
$ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
- moving ../d1/d11/a1 to d3/d11/a1 (glob)
+ moving ../d1/d11/a1 to d3/d11/a1
$ hg status -C
A d2/d3/d11/a1
d1/d11/a1
@@ -193,7 +193,7 @@
move directory d1/d11 to an existing directory d2 (removes empty d1)
$ hg rename d1/d11/ d2
- moving d1/d11/a1 to d2/d11/a1 (glob)
+ moving d1/d11/a1 to d2/d11/a1
$ hg status -C
A d2/d11/a1
d1/d11/a1
@@ -206,11 +206,11 @@
$ mkdir d3
$ hg rename d1 d2 d3
- moving d1/a to d3/d1/a (glob)
- moving d1/b to d3/d1/b (glob)
- moving d1/ba to d3/d1/ba (glob)
- moving d1/d11/a1 to d3/d1/d11/a1 (glob)
- moving d2/b to d3/d2/b (glob)
+ moving d1/a to d3/d1/a
+ moving d1/b to d3/d1/b
+ moving d1/ba to d3/d1/ba
+ moving d1/d11/a1 to d3/d1/d11/a1
+ moving d2/b to d3/d2/b
$ hg status -C
A d3/d1/a
d1/a
@@ -236,11 +236,11 @@
$ mkdir d3
$ mv d1 d2 d3
$ hg rename --after d1 d2 d3
- moving d1/a to d3/d1/a (glob)
- moving d1/b to d3/d1/b (glob)
- moving d1/ba to d3/d1/ba (glob)
- moving d1/d11/a1 to d3/d1/d11/a1 (glob)
- moving d2/b to d3/d2/b (glob)
+ moving d1/a to d3/d1/a
+ moving d1/b to d3/d1/b
+ moving d1/ba to d3/d1/ba
+ moving d1/d11/a1 to d3/d1/d11/a1
+ moving d2/b to d3/d2/b
$ hg status -C
A d3/d1/a
d1/a
@@ -267,7 +267,7 @@
$ hg rename d1/* d2
d2/b: not overwriting - file already committed
(hg rename --force to replace the file by recording a rename)
- moving d1/d11/a1 to d2/d11/a1 (glob)
+ moving d1/d11/a1 to d2/d11/a1
$ hg status -C
A d2/a
d1/a
@@ -304,14 +304,14 @@
abort: with multiple sources, destination must be an existing directory
[255]
-move every file under d1 to d2/d21 (glob)
+move every file under d1 to d2/d21
$ mkdir d2/d21
$ hg rename 'glob:d1/**' d2/d21
- moving d1/a to d2/d21/a (glob)
- moving d1/b to d2/d21/b (glob)
- moving d1/ba to d2/d21/ba (glob)
- moving d1/d11/a1 to d2/d21/a1 (glob)
+ moving d1/a to d2/d21/a
+ moving d1/b to d2/d21/b
+ moving d1/ba to d2/d21/ba
+ moving d1/d11/a1 to d2/d21/a1
$ hg status -C
A d2/d21/a
d1/a
@@ -329,15 +329,15 @@
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d2/d21
-move --after some files under d1 to d2/d21 (glob)
+move --after some files under d1 to d2/d21
$ mkdir d2/d21
$ mv d1/a d1/d11/a1 d2/d21
$ hg rename --after 'glob:d1/**' d2/d21
- moving d1/a to d2/d21/a (glob)
- d1/b: not recording move - d2/d21/b does not exist (glob)
- d1/ba: not recording move - d2/d21/ba does not exist (glob)
- moving d1/d11/a1 to d2/d21/a1 (glob)
+ moving d1/a to d2/d21/a
+ d1/b: not recording move - d2/d21/b does not exist
+ d1/ba: not recording move - d2/d21/ba does not exist
+ moving d1/d11/a1 to d2/d21/a1
$ hg status -C
A d2/d21/a
d1/a
@@ -353,8 +353,8 @@
$ mkdir d2/d21
$ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
- moving d1/a to d2/d21/a (glob)
- moving d1/d11/a1 to d2/d21/a1 (glob)
+ moving d1/a to d2/d21/a
+ moving d1/d11/a1 to d2/d21/a1
$ hg status -C
A d2/d21/a
d1/a
@@ -419,7 +419,7 @@
$ mkdir d3
$ hg rename d1/* d2/* d3
- moving d1/d11/a1 to d3/d11/a1 (glob)
+ moving d1/d11/a1 to d3/d11/a1
d3/b: not overwriting - d2/b collides with d1/b
$ hg status -C
A d3/a
@@ -445,7 +445,7 @@
moving a to ../d3/d1/a
moving b to ../d3/d1/b
moving ba to ../d3/d1/ba
- moving d11/a1 to ../d3/d1/d11/a1 (glob)
+ moving d11/a1 to ../d3/d1/d11/a1
$ hg status -C
A d3/d1/a
d1/a
@@ -471,7 +471,7 @@
moving a to ../d3/a
moving b to ../d3/b
moving ba to ../d3/ba
- moving d11/a1 to ../d3/d11/a1 (glob)
+ moving d11/a1 to ../d3/d11/a1
$ hg status -C
A d3/a
d1/a
@@ -492,9 +492,9 @@
move the parent tree with "hg rename .."
$ (cd d1/d11; hg rename .. ../../d3)
- moving ../a to ../../d3/a (glob)
- moving ../b to ../../d3/b (glob)
- moving ../ba to ../../d3/ba (glob)
+ moving ../a to ../../d3/a
+ moving ../b to ../../d3/b
+ moving ../ba to ../../d3/ba
moving a1 to ../../d3/d11/a1
$ hg status -C
A d3/a
@@ -517,9 +517,9 @@
$ hg remove d1/b
$ hg rename d1 d3
- moving d1/a to d3/a (glob)
- moving d1/ba to d3/ba (glob)
- moving d1/d11/a1 to d3/d11/a1 (glob)
+ moving d1/a to d3/a
+ moving d1/ba to d3/ba
+ moving d1/d11/a1 to d3/d11/a1
$ hg status -C
A d3/a
d1/a
@@ -603,7 +603,7 @@
check illegal path components
$ hg rename d1/d11/a1 .hg/foo
- abort: path contains illegal component: .hg/foo (glob)
+ abort: path contains illegal component: .hg/foo
[255]
$ hg status -C
$ hg rename d1/d11/a1 ../foo
@@ -613,7 +613,7 @@
$ mv d1/d11/a1 .hg/foo
$ hg rename --after d1/d11/a1 .hg/foo
- abort: path contains illegal component: .hg/foo (glob)
+ abort: path contains illegal component: .hg/foo
[255]
$ hg status -C
! d1/d11/a1
@@ -622,25 +622,25 @@
$ rm .hg/foo
$ hg rename d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1 (glob)
+ abort: path contains illegal component: .hg/a1
[255]
$ hg --config extensions.largefiles= rename d1/d11/a1 .hg
The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
- abort: path contains illegal component: .hg/a1 (glob)
+ abort: path contains illegal component: .hg/a1
[255]
$ hg status -C
$ hg rename d1/d11/a1 ..
- abort: ../a1 not under root '$TESTTMP' (glob)
+ abort: ../a1 not under root '$TESTTMP'
[255]
$ hg --config extensions.largefiles= rename d1/d11/a1 ..
The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
- abort: ../a1 not under root '$TESTTMP' (glob)
+ abort: ../a1 not under root '$TESTTMP'
[255]
$ hg status -C
$ mv d1/d11/a1 .hg
$ hg rename --after d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1 (glob)
+ abort: path contains illegal component: .hg/a1
[255]
$ hg status -C
! d1/d11/a1
@@ -649,7 +649,7 @@
$ rm .hg/a1
$ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
- abort: path contains illegal component: .hg/foo (glob)
+ abort: path contains illegal component: .hg/foo
[255]
$ hg status -C
$ (cd d1/d11; hg rename ../../d2/b ../../../foo)
--- a/tests/test-resolve.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-resolve.t Sun Dec 10 22:50:57 2017 -0500
@@ -249,7 +249,7 @@
.orig files should exists where specified
$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
merging file1
- creating directory: $TESTTMP/repo/.hg/origbackups (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups
merging file2
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
@@ -270,7 +270,7 @@
test .orig behavior with resolve
$ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
- $TESTTMP/repo/file1.orig: (glob)
+ $TESTTMP/repo/file1.orig:
>>>
foo
baz
--- a/tests/test-revert-interactive.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-revert-interactive.t Sun Dec 10 22:50:57 2017 -0500
@@ -52,9 +52,9 @@
> n
> EOF
reverting f
- reverting folder1/g (glob)
- removing folder1/i (glob)
- reverting folder2/h (glob)
+ reverting folder1/g
+ removing folder1/i
+ reverting folder2/h
remove added file folder1/i (Yn)? y
diff --git a/f b/f
2 hunks, 2 lines changed
@@ -140,8 +140,8 @@
Test that --interactive lift the need for --all
$ echo q | hg revert -i -r 2
- reverting folder1/g (glob)
- reverting folder2/h (glob)
+ reverting folder1/g
+ reverting folder2/h
diff --git a/folder1/g b/folder1/g
1 hunks, 1 lines changed
examine changes to 'folder1/g'? [Ynesfdaq?] q
@@ -198,9 +198,9 @@
> n
> EOF
reverting f
- reverting folder1/g (glob)
- removing folder1/i (glob)
- reverting folder2/h (glob)
+ reverting folder1/g
+ removing folder1/i
+ reverting folder2/h
remove added file folder1/i (Yn)? n
diff --git a/f b/f
2 hunks, 2 lines changed
--- a/tests/test-revert.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-revert.t Sun Dec 10 22:50:57 2017 -0500
@@ -91,8 +91,8 @@
$ echo z > e
$ hg revert --all -v --config 'ui.origbackuppath=.hg/origbackups'
- creating directory: $TESTTMP/repo/.hg/origbackups (glob)
- saving current version of e as $TESTTMP/repo/.hg/origbackups/e (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups
+ saving current version of e as $TESTTMP/repo/.hg/origbackups/e
reverting e
$ rm -rf .hg/origbackups
@@ -283,11 +283,11 @@
$ echo foo > newdir/newfile
$ hg add newdir/newfile
$ hg revert b newdir
- reverting b/b (glob)
- forgetting newdir/newfile (glob)
+ reverting b/b
+ forgetting newdir/newfile
$ echo foobar > b/b
$ hg revert .
- reverting b/b (glob)
+ reverting b/b
reverting a rename target should revert the source
@@ -336,8 +336,8 @@
$ hg revert -a --no-backup
reverting ignored
- reverting ignoreddir/file (glob)
- undeleting ignoreddir/removed (glob)
+ reverting ignoreddir/file
+ undeleting ignoreddir/removed
undeleting removed
$ hg st -mardi
--- a/tests/test-revlog-mmapindex.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-revlog-mmapindex.t Sun Dec 10 22:50:57 2017 -0500
@@ -37,7 +37,7 @@
mmap index which is now more than 4k long
$ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=4k
- mmapping $TESTTMP/a/.hg/store/00changelog.i (glob)
+ mmapping $TESTTMP/a/.hg/store/00changelog.i
100
99
98
--- a/tests/test-revset-outgoing.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-revset-outgoing.t Sun Dec 10 22:50:57 2017 -0500
@@ -38,7 +38,7 @@
$ cat .hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/a#stable (glob)
+ default = $TESTTMP/a#stable
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
@@ -70,7 +70,7 @@
$ hg tout
- comparing with $TESTTMP/a (glob)
+ comparing with $TESTTMP/a
searching for changes
2:1d4099801a4e: '3' stable
@@ -90,7 +90,7 @@
$ cat .hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/a#stable (glob)
+ default = $TESTTMP/a#stable
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
--- a/tests/test-run-tests.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-run-tests.t Sun Dec 10 22:50:57 2017 -0500
@@ -680,7 +680,7 @@
Interactive with custom view
$ echo 'n' | rt -i --view echo
- $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob)
+ $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
Accept this change? [n]* (glob)
ERROR: test-failure.t output changed
!.
@@ -692,7 +692,7 @@
View the fix
$ echo 'y' | rt --view echo
- $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob)
+ $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
ERROR: test-failure.t output changed
!.
@@ -858,8 +858,8 @@
test --tmpdir support
$ rt --tmpdir=$TESTTMP/keep test-success.t
- Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t (glob)
- Keeping threadtmp dir: $TESTTMP/keep/child1 (glob)
+ Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t
+ Keeping threadtmp dir: $TESTTMP/keep/child1
.
# Ran 1 tests, 0 skipped, 0 failed.
--- a/tests/test-share.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-share.t Sun Dec 10 22:50:57 2017 -0500
@@ -41,14 +41,14 @@
Some sed versions appends newline, some don't, and some just fails
$ cat .hg/sharedpath; echo
- $TESTTMP/repo1/.hg (glob)
+ $TESTTMP/repo1/.hg
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
$ hg tip -q
0:d3873e73d99e
@@ -278,7 +278,7 @@
bm3 4:62f4ded848e4
* bm4 5:92793bfc8cad
$ hg push -B bm4
- pushing to $TESTTMP/repo3 (glob)
+ pushing to $TESTTMP/repo3
searching for changes
adding changesets
adding manifests
@@ -348,7 +348,7 @@
bm1 3:b87954705719
bm4 5:92793bfc8cad
$ hg --config "extensions.failpullbookmarks=$TESTTMP/failpullbookmarks.py" pull $TESTTMP/repo4
- pulling from $TESTTMP/repo4 (glob)
+ pulling from $TESTTMP/repo4
searching for changes
no changes found
adding remote bookmark bm3
@@ -358,7 +358,7 @@
bm1 3:b87954705719
bm4 5:92793bfc8cad
$ hg pull $TESTTMP/repo4
- pulling from $TESTTMP/repo4 (glob)
+ pulling from $TESTTMP/repo4
searching for changes
no changes found
adding remote bookmark bm3
@@ -396,7 +396,7 @@
$ hg share -U thisdir/orig thisdir/abs
$ hg share -U --relative thisdir/abs thisdir/rel
$ cat thisdir/rel/.hg/sharedpath
- ../../orig/.hg (no-eol) (glob)
+ ../../orig/.hg (no-eol)
$ grep shared thisdir/*/.hg/requires
thisdir/abs/.hg/requires:shared
thisdir/rel/.hg/requires:shared
@@ -406,22 +406,22 @@
$ cd thisdir
$ hg -R rel root
- $TESTTMP/thisdir/rel (glob)
+ $TESTTMP/thisdir/rel
$ cd ..
now test that relative paths really are relative, survive across
renames and changes of PWD
$ hg -R thisdir/abs root
- $TESTTMP/thisdir/abs (glob)
+ $TESTTMP/thisdir/abs
$ hg -R thisdir/rel root
- $TESTTMP/thisdir/rel (glob)
+ $TESTTMP/thisdir/rel
$ mv thisdir thatdir
$ hg -R thatdir/abs root
- abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg! (glob)
+ abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg!
[255]
$ hg -R thatdir/rel root
- $TESTTMP/thatdir/rel (glob)
+ $TESTTMP/thatdir/rel
test unshare relshared repo
--- a/tests/test-shelve.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-shelve.t Sun Dec 10 22:50:57 2017 -0500
@@ -158,7 +158,7 @@
$ echo a >> a/a
$ hg mv b b.rename
- moving b/b to b.rename/b (glob)
+ moving b/b to b.rename/b
$ hg cp c c.copy
$ hg status -C
M a/a
@@ -352,7 +352,7 @@
# Unresolved merge conflicts:
#
- # a/a (glob)
+ # a/a
#
# To mark files as resolved: hg resolve --mark FILE
@@ -643,7 +643,7 @@
$ hg rebase -d 1 --config extensions.rebase=
rebasing 2:323bfa07f744 "xyz" (tip)
merging x
- saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg
$ hg unshelve
unshelving change 'default'
rebasing shelved changes
@@ -899,7 +899,7 @@
is a no-op), works (issue4398)
$ hg revert -a -r .
- reverting a/a (glob)
+ reverting a/a
$ hg resolve -m a/a
(no more unresolved files)
continue: hg unshelve --continue
--- a/tests/test-single-head.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-single-head.t Sun Dec 10 22:50:57 2017 -0500
@@ -36,7 +36,7 @@
$ mkcommit c_dB0
$ hg push
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -52,7 +52,7 @@
(branches are permanent and global, did you want a bookmark?)
$ mkcommit c_aC0
$ hg push --new-branch
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -66,7 +66,7 @@
$ mkcommit c_dD0
created new head
$ hg push -f
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -85,7 +85,7 @@
(branch merge, don't forget to commit)
$ mkcommit c_dE0
$ hg push
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -97,7 +97,7 @@
$ mkcommit c_dF0
$ hg push
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -105,7 +105,7 @@
added 1 changesets with 1 changes to 1 files
$ hg commit --amend -m c_dF1
$ hg push
- pushing to $TESTTMP/single-head-server (glob)
+ pushing to $TESTTMP/single-head-server
searching for changes
adding changesets
adding manifests
@@ -199,5 +199,5 @@
actual stripping
$ hg strip --config extensions.strip= --rev 'desc("c_dH0")'
- saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg (glob)
+ saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg
--- a/tests/test-sparse.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-sparse.t Sun Dec 10 22:50:57 2017 -0500
@@ -257,7 +257,7 @@
4 files changed, 4 insertions(+), 2 deletions(-)
$ hg strip -r . -k
- saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/39278f7c08a9-ce59e002-backup.hg (glob)
+ saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/39278f7c08a9-ce59e002-backup.hg
$ hg status
M show
? show2
@@ -267,7 +267,7 @@
$ hg commit -Aqm "add show2"
$ hg rebase -d 1 --config extensions.rebase=
rebasing 2:bdde55290160 "add show2" (tip)
- saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg (glob)
+ saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg
Verify log --sparse only shows commits that affect the sparse checkout
--- a/tests/test-ssh-bundle1.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-ssh-bundle1.t Sun Dec 10 22:50:57 2017 -0500
@@ -372,7 +372,7 @@
73649e48688a
$ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
- remote: Illegal repository "$TESTTMP/a'repo" (glob)
+ remote: Illegal repository "$TESTTMP/a'repo"
abort: no suitable response from remote hg!
[255]
--- a/tests/test-ssh.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-ssh.t Sun Dec 10 22:50:57 2017 -0500
@@ -389,7 +389,7 @@
73649e48688a
$ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
- remote: Illegal repository "$TESTTMP/a'repo" (glob)
+ remote: Illegal repository "$TESTTMP/a'repo"
abort: no suitable response from remote hg!
[255]
--- a/tests/test-strip.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-strip.t Sun Dec 10 22:50:57 2017 -0500
@@ -203,7 +203,7 @@
$ hg --traceback strip 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
$ hg parents
changeset: 1:ef3a871183d7
user: test
@@ -659,7 +659,7 @@
singlenode1 13:43227190fef8
singlenode2 13:43227190fef8
$ hg strip -B multipledelete1 -B multipledelete2
- saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob)
+ saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg
bookmark 'multipledelete1' deleted
bookmark 'multipledelete2' deleted
$ hg id -ir e46a4836065c
@@ -669,7 +669,7 @@
abort: unknown revision 'b4594d867745'!
[255]
$ hg strip -B singlenode1 -B singlenode2
- saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob)
+ saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg
bookmark 'singlenode1' deleted
bookmark 'singlenode2' deleted
$ hg id -ir 43227190fef8
@@ -737,12 +737,12 @@
$ hg commit -Aqm b
$ hg strip -r 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob)
+ saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
$ ls .hg/strip-backup
3903775176ed-e68910bd-backup.hg
$ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
$ hg strip -r 0
- saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob)
+ saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
$ ls .hg/strip-backup
3903775176ed-54390173-backup.hg
3903775176ed-e68910bd-backup.hg
@@ -846,7 +846,7 @@
bundle2-output-bundle: "HG20", (1 params) 2 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
updating the branch cache
invalid branchheads cache (served): tip differs
truncating cache/rbc-revs-v1 to 24
@@ -917,7 +917,7 @@
$ hg book -r tip blah
$ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg
$ hg up -C 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -937,8 +937,8 @@
> repo.__class__ = crashstriprepo
> EOF
$ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob)
- strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg
+ strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'
abort: boom
[255]
@@ -1005,7 +1005,7 @@
$ hg strip --force -r 35358f982181
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg
$ hg log -G
@ changeset: 3:f62c6c09b707
| branch: new-branch
@@ -1082,7 +1082,7 @@
$ hg strip -r 35358f982181
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
$ hg log -G
@ changeset: 3:f62c6c09b707
| branch: new-branch
@@ -1109,7 +1109,7 @@
$ hg pull -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
- pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+ pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
searching for changes
adding changesets
adding manifests
@@ -1119,7 +1119,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg strip -k -r 35358f982181
- saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
$ hg log -G
@ changeset: 3:f62c6c09b707
| branch: new-branch
@@ -1188,7 +1188,7 @@
> EOF
$ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
- saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
+ saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg
$ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
@ 6:2f2d51af6205 J
@@ -1242,7 +1242,7 @@
> EOF
$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
- saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
+ saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 8:1473d4b996d1 G2 b-F@divergent3 b-G
@@ -1331,7 +1331,7 @@
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ hg strip .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob)
+ saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg
$ hg unbundle -q .hg/strip-backup/*
$ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
--- a/tests/test-subrepo-deep-nested-change.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-deep-nested-change.t Sun Dec 10 22:50:57 2017 -0500
@@ -18,7 +18,7 @@
$ hg init sub2
$ echo sub2 > sub2/sub2
$ hg add -R sub2
- adding sub2/sub2 (glob)
+ adding sub2/sub2
$ hg commit -R sub2 -m "sub2 import"
Preparing the 'sub1' repo which depends on the subrepo 'sub2'
@@ -41,8 +41,8 @@
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R sub1
- adding sub1/.hgsub (glob)
- adding sub1/sub1 (glob)
+ adding sub1/.hgsub
+ adding sub1/sub1
$ hg commit -R sub1 -m "sub1 import"
Preparing the 'main' repo which depends on the subrepo 'sub1'
@@ -77,8 +77,8 @@
cloning subrepo sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main
- adding main/.hgsub (glob)
- adding main/main (glob)
+ adding main/.hgsub
+ adding main/main
$ hg commit -R main -m "main import"
#if serve
@@ -89,13 +89,13 @@
are also available as siblings of 'main'.
$ hg serve -R main --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
- adding = $TESTTMP/main (glob)
- adding sub1 = $TESTTMP/main/sub1 (glob)
- adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob)
+ adding = $TESTTMP/main
+ adding sub1 = $TESTTMP/main/sub1
+ adding sub1/sub2 = $TESTTMP/main/sub1/sub2
listening at http://*:$HGPORT/ (bound to *:$HGPORT) (glob) (?)
- adding = $TESTTMP/main (glob) (?)
- adding sub1 = $TESTTMP/main/sub1 (glob) (?)
- adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob) (?)
+ adding = $TESTTMP/main (?)
+ adding sub1 = $TESTTMP/main/sub1 (?)
+ adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (?)
$ cat hg1.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT httpclone --config progress.disable=True
@@ -186,14 +186,14 @@
\r (no-eol) (esc)
updating to branch default
cloning subrepo sub1 from $TESTTMP/sub1
- cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
+ cloning subrepo sub1/sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Largefiles is NOT enabled in the clone if the source repo doesn't require it
$ cat cloned/.hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/main (glob)
+ default = $TESTTMP/main
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
@@ -231,7 +231,7 @@
$ echo modified > cloned/sub1/sub2/sub2
$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
committing subrepository sub1
- committing subrepository sub1/sub2 (glob)
+ committing subrepository sub1/sub2
Checking modified node ids
@@ -263,7 +263,7 @@
$ hg ci -ASm "add test.txt"
adding sub1/sub2/folder/test.txt
committing subrepository sub1
- committing subrepository sub1/sub2 (glob)
+ committing subrepository sub1/sub2
$ rm -r main
$ hg archive -S -qr 'wdir()' ../wdir
@@ -309,8 +309,8 @@
\r (no-eol) (esc)
deleting [===========================================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
- removing sub1/sub2/folder/test.txt (glob)
- removing sub1/sub2/test.txt (glob)
+ removing sub1/sub2/folder/test.txt
+ removing sub1/sub2/test.txt
$ hg status -S
R sub1/sub2/folder/test.txt
R sub1/sub2/test.txt
@@ -368,10 +368,10 @@
\r (no-eol) (esc)
searching for exact renames [ ] 0/1\r (no-eol) (esc)
\r (no-eol) (esc)
- adding ../sub1/sub2/folder/test.txt (glob)
- removing ../sub1/sub2/test.txt (glob)
- adding ../sub1/foo (glob)
- adding bar/abc (glob)
+ adding ../sub1/sub2/folder/test.txt
+ removing ../sub1/sub2/test.txt
+ adding ../sub1/foo
+ adding bar/abc
$ cd ..
$ hg status -S
A foo/bar/abc
@@ -398,9 +398,9 @@
archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
$ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
Only in ../wdir: .hg_archival.txt
@@ -442,9 +442,9 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
$ find ../wdir -type f | sort
../wdir/.hg_archival.txt
@@ -474,10 +474,10 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
$ cat ../wdir/.hg_archival.txt
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
@@ -489,15 +489,15 @@
$ touch sub1/sub2/folder/bar
$ hg addremove sub1/sub2
- adding sub1/sub2/folder/bar (glob)
+ adding sub1/sub2/folder/bar
$ hg status -S
A sub1/sub2/folder/bar
? foo/bar/abc
? sub1/foo
$ hg update -Cq
$ hg addremove sub1
- adding sub1/sub2/folder/bar (glob)
- adding sub1/foo (glob)
+ adding sub1/sub2/folder/bar
+ adding sub1/foo
$ hg update -Cq
$ rm sub1/sub2/folder/test.txt
$ rm sub1/sub2/test.txt
@@ -508,7 +508,7 @@
adding sub1/foo
adding foo/bar/abc
committing subrepository sub1
- committing subrepository sub1/sub2 (glob)
+ committing subrepository sub1/sub2
$ hg forget sub1/sub2/sub2
$ echo x > sub1/sub2/x.txt
@@ -518,75 +518,75 @@
$ hg files -S
.hgsub
.hgsubstate
- foo/bar/abc (glob)
+ foo/bar/abc
main
- sub1/.hgsub (glob)
- sub1/.hgsubstate (glob)
- sub1/foo (glob)
- sub1/sub1 (glob)
- sub1/sub2/folder/bar (glob)
- sub1/sub2/x.txt (glob)
+ sub1/.hgsub
+ sub1/.hgsubstate
+ sub1/foo
+ sub1/sub1
+ sub1/sub2/folder/bar
+ sub1/sub2/x.txt
$ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')"
.hgsub
.hgsubstate
- foo/bar/abc (glob)
+ foo/bar/abc
main
- sub1/.hgsub (glob)
- sub1/.hgsubstate (glob)
- sub1/foo (glob)
- sub1/sub1 (glob)
- sub1/sub2/folder/bar (glob)
- sub1/sub2/x.txt (glob)
+ sub1/.hgsub
+ sub1/.hgsubstate
+ sub1/foo
+ sub1/sub1
+ sub1/sub2/folder/bar
+ sub1/sub2/x.txt
$ hg files -r '.^' -S "set:eol('dos') or eol('unix')"
.hgsub
.hgsubstate
main
- sub1/.hgsub (glob)
- sub1/.hgsubstate (glob)
- sub1/sub1 (glob)
- sub1/sub2/folder/test.txt (glob)
- sub1/sub2/sub2 (glob)
- sub1/sub2/test.txt (glob)
+ sub1/.hgsub
+ sub1/.hgsubstate
+ sub1/sub1
+ sub1/sub2/folder/test.txt
+ sub1/sub2/sub2
+ sub1/sub2/test.txt
$ hg files sub1
- sub1/.hgsub (glob)
- sub1/.hgsubstate (glob)
- sub1/foo (glob)
- sub1/sub1 (glob)
- sub1/sub2/folder/bar (glob)
- sub1/sub2/x.txt (glob)
+ sub1/.hgsub
+ sub1/.hgsubstate
+ sub1/foo
+ sub1/sub1
+ sub1/sub2/folder/bar
+ sub1/sub2/x.txt
$ hg files sub1/sub2
- sub1/sub2/folder/bar (glob)
- sub1/sub2/x.txt (glob)
+ sub1/sub2/folder/bar
+ sub1/sub2/x.txt
$ hg files
.hgsub
.hgsubstate
- foo/bar/abc (glob)
+ foo/bar/abc
main
$ hg files -S -r '.^' sub1/sub2/folder
- sub1/sub2/folder/test.txt (glob)
+ sub1/sub2/folder/test.txt
$ hg files -S -r '.^' sub1/sub2/missing
- sub1/sub2/missing: no such file in rev 78026e779ea6 (glob)
+ sub1/sub2/missing: no such file in rev 78026e779ea6
[1]
$ hg files -r '.^' sub1/
- sub1/.hgsub (glob)
- sub1/.hgsubstate (glob)
- sub1/sub1 (glob)
- sub1/sub2/folder/test.txt (glob)
- sub1/sub2/sub2 (glob)
- sub1/sub2/test.txt (glob)
+ sub1/.hgsub
+ sub1/.hgsubstate
+ sub1/sub1
+ sub1/sub2/folder/test.txt
+ sub1/sub2/sub2
+ sub1/sub2/test.txt
$ hg files -r '.^' sub1/sub2
- sub1/sub2/folder/test.txt (glob)
- sub1/sub2/sub2 (glob)
- sub1/sub2/test.txt (glob)
+ sub1/sub2/folder/test.txt
+ sub1/sub2/sub2
+ sub1/sub2/test.txt
$ hg rollback -q
$ hg up -Cq
@@ -605,10 +605,10 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
$ find ../archive_all | sort
../archive_all
@@ -642,8 +642,8 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
$ find ../archive_exclude | sort
../archive_exclude
@@ -663,9 +663,9 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
$ find ../archive_include | sort
../archive_include
@@ -686,7 +686,7 @@
$ hg --config extensions.largefiles= add --large large.bin
$ hg --config extensions.largefiles= ci -S -m "add large files"
committing subrepository sub1
- committing subrepository sub1/sub2 (glob)
+ committing subrepository sub1/sub2
$ hg --config extensions.largefiles= archive -S ../archive_lf
$ find ../archive_lf | sort
@@ -785,7 +785,7 @@
$ cat ../lfclone/.hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/cloned (glob)
+ default = $TESTTMP/cloned
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
@@ -817,16 +817,16 @@
$ touch sub1/sub2/untracked.txt
$ touch sub1/sub2/large.dat
$ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt
- not removing sub1/sub2/untracked.txt: file is already untracked (glob)
+ not removing sub1/sub2/untracked.txt: file is already untracked
[1]
$ hg add --large --dry-run -v sub1/sub2/untracked.txt
- adding sub1/sub2/untracked.txt as a largefile (glob)
+ adding sub1/sub2/untracked.txt as a largefile
$ hg add --large -v sub1/sub2/untracked.txt
- adding sub1/sub2/untracked.txt as a largefile (glob)
+ adding sub1/sub2/untracked.txt as a largefile
$ hg add --normal -v sub1/sub2/large.dat
- adding sub1/sub2/large.dat (glob)
+ adding sub1/sub2/large.dat
$ hg forget -v sub1/sub2/untracked.txt
- removing sub1/sub2/untracked.txt (glob)
+ removing sub1/sub2/untracked.txt
$ hg status -S
A sub1/sub2/large.dat
R sub1/sub2/large.bin
@@ -907,7 +907,7 @@
$ hg add -v foo/bar/abc a.txt a.dat
adding a.dat as a largefile
adding a.txt
- adding foo/bar/abc (glob)
+ adding foo/bar/abc
$ hg ci -m 'dir commit with only normal file deltas' foo/bar
$ hg status
A a.dat
@@ -1040,7 +1040,7 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
@@ -1054,7 +1054,7 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
--- cloned.*/.hgsub * (glob)
@@ -1082,8 +1082,8 @@
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving [ ] 0/8\r (no-eol) (esc)
@@ -1101,10 +1101,10 @@
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (sub3) [ ] 0/1\r (no-eol) (esc)
@@ -1179,8 +1179,8 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
--- */cloned.*/sub1/sub2/sub2 * (glob)
+++ */cloned/sub1/sub2/sub2 * (glob)
--- a/tests/test-subrepo-git.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-git.t Sun Dec 10 22:50:57 2017 -0500
@@ -191,7 +191,7 @@
user b push changes
$ hg push 2>/dev/null
- pushing to $TESTTMP/t (glob)
+ pushing to $TESTTMP/t
pushing branch testing of subrepository "s"
searching for changes
adding changesets
@@ -203,7 +203,7 @@
$ cd ../ta
$ hg pull
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -236,7 +236,7 @@
source ../gitroot
revision f47b465e1bce645dbf37232a00574aa1546ca8d3
$ hg push 2>/dev/null
- pushing to $TESTTMP/t (glob)
+ pushing to $TESTTMP/t
pushing branch testing of subrepository "s"
searching for changes
adding changesets
@@ -268,7 +268,7 @@
$ echo aa >> a
$ hg commit -m aa
$ hg push
- pushing to $TESTTMP/t (glob)
+ pushing to $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -399,7 +399,7 @@
M inner/s/f
$ hg commit --subrepos -m nested
committing subrepository inner
- committing subrepository inner/s (glob)
+ committing subrepository inner/s
nested archive
@@ -678,8 +678,8 @@
$ hg -R tc pull -q
$ hg -R tc update -q -C 3473d20bddcf 2>&1 | sort
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob)
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob)
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg'
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg'
$ cd tc
$ hg parents -q
8:3473d20bddcf
@@ -725,8 +725,8 @@
$ cd ..
$ hg -R tc pull -q
$ hg -R tc update -q -C ed23f7fe024e 2>&1 | sort
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob)
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg' (glob)
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg'
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/sub/.hg'
$ cd tc
$ hg parents -q
9:ed23f7fe024e
@@ -924,8 +924,8 @@
$ echo 'bloop' > s/foobar
$ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
reverting subrepo ../gitroot
- creating directory: $TESTTMP/tc/.hg/origbackups (glob)
- saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar (glob)
+ creating directory: $TESTTMP/tc/.hg/origbackups
+ saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar
$ ls .hg/origbackups
foobar
$ rm -rf .hg/origbackups
@@ -998,7 +998,7 @@
reverting subrepo ../gitroot
$ hg add --subrepos "glob:**.python"
- adding s/snake.python (glob)
+ adding s/snake.python
$ hg st --subrepos s
A s/snake.python
? s/barfoo
@@ -1009,11 +1009,11 @@
reverting subrepo ../gitroot
$ hg add --subrepos s
- adding s/barfoo (glob)
- adding s/c.c (glob)
- adding s/cpp.cpp (glob)
- adding s/foobar.orig (glob)
- adding s/snake.python (glob)
+ adding s/barfoo
+ adding s/c.c
+ adding s/cpp.cpp
+ adding s/foobar.orig
+ adding s/snake.python
$ hg st --subrepos s
A s/barfoo
A s/c.c
@@ -1031,10 +1031,10 @@
? s/snake.python
$ hg add --subrepos --exclude "path:s/c.c"
- adding s/barfoo (glob)
- adding s/cpp.cpp (glob)
- adding s/foobar.orig (glob)
- adding s/snake.python (glob)
+ adding s/barfoo
+ adding s/cpp.cpp
+ adding s/foobar.orig
+ adding s/snake.python
$ hg st --subrepos s
A s/barfoo
A s/cpp.cpp
@@ -1050,7 +1050,7 @@
> EOF
$ hg add .hgignore
$ hg add --subrepos "glob:**.python" s/barfoo
- adding s/snake.python (glob)
+ adding s/snake.python
$ hg st --subrepos s
A s/barfoo
A s/snake.python
@@ -1099,10 +1099,10 @@
correctly do a dry run
$ hg add --subrepos s --dry-run
- adding s/barfoo (glob)
- adding s/c.c (glob)
- adding s/cpp.cpp (glob)
- adding s/foobar.orig (glob)
+ adding s/barfoo
+ adding s/c.c
+ adding s/cpp.cpp
+ adding s/foobar.orig
$ hg st --subrepos s
A s/.gitignore
A s/snake.python
@@ -1196,7 +1196,7 @@
$ unset GIT_ALLOW_PROTOCOL
$ PWNED_MSG="your git is too old or mercurial has regressed" hg clone \
> malicious-subrepository malicious-subrepository-protected
- Cloning into '$TESTTMP/tc/malicious-subrepository-protected/s'... (glob)
+ Cloning into '$TESTTMP/tc/malicious-subrepository-protected/s'...
fatal: transport 'ext' not allowed
updating to branch default
cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt
@@ -1209,7 +1209,7 @@
$ rm -f pwned.txt
$ env GIT_ALLOW_PROTOCOL=ext PWNED_MSG="you asked for it" hg clone \
> malicious-subrepository malicious-subrepository-clone-allowed
- Cloning into '$TESTTMP/tc/malicious-subrepository-clone-allowed/s'... (glob)
+ Cloning into '$TESTTMP/tc/malicious-subrepository-clone-allowed/s'...
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
--- a/tests/test-subrepo-missing.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-missing.t Sun Dec 10 22:50:57 2017 -0500
@@ -130,10 +130,10 @@
checking files
2 files, 5 changesets, 5 total revisions
checking subrepo links
- 0: repository $TESTTMP/repo/subrepo not found (glob)
- 1: repository $TESTTMP/repo/subrepo not found (glob)
- 3: repository $TESTTMP/repo/subrepo not found (glob)
- 4: repository $TESTTMP/repo/subrepo not found (glob)
+ 0: repository $TESTTMP/repo/subrepo not found
+ 1: repository $TESTTMP/repo/subrepo not found
+ 3: repository $TESTTMP/repo/subrepo not found
+ 4: repository $TESTTMP/repo/subrepo not found
$ ls
b
$ mv b subrepo
--- a/tests/test-subrepo-paths.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-paths.t Sun Dec 10 22:50:57 2017 -0500
@@ -55,7 +55,7 @@
> .* = \1
> EOF
$ hg debugsub
- abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
+ abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
[255]
$ cd ..
--- a/tests/test-subrepo-recursion.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-recursion.t Sun Dec 10 22:50:57 2017 -0500
@@ -23,10 +23,10 @@
$ hg add -S .hgsub
$ hg add -S foo/.hgsub
$ hg add -S foo/bar
- adding foo/bar/z.txt (glob)
+ adding foo/bar/z.txt
$ hg add -S
adding x.txt
- adding foo/y.txt (glob)
+ adding foo/y.txt
Test recursive status without committing anything:
@@ -67,7 +67,7 @@
$ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
committing subrepository foo
- committing subrepository foo/bar (glob)
+ committing subrepository foo/bar
$ cd foo
$ echo y2 >> y.txt
@@ -192,7 +192,7 @@
$ rm -r dir
$ hg commit --subrepos -m 2-3-2
committing subrepository foo
- committing subrepository foo/bar (glob)
+ committing subrepository foo/bar
Test explicit path commands within subrepos: add/forget
$ echo z1 > foo/bar/z2.txt
@@ -205,7 +205,7 @@
$ hg status -S
? foo/bar/z2.txt
$ hg forget foo/bar/z2.txt
- not removing foo/bar/z2.txt: file is already untracked (glob)
+ not removing foo/bar/z2.txt: file is already untracked
[1]
$ hg status -S
? foo/bar/z2.txt
@@ -254,13 +254,13 @@
#if serve
$ cd ..
$ hg serve -R repo --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
- adding = $TESTTMP/repo (glob)
- adding foo = $TESTTMP/repo/foo (glob)
- adding foo/bar = $TESTTMP/repo/foo/bar (glob)
+ adding = $TESTTMP/repo
+ adding foo = $TESTTMP/repo/foo
+ adding foo/bar = $TESTTMP/repo/foo/bar
listening at http://*:$HGPORT/ (bound to *:$HGPORT) (glob) (?)
- adding = $TESTTMP/repo (glob) (?)
- adding foo = $TESTTMP/repo/foo (glob) (?)
- adding foo/bar = $TESTTMP/repo/foo/bar (glob) (?)
+ adding = $TESTTMP/repo (?)
+ adding foo = $TESTTMP/repo/foo (?)
+ adding foo/bar = $TESTTMP/repo/foo/bar (?)
$ cat hg1.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT clone --config progress.disable=True
@@ -278,7 +278,7 @@
adding file changes
added 4 changesets with 7 changes to 3 files
new changesets af048e97ade2:65903cebad86
- cloning subrepo foo/bar from http://localhost:$HGPORT/foo/bar (glob)
+ cloning subrepo foo/bar from http://localhost:$HGPORT/foo/bar
requesting all changes
adding changesets
adding manifests
@@ -340,8 +340,8 @@
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
$ find ../archive | sort
../archive
@@ -372,8 +372,8 @@
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
(unzip date formating is unstable, we do not care about it and glob it out)
@@ -445,11 +445,11 @@
linking [ <=> ] 6\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
#else
Note there's a slight output glitch on non-hardlink systems: the last
"linking" progress topic never gets closed, leading to slight output corruption on that platform.
@@ -462,7 +462,7 @@
\r (no-eol) (esc)
\r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc)
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
#endif
Archive + subrepos uses '/' for all component separators
@@ -498,7 +498,7 @@
$ echo f > foo/f
$ hg archive --subrepos -r tip archive
cloning subrepo foo from $TESTTMP/empty/foo
- abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepository "foo") (glob)
+ abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepository "foo")
[255]
Clone and test outgoing:
@@ -507,11 +507,11 @@
$ hg clone repo repo2
updating to branch default
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
- comparing with $TESTTMP/repo (glob)
+ comparing with $TESTTMP/repo
searching for changes
no changes found
comparing with $TESTTMP/repo/foo
@@ -537,7 +537,7 @@
$ hg commit --subrepos -m 3-4-2
committing subrepository foo
$ hg outgoing -S
- comparing with $TESTTMP/repo (glob)
+ comparing with $TESTTMP/repo
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -567,7 +567,7 @@
Test incoming:
$ hg incoming -S
- comparing with $TESTTMP/repo2 (glob)
+ comparing with $TESTTMP/repo2
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
--- a/tests/test-subrepo-relative-path.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-relative-path.t Sun Dec 10 22:50:57 2017 -0500
@@ -5,7 +5,7 @@
$ hg init sub
$ echo sub > sub/sub
$ hg add -R sub
- adding sub/sub (glob)
+ adding sub/sub
$ hg commit -R sub -m "sub import"
Preparing the 'main' repo which depends on the subrepo 'sub'
@@ -17,8 +17,8 @@
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main
- adding main/.hgsub (glob)
- adding main/main (glob)
+ adding main/.hgsub
+ adding main/main
$ hg commit -R main -m "main import"
Cleaning both repositories, just as a clone -U
--- a/tests/test-subrepo-svn.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo-svn.t Sun Dec 10 22:50:57 2017 -0500
@@ -22,12 +22,12 @@
$ echo alpha > src/alpha
$ svn add src
A src
- A src/alpha (glob)
+ A src/alpha
$ mkdir externals
$ echo other > externals/other
$ svn add externals
A externals
- A externals/other (glob)
+ A externals/other
$ svn ci -qm 'Add alpha'
$ svn up -q
$ echo "externals -r1 $SVNREPOURL/externals" > extdef
@@ -173,7 +173,7 @@
this commit fails because of meta changes
$ svn propset svn:mime-type 'text/html' s/alpha
- property 'svn:mime-type' set on 's/alpha' (glob)
+ property 'svn:mime-type' set on 's/alpha'
$ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
committing subrepository s
abort: svn:*Commit failed (details follow): (glob)
@@ -204,7 +204,7 @@
this commit fails because of externals meta changes
$ svn propset svn:mime-type 'text/html' s/externals/other
- property 'svn:mime-type' set on 's/externals/other' (glob)
+ property 'svn:mime-type' set on 's/externals/other'
$ hg ci --subrepos -m 'amend externals from hg'
committing subrepository s
abort: cannot commit svn externals (in subrepository "s")
@@ -216,19 +216,19 @@
$ cd ..
$ hg clone t tc
updating to branch default
- A tc/s/alpha (glob)
- U tc/s (glob)
+ A tc/s/alpha
+ U tc/s
Fetching external item into 'tc/s/externals'* (glob)
- A tc/s/externals/other (glob)
+ A tc/s/externals/other
Checked out external at revision 1.
Checked out revision 3.
- A tc/subdir/s/alpha (glob)
- U tc/subdir/s (glob)
+ A tc/subdir/s/alpha
+ U tc/subdir/s
Fetching external item into 'tc/subdir/s/externals'* (glob)
- A tc/subdir/s/externals/other (glob)
+ A tc/subdir/s/externals/other
Checked out external at revision 1.
Checked out revision 2.
@@ -430,7 +430,7 @@
$ echo epsilon.py > dir/epsilon.py
$ svn add dir
A dir
- A dir/epsilon.py (glob)
+ A dir/epsilon.py
$ svn ci -qm 'Add dir/epsilon.py'
$ cd ../..
$ hg init rebaserepo
@@ -495,7 +495,7 @@
$ hg ci --subrepos -m cleanup | filter_svn_output
committing subrepository obstruct
- Sending obstruct/other (glob)
+ Sending obstruct/other
Committed revision 7.
At revision 7.
$ svn mkdir -qm "baseline" $SVNREPOURL/trunk
@@ -516,7 +516,7 @@
$ cd ..
$ rm -rf tempwc
$ svn co "$SVNREPOURL/branch"@10 recreated
- A recreated/somethingold (glob)
+ A recreated/somethingold
Checked out revision 10.
$ echo "recreated = [svn] $SVNREPOURL/branch" >> .hgsub
$ hg ci -m addsub
@@ -584,8 +584,8 @@
$ mkdir trunk/subdir branches
$ echo a > trunk/subdir/a
$ svn add trunk/subdir branches
- A trunk/subdir (glob)
- A trunk/subdir/a (glob)
+ A trunk/subdir
+ A trunk/subdir/a
A branches
$ svn ci -qm addsubdir
$ svn cp -qm branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
@@ -594,7 +594,7 @@
$ hg init repo2
$ cd repo2
$ svn co $SVNREPOURL/branches/somebranch/subdir
- A subdir/a (glob)
+ A subdir/a
Checked out revision 15.
$ echo "subdir = [svn] $SVNREPOURL/branches/somebranch/subdir" > .hgsub
$ hg add .hgsub
@@ -618,10 +618,10 @@
$ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc
$ svn add .hg sub
A .hg
- A .hg/hgrc (glob)
+ A .hg/hgrc
A sub
- A sub/.hg (glob)
- A sub/.hg/hgrc (glob)
+ A sub/.hg
+ A sub/.hg/hgrc
$ svn ci -qm 'add .hg/hgrc to be sanitized at hg update'
$ svn up -q
$ cd ..
@@ -631,8 +631,8 @@
$ cd ..
$ hg -R tc pull -u -q 2>&1 | sort
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg' (glob)
- warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg' (glob)
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg'
+ warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg'
$ cd tc
$ grep ' s$' .hgsubstate
16 s
--- a/tests/test-subrepo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-subrepo.t Sun Dec 10 22:50:57 2017 -0500
@@ -29,7 +29,7 @@
$ hg files -S
.hgsub
a
- s/a (glob)
+ s/a
$ hg -R s ci -Ams0
$ hg sum
@@ -58,10 +58,10 @@
$ mkdir snot
$ touch snot/file
$ hg remove -S snot/file
- not removing snot/file: file is untracked (glob)
+ not removing snot/file: file is untracked
[1]
$ hg cat snot/filenot
- snot/filenot: no such file in rev 7cf8cfea66e4 (glob)
+ snot/filenot: no such file in rev 7cf8cfea66e4
[1]
$ rm -r snot
@@ -70,12 +70,12 @@
$ echo b > s/a
$ hg revert --dry-run "set:subrepo('glob:s*')"
reverting subrepo s
- reverting s/a (glob)
+ reverting s/a
$ cat s/a
b
$ hg revert "set:subrepo('glob:s*')"
reverting subrepo s
- reverting s/a (glob)
+ reverting s/a
$ cat s/a
a
$ rm s/a.orig
@@ -131,7 +131,7 @@
phases: 2 draft
$ hg ci -m2
committing subrepository s
- committing subrepository s/ss (glob)
+ committing subrepository s/ss
$ hg sum
parent: 2:df30734270ae tip
2
@@ -205,7 +205,7 @@
$ hg init t
$ echo t > t/t
$ hg -R t add t
- adding t/t (glob)
+ adding t/t
5
@@ -473,7 +473,7 @@
$ hg clone t tc
updating to branch default
cloning subrepo s from $TESTTMP/t/s
- cloning subrepo s/ss from $TESTTMP/t/s/ss (glob)
+ cloning subrepo s/ss from $TESTTMP/t/s/ss
cloning subrepo t from $TESTTMP/t/t
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd tc
@@ -529,8 +529,8 @@
$ hg ci -m11
committing subrepository t
$ hg push
- pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
no changes made to subrepo s since last push to $TESTTMP/t/s
pushing subrepo t to $TESTTMP/t/t
searching for changes
@@ -550,16 +550,16 @@
$ hg ci -m12
committing subrepository s
$ hg push
- pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
pushing subrepo s to $TESTTMP/t/s
searching for changes
abort: push creates new remote head 12a213df6fa9! (in subrepository "s")
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg push -f
- pushing to $TESTTMP/t (glob)
- pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ pushing subrepo s/ss to $TESTTMP/t/s/ss
searching for changes
no changes found
pushing subrepo s to $TESTTMP/t/s
@@ -582,7 +582,7 @@
$ hg clone . ../tcc
updating to branch default
cloning subrepo s from $TESTTMP/tc/s
- cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob)
+ cloning subrepo s/ss from $TESTTMP/tc/s/ss
cloning subrepo t from $TESTTMP/tc/t
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -590,7 +590,7 @@
$ hg push -R ../tcc .
pushing to .
- no changes made to subrepo s/ss since last push to s/ss (glob)
+ no changes made to subrepo s/ss since last push to s/ss
no changes made to subrepo s since last push to s
no changes made to subrepo t since last push to t
searching for changes
@@ -602,7 +602,7 @@
$ hg push ../tcc
pushing to ../tcc
- pushing subrepo s/ss to ../tcc/s/ss (glob)
+ pushing subrepo s/ss to ../tcc/s/ss
searching for changes
no changes found
pushing subrepo s to ../tcc/s
@@ -619,7 +619,7 @@
$ hg push ../tcc
pushing to ../tcc
- no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob)
+ no changes made to subrepo s/ss since last push to ../tcc/s/ss
no changes made to subrepo s since last push to ../tcc/s
no changes made to subrepo t since last push to ../tcc/t
searching for changes
@@ -632,8 +632,8 @@
$ hg -R s update '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg push
- pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -641,8 +641,8 @@
[1]
$ echo foo >> s/a
$ hg push
- pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -657,7 +657,7 @@
$ hg -R s/ss commit -m 'test dirty store detection'
$ hg out -S -r `hg log -r tip -T "{node|short}"`
- comparing with $TESTTMP/t (glob)
+ comparing with $TESTTMP/t
searching for changes
no changes found
comparing with $TESTTMP/t/s
@@ -676,8 +676,8 @@
no changes found
$ hg push
- pushing to $TESTTMP/t (glob)
- pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ pushing subrepo s/ss to $TESTTMP/t/s/ss
searching for changes
adding changesets
adding manifests
@@ -692,8 +692,8 @@
a subrepo store may be clean versus one repo but not versus another
$ hg push
- pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
+ pushing to $TESTTMP/t
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -701,7 +701,7 @@
[1]
$ hg push ../tcc
pushing to ../tcc
- pushing subrepo s/ss to ../tcc/s/ss (glob)
+ pushing subrepo s/ss to ../tcc/s/ss
searching for changes
adding changesets
adding manifests
@@ -740,7 +740,7 @@
$ cd ../tc
$ hg pull
- pulling from $TESTTMP/t (glob)
+ pulling from $TESTTMP/t
searching for changes
adding changesets
adding manifests
@@ -752,7 +752,7 @@
should pull t
$ hg incoming -S -r `hg log -r tip -T "{node|short}"`
- comparing with $TESTTMP/t (glob)
+ comparing with $TESTTMP/t
no changes found
comparing with $TESTTMP/t/s
searching for changes
@@ -918,15 +918,15 @@
$ echo test > testdelete/nested/foo
$ echo test > testdelete/nested2/foo
$ hg -R testdelete/nested add
- adding testdelete/nested/foo (glob)
+ adding testdelete/nested/foo
$ hg -R testdelete/nested2 add
- adding testdelete/nested2/foo (glob)
+ adding testdelete/nested2/foo
$ hg -R testdelete/nested ci -m test
$ hg -R testdelete/nested2 ci -m test
$ echo nested = nested > testdelete/.hgsub
$ echo nested2 = nested2 >> testdelete/.hgsub
$ hg -R testdelete add
- adding testdelete/.hgsub (glob)
+ adding testdelete/.hgsub
$ hg -R testdelete ci -m "nested 1 & 2 added"
$ echo nested = nested > testdelete/.hgsub
$ hg -R testdelete ci -m "nested 2 deleted"
@@ -943,19 +943,19 @@
$ hg init nested_absolute
$ echo test > nested_absolute/foo
$ hg -R nested_absolute add
- adding nested_absolute/foo (glob)
+ adding nested_absolute/foo
$ hg -R nested_absolute ci -mtest
$ cd mercurial
$ hg init nested_relative
$ echo test2 > nested_relative/foo2
$ hg -R nested_relative add
- adding nested_relative/foo2 (glob)
+ adding nested_relative/foo2
$ hg -R nested_relative ci -mtest2
$ hg init main
$ echo "nested_relative = ../nested_relative" > main/.hgsub
$ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
$ hg -R main add
- adding main/.hgsub (glob)
+ adding main/.hgsub
$ hg -R main ci -m "add subrepos"
$ cd ..
$ hg clone mercurial/main mercurial2/main
@@ -1035,7 +1035,7 @@
$ rm repo/s/b
$ touch -t 200001010000 repo/.hgsubstate
$ hg -R repo revert --all
- reverting repo/.hgsubstate (glob)
+ reverting repo/.hgsubstate
reverting subrepo s
$ hg -R repo update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1056,10 +1056,10 @@
$ echo sub/repo = sub/repo > .hgsub
$ hg add .hgsub
$ hg ci -mtest
- committing subrepository sub/repo (glob)
+ committing subrepository sub/repo
$ echo test >> sub/repo/foo
$ hg ci -mtest
- committing subrepository sub/repo (glob)
+ committing subrepository sub/repo
$ hg cat sub/repo/foo
test
test
@@ -1077,9 +1077,9 @@
$ hg cat -T '{path}\n' 'glob:**'
.hgsub
.hgsubstate
- sub/repo/foo (glob)
+ sub/repo/foo
$ hg cat -T '{path}\n' 're:^sub'
- sub/repo/foo (glob)
+ sub/repo/foo
missing subrepos in working directory:
@@ -1108,7 +1108,7 @@
new changesets 19487b456929:be5eb94e7215
(run 'hg update' to get a working copy)
$ hg -R issue1852b update
- abort: default path for subrepository not found (in subrepository "sub/repo") (glob)
+ abort: default path for subrepository not found (in subrepository "sub/repo")
[255]
Ensure a full traceback, not just the SubrepoAbort part
@@ -1133,14 +1133,14 @@
adding file changes
added 1 changesets with 2 changes to 2 files
new changesets 19487b456929
- cloning subrepo sub/repo from issue1852a/sub/repo (glob)
+ cloning subrepo sub/repo from issue1852a/sub/repo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Try to push from the other side
$ hg -R issue1852a push `pwd`/issue1852c
- pushing to $TESTTMP/issue1852c (glob)
- pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
+ pushing to $TESTTMP/issue1852c
+ pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
searching for changes
no changes found
searching for changes
@@ -1183,12 +1183,12 @@
$ echo def > issue1852a/sub/repo/foo
$ hg -R issue1852a ci -SAm 'tweaked subrepo'
adding tmp/sub/repo/foo_p
- committing subrepository sub/repo (glob)
+ committing subrepository sub/repo
$ echo 'addedsub = addedsub' >> issue1852d/.hgsub
$ echo xyz > issue1852d/sub/repo/foo
$ hg -R issue1852d pull -u
- pulling from $TESTTMP/issue1852a (glob)
+ pulling from $TESTTMP/issue1852a
searching for changes
adding changesets
adding manifests
@@ -1197,14 +1197,14 @@
new changesets c82b79fdcc5b
subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c)
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
- pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob)
+ pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 46cd4aac504c
- subrepository sources for sub/repo differ (glob)
+ subrepository sources for sub/repo differ
use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat issue1852d/.hgsubstate
@@ -1541,8 +1541,8 @@
? s/f9
$ hg add -S
adding f8
- adding s/f10 (glob)
- adding s/f9 (glob)
+ adding s/f10
+ adding s/f9
$ hg st -S
A f8
A s/f10
@@ -1583,7 +1583,7 @@
? s/fn18
$ hg add -S 'glob:**fm*'
adding fm15
- adding s/fm17 (glob)
+ adding s/fm17
$ hg st -S
A fm15
A s/fm17
@@ -1621,7 +1621,7 @@
> default=../issue3781-dest/
> EOF
$ hg push --config devel.legacy.exchange=bundle1
- pushing to $TESTTMP/issue3781-dest (glob)
+ pushing to $TESTTMP/issue3781-dest
pushing subrepo s to $TESTTMP/issue3781-dest/s
searching for changes
no changes found
@@ -1631,7 +1631,7 @@
# clean the push cache
$ rm s/.hg/cache/storehash/*
$ hg push # bundle2+
- pushing to $TESTTMP/issue3781-dest (glob)
+ pushing to $TESTTMP/issue3781-dest
pushing subrepo s to $TESTTMP/issue3781-dest/s
searching for changes
no changes found
@@ -1689,7 +1689,7 @@
$ echo phasecheck4 >> t/t
$ hg commit -S -m phasecheck4
committing subrepository s
- committing subrepository s/ss (glob)
+ committing subrepository s/ss
warning: changes are committed in secret phase from subrepository ss
committing subrepository t
warning: changes are committed in secret phase from subrepository s
--- a/tests/test-tag.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-tag.t Sun Dec 10 22:50:57 2017 -0500
@@ -515,7 +515,7 @@
$ hg -R repo-tag --config hooks.commit="sh ../issue3344.sh" tag tag
hook: tag changes detected
hook: +A be090ea6625635128e90f7d89df8beeb2bcc1653 tag
- pushing to $TESTTMP/repo-tag-target (glob)
+ pushing to $TESTTMP/repo-tag-target
searching for changes
adding changesets
adding manifests
@@ -619,7 +619,7 @@
$ cd ../repo-automatic-tag-merge-clone
$ hg pull
- pulling from $TESTTMP/repo-automatic-tag-merge (glob)
+ pulling from $TESTTMP/repo-automatic-tag-merge
searching for changes
adding changesets
adding manifests
--- a/tests/test-tools.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-tools.t Sun Dec 10 22:50:57 2017 -0500
@@ -91,10 +91,10 @@
$ f -qr dir -HB 17
dir: directory with 3 files (symlink !)
dir: directory with 2 files (no-symlink !)
- dir/bar: (glob)
+ dir/bar:
0000: 31 0a 32 0a 33 0a 34 0a 35 0a 36 0a 37 0a 38 0a |1.2.3.4.5.6.7.8.|
0010: 39 |9|
- dir/foo: (glob)
+ dir/foo:
0000: 66 6f 6f 0a |foo.|
dir/l: (symlink !)
0000: 79 61 64 64 61 |yadda| (symlink !)
--- a/tests/test-treemanifest.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-treemanifest.t Sun Dec 10 22:50:57 2017 -0500
@@ -54,12 +54,12 @@
$ hg files -r .
a
b
- dir1/a (glob)
- dir1/b (glob)
- dir1/dir1/a (glob)
- dir1/dir1/b (glob)
- dir1/dir2/a (glob)
- dir1/dir2/b (glob)
+ dir1/a
+ dir1/b
+ dir1/dir1/a
+ dir1/dir1/b
+ dir1/dir2/a
+ dir1/dir2/b
e
The manifest command works
@@ -80,7 +80,7 @@
$ mkdir dir2
$ echo 3 > dir2/a
$ hg add dir2
- adding dir2/a (glob)
+ adding dir2/a
$ hg debugindex --dir dir1 > before
$ hg ci -qm 'add dir2'
$ hg debugindex --dir dir1 > after
@@ -90,8 +90,8 @@
Removing directory does not create an revlog entry
$ hg rm dir1/dir1
- removing dir1/dir1/a (glob)
- removing dir1/dir1/b (glob)
+ removing dir1/dir1/a
+ removing dir1/dir1/b
$ hg debugindex --dir dir1/dir1 > before
$ hg ci -qm 'remove dir1/dir1'
$ hg debugindex --dir dir1/dir1 > after
@@ -105,12 +105,12 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mv .hg/store/meta/dir2 .hg/store/meta/dir2-backup
$ hg files -r . dir1
- dir1/a (glob)
- dir1/b (glob)
- dir1/dir1/a (glob)
- dir1/dir1/b (glob)
- dir1/dir2/a (glob)
- dir1/dir2/b (glob)
+ dir1/a
+ dir1/b
+ dir1/dir1/a
+ dir1/dir1/b
+ dir1/dir2/a
+ dir1/dir2/b
Check that status between revisions works (calls treemanifest.matches())
without loading all directory revlogs
@@ -161,7 +161,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert -r 'desc("modify dir2/a")' .
- reverting dir1/a (glob)
+ reverting dir1/a
$ hg ci -m 'merge, keeping parent 1'
$ hg debugindex --dir dir2 > after
$ diff before after
@@ -177,7 +177,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert -r 'desc("modify dir1/a")' .
- reverting dir2/a (glob)
+ reverting dir2/a
$ hg ci -m 'merge, keeping parent 2'
created new head
$ hg debugindex --dir dir1 > after
@@ -322,7 +322,7 @@
M dir1/a
$ hg --config extensions.strip= strip tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
$ hg debugindex --dir dir1
rev offset length delta linkrev nodeid p1 p2
0 0 127 -1 4 064927a0648a 000000000000 000000000000
@@ -455,31 +455,31 @@
Test files from the root.
$ hg files -r .
- .A/one.txt (glob)
- .A/two.txt (glob)
- b/bar/fruits.txt (glob)
- b/bar/orange/fly/gnat.py (glob)
- b/bar/orange/fly/housefly.txt (glob)
- b/foo/apple/bees/flower.py (glob)
+ .A/one.txt
+ .A/two.txt
+ b/bar/fruits.txt
+ b/bar/orange/fly/gnat.py
+ b/bar/orange/fly/housefly.txt
+ b/foo/apple/bees/flower.py
c.txt
d.py
Excludes with a glob should not exclude everything from the glob's root
$ hg files -r . -X 'b/fo?' b
- b/bar/fruits.txt (glob)
- b/bar/orange/fly/gnat.py (glob)
- b/bar/orange/fly/housefly.txt (glob)
+ b/bar/fruits.txt
+ b/bar/orange/fly/gnat.py
+ b/bar/orange/fly/housefly.txt
$ cp -R .hg/store .hg/store-copy
Test files for a subdirectory.
$ rm -r .hg/store/meta/~2e_a
$ hg files -r . b
- b/bar/fruits.txt (glob)
- b/bar/orange/fly/gnat.py (glob)
- b/bar/orange/fly/housefly.txt (glob)
- b/foo/apple/bees/flower.py (glob)
+ b/bar/fruits.txt
+ b/bar/orange/fly/gnat.py
+ b/bar/orange/fly/housefly.txt
+ b/foo/apple/bees/flower.py
$ hg diff -r '.^' -r . --stat b
b/bar/fruits.txt | 1 +
b/bar/orange/fly/gnat.py | 1 +
@@ -494,7 +494,7 @@
$ rm -r .hg/store/meta/b/bar/orange/fly
$ rm -r .hg/store/meta/b/foo/apple/bees
$ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
- b/bar/fruits.txt (glob)
+ b/bar/fruits.txt
$ hg diff -r '.^' -r . --stat -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
b/bar/fruits.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
@@ -505,9 +505,9 @@
$ rm -r .hg/store/meta/~2e_a
$ rm -r .hg/store/meta/b/foo
$ hg files -r . -X path:b/foo b
- b/bar/fruits.txt (glob)
- b/bar/orange/fly/gnat.py (glob)
- b/bar/orange/fly/housefly.txt (glob)
+ b/bar/fruits.txt
+ b/bar/orange/fly/gnat.py
+ b/bar/orange/fly/housefly.txt
$ hg diff -r '.^' -r . --stat -X path:b/foo b
b/bar/fruits.txt | 1 +
b/bar/orange/fly/gnat.py | 1 +
@@ -521,8 +521,8 @@
$ rm -r .hg/store/meta/~2e_a
$ rm -r .hg/store/meta/b/foo
$ hg files -r . -I path:b/bar/orange -I path:a b
- b/bar/orange/fly/gnat.py (glob)
- b/bar/orange/fly/housefly.txt (glob)
+ b/bar/orange/fly/gnat.py
+ b/bar/orange/fly/housefly.txt
$ hg diff -r '.^' -r . --stat -I path:b/bar/orange -I path:a b
b/bar/orange/fly/gnat.py | 1 +
b/bar/orange/fly/housefly.txt | 1 +
@@ -536,7 +536,7 @@
$ rm -r .hg/store/meta/b/foo
$ rm -r .hg/store/meta/b/bar/orange
$ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
- b/bar/fruits.txt (glob)
+ b/bar/fruits.txt
$ hg diff -r '.^' -r . --stat glob:**.txt -I path:b/bar -X path:b/bar/orange
b/bar/fruits.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
@@ -838,7 +838,7 @@
$ hg co '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg revert -r tip dir/
- reverting dir/file (glob)
+ reverting dir/file
$ echo b > file # to make sure root manifest is sent
$ hg ci -m grafted
created new head
@@ -855,7 +855,7 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd grafted-dir-repo-clone
$ hg pull -r 2
- pulling from $TESTTMP/grafted-dir-repo (glob)
+ pulling from $TESTTMP/grafted-dir-repo
searching for changes
adding changesets
adding manifests
@@ -869,7 +869,7 @@
$ hg commit -Aqm 'pre-empty commit'
$ hg rm z
$ hg commit --amend -m 'empty commit'
- saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg (glob)
+ saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg
$ hg log -r 'tip + tip^' -T '{manifest}\n'
1:678d3574b88c
1:678d3574b88c
--- a/tests/test-unified-test.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-unified-test.t Sun Dec 10 22:50:57 2017 -0500
@@ -81,7 +81,7 @@
fo?/bar\r (no-eol) (glob) (esc)
#if windows
$ printf 'foo\\bar\r'
- foo/bar\r (no-eol) (glob) (esc)
+ foo/bar\r (no-eol) (esc)
#endif
$ printf 'foo/bar\rfoo/bar\r'
foo.bar\r \(no-eol\) (re) (esc)
--- a/tests/test-unionrepo.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-unionrepo.t Sun Dec 10 22:50:57 2017 -0500
@@ -167,4 +167,4 @@
"hg files -v" to call fctx.size() -> fctx.iscensored()
$ hg files -R union:b+a -r2 -v
- 3 b/f (glob)
+ 3 b/f
--- a/tests/test-url-rev.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-url-rev.t Sun Dec 10 22:50:57 2017 -0500
@@ -44,7 +44,7 @@
$ cat clone/.hg/hgrc
# example repository config (see 'hg help config' for more info)
[paths]
- default = $TESTTMP/repo#foo (glob)
+ default = $TESTTMP/repo#foo
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
@@ -329,4 +329,4 @@
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg root -R '#foo'
- $TESTTMP/#foo (glob)
+ $TESTTMP/#foo
--- a/tests/test-walk.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-walk.t Sun Dec 10 22:50:57 2017 -0500
@@ -255,7 +255,7 @@
f mammals/Procyonidae/raccoon Procyonidae/raccoon
f mammals/skunk skunk
$ hg debugwalk .hg
- abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
+ abort: path 'mammals/.hg' is inside nested repo 'mammals'
[255]
$ hg debugwalk ../.hg
abort: path contains illegal component: .hg
@@ -326,10 +326,10 @@
f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon
f mammals/skunk mammals/skunk
$ hg debugwalk ..
- abort: .. not under root '$TESTTMP/t' (glob)
+ abort: .. not under root '$TESTTMP/t'
[255]
$ hg debugwalk beans/../..
- abort: beans/../.. not under root '$TESTTMP/t' (glob)
+ abort: beans/../.. not under root '$TESTTMP/t'
[255]
$ hg debugwalk .hg
abort: path contains illegal component: .hg
@@ -338,10 +338,10 @@
abort: path contains illegal component: .hg
[255]
$ hg debugwalk beans/../.hg/data
- abort: path contains illegal component: .hg/data (glob)
+ abort: path contains illegal component: .hg/data
[255]
$ hg debugwalk beans/.hg
- abort: path 'beans/.hg' is inside nested repo 'beans' (glob)
+ abort: path 'beans/.hg' is inside nested repo 'beans'
[255]
Test absolute paths:
@@ -355,7 +355,7 @@
f beans/pinto beans/pinto
f beans/turtle beans/turtle
$ hg debugwalk `pwd`/..
- abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob)
+ abort: $TESTTMP/t/.. not under root '$TESTTMP/t'
[255]
Test patterns:
--- a/tests/test-win32text.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-win32text.t Sun Dec 10 22:50:57 2017 -0500
@@ -112,7 +112,7 @@
abort: pretxncommit.crlf hook failed
[255]
$ hg revert -a
- forgetting d/f2 (glob)
+ forgetting d/f2
$ rm d/f2
$ hg rem f
@@ -177,10 +177,10 @@
$ for x in a b c d; do echo content > dupe/$x; done
$ hg -R dupe add
- adding dupe/a (glob)
- adding dupe/b (glob)
- adding dupe/c (glob)
- adding dupe/d (glob)
+ adding dupe/a
+ adding dupe/b
+ adding dupe/c
+ adding dupe/d
$ $PYTHON unix2dos.py dupe/b dupe/c dupe/d
$ hg -R dupe ci -m a dupe/a
$ hg -R dupe ci -m b/c dupe/[bc]
@@ -385,7 +385,7 @@
WARNING: f4.bat already has CRLF line endings
and does not need EOL conversion by the win32text plugin.
Before your next commit, please reconsider your encode/decode settings in
- Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
+ Mercurial.ini or $TESTTMP/t/.hg/hgrc.
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat bin
hello\x00\r (esc)