facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 14:58:03 +03:00
Code Issues Projects Releases Wiki Activity

tests: remove (glob) annotations that were only for '\' matches

Browse Source 
# 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)
This commit is contained in:
Matt Harbison 2017-12-10 22:50:57 -05:00
parent 1c506fb28b
commit 7d8bebd9c1
180 changed files with 1105 additions and 1105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test-add.t
View File

@ -197,17 +197,17 @@ Test that adding a directory doesn't require case matching (issue4578)
$ 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 @@ Test that adding a directory doesn't require case matching (issue4578)
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 @@ and OS X
$ 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 ..

6
tests/test-addremove-similar.t
View File

@ -153,7 +153,7 @@ Issue1527: repeated addremove causes Abort
$ 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 @@ Issue1527: repeated addremove causes Abort
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 ..

2
tests/test-amend-subrepo.t
View File

@ -58,7 +58,7 @@ amend with dirty subrepo
$ 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)

16
tests/test-amend.t
View File

@ -29,7 +29,7 @@ Basic amend
$ 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 @@ Matcher and metadata options
$ 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 @@ Amend with editor
$ 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 @@ Amend with editor
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 @@ Interactive mode
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 @@ Amend a merge changeset
> 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

6
tests/test-archive.t
View File

@ -32,7 +32,7 @@ hg subrepos are shared when the parent repo is shared
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 @@ hg subrepos are shared into existence on demand if the parent was shared
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 subrepos are shared into existence on demand if the parent was shared
$ 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 (?)

14
tests/test-audit-path.t
View File

@ -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 @@ Symlinks
$ 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 @@ attack .hg/test
$ 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 @@ attack foo/.hg/test
$ 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 @@ attack ../test
$ 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 @@ attack /tmp/test
$ 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 ..

4
tests/test-audit-subrepo.t
View File

@ -9,7 +9,7 @@ on commit:
$ 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 @@ prepare tampered repo (including the commit above):
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

4
tests/test-basic.t
View File

@ -4,8 +4,8 @@ Create a repository:
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

8
tests/test-blackbox.t
View File

@ -60,7 +60,7 @@ clone, commit, pull
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 @@ we must not cause a failure if we cannot write to the log
$ 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 @@ we must not cause a failure if we cannot write to the log
$ hg pull
pulling from $TESTTMP/blackboxtest (glob)
pulling from $TESTTMP/blackboxtest
searching for changes
adding changesets
adding manifests
@ -133,7 +133,7 @@ backup bundles get logged
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)

14
tests/test-bookmarks-pushpull.t
View File

@ -409,7 +409,7 @@ divergent bookmarks
* 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 @@ explicit pull should overwrite the local version (issue4439)
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 @@ Test to show result of bookmarks comparison
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 @@ pushing an existing but divergent bookmark with -B still requires -f
$ 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 @@ Local push
#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 @@ Local push
#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

2
tests/test-bookmarks-rebase.t
View File

@ -38,7 +38,7 @@ rebase
$ 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

2
tests/test-bookmarks.t
View File

@ -736,7 +736,7 @@ We warn about divergent during bare update to the active bookmark
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

2
tests/test-bugzilla.t
View File

@ -61,7 +61,7 @@ push with default template:
$ 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
----

2
tests/test-bundle.t
View File

@ -856,7 +856,7 @@ directory does not exist
$ 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

6
tests/test-bundle2-exchange.t
View File

@ -106,7 +106,7 @@ pull
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 @@ pull empty (with phase movement)
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 (with phase movement)
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

6
tests/test-bundle2-multiple-changegroups.t
View File

@ -74,7 +74,7 @@ Add two linear commits
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 @@ pullop.cgresult
$ cd ../clone
$ hg pull
pulling from $TESTTMP/repo (glob)
pulling from $TESTTMP/repo
searching for changes
remote: changegroup1
adding changesets
@ -219,7 +219,7 @@ pullop.cgresult
$ cd ../clone
$ hg pull
pulling from $TESTTMP/repo (glob)
pulling from $TESTTMP/repo
searching for changes
remote: changegroup1
adding changesets

4
tests/test-casefolding.t
View File

@ -178,8 +178,8 @@ issue 4481: revert across case only renames
$ 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

4
tests/test-cat.t
View File

@ -66,9 +66,9 @@ Test fileset
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 -

4
tests/test-censor.t
View File

@ -353,7 +353,7 @@ Repo cloned before tainted content introduced can pull censored nodes
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 @@ Censored nodes can be pushed if they censor previously unexchanged nodes
$ 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

2
tests/test-check-config.t
View File

@ -33,7 +33,7 @@ Sanity check check-config.py
$ $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]

10
tests/test-clone.t
View File

@ -138,7 +138,7 @@ Check that path aliases are expanded:
$ hg clone -q -U --config 'paths.foobar=a#0' foobar f
$ hg -R f showconfig paths.default
$TESTTMP/a#0 (glob)
$TESTTMP/a#0
Use --pull:
@ -808,7 +808,7 @@ The shared repo should have been created
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 destination should have bookmarks
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 @@ Clone with existing share dir should result in pull + share
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 @@ We only get bookmarks from the remote, not everything in the share
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

46
tests/test-commit-amend.t
View File

@ -41,7 +41,7 @@ Amending changeset with changes in working dir:
$ 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 @@ the amend, there should be no rollback.
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 @@ Remove file that was added in amended commit:
$ 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 @@ No changes, just a different message:
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 @@ Test -u/-d:
> 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 @@ then, test editing custom commit message
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 @@ Same, but with changes in working dir (different code path):
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 @@ Moving bookmarks, preserve active bookmark:
$ 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 @@ Moving branches:
$ 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 @@ Close branch:
$ 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 @@ Same thing, different code path:
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 @@ Follow copies/renames:
$ 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 @@ Follow copies/renames:
$ 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 @@ Follow copies/renames:
$ 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 @@ Move added file (issue3410):
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 @@ Preserve extra dict (issue3430):
$ 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 @@ first graft something so there's an additional entry:
$ 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 @@ directory)
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 @@ directory)
$ 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 @@ directory)
$ 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

2
tests/test-commit-interactive-curses.t
View File

@ -206,7 +206,7 @@ Amend option works
> 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

10
tests/test-commit.t
View File

@ -61,7 +61,7 @@ commit added file that has been deleted
$ 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 @@ partial subdir commit test
$ 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 @@ verify pathauditor blocks evil filepaths
> 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 @@ verify pathauditor blocks evil filepaths
> 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

8
tests/test-config.t
View File

@ -7,7 +7,7 @@ Invalid syntax: no value
> 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 @@ Invalid syntax: no key
> =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 @@ Test hint about invalid syntax from leading white space
> 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 @@ Test hint about invalid syntax from leading white space
> 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]

4
tests/test-convert-authormap.t
View File

@ -27,7 +27,7 @@ Explicit --authors
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 @@ Implicit .hg/authormap
$ 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...

2
tests/test-convert-filemap.t
View File

@ -637,7 +637,7 @@ test named branch pruning
$ 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

2
tests/test-convert-git.t
View File

@ -936,7 +936,7 @@ damage git repository by renaming a commit object
$ 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

28
tests/test-convert-svn-sink.t
View File

@ -48,8 +48,8 @@ Modify
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 @@ Rename
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 @@ Copy
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 @@ Remove
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 @@ Executable
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 @@ Make sure our changes don't affect the rest of the test cases
$ 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 @@ Executable in new directory
$ 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 @@ Copy to new directory
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

4
tests/test-convert-svn-source.t
View File

@ -32,8 +32,8 @@ Initial svn import
$ 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

2
tests/test-convert.t
View File

@ -476,7 +476,7 @@ running from a devel copy, not a temp installation
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

6
tests/test-copy-move-merge.t
View File

@ -82,7 +82,7 @@ Test disabling copy tracing
$ 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 @@ Verify disabling copy tracing still keeps copies from rebase source
$ 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 @@ Verify we duplicate existing copies, instead of detecting them
$ 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

28
tests/test-copytrace-heuristics.t
View File

@ -55,7 +55,7 @@ Check filename heuristics (same dirname and same basename)
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 @@ Test when lca didn't modified the file that was moved
$ 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 @@ Rebase "backwards"
$ 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 @@ Check a few potential move candidates
$ 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 @@ With default limit which is 100
$ 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 @@ Move file in one branch and delete it in another
$ 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 @@ Move a directory in draft branch
$ 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 @@ Move file twice and rebase mod on top of moves
$ 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 @@ Move file twice and rebase moves on top of mods
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 @@ Move one file and add another file in the same folder in one branch, modify file
$ 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 @@ Copy and move file
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 @@ File directory and base name changed in same move
$ 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 @@ in other merge parent. File moved on rebase.
$ 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 @@ fullcopytracing
$ 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

8
tests/test-default-push.t
View File

@ -27,7 +27,7 @@ Push should provide a hint when both 'default' and 'default-push' not set:
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 @@ Push should push to 'default-push' when set:
$ 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 @@ Push should push to 'default-push' when set:
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 @@ Push should push to 'default-push' when 'default' is not set
$ 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

2
tests/test-diffstat.t
View File

@ -100,7 +100,7 @@ diffstat within directories:
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

2
tests/test-dirstate-race.t
View File

@ -45,7 +45,7 @@ confused with a file with the exec bit set
#endif
$ hg add b dir1 d e
adding dir1/c (glob)
adding dir1/c
$ hg commit -m test2
$ cat >> $TESTTMP/dirstaterace.py << EOF

6
tests/test-dirstate.t
View File

@ -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

2
tests/test-dispatch.t
View File

@ -90,7 +90,7 @@ However, we can't prevent it from loading extensions and configs:
$ 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

8
tests/test-drawdag.t
View File

@ -261,12 +261,12 @@ Change file contents via comments
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

56
tests/test-extension.t
View File

@ -180,7 +180,7 @@ Check "from __future__ import absolute_import" support for external libraries
> 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 @@ Check "from __future__ import absolute_import" support for external libraries
> 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 @@ Check absolute/relative import of extension specific modules
(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 @@ Check absolute/relative import of extension specific modules
(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 @@ Broken disabled extension and command:
> 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 @@ Commands handling multiple repositories at a time should invoke only
$ 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 @@ Commands handling multiple repositories at a time should invoke only
> 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 @@ Commands handling multiple repositories at a time should invoke only
> 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 @@ disabling in command line overlays with all configuration
$ 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

4
tests/test-flagprocessor.t
View File

@ -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

4
tests/test-fncache.t
View File

@ -14,7 +14,7 @@ Testing a.i/b:
$ 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 @@ Testing a.i.hg/c:
$ 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

2
tests/test-generaldelta.t
View File

@ -154,7 +154,7 @@ Test format.aggressivemergedeltas
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}

4
tests/test-git-export.t
View File

@ -99,7 +99,7 @@ Cross and same-directory copies with a relative root:
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 @@ Cross and same-directory copies with a relative root:
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 ..

2
tests/test-globalopts.t
View File

@ -88,7 +88,7 @@ Implicit -R:
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

2
tests/test-graft.t
View File

@ -811,7 +811,7 @@ but do some destructive editing of the repo:
$ 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]

2
tests/test-hardlinks.t
View File

@ -155,7 +155,7 @@ Push to repo r1 should break up most hardlinks in r2:
$ cd r3
$ hg push
pushing to $TESTTMP/r1 (glob)
pushing to $TESTTMP/r1
searching for changes
adding changesets
adding manifests

10
tests/test-hgignore.t
View File

@ -59,9 +59,9 @@ Ensure given files are relative to cwd
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 @@ Test relative ignore path (issue4473):
$ 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 @@ Check recursive glob pattern matches no directories (dir/**/c.o matches dir/c.o)
$ 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 @@ Check include subignore at the same level
$ 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

10
tests/test-hgrc.t
View File

@ -30,7 +30,7 @@ Issue1199: Can't use '%' in hgrc (eg url encoded username)
$ 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 @@ Issue1199: Can't use '%' in hgrc (eg url encoded username)
# 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 @@ source of paths is not mangled
$ 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

2
tests/test-hgweb-bundle.t
View File

@ -18,7 +18,7 @@ Produce a bundle to use
$ 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

4
tests/test-histedit-arguments.t
View File

@ -148,7 +148,7 @@ temporarily.
$ 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 @@ short hash. This tests issue3893.
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

4
tests/test-histedit-bookmark-motion.t
View File

@ -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.

2
tests/test-histedit-commute.t
View File

@ -420,7 +420,7 @@ Now, let's try to fold the second commit into the first:
> 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

4
tests/test-histedit-edit.t
View File

@ -273,7 +273,7 @@ check histedit_source
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 @@ rollback should not work after a histedit
(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

4
tests/test-histedit-fold.t
View File

@ -317,7 +317,7 @@ should effectively drop the changes from +6.
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 @@ dropped revision.
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
|

2
tests/test-histedit-obsolete.t
View File

@ -526,7 +526,7 @@ attempted later.
$ 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

2
tests/test-hook.t
View File

@ -792,7 +792,7 @@ new commits must be visible in pretxnchangegroup (issue3428)
$ 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

18
tests/test-import-git.t
View File

@ -648,8 +648,8 @@ prefix '.' is the same as no prefix
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 @@ prefix with default strip
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 @@ prefix with default strip
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

2
tests/test-import.t
View File

@ -938,7 +938,7 @@ test paths outside repo root
> 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 ..

4
tests/test-issue1089.t
View File

@ -7,7 +7,7 @@ https://bz.mercurial-scm.org/1089
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 @@ https://bz.mercurial-scm.org/1089
adding a/b
$ hg rm a
removing a/b (glob)
removing a/b
$ cd b
Relative delete:

4
tests/test-issue1502.t
View File

@ -13,7 +13,7 @@ Initialize repository
$ 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 @@ Pull. Bookmark should not jump to new head.
$ 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

2
tests/test-issue612.t
View File

@ -7,7 +7,7 @@ https://bz.mercurial-scm.org/612
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

4
tests/test-issue660.t
View File

@ -67,9 +67,9 @@ Revert all - should succeed:
$ hg revert --all
undeleting a
forgetting a/a (glob)
forgetting a/a
forgetting b
undeleting b/b (glob)
undeleting b/b
$ hg st

6
tests/test-keyword.t
View File

@ -272,7 +272,7 @@ Pull from bundle and trigger notify
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 @@ Pull from bundle and trigger notify
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 @@ Clone to test incoming
> default = ../Test
> EOF
$ hg incoming
comparing with $TESTTMP/Test (glob)
comparing with $TESTTMP/Test
searching for changes
changeset: 2:bb948857c743
tag: tip

4
tests/test-largefiles-cache.t
View File

@ -207,7 +207,7 @@ Inject corruption into the largefiles store and see how update handles that:
$ 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 @@ Test coverage of error handling from putlfile:
$ 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

76
tests/test-largefiles-misc.t
View File

@ -66,8 +66,8 @@ TODO: Ideally, this should mention the largefile, not the standin
./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 @@ Add a normal file to the subrepo, then test archiving
? 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 @@ Add a normal file to the subrepo, then test archiving
$ 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 @@ Add a normal file to the subrepo, then test archiving
$ 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 @@ Test update with subrepos.
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 @@ Test reverting a forgotten file
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 actions on largefiles using relative paths from subdir
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 @@ check messages when there is no files to upload:
$ 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 @@ check messages when there is no files to upload:
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 @@ check messages when there are files to upload:
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 @@ check messages when there are files to upload:
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 @@ check messages when there are files to upload:
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 @@ check messages when there are files to upload:
$ 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 @@ check messages when there are files to upload:
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 @@ check messages when there are files to upload:
$ 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 @@ and #5 refer it.
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 @@ and #5 refer it.
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 @@ merge action 'd' for 'local renamed directory to d2/g' which has no filename
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 @@ enabling largefiles extension.
> 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 @@ largefiles (issue4547)
*/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 @@ Move (and then undo) a directory move with only largefiles.
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 @@ Move (and then undo) a directory move with only largefiles.
? 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 @@ The standin for subdir2 should be deleted, not just dropped
'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 @@ Start from scratch, and rename something other than the final path component.
$ 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 @@ Start from scratch, and rename something other than the final path component.
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 @@ Test "pull --rebase" when rebase is enabled before largefiles (issue3861)
> 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

4
tests/test-largefiles-update.t
View File

@ -440,7 +440,7 @@ Test that the internal linear merging works correctly
$ 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 @@ Test that the internal linear merging works correctly
$ 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

2
tests/test-largefiles-wireproto.t
View File

@ -181,7 +181,7 @@ Corrupt the cached largefile in r7 and move it out of the servers usercache
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

64
tests/test-largefiles.t
View File

@ -343,8 +343,8 @@ Corner cases for adding largefiles.
$ 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 a standin can't be added as a large file
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 @@ downloaded from 'default' instead of 'default-push' when no source is specified
$ 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 @@ redo pull with --lfrev and check it pulls largefiles for the right revs
$ 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 @@ rebased or not.
$ [ ! -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 @@ rebased or not.
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 @@ rebased or not.
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 @@ Test hg remove removes empty largefiles directories
# 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 @@ Test hg remove removes empty largefiles directories
$ 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 @@ Test hg remove removes empty largefiles directories
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 @@ revert some files to an older revision
$ pwd
$TESTTMP/e
$ hg paths
default = $TESTTMP/d (glob)
default = $TESTTMP/d
$ hg verify --large
checking changesets
@ -1565,14 +1565,14 @@ and make sure that this is caught:
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 @@ and make sure that this is caught:
- 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 @@ Merge with revision with missing largefile - and make sure it tries to fetch it.
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 @@ Test status after merging with a branch that introduces a new largefile:
- 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 @@ coexist.
$ 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 @@ Cat a standin
$ 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

14
tests/test-lfconvert.t
View File

@ -215,7 +215,7 @@ lfconvert with rename, merge, and remove
$ 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 @@ process.
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

6
tests/test-lfs.t
View File

@ -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

70
tests/test-locate.t
View File

@ -90,16 +90,16 @@ Issue294: hg remove --after dir fails when dir.* also exists
$ 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 @@ Issue294: hg remove --after dir fails when dir.* also exists
$ 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]

2
tests/test-manifest.t
View File

@ -26,7 +26,7 @@ The next call is expected to return nothing:
$ hg files -vr .
2 a
2 x b/a (glob)
2 x b/a
1 l l
$ hg files -r . -X b
a

12
tests/test-merge-criss-cross.t
View File

@ -116,11 +116,11 @@ Criss cross merging
$ 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 @@ Redo merge with merge.preferancestor="*" to enable bid merge
$ 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 @@ The other way around:
$ f --dump --recurse *
d2: directory with 2 files
d2/f3: (glob)
d2/f3:
>>>
0 base
<<<
d2/f4: (glob)
d2/f4:
>>>
0 base
<<<

2
tests/test-merge-subrepos.t
View File

@ -122,7 +122,7 @@ XXX: There's a difference between wdir() and '.', so there should be a status.
$ hg files -R subrepo
[1]
$ hg files -R subrepo -r '.'
subrepo/b (glob)
subrepo/b
$ hg bookmark -r tip @other
$ echo xyz > subrepo/c

8
tests/test-mq-merge.t
View File

@ -58,7 +58,7 @@ Create a patch removing a:
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 @@ Update b and commit in an "update" changeset:
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 @@ Classic MQ merge sequence *with an explicit named queue*:
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).

4
tests/test-mq-qnew.t
View File

@ -117,7 +117,7 @@ plain headers
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 @@ hg headers
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

2
tests/test-mq-safety.t
View File

@ -68,7 +68,7 @@ qpop/qrefresh on the wrong revision
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

4
tests/test-mq-subrepo.t
View File

@ -247,7 +247,7 @@ qpop
[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 @@ qpush
[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)

14
tests/test-mq.t
View File

@ -154,7 +154,7 @@ qinit -c should create both files if they don't exist
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 @@ qinit -c should create both files if they don't exist
$ 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 @@ strip with local changes, should complain
$ 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 @@ repo with unversioned patch dir
$ 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 @@ apply force, should discard changes in hello, but not bye
$ 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

2
tests/test-mv-cp-st-diff.t
View File

@ -1339,7 +1339,7 @@ directory move
% 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

8
tests/test-nested-repo.t
View File

@ -14,16 +14,16 @@ Should print nothing:
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 arguably print nothing:
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

16
tests/test-notify-changegroup.t
View File

@ -56,11 +56,11 @@ push
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 @@ unbundle with correct source
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 @@ push
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

4
tests/test-notify.t
View File

@ -199,7 +199,7 @@ pull (minimal config)
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 @@ default template:
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

2
tests/test-obsmarker-template.t
View File

@ -1419,7 +1419,7 @@ Test setup
$ 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

46
tests/test-obsolete-bundle-strip.t
View File

@ -158,7 +158,7 @@ Actual testing
### 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 @@ Actual testing
### 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 @@ Actual testing
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 @@ problematic)
#################################
### 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 @@ problematic)
#################################
### 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 @@ bundling multiple revisions
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 @@ Actual testing
### 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 @@ Actual testing
#################################
### 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 @@ Actual testing
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 @@ Actual testing
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 @@ Actual testing
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 @@ Actual testing
### 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 @@ Actual testing
### 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 @@ Actual testing
### 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 @@ Actual testing
### 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 @@ Actual testing
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 @@ Bundle multiple revisions
### 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 @@ Bundle multiple revisions
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 @@ Bundle multiple revisions
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 @@ Bundle multiple revisions
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 @@ Bundle multiple revisions
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 @@ Actual testing
#################################
### 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 @@ Actual testing
#################################
### 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> ###

2
tests/test-obsolete-changeset-exchange.t
View File

@ -142,7 +142,7 @@ client only pulls down 1 changeset
$ 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

22
tests/test-obsolete-checkheads.t
View File

@ -37,7 +37,7 @@ setup
$ mkcommit old
$ hg push
pushing to $TESTTMP/remote (glob)
pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@ -61,7 +61,7 @@ old exists remotely as draft. It is obsoleted by new that we now push.
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 @@ setup
$ 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 @@ setup
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 @@ old exists remotely as draft. It is obsoleted by new but we don't push new.
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 @@ setup. (The obsolete marker is known locally only
$ 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 @@ Push should not warn about adding new heads. We create one, but we'll delete
one anyway.
$ hg push
pushing to $TESTTMP/remote (glob)
pushing to $TESTTMP/remote
searching for changes
adding changesets
adding manifests
@ -260,7 +260,7 @@ setup
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 @@ We do not have enought data to take the right decision, we should fail
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 @@ Pulling the missing data makes it work
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 @@ setup
$ 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)

8
tests/test-obsolete-distributed.t
View File

@ -136,7 +136,7 @@ client side: pull from the server
$ 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 @@ obsolete on the server side but the marker is sent out.)
$ 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 @@ Celeste now pushes to the server
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 @@ from the server (note: could be from Celeste directly)
$ 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

12
tests/test-obsolete.t
View File

@ -1083,15 +1083,15 @@ This test issue 3805
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 @@ Test ability to pull changeset with locally applying obsolescence markers
$ 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 @@ Testing that strip remove markers:
$ 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 @@ Test adding changeset after obsmarkers affecting it
$ 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

16
tests/test-origbackup-conflict.t
View File

@ -30,7 +30,7 @@ Peform an update that causes b/c to be backed up
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 @@ Perform an update that causes b to be backed up - it should replace the backup b
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 @@ Perform an update the causes b/c to be backed up again - it should replace the b
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 @@ Perform an update that causes b/c and d to be backed up again - b/c should not g
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 @@ Incorrectly configure origbackuppath to be under a file
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

2
tests/test-parents.t
View File

@ -71,7 +71,7 @@ hg parents c, single revision
$ hg parents -r 2 ../a
abort: ../a not under root '$TESTTMP/repo' (glob)
abort: ../a not under root '$TESTTMP/repo'
[255]

2
tests/test-pathconflicts-merge.t
View File

@ -48,7 +48,7 @@ Merge - local file conflicts with remote directory
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

42
tests/test-paths.t
View File

@ -20,35 +20,35 @@ with paths:
$ 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 @@ formatter output with paths:
{
"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 @@ formatter output with paths:
{
"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 @@ log template:
(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 @@ output:
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 ..

4
tests/test-profile.t
View File

@ -143,12 +143,12 @@ profiler extension could be loaded before other extensions
$ 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

2
tests/test-pull-r.t
View File

@ -43,7 +43,7 @@ don't show "(+1 heads)" message when pulling closed head
2:effea6de0384
1:ed1b79f46b9a
$ hg pull
pulling from $TESTTMP/repo2 (glob)
pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests

10
tests/test-pull-update.t
View File

@ -100,7 +100,7 @@ explicit destination of the update.
* 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 @@ explicit destination of the update.
* 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 @@ match with the name of any existing bookmarks.
* 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 @@ match with the name of any existing bookmarks.
* 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 @@ match with the name of any existing bookmarks.
* 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

4
tests/test-push-checkheads-partial-C1.t
View File

@ -47,7 +47,7 @@ Test setup
$ 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 @@ Actual testing
--------------
$ 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)

4
tests/test-push-checkheads-partial-C2.t
View File

@ -47,7 +47,7 @@ Test setup
$ 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 @@ Actual testing
--------------
$ 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)

4
tests/test-push-checkheads-partial-C3.t
View File

@ -47,7 +47,7 @@ Test setup
$ 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 @@ Actual testing
--------------
$ 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)

Some files were not shown because too many files have changed in this diff Show More