tests: run many tests in $TESTTMP/repo instead of $TESTTMP

This is useful so we can store other files in $TESTTMP
(in particular tests that use docket files (nodemap, dirstate-v2) keep
file uids in $TESTTMP/UID)

tests/test-audit-path.t

@@ -1,240 +1,241 b''
 The simple store doesn't escape paths robustly and can't store paths
 with periods, etc. So much of this test fails with it.
 #require no-reposimplestore
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 audit of .hg
 
   $ hg add .hg/00changelog.i
   abort: path contains illegal component: .hg/00changelog.i
   [10]
 
 #if symlink
 
 Symlinks
 
   $ mkdir a
   $ echo a > a/a
   $ hg ci -Ama
   adding a/a
   $ ln -s a b
   $ echo b > a/b
   $ hg add b/b
   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'
   [255]
 
   $ hg commit -m 'add symlink b'
 
 
 Test symlink traversing when accessing history:
 -----------------------------------------------
 
 (build a changeset where the path exists as a directory)
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkdir b
   $ echo c > b/a
   $ hg add b/a
   $ hg ci -m 'add directory b'
   created new head
 
 Test that hg cat does not do anything wrong the working copy has 'b' as directory
 
   $ hg cat b/a
   c
   $ hg cat -r "desc(directory)" b/a
   c
   $ hg cat -r "desc(symlink)" b/a
   b/a: no such file in rev bc151a1f53bd
   [1]
 
 Test that hg cat does not do anything wrong the working copy has 'b' as a symlink (issue4749)
 
   $ hg up 'desc(symlink)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg cat b/a
   b/a: no such file in rev bc151a1f53bd
   [1]
   $ hg cat -r "desc(directory)" b/a
   c
   $ hg cat -r "desc(symlink)" b/a
   b/a: no such file in rev bc151a1f53bd
   [1]
 
 #endif
 
 
 unbundle tampered bundle
 
   $ hg init target
   $ cd target
   $ hg unbundle "$TESTDIR/bundles/tampered.hg"
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 6 files (+4 heads)
   new changesets b7da9bf6b037:fc1393d727bc (5 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 attack .hg/test
 
   $ hg manifest -r0
   .hg/test
   $ hg update -Cr0
   abort: path contains illegal component: .hg/test
   [10]
 
 attack foo/.hg/test
 
   $ hg manifest -r1
   foo/.hg/test
   $ hg update -Cr1
   abort: path 'foo/.hg/test' is inside nested repo 'foo'
   [10]
 
 attack back/test where back symlinks to ..
 
   $ hg manifest -r2
   back
   back/test
 #if symlink
   $ hg update -Cr2
   abort: path 'back/test' traverses symbolic link 'back'
   [255]
 #else
 ('back' will be a file and cause some other system specific error)
   $ hg update -Cr2
   abort: $TESTTMP/target/back/test: $ENOTDIR$
   [255]
 #endif
 
 attack ../test
 
   $ hg manifest -r3
   ../test
   $ mkdir ../test
   $ echo data > ../test/file
   $ hg update -Cr3
   abort: path contains illegal component: ../test
   [10]
   $ cat ../test/file
   data
 
 attack /tmp/test
 
   $ hg manifest -r4
   /tmp/test
   $ hg update -Cr4
   abort: path contains illegal component: /tmp/test
   [10]
 
   $ cd ..
 
 Test symlink traversal on merge:
 --------------------------------
 
 #if symlink
 
 set up symlink hell
 
   $ mkdir merge-symlink-out
   $ hg init merge-symlink
   $ cd merge-symlink
   $ touch base
   $ hg commit -qAm base
   $ ln -s ../merge-symlink-out a
   $ hg commit -qAm 'symlink a -> ../merge-symlink-out'
   $ hg up -q 0
   $ mkdir a
   $ touch a/poisoned
   $ hg commit -qAm 'file a/poisoned'
   $ hg log -G -T '{rev}: {desc}\n'
   @  2: file a/poisoned
   |
   | o  1: symlink a -> ../merge-symlink-out
   |/
   o  0: base
   
 
 try trivial merge
 
   $ hg up -qC 1
   $ hg merge 2
   abort: path 'a/poisoned' traverses symbolic link 'a'
   [255]
 
 try rebase onto other revision: cache of audited paths should be discarded,
 and the rebase should fail (issue5628)
 
   $ hg up -qC 2
   $ hg rebase -s 2 -d 1 --config extensions.rebase=
   rebasing 2:e73c21d6b244 tip "file a/poisoned"
   abort: path 'a/poisoned' traverses symbolic link 'a'
   [255]
   $ ls ../merge-symlink-out
 
   $ cd ..
 
 Test symlink traversal on update:
 ---------------------------------
 
   $ mkdir update-symlink-out
   $ hg init update-symlink
   $ cd update-symlink
   $ ln -s ../update-symlink-out a
   $ hg commit -qAm 'symlink a -> ../update-symlink-out'
   $ hg rm a
   $ mkdir a && touch a/b
   $ hg ci -qAm 'file a/b' a/b
   $ hg up -qC 0
   $ hg rm a
   $ mkdir a && touch a/c
   $ hg ci -qAm 'rm a, file a/c'
   $ hg log -G -T '{rev}: {desc}\n'
   @  2: rm a, file a/c
   |
   | o  1: file a/b
   |/
   o  0: symlink a -> ../update-symlink-out
   
 
 try linear update where symlink already exists:
 
   $ hg up -qC 0
   $ hg up 1
   abort: path 'a/b' traverses symbolic link 'a'
   [255]
 
 try linear update including symlinked directory and its content: paths are
 audited first by calculateupdates(), where no symlink is created so both
 'a' and 'a/b' are taken as good paths. still applyupdates() should fail.
 
   $ hg up -qC null
   $ hg up 1
   abort: path 'a/b' traverses symbolic link 'a'
   [255]
   $ ls ../update-symlink-out
 
 try branch update replacing directory with symlink, and its content: the
 path 'a' is audited as a directory first, which should be audited again as
 a symlink.
 
   $ rm -f a
   $ hg up -qC 2
   $ hg up 1
   abort: path 'a/b' traverses symbolic link 'a'
   [255]
   $ ls ../update-symlink-out
 
   $ cd ..
 
 #endif

tests/test-backwards-remove.t

@@ -1,18 +1,19 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ ls -A
   .hg
   a
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ hg co 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 B should disappear
 
   $ ls -A
   .hg
   a

tests/test-bisect.t

@@ -1,795 +1,795 b''
-  $ hg init
-
+  $ hg init repo
+  $ cd repo
 
 committing changes
 
   $ count=0
   $ echo > a
   $ while test $count -lt 32 ; do
   >     echo 'a' >> a
   >     test $count -eq 0 && hg add
   >     hg ci -m "msg $count" -d "$count 0"
   >     count=`expr $count + 1`
   > done
   adding a
 
 
   $ hg log -G
   @  changeset:   31:58c80a7c8a40
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:31 1970 +0000
   |  summary:     msg 31
   |
   o  changeset:   30:ed2d2f24b11c
   |  user:        test
   |  date:        Thu Jan 01 00:00:30 1970 +0000
   |  summary:     msg 30
   |
   o  changeset:   29:b5bd63375ab9
   |  user:        test
   |  date:        Thu Jan 01 00:00:29 1970 +0000
   |  summary:     msg 29
   |
   o  changeset:   28:8e0c2264c8af
   |  user:        test
   |  date:        Thu Jan 01 00:00:28 1970 +0000
   |  summary:     msg 28
   |
   o  changeset:   27:288867a866e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:27 1970 +0000
   |  summary:     msg 27
   |
   o  changeset:   26:3efc6fd51aeb
   |  user:        test
   |  date:        Thu Jan 01 00:00:26 1970 +0000
   |  summary:     msg 26
   |
   o  changeset:   25:02a84173a97a
   |  user:        test
   |  date:        Thu Jan 01 00:00:25 1970 +0000
   |  summary:     msg 25
   |
   o  changeset:   24:10e0acd3809e
   |  user:        test
   |  date:        Thu Jan 01 00:00:24 1970 +0000
   |  summary:     msg 24
   |
   o  changeset:   23:5ec79163bff4
   |  user:        test
   |  date:        Thu Jan 01 00:00:23 1970 +0000
   |  summary:     msg 23
   |
   o  changeset:   22:06c7993750ce
   |  user:        test
   |  date:        Thu Jan 01 00:00:22 1970 +0000
   |  summary:     msg 22
   |
   o  changeset:   21:e5db6aa3fe2a
   |  user:        test
   |  date:        Thu Jan 01 00:00:21 1970 +0000
   |  summary:     msg 21
   |
   o  changeset:   20:7128fb4fdbc9
   |  user:        test
   |  date:        Thu Jan 01 00:00:20 1970 +0000
   |  summary:     msg 20
   |
   o  changeset:   19:52798545b482
   |  user:        test
   |  date:        Thu Jan 01 00:00:19 1970 +0000
   |  summary:     msg 19
   |
   o  changeset:   18:86977a90077e
   |  user:        test
   |  date:        Thu Jan 01 00:00:18 1970 +0000
   |  summary:     msg 18
   |
   o  changeset:   17:03515f4a9080
   |  user:        test
   |  date:        Thu Jan 01 00:00:17 1970 +0000
   |  summary:     msg 17
   |
   o  changeset:   16:a2e6ea4973e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:16 1970 +0000
   |  summary:     msg 16
   |
   o  changeset:   15:e7fa0811edb0
   |  user:        test
   |  date:        Thu Jan 01 00:00:15 1970 +0000
   |  summary:     msg 15
   |
   o  changeset:   14:ce8f0998e922
   |  user:        test
   |  date:        Thu Jan 01 00:00:14 1970 +0000
   |  summary:     msg 14
   |
   o  changeset:   13:9d7d07bc967c
   |  user:        test
   |  date:        Thu Jan 01 00:00:13 1970 +0000
   |  summary:     msg 13
   |
   o  changeset:   12:1941b52820a5
   |  user:        test
   |  date:        Thu Jan 01 00:00:12 1970 +0000
   |  summary:     msg 12
   |
   o  changeset:   11:7b4cd9578619
   |  user:        test
   |  date:        Thu Jan 01 00:00:11 1970 +0000
   |  summary:     msg 11
   |
   o  changeset:   10:7c5eff49a6b6
   |  user:        test
   |  date:        Thu Jan 01 00:00:10 1970 +0000
   |  summary:     msg 10
   |
   o  changeset:   9:eb44510ef29a
   |  user:        test
   |  date:        Thu Jan 01 00:00:09 1970 +0000
   |  summary:     msg 9
   |
   o  changeset:   8:453eb4dba229
   |  user:        test
   |  date:        Thu Jan 01 00:00:08 1970 +0000
   |  summary:     msg 8
   |
   o  changeset:   7:03750880c6b5
   |  user:        test
   |  date:        Thu Jan 01 00:00:07 1970 +0000
   |  summary:     msg 7
   |
   o  changeset:   6:a3d5c6fdf0d3
   |  user:        test
   |  date:        Thu Jan 01 00:00:06 1970 +0000
   |  summary:     msg 6
   |
   o  changeset:   5:7874a09ea728
   |  user:        test
   |  date:        Thu Jan 01 00:00:05 1970 +0000
   |  summary:     msg 5
   |
   o  changeset:   4:9b2ba8336a65
   |  user:        test
   |  date:        Thu Jan 01 00:00:04 1970 +0000
   |  summary:     msg 4
   |
   o  changeset:   3:b53bea5e2fcb
   |  user:        test
   |  date:        Thu Jan 01 00:00:03 1970 +0000
   |  summary:     msg 3
   |
   o  changeset:   2:db07c04beaca
   |  user:        test
   |  date:        Thu Jan 01 00:00:02 1970 +0000
   |  summary:     msg 2
   |
   o  changeset:   1:5cd978ea5149
   |  user:        test
   |  date:        Thu Jan 01 00:00:01 1970 +0000
   |  summary:     msg 1
   |
   o  changeset:   0:b99c7b9c8e11
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     msg 0
   
 
   $ hg up -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 bisect test
 
   $ hg bisect -r
   $ hg bisect -b
   $ hg status -v
   # The repository is in an unfinished *bisect* state.
   
   # To mark the changeset good:    hg bisect --good
   # To mark the changeset bad:     hg bisect --bad
   # To abort:                      hg bisect --reset
   
   $ hg status -v --config commands.status.skipstates=bisect
   $ hg summary
   parent: 31:58c80a7c8a40 tip
    msg 31
   branch: default
   commit: (clean)
   update: (current)
   phases: 32 draft
   $ hg bisect -g 1
   Testing changeset 16:a2e6ea4973e9 "msg 16" (30 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 23:5ec79163bff4 "msg 23" (15 changesets remaining, ~3 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 skip
 
   $ hg bisect -s
   Testing changeset 24:10e0acd3809e "msg 24" (15 changesets remaining, ~3 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 27:288867a866e9 "msg 27" (7 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 29:b5bd63375ab9 "msg 29" (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -b
   Testing changeset 28:8e0c2264c8af "msg 28" (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first bad revision is:
   changeset:   29:b5bd63375ab9
   user:        test
   date:        Thu Jan 01 00:00:29 1970 +0000
   summary:     msg 29
   
 
 mark revsets instead of single revs
 
   $ hg bisect -r
   $ hg bisect -b "0::3"
   $ hg bisect -s "13::16"
   $ hg bisect -g "26::tip"
   Testing changeset 12:1941b52820a5 "msg 12" (23 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat .hg/bisect.state
   bad b99c7b9c8e11558adef3fad9af211c58d46f325b
   bad 5cd978ea51499179507ee7b6f340d2dbaa401185
   bad db07c04beaca44cf24832541e7f4a2346a95275b
   bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b
   current 1941b52820a544549596820a8ae006842b0e2c64
   good 3efc6fd51aeb8594398044c6c846ca59ae021203
   good 288867a866e9adb7a29880b66936c874b80f4651
   good 8e0c2264c8af790daf3585ada0669d93dee09c83
   good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8
   good ed2d2f24b11c368fa8aa0da9f4e1db580abade59
   good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96
   skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991
   skip ce8f0998e922c179e80819d5066fbe46e2998784
   skip e7fa0811edb063f6319531f0d0a865882138e180
   skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3
 
 bisect reverse test
 
   $ hg bisect -r
   $ hg bisect -b null
   $ hg bisect -g tip
   Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 7:03750880c6b5 "msg 7" (16 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 skip
 
   $ hg bisect -s
   Testing changeset 6:a3d5c6fdf0d3 "msg 6" (16 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 2:db07c04beaca "msg 2" (7 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 0:b99c7b9c8e11 "msg 0" (3 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -b
   Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first good revision is:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
 
   $ hg bisect -r
   $ hg bisect -g tip
   $ hg bisect -b tip
   abort: inconsistent state, 31:58c80a7c8a40 is good and bad
   [255]
 
   $ hg bisect -r
   $ hg bisect -g null
   $ hg bisect -bU tip
   Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests)
   $ hg id
   5cd978ea5149
 
 
 Issue1228: hg bisect crashes when you skip the last rev in bisection
 Issue1182: hg bisect exception
 
   $ hg bisect -r
   $ hg bisect -b 4
   $ hg bisect -g 0
   Testing changeset 2:db07c04beaca "msg 2" (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 1:5cd978ea5149 "msg 1" (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 3:b53bea5e2fcb "msg 3" (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Due to skipped revisions, the first bad revision could be any of:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
   changeset:   3:b53bea5e2fcb
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     msg 3
   
   changeset:   4:9b2ba8336a65
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     msg 4
   
 
 
 reproduce non converging bisect, issue1182
 
   $ hg bisect -r
   $ hg bisect -g 0
   $ hg bisect -b 2
   Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Due to skipped revisions, the first bad revision could be any of:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
 
 
 test no action
 
   $ hg bisect -r
   $ hg bisect
   abort: cannot bisect (no known good revisions)
   [20]
 
 
 reproduce AssertionError, issue1445
 
   $ hg bisect -r
   $ hg bisect -b 6
   $ hg bisect -g 0
   Testing changeset 3:b53bea5e2fcb "msg 3" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 2:db07c04beaca "msg 2" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 4:9b2ba8336a65 "msg 4" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 1:5cd978ea5149 "msg 1" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 5:7874a09ea728 "msg 5" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first bad revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   $ hg log -r "bisect(good)"
   changeset:   0:b99c7b9c8e11
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     msg 0
   
   changeset:   5:7874a09ea728
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     msg 5
   
   $ hg log -r "bisect(bad)"
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   $ hg log -r "bisect(current)"
   changeset:   5:7874a09ea728
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     msg 5
   
   $ hg log -r "bisect(skip)"
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
   changeset:   3:b53bea5e2fcb
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     msg 3
   
   changeset:   4:9b2ba8336a65
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     msg 4
   
 
 test legacy bisected() keyword
 
   $ hg log -r "bisected(bad)"
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
   $ set +e
 
 test invalid command
 assuming that the shell returns 127 if command not found ...
 
   $ hg bisect -r
   $ hg bisect --command 'exit 127'
   abort: failed to execute exit 127
   [255]
 
 
 test bisecting command
 
-  $ cat > script.py <<EOF
+  $ cat > "$TESTTMP/script.py" <<EOF
   > #!$PYTHON
   > import sys
   > from mercurial import hg, ui as uimod
   > repo = hg.repository(uimod.ui.load(), b'.')
   > if repo[b'.'].rev() < 6:
   >     sys.exit(1)
   > EOF
-  $ chmod +x script.py
+  $ chmod +x "$TESTTMP/script.py"
   $ hg bisect -r
   $ hg up -qr tip
   $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
   changeset 31:58c80a7c8a40 tip "msg 31": good
   abort: cannot bisect (no known bad revisions)
   [20]
   $ hg up -qr 0
   $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
   changeset 0:b99c7b9c8e11 "msg 0": bad
   changeset 15:e7fa0811edb0 "msg 15": good
   changeset 7:03750880c6b5 "msg 7": good
   changeset 3:b53bea5e2fcb "msg 3": bad
   changeset 5:7874a09ea728 "msg 5": bad
   changeset 6:a3d5c6fdf0d3 "msg 6": good
   The first good revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
 
 test bisecting via a command without updating the working dir, and
 ensure that the bisect state file is updated before running a test
 command
 
   $ hg update null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ cat > script.sh <<'EOF'
+  $ cat > "$TESTTMP/script.sh" <<'EOF'
   > #!/bin/sh
   > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
   > current="`hg log -r \"bisect(current)\" --template {node}`"
   > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127)
   > rev="`hg log -r $HG_NODE --template {rev}`"
   > test "$rev" -ge 6
   > EOF
-  $ chmod +x script.sh
+  $ chmod +x "$TESTTMP/script.sh"
   $ hg bisect -r
   $ hg bisect --good tip --noupdate
   $ hg bisect --bad 0 --noupdate
   Testing changeset 15:e7fa0811edb0 "msg 15" (31 changesets remaining, ~4 tests)
   $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate
   changeset 15:e7fa0811edb0 "msg 15": good
   changeset 7:03750880c6b5 "msg 7": good
   changeset 3:b53bea5e2fcb "msg 3": bad
   changeset 5:7874a09ea728 "msg 5": bad
   changeset 6:a3d5c6fdf0d3 "msg 6": good
   The first good revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
 ensure that we still don't have a working dir
 
   $ hg parents
 
 
 test the same case, this time with updating
 
-  $ cat > script.sh <<'EOF'
+  $ cat > "$TESTTMP/script.sh" <<'EOF'
   > #!/bin/sh
   > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
   > current="`hg log -r \"bisect(current)\" --template {node}`"
   > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127)
   > rev="`hg log -r . --template {rev}`"
   > test "$rev" -ge 6
   > EOF
-  $ chmod +x script.sh
+  $ chmod +x "$TESTTMP/script.sh"
   $ hg bisect -r
   $ hg up -qr tip
   $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
   changeset 31:58c80a7c8a40 tip "msg 31": good
   abort: cannot bisect (no known bad revisions)
   [20]
   $ hg up -qr 0
   $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
   changeset 0:b99c7b9c8e11 "msg 0": bad
   changeset 15:e7fa0811edb0 "msg 15": good
   changeset 7:03750880c6b5 "msg 7": good
   changeset 3:b53bea5e2fcb "msg 3": bad
   changeset 5:7874a09ea728 "msg 5": bad
   changeset 6:a3d5c6fdf0d3 "msg 6": good
   The first good revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   $ hg graft -q 15
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [1]
   $ hg bisect --reset
   $ hg up -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check that bisect does not break on obsolete changesets
 =========================================================
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 tip is obsolete
 ---------------------
 
   $ hg debugobsolete `hg id --debug -i -r tip`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg bisect --reset
   $ hg bisect --good 15
   $ hg bisect --bad 30
   Testing changeset 22:06c7993750ce "msg 22" (15 changesets remaining, ~3 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect --command true
   changeset 22:06c7993750ce "msg 22": good
   changeset 26:3efc6fd51aeb "msg 26": good
   changeset 28:8e0c2264c8af "msg 28": good
   changeset 29:b5bd63375ab9 "msg 29": good
   The first bad revision is:
   changeset:   30:ed2d2f24b11c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:30 1970 +0000
   summary:     msg 30
   
 
 Rewritten commits should not crash
 
   $ hg co 29
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert --all -r 30
   reverting a
   $ hg commit -m 'msg 30 -- fixed'
   created new head
   $ hg debugobsolete `hg id --debug -i -r 30` `hg id --debug -i -r .`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg bisect
   The first bad revision is:
   changeset:   30:ed2d2f24b11c
   user:        test
   date:        Thu Jan 01 00:00:30 1970 +0000
   obsolete:    rewritten as 32:8a638ebd1122
   summary:     msg 30
   
 
 Log template does not crash
 
   $ hg log -GTbisect -r 15::
   @  changeset:   32:8a638ebd1122
   |  bisect:      good (implicit)
   |  tag:         tip
   |  parent:      29:b5bd63375ab9
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     msg 30 -- fixed
   |
   o  changeset:   29:b5bd63375ab9
   |  bisect:      good
   |  user:        test
   |  date:        Thu Jan 01 00:00:29 1970 +0000
   |  summary:     msg 29
   |
   o  changeset:   28:8e0c2264c8af
   |  bisect:      good
   |  user:        test
   |  date:        Thu Jan 01 00:00:28 1970 +0000
   |  summary:     msg 28
   |
   o  changeset:   27:288867a866e9
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:27 1970 +0000
   |  summary:     msg 27
   |
   o  changeset:   26:3efc6fd51aeb
   |  bisect:      good
   |  user:        test
   |  date:        Thu Jan 01 00:00:26 1970 +0000
   |  summary:     msg 26
   |
   o  changeset:   25:02a84173a97a
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:25 1970 +0000
   |  summary:     msg 25
   |
   o  changeset:   24:10e0acd3809e
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:24 1970 +0000
   |  summary:     msg 24
   |
   o  changeset:   23:5ec79163bff4
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:23 1970 +0000
   |  summary:     msg 23
   |
   o  changeset:   22:06c7993750ce
   |  bisect:      good
   |  user:        test
   |  date:        Thu Jan 01 00:00:22 1970 +0000
   |  summary:     msg 22
   |
   o  changeset:   21:e5db6aa3fe2a
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:21 1970 +0000
   |  summary:     msg 21
   |
   o  changeset:   20:7128fb4fdbc9
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:20 1970 +0000
   |  summary:     msg 20
   |
   o  changeset:   19:52798545b482
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:19 1970 +0000
   |  summary:     msg 19
   |
   o  changeset:   18:86977a90077e
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:18 1970 +0000
   |  summary:     msg 18
   |
   o  changeset:   17:03515f4a9080
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:17 1970 +0000
   |  summary:     msg 17
   |
   o  changeset:   16:a2e6ea4973e9
   |  bisect:      ignored
   |  user:        test
   |  date:        Thu Jan 01 00:00:16 1970 +0000
   |  summary:     msg 16
   |
   o  changeset:   15:e7fa0811edb0
   |  bisect:      good
   ~  user:        test
      date:        Thu Jan 01 00:00:15 1970 +0000
      summary:     msg 15
   
   $ hg debugobsolete --delete `hg debugobsolete --index -T'{index}\n' | tail -1`
   deleted 1 obsolescence markers
 
 Changeset in the bad:good range is obsolete
 ---------------------------------------------
 
   $ hg up 30
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'a' >> a
   $ hg ci -m "msg 32" -d "32 0"
   $ hg bisect --reset
   $ hg bisect --good .
   $ hg bisect --bad 25
   Testing changeset 28:8e0c2264c8af "msg 28" (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect --command true
   changeset 28:8e0c2264c8af "msg 28": good
   changeset 26:3efc6fd51aeb "msg 26": good
   The first good revision is:
   changeset:   26:3efc6fd51aeb
   user:        test
   date:        Thu Jan 01 00:00:26 1970 +0000
   summary:     msg 26
   
 Test the validation message when exclusive options are used:
 
   $ hg bisect -r
   $ hg bisect -b -c false
   abort: --bad and --command are incompatible
   [10]
   $ hg bisect -b -e
   abort: --bad and --extend are incompatible
   [10]
   $ hg bisect -b -g
   abort: --bad and --good are incompatible
   [10]
   $ hg bisect -b -r
   abort: --bad and --reset are incompatible
   [10]
   $ hg bisect -b -s
   abort: --bad and --skip are incompatible
   [10]
   $ hg bisect -c false -e
   abort: --command and --extend are incompatible
   [10]
   $ hg bisect -c false -g
   abort: --command and --good are incompatible
   [10]
   $ hg bisect -c false -r
   abort: --command and --reset are incompatible
   [10]
   $ hg bisect -c false -s
   abort: --command and --skip are incompatible
   [10]
   $ hg bisect -e -g
   abort: --extend and --good are incompatible
   [10]
   $ hg bisect -e -r
   abort: --extend and --reset are incompatible
   [10]
   $ hg bisect -e -s
   abort: --extend and --skip are incompatible
   [10]
   $ hg bisect -g -r
   abort: --good and --reset are incompatible
   [10]
   $ hg bisect -g -s
   abort: --good and --skip are incompatible
   [10]
   $ hg bisect -r -s
   abort: --reset and --skip are incompatible
   [10]

tests/test-bookmarks-current.t

@@ -1,248 +1,249 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 no bookmarks
 
   $ hg bookmarks
   no bookmarks set
 
 set bookmark X
 
   $ hg bookmark X
 
 list bookmarks
 
   $ hg bookmark
    * X                         -1:000000000000
 
 list bookmarks with color
 
   $ hg --config extensions.color= --config color.mode=ansi \
   >     bookmark --color=always
   \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m                         -1:000000000000\x1b[0m (esc)
 
 update to bookmark X
 
   $ hg bookmarks
    * X                         -1:000000000000
   $ hg update X
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 list bookmarks
 
   $ hg bookmarks
    * X                         -1:000000000000
 
 rename
 
   $ hg bookmark -m X Z
 
 list bookmarks
 
   $ cat .hg/bookmarks.current
   Z (no-eol)
   $ cat .hg/bookmarks
   0000000000000000000000000000000000000000 Z
   $ hg bookmarks
    * Z                         -1:000000000000
 
 new bookmarks X and Y, first one made active
 
   $ hg bookmark Y X
 
 list bookmarks
 
   $ hg bookmark
      X                         -1:000000000000
    * Y                         -1:000000000000
      Z                         -1:000000000000
 
   $ hg bookmark -d X
 
 commit
 
   $ echo 'b' > b
   $ hg add b
   $ hg commit -m'test'
 
 list bookmarks
 
   $ hg bookmark
    * Y                         0:719295282060
      Z                         -1:000000000000
 
 Verify that switching to Z updates the active bookmark:
   $ hg update Z
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark Z)
   $ hg bookmark
      Y                         0:719295282060
    * Z                         -1:000000000000
 
 Switch back to Y for the remaining tests in this file:
   $ hg update Y
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark Y)
 
 delete bookmarks
 
   $ hg bookmark -d Y
   $ hg bookmark -d Z
 
 list bookmarks
 
   $ hg bookmark
   no bookmarks set
 
 update to tip
 
   $ hg update tip
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 set bookmark Y using -r . but make sure that the active
 bookmark is not activated
 
   $ hg bookmark -r . Y
 
 list bookmarks, Y should not be active
 
   $ hg bookmark
      Y                         0:719295282060
 
 now, activate Y
 
   $ hg up -q Y
 
 set bookmark Z using -i
 
   $ hg bookmark -r . -i Z
   $ hg bookmarks
    * Y                         0:719295282060
      Z                         0:719295282060
 
 deactivate active bookmark using -i
 
   $ hg bookmark -i Y
   $ hg bookmarks
      Y                         0:719295282060
      Z                         0:719295282060
 
   $ hg up -q Y
   $ hg bookmark -i
   $ hg bookmarks
      Y                         0:719295282060
      Z                         0:719295282060
   $ hg bookmark -i
   no active bookmark
   $ hg up -q Y
   $ hg bookmarks
    * Y                         0:719295282060
      Z                         0:719295282060
 
 deactivate active bookmark while renaming
 
   $ hg bookmark -i -m Y X
   $ hg bookmarks
      X                         0:719295282060
      Z                         0:719295282060
 
 bare update moves the active bookmark forward and clear the divergent bookmarks
 
   $ echo a > a
   $ hg ci -Am1
   adding a
   $ echo b >> a
   $ hg ci -Am2
   $ hg bookmark X@1 -r 1
   $ hg bookmark X@2 -r 2
   $ hg update X
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark X)
   $ hg bookmarks
    * X                         0:719295282060
      X@1                       1:cc586d725fbe
      X@2                       2:49e1c4e84c58
      Z                         0:719295282060
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updating bookmark X
   $ hg bookmarks
    * X                         2:49e1c4e84c58
      Z                         0:719295282060
 
 test deleting .hg/bookmarks.current when explicitly updating
 to a revision
 
   $ echo a >> b
   $ hg ci -m.
   $ hg up -q X
   $ test -f .hg/bookmarks.current
 
 try to update to it again to make sure we don't
 set and then unset it
 
   $ hg up -q X
   $ test -f .hg/bookmarks.current
 
   $ hg up -q 1
   $ test -f .hg/bookmarks.current
   [1]
 
 when a bookmark is active, hg up -r . is
 analogous to hg book -i <active bookmark>
 
   $ hg up -q X
   $ hg up -q .
   $ test -f .hg/bookmarks.current
   [1]
 
 issue 4552 -- simulate a pull moving the active bookmark
 
   $ hg up -q X
   $ printf "Z" > .hg/bookmarks.current
   $ hg log -T '{activebookmark}\n' -r Z
   Z
   $ hg log -T '{bookmarks % "{active}\n"}' -r Z
   Z
 
 test that updating to closed branch head also advances active bookmark
 
   $ hg commit --close-branch -m "closed"
   $ hg update -q ".^1"
   $ hg bookmark Y
   $ hg bookmarks
      X                         3:4d6bd4bfb1ae
    * Y                         3:4d6bd4bfb1ae
      Z                         0:719295282060
   $ hg update
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updating bookmark Y
   $ hg bookmarks
      X                         3:4d6bd4bfb1ae
    * Y                         4:8fa964221e8e
      Z                         0:719295282060
   $ hg parents -q
   4:8fa964221e8e
 
 Checks command to retrieve active bookmark
 ------------------------------------------
 
 display how "{activebookmark}" template is unsuitable for the task
 
   $ hg book -T '- {activebookmark}\n'
   - 
   - Y
   - 
 
   $ hg book -r . W
   $ hg book -T '- {activebookmark}\n'
   - Y
   - 
   - Y
   - 
 
   $ hg bookmarks -ql .
   Y
   $ hg bookmarks --inactive
   $ hg bookmarks -ql .
   abort: no active bookmark
   [10]

tests/test-bookmarks-merge.t

@@ -1,152 +1,153 b''
 # init
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg add a
   $ hg commit -m'a'
   $ echo b > b
   $ hg add b
   $ hg commit -m'b'
   $ hg up -C 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg add c
   $ hg commit -m'c'
   created new head
 
 # test merging of diverged bookmarks
   $ hg bookmark -r 1 "c@diverge"
   $ hg bookmark -r 1 b
   $ hg bookmark c
   $ hg bookmarks
      b                         1:d2ae7f538514
    * c                         2:d36c0562f908
      c@diverge                 1:d2ae7f538514
   $ hg merge "c@diverge"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m'merge'
   $ hg bookmarks
      b                         1:d2ae7f538514
    * c                         3:b8f96cf4688b
 
   $ hg up -C 3
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark c)
   $ echo d > d
   $ hg add d
   $ hg commit -m'd'
 
   $ hg up -C 3
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo e > e
   $ hg add e
   $ hg commit -m'e'
   created new head
   $ hg up -C 5
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bookmark e
   $ hg bookmarks
      b                         1:d2ae7f538514
      c                         3:b8f96cf4688b
    * e                         5:26bee9c5bcf3
 
 # the picked side is bookmarked
 
   $ hg up -C 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark e)
   $ hg merge
   abort: heads are bookmarked - please merge with an explicit rev
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]
 
 # our revision is bookmarked
 
   $ hg up -C e
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark e)
   $ hg merge
   abort: no matching bookmark to merge - please merge with an explicit rev or bookmark
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]
 
 # merge bookmark heads
 
   $ hg up -C 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark e)
   $ echo f > f
   $ hg commit -Am "f"
   adding f
   $ hg bookmarks -r 4 "e@diverged"
   $ hg up -q -C "e@diverged"
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg parents
   changeset:   4:a0546fcfe0fb
   bookmark:    e@diverged
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   changeset:   5:26bee9c5bcf3
   bookmark:    e
   parent:      3:b8f96cf4688b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     e
   
   $ hg up -C e
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark e)
   $ hg bookmarks
      b                         1:d2ae7f538514
      c                         3:b8f96cf4688b
    * e                         5:26bee9c5bcf3
      e@diverged                4:a0546fcfe0fb
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m'merge'
   $ hg bookmarks
      b                         1:d2ae7f538514
      c                         3:b8f96cf4688b
    * e                         7:ca784329f0ba
 
 # test warning when all heads are inactive bookmarks
 
   $ hg up -C 6
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark e)
   $ echo g > g
   $ hg commit -Am 'g'
   adding g
   $ hg bookmark -i g
   $ hg bookmarks
      b                         1:d2ae7f538514
      c                         3:b8f96cf4688b
      e                         7:ca784329f0ba
      g                         8:04dd21731d95
   $ hg heads
   changeset:   8:04dd21731d95
   bookmark:    g
   tag:         tip
   parent:      6:be381d1126a0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     g
   
   changeset:   7:ca784329f0ba
   bookmark:    e
   parent:      5:26bee9c5bcf3
   parent:      4:a0546fcfe0fb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
   
   $ hg merge
   abort: heads are bookmarked - please merge with an explicit rev
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]

tests/test-bookmarks-rebase.t

@@ -1,105 +1,106 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "rebase=" >> $HGRCPATH
 
 initialize repository
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo 'a' > a
   $ hg ci -A -m "0"
   adding a
 
   $ echo 'b' > b
   $ hg ci -A -m "1"
   adding b
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo 'c' > c
   $ hg ci -A -m "2"
   adding c
   created new head
 
   $ echo 'd' > d
   $ hg ci -A -m "3"
   adding d
 
   $ hg bookmark -r 1 one
   $ hg bookmark -r 3 two
   $ hg up -q two
 
 bookmark list
 
   $ hg bookmark
      one                       1:925d80f479bb
    * two                       3:2ae46b1d99a7
 
 rebase
 
   $ hg rebase -s two -d one
   rebasing 3:2ae46b1d99a7 two tip "3"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
 
   $ hg log
   changeset:   3:42e5ed2cdcf4
   bookmark:    two
   tag:         tip
   parent:      1:925d80f479bb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   2:db815d6d32e6
   parent:      0:f7b1eb17ad24
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   1:925d80f479bb
   bookmark:    one
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   0:f7b1eb17ad24
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
 aborted rebase should restore active bookmark.
 
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark two)
   $ echo 'e' > d
   $ hg ci -A -m "4"
   adding d
   created new head
   $ hg bookmark three
   $ hg rebase -s three -d two
   rebasing 4:dd7c838e8362 three tip "4"
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [240]
   $ hg rebase --abort
   rebase aborted
   $ hg bookmark
      one                       1:925d80f479bb
    * three                     4:dd7c838e8362
      two                       3:42e5ed2cdcf4
 
 after aborted rebase, restoring a bookmark that has been removed should not fail
 
   $ hg rebase -s three -d two
   rebasing 4:dd7c838e8362 three tip "4"
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [240]
   $ hg bookmark -d three
   $ hg rebase --abort
   rebase aborted
   $ hg bookmark
      one                       1:925d80f479bb
      two                       3:42e5ed2cdcf4

tests/test-cat.t

@@ -1,127 +1,128 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo 0 > a
   $ echo 0 > b
   $ hg ci -A -m m
   adding a
   adding b
   $ hg rm a
   $ hg cat a
   0
   $ hg cat --decode a # more tests in test-encode
   0
   $ echo 1 > b
   $ hg ci -m m
   $ echo 2 > b
   $ hg cat -r 0 a
   0
   $ hg cat -r 0 b
   0
   $ hg cat -r 1 a
   a: no such file in rev 7040230c159c
   [1]
   $ hg cat -r 1 b
   1
 
 Test multiple files
 
   $ echo 3 > c
   $ hg ci -Am addmore c
   $ hg cat b c
   1
   3
   $ hg cat .
   1
   3
   $ hg cat . c
   1
   3
 
 Test fileset
 
   $ hg cat 'set:not(b) or a'
   3
   $ hg cat 'set:c or b'
   1
   3
 
   $ mkdir tmp
   $ hg cat --output tmp/HH_%H c
   $ hg cat --output tmp/RR_%R c
   $ hg cat --output tmp/h_%h c
   $ hg cat --output tmp/r_%r c
   $ hg cat --output tmp/%s_s c
   $ hg cat --output tmp/%d%%_d c
   $ hg cat --output tmp/%p_p c
   $ hg log -r . --template "{rev}: {node|short}\n"
   2: 45116003780e
   $ find tmp -type f | sort
   tmp/.%_d
   tmp/HH_45116003780e3678b333fb2c99fa7d559c8457e9
   tmp/RR_2
   tmp/c_p
   tmp/c_s
   tmp/h_45116003780e
   tmp/r_2
 
 Test template output
 
   $ hg --cwd tmp cat ../b ../c -T '== {path|relpath} ({path}) r{rev} ==\n{data}'
   == ../b (b) r2 ==
   1
   == ../c (c) r2 ==
   3
 
   $ hg cat b c -Tjson --output -
   [
    {
     "data": "1\n",
     "path": "b"
    },
    {
     "data": "3\n",
     "path": "c"
    }
   ]
 
   $ hg cat b c -Tjson --output 'tmp/%p.json'
   $ cat tmp/b.json
   [
    {
     "data": "1\n",
     "path": "b"
    }
   ]
   $ cat tmp/c.json
   [
    {
     "data": "3\n",
     "path": "c"
    }
   ]
 
 Test working directory
 
   $ echo b-wdir > b
   $ hg cat -r 'wdir()' b
   b-wdir
 
 Environment variables are not visible by default
 
   $ PATTERN='t4' hg log -r '.' -T "{ifcontains('PATTERN', envvars, 'yes', 'no')}\n"
   no
 
 Environment variable visibility can be explicit
 
   $ PATTERN='t4' hg log -r '.' -T "{envvars % '{key} -> {value}\n'}" \
   >                 --config "experimental.exportableenviron=PATTERN"
   PATTERN -> t4
 
 Test behavior of output when directory structure does not already exist
 
   $ mkdir foo
   $ echo a > foo/a
   $ hg add foo/a
   $ hg commit -qm "add foo/a"
   $ hg cat --output "output/%p" foo/a
   $ cat output/foo/a
   a

tests/test-clone-update-order.t

@@ -1,112 +1,113 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > bar
   $ hg commit -Am default
   adding bar
   $ hg up -r null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch mine
   marked working directory as branch mine
   (branches are permanent and global, did you want a bookmark?)
   $ echo hello > world
   $ hg commit -Am hello
   adding world
   $ hg up -r null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch other
   marked working directory as branch other
   $ echo good > bye
   $ hg commit -Am other
   adding bye
   $ hg up -r mine
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
   abort: cannot specify both --noupdate and --updaterev
   [10]
 
   $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   $ rm -rf ../b
 
   $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch mine
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch mine
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch other
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
 Test -r mine ... mine is ignored:
 
   $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch other
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone .#other ../b -b default -b mine
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+2 heads)
   new changesets 8c68ee086fd0:fcc393352796
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone .#other ../b
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets fcc393352796
   updating to branch other
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b
 
   $ hg clone -U . ../c -r 1 -r 2 > /dev/null
   $ hg clone ../c ../b
   updating to branch other
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf ../b ../c
 

tests/test-commit-amend.t

@@ -1,1330 +1,1331 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Setup:
 
   $ echo a >> a
   $ hg ci -Am 'base'
   adding a
 
 Refuse to amend public csets:
 
   $ hg phase -r . -p
   $ hg ci --amend
   abort: cannot amend public changesets: ad120869acf0
   (see 'hg help phases' for details)
   [10]
   $ hg phase -r . -f -d
 
   $ echo a >> a
   $ hg ci -Am 'base1'
 
 Nothing to amend:
 
   $ hg ci --amend -m 'base1'
   nothing changed
   [1]
 
   $ cat >> $HGRCPATH <<EOF
   > [hooks]
   > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE"
   > EOF
 
 Amending changeset with changes in working dir:
 (and check that --message does not trigger an editor)
 
   $ echo a >> a
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg
   $ echo 'pretxncommit.foo = ' >> $HGRCPATH
   $ hg diff -c .
   diff -r ad120869acf0 -r 43f1ba15f28a a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    a
   +a
   +a
   $ hg log
   changeset:   1:43f1ba15f28a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     amend base1
   
   changeset:   0:ad120869acf0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     base
   
 
 Check proper abort for empty message
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > echo "" > "$1"
   > __EOF__
 
 Update the existing file to ensure that the dirstate is not in pending state
 (where the status of some files in the working copy is not known yet). This in
 turn ensures that when the transaction is aborted due to an empty message during
 the amend, there should be no rollback.
   $ echo a >> a
 
   $ echo b > b
   $ hg add b
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 modified, 1 added, 1 unknown
   update: (current)
   phases: 2 draft
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
   abort: empty commit message
   [10]
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 modified, 1 added, 1 unknown
   update: (current)
   phases: 2 draft
 
 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg
 
 Remove file that was added in amended commit:
 (and test logfile option)
 (and test that logfile option do not trigger an editor)
 
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg
 
   $ hg cat b
   b: no such file in rev 47343646fa3d
   [1]
 
 No changes, just a different message:
 
   $ hg ci -v --amend -m 'no changes, new message'
   amending changeset 47343646fa3d
   copying changeset 47343646fa3d to ad120869acf0
   committing files:
   a
   committing manifest
   committing changelog
   1 changesets found
   uncompressed size of bundle content:
        254 (changelog)
        163 (manifests)
        131  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        250 (changelog)
        163 (manifests)
        131  a
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:401431e913a1
   $ hg diff -c .
   diff -r ad120869acf0 -r 401431e913a1 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,4 @@
    a
   +a
   +a
   +a
   $ hg log
   changeset:   1:401431e913a1
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     no changes, new message
   
   changeset:   0:ad120869acf0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     base
   
 
 Disable default date on commit so when -d isn't given, the old date is preserved:
 
   $ echo '[defaults]' >> $HGRCPATH
   $ echo 'commit=' >> $HGRCPATH
 
 Test -u/-d:
 
   $ cat > .hg/checkeditform.sh <<EOF
   > env | grep HGEDITFORM
   > true
   > 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
+  saved backup bundle to $TESTTMP/repo/.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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
   $ hg log -r .
   changeset:   1:a9a13940fc03
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     no changes, new message
   
 
 Open editor with old commit message if a message isn't given otherwise:
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > cat $1
   > echo "another precious commit message" > "$1"
   > __EOF__
 
 at first, test saving last-message.txt
 
   $ cat > .hg/hgrc << '__EOF__'
   > [hooks]
   > pretxncommit.test-saving-last-message = false
   > __EOF__
 
   $ rm -f .hg/last-message.txt
   $ hg commit --amend -v -m "message given from command line"
   amending changeset a9a13940fc03
   copying changeset a9a13940fc03 to ad120869acf0
   committing files:
   a
   committing manifest
   committing changelog
   running hook pretxncommit.test-saving-last-message: false
   transaction abort!
   rollback completed
   abort: pretxncommit.test-saving-last-message hook exited with status 1
   [40]
   $ cat .hg/last-message.txt
   message given from command line (no-eol)
 
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset a9a13940fc03
   copying changeset a9a13940fc03 to ad120869acf0
   no changes, new message
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: changed a
   committing files:
   a
   committing manifest
   committing changelog
   running hook pretxncommit.test-saving-last-message: false
   transaction abort!
   rollback completed
   abort: pretxncommit.test-saving-last-message hook exited with status 1
   [40]
 
   $ cat .hg/last-message.txt
   another precious commit message
 
   $ cat > .hg/hgrc << '__EOF__'
   > [hooks]
   > pretxncommit.test-saving-last-message =
   > __EOF__
 
 then, test editing custom commit message
 
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset a9a13940fc03
   copying changeset a9a13940fc03 to ad120869acf0
   no changes, new message
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: changed a
   committing files:
   a
   committing manifest
   committing changelog
   1 changesets found
   uncompressed size of bundle content:
        249 (changelog)
        163 (manifests)
        133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
        163 (manifests)
        133  a
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:64a124ba1b44
 
 Same, but with changes in working dir (different code path):
 
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset 64a124ba1b44
   another precious commit message
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: changed a
   committing files:
   a
   committing manifest
   committing changelog
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
        163 (manifests)
        133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
        163 (manifests)
        135  a
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:7892795b8e38
 
   $ rm editor.sh
   $ hg log -r .
   changeset:   1:7892795b8e38
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     another precious commit message
   
 
 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
+  saved backup bundle to $TESTTMP/repo/.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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
   $ hg book
      book1                     1:a3b65065808c
    * book2                     1:a3b65065808c
 
 abort does not loose bookmarks
 
   $ cat > editor.sh << '__EOF__'
   > #!/bin/sh
   > echo "" > "$1"
   > __EOF__
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
   abort: empty commit message
   [10]
   $ hg book
      book1                     1:a3b65065808c
    * book2                     1:a3b65065808c
   $ hg revert -Caq
   $ rm editor.sh
 
   $ echo '[defaults]' >> $HGRCPATH
   $ echo "commit=-d '0 0'" >> $HGRCPATH
 
 Moving branches:
 
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -m 'branch foo'
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
   $ hg branches
   default                        2:9c07515f2650
 
 Close branch:
 
   $ hg up -q 0
   $ echo b >> b
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Am 'fork'
   adding b
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
 
 Same thing, different code path:
 
   $ echo b >> b
   $ hg ci -m 'reopen branch'
   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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/027371728205-b900d9fa-amend.hg
   $ hg branches
   default                        2:9c07515f2650
 
 Refuse to amend during a merge:
 
   $ hg up -q default
   $ hg merge foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci --amend
   abort: cannot amend changesets while merging
   [20]
   $ hg ci -m 'merge'
 
 Refuse to amend if there is a merge conflict (issue5805):
 
   $ hg up -q foo
   $ echo c > a
   $ hg up default -t :fail
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ hg resolve -l
   U a
 
   $ hg ci --amend
   abort: unresolved merge conflicts (see 'hg help resolve')
   [20]
 
   $ hg up -qC .
 
 Follow copies/renames:
 
   $ hg mv b c
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
   $ hg st --rev '.^' --copies d
   A d
     b
   $ hg cp d e
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
   $ hg st --rev '.^' --copies f
   A f
     d
 
   $ mv f f.orig
   $ hg rm -A f
   $ hg ci -m removef
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
   $ hg st --change . --copies
   $ hg log -r . --template "{file_copies}\n"
   
 
 Move added file (issue3410):
 
   $ echo g >> g
   $ hg ci -Am g
   adding g
   $ hg mv g h
   $ hg ci --amend
-  saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
   $ hg st --change . --copies h
   A h
   $ hg log -r . --template "{file_copies}\n"
   
 
 Can't rollback an amend:
 
   $ hg rollback
   no rollback information available
   [1]
 
 Preserve extra dict (issue3430):
 
   $ hg branch a
   marked working directory as branch a
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -ma
   $ hg ci --amend -m "a'"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
+  saved backup bundle to $TESTTMP/repo/.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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
   $ hg log -r . --template "{branch}\n"
   a
 
 Also preserve other entries in the dict that are in the old commit,
 first graft something so there's an additional entry:
 
   $ hg up 0 -q
   $ echo z > z
   $ hg ci -Am 'fork'
   adding z
   created new head
   $ hg up 11
   5 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ 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
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
   $ hg log -r . --debug | grep extra
   extra:       amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
   extra:       branch=a
   extra:       source=2647734878ef0236dda712fae9c1651cf694ea8a
 
 Preserve phase
 
   $ hg phase '.^::.'
   11: draft
   13: draft
   $ hg phase --secret --force .
   $ hg phase '.^::.'
   11: draft
   13: secret
   $ hg commit --amend -m 'amend for phase' -q
   $ hg phase '.^::.'
   11: draft
   13: secret
 
 Test amend with obsolete
 ---------------------------
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > evolution.allowunstable=True
   > EOF
 
 Amend with no files changes
 
   $ hg id -n
   13
   $ hg ci --amend -m 'babar'
   $ hg id -n
   14
   $ hg log -Gl 3 --style=compact
   @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
   |    babar
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   ~
   $ hg log -Gl 4 --hidden --style=compact
   @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   ~
 
 Amend with files changes
 
 (note: the extra commit over 15 is a temporary junk I would be happy to get
 ride of)
 
   $ echo 'babar' >> a
   $ hg commit --amend
   $ hg log -Gl 6 --hidden --style=compact
   @  15[tip]:11   a5b42b49b0d5   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  14:11   682950e85999   1970-01-01 00:00 +0000   test
   |/     babar
   |
   | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   |
   o  10   5fa75032e226   1970-01-01 00:00 +0000   test
   |    g
   ~
 
 
 Test that amend does not make it easy to create obsolescence cycle
 ---------------------------------------------------------------------
 
   $ hg id -r 14 --hidden
   682950e85999 (a)
   $ hg revert -ar 14 --hidden
   reverting a
   $ hg commit --amend
   $ hg id
   37973c7e0b61 (a) tip
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo 'b' >> a
   $ hg log --style compact -r 'children(.)'
   16[tip]:11   37973c7e0b61   1970-01-01 00:00 +0000   test
     babar
   
   $ hg commit --amend
   1 new orphan changesets
   $ hg log -r 'orphan()'
   changeset:   16:37973c7e0b61
   branch:      a
   parent:      11:0ddb275cfad1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   instability: orphan
   summary:     babar
   
 
 Amend a merge changeset (with renames and conflicts from the second parent):
 
   $ hg up -q default
   $ hg branch -q bar
   $ hg cp a aa
   $ hg mv z zz
   $ echo cc > cc
   $ hg add cc
   $ hg ci -m aazzcc
   $ hg up -q default
   $ echo a >> a
   $ echo dd > cc
   $ hg add cc
   $ hg ci -m aa
   $ hg merge -q bar
   warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
   (no more unresolved files)
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   20:5aba7f3726e6
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit
   HGEDITFORM=commit.amend.merge
   $ hg log --config diff.git=1 -pr .
   changeset:   21:4b0631ef043e
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (amend message)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ hg mv zz z
   $ hg ci --amend -m 'merge bar (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   22:06423be42d60
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (undo rename)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   
   $ hg debugrename z
   z not renamed
 
 Amend a merge changeset (with renames during the merge):
 
   $ hg up -q bar
   $ echo x > x
   $ hg add x
   $ hg ci -m x
   $ hg up -q default
   $ hg merge -q bar
   $ hg mv aa aaa
   $ echo aa >> aaa
   $ hg ci -m 'merge bar again'
   $ hg log --config diff.git=1 -pr .
   changeset:   24:a89974a20457
   tag:         tip
   parent:      22:06423be42d60
   parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -a
   diff --git a/aaa b/aaa
   new file mode 100644
   --- /dev/null
   +++ b/aaa
   @@ -0,0 +1,3 @@
   +a
   +a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aaa
   aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
 
 Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists
 in p1 too, but it was recorded as copied from p2.
   $ echo modified >> aaa
   $ hg co -m '.^' -t :merge3
   file 'aaa' was deleted in other [destination] but was modified in local [working copy].
   You can use (c)hanged version, (d)elete, or leave (u)nresolved.
   What do you want to do? u
   1 files updated, 0 files merged, 1 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ hg co -C tip
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg mv aaa aa
   $ hg ci --amend -m 'merge bar again (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   25:282080768800
   tag:         tip
   parent:      22:06423be42d60
   parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again (undo rename)
   
   diff --git a/aa b/aa
   --- a/aa
   +++ b/aa
   @@ -1,2 +1,3 @@
    a
    a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aa
   aa not renamed
   $ hg debugrename -r '.^' aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
 
 Amend a merge changeset (with manifest-level conflicts):
 
   $ hg up -q bar
   $ hg rm aa
   $ hg ci -m 'rm aa'
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
   file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
   You can use (c)hanged version, (d)elete, or leave (u)nresolved.
   What do you want to do? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .
   changeset:   28:ed15db12298d
   tag:         tip
   parent:      27:eb5adec0b43b
   parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts)
   
   
   $ hg rm aa
   $ hg ci --amend -m 'merge bar (with conflicts, amended)'
   $ hg log --config diff.git=1 -pr .
   changeset:   29:0eeafd043f63
   tag:         tip
   parent:      27:eb5adec0b43b
   parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts, amended)
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,4 +0,0 @@
   -a
   -a
   -aa
   -aa
   
 Issue 3445: amending with --close-branch a commit that created a new head should fail
 This shouldn't be possible:
 
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m..
   $ hg ci --amend --close-branch -m 'closing'
   abort: can only close branch heads
   [10]
 
 This silliness fails:
 
   $ hg branch silliness
   marked working directory as branch silliness
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: branch "silliness" has no heads to close
   [10]
 
 Test that amend with --secret creates new secret changeset forcibly
 ---------------------------------------------------------------------
 
   $ hg phase '.^::.'
   29: draft
   30: draft
   $ hg commit --amend --secret -m 'amend as secret' -q
   $ hg phase '.^::.'
   29: draft
   31: secret
 
 Test that amend with --edit invokes editor forcibly
 ---------------------------------------------------
 
   $ hg parents --template "{desc}\n"
   amend as secret
   $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
   $ hg parents --template "{desc}\n"
   editor should be suppressed
 
   $ hg status --rev '.^1::.'
   A foo
   $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
   editor should be invoked
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'silliness'
   HG: added foo
   $ hg parents --template "{desc}\n"
   editor should be invoked
 
 Test that amend with --no-edit avoids the editor
 ------------------------------------------------
 
   $ hg commit --amend -m "before anything happens"
   $ hg parents --template "{desc}\n"
   before anything happens
   $ HGEDITOR=cat hg commit --amend --no-edit -m "editor should be suppressed"
   $ hg parents --template "{desc}\n"
   editor should be suppressed
 
 (We need a file change here since we won't have a message change)
   $ cp foo foo.orig
   $ echo hi >> foo
   $ HGEDITOR=cat hg commit --amend --no-edit
   $ hg parents --template "{desc}\n"
   editor should be suppressed
   $ hg status -mar
 (Let's undo adding that "hi" so later tests don't need to be adjusted)
   $ mv foo.orig foo
   $ hg commit --amend --no-edit
 
 Test that "diff()" in committemplate works correctly for amending
 -----------------------------------------------------------------
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit.amend = {desc}\n
   >     HG: {revset('parents()') % 'parent: {desc|firstline}\n'}
   >     HG: M: {file_mods}
   >     HG: A: {file_adds}
   >     HG: R: {file_dels}
   >     {splitlines(diff()) % 'HG: {line}\n'}
   > EOF
 
   $ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n"
   M: 
   A: foo
   R: 
   $ hg status -amr
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
   expecting diff of foo
   
   HG: parent: editor should be suppressed
   
   HG: M: 
   HG: A: foo
   HG: R: 
   HG: diff -r 0eeafd043f63 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
 
   $ echo y > y
   $ hg add y
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
   expecting diff of foo and y
   
   HG: parent: expecting diff of foo
   
   HG: M: 
   HG: A: foo y
   HG: R: 
   HG: diff -r 0eeafd043f63 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 0eeafd043f63 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ hg rm a
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
   expecting diff of a, foo and y
   
   HG: parent: expecting diff of foo and y
   
   HG: M: 
   HG: A: foo y
   HG: R: a
   HG: diff -r 0eeafd043f63 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 0eeafd043f63 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 0eeafd043f63 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ hg rm x
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
   expecting diff of a, foo, x and y
   
   HG: parent: expecting diff of a, foo and y
   
   HG: M: 
   HG: A: foo y
   HG: R: a x
   HG: diff -r 0eeafd043f63 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 0eeafd043f63 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 0eeafd043f63 x
   HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,1 +0,0 @@
   HG: -x
   HG: diff -r 0eeafd043f63 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ echo cccc >> cc
   $ hg status -amr
   M cc
   $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
   cc should be excluded
   
   HG: parent: expecting diff of a, foo, x and y
   
   HG: M: 
   HG: A: foo y
   HG: R: a x
   HG: diff -r 0eeafd043f63 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 0eeafd043f63 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 0eeafd043f63 x
   HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,1 +0,0 @@
   HG: -x
   HG: diff -r 0eeafd043f63 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
 Check for issue4405
 -------------------
 
 Setup the repo with a file that gets moved in a second commit.
   $ hg init repo
   $ cd repo
   $ touch a0
   $ hg add a0
   $ hg commit -m a0
   $ hg mv a0 a1
   $ hg commit -m a1
   $ hg up -q 0
   $ hg log -G --template '{rev} {desc}'
   o  1 a1
   |
   @  0 a0
   
 
 Now we branch the repro, but re-use the file contents, so we have a divergence
 in the file revlog topology and the changelog topology.
   $ hg revert --rev 1 --all
   removing a0
   adding a1
   $ hg ci -qm 'a1-amend'
   $ hg log -G --template '{rev} {desc}'
   @  2 a1-amend
   |
   | o  1 a1
   |/
   o  0 a0
   
 
 The way mercurial does amends is by folding the working copy and old commit
 together into another commit (rev 3). During this process, _findlimit is called
 to  check how far back to look for the transitive closure of file copy
 information, but due to the divergence of the filelog and changelog graph
 topologies, before _findlimit was fixed, it returned a rev which was not far
 enough back in this case.
   $ hg mv a1 a2
   $ hg status --copies --rev 0
   A a2
     a0
   R a0
   $ hg ci --amend -q
   $ hg log -G --template '{rev} {desc}'
   @  3 a1-amend
   |
   | o  1 a1
   |/
   o  0 a0
   
 
 Before the fix, the copy information was lost.
   $ hg status --copies --rev 0
   A a2
     a0
   R a0
   $ cd ..
 
 Check that amend properly preserve rename from directory rename (issue-4516)
 
 If a parent of the merge renames a full directory, any files added to the old
 directory in the other parent will be renamed to the new directory. For some
 reason, the rename metadata was when amending such merge. This test ensure we
 do not regress. We have a dedicated repo because it needs a setup with renamed
 directory)
 
   $ hg init issue4516
   $ cd issue4516
   $ mkdir olddirname
   $ echo line1 > olddirname/commonfile.py
   $ hg add olddirname/commonfile.py
   $ hg ci -m first
 
   $ hg branch newdirname
   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
   $ hg ci -m rename
 
   $ hg update default
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo line1 > olddirname/newfile.py
   $ hg add olddirname/newfile.py
   $ hg ci -m log
 
   $ hg up newdirname
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ # create newdirname/newfile.py
   $ hg merge default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m add
   $ 
   $ hg debugrename newdirname/newfile.py
   newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
   $ hg status -C --change .
   A newdirname/newfile.py
   $ hg status -C --rev 1
   A newdirname/newfile.py
   $ hg status -C --rev 2
   A newdirname/commonfile.py
     olddirname/commonfile.py
   A newdirname/newfile.py
     olddirname/newfile.py
   R olddirname/commonfile.py
   R olddirname/newfile.py
   $ hg debugindex newdirname/newfile.py
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       3 34a4d536c0c0 000000000000 000000000000
 
   $ echo a >> newdirname/commonfile.py
   $ hg ci --amend -m bug
   $ hg debugrename newdirname/newfile.py
   newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
   $ hg debugindex newdirname/newfile.py
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       3 34a4d536c0c0 000000000000 000000000000
 
 #if execbit
 
 Test if amend preserves executable bit changes
   $ chmod +x newdirname/commonfile.py
   $ hg ci -m chmod
   $ hg ci --amend -m "chmod amended"
   $ hg ci --amend -m "chmod amended second time"
   $ hg log -p --git -r .
   changeset:   7:b1326f52dddf
   branch:      newdirname
   tag:         tip
   parent:      4:7fd235f7cb2f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod amended second time
   
   diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py
   old mode 100644
   new mode 100755
   
 #endif
 
 Test amend with file inclusion options
 --------------------------------------
 
 These tests ensure that we are always amending some files that were part of the
 pre-amend commit. We want to test that the remaining files in the pre-amend
 commit were not changed in the amended commit. We do so by performing a diff of
 the amended commit against its parent commit.
   $ cd ..
   $ hg init testfileinclusions
   $ cd testfileinclusions
   $ echo a > a
   $ echo b > b
   $ hg commit -Aqm "Adding a and b"
 
 Only add changes to a particular file
   $ echo a >> a
   $ echo b >> b
   $ hg commit --amend -I a
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +b
 
   $ echo a >> a
   $ hg commit --amend b
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,2 @@
   +b
   +b
 
 Exclude changes to a particular file
   $ echo b >> b
   $ hg commit --amend -X a
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,3 @@
   +b
   +b
   +b
 
 Check the addremove flag
   $ echo c > c
   $ rm a
   $ hg commit --amend -A
   removing a
   adding c
   $ hg diff --git -r null -r .
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,3 @@
   +b
   +b
   +b
   diff --git a/c b/c
   new file mode 100644
   --- /dev/null
   +++ b/c
   @@ -0,0 +1,1 @@
   +c

tests/test-conflict.t

@@ -1,422 +1,423 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat << EOF > a
   > Small Mathematical Series.
   > One
   > Two
   > Three
   > Four
   > Five
   > Hop we are done.
   > EOF
   $ hg add a
   $ hg commit -m ancestor
   $ cat << EOF > a
   > Small Mathematical Series.
   > 1
   > 2
   > 3
   > 4
   > 5
   > Hop we are done.
   > EOF
   $ hg commit -m branch1
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat << EOF > a
   > Small Mathematical Series.
   > 1
   > 2
   > 3
   > 6
   > 8
   > Hop we are done.
   > EOF
   $ hg commit -m branch2
   created new head
 
   $ hg merge 1
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
   $ hg id
   618808747361+c0c68e4fe667+ tip
 
   $ echo "[commands]" >> $HGRCPATH
   $ echo "status.verbose=true" >> $HGRCPATH
   $ hg status
   M a
   ? a.orig
   # The repository is in an unfinished *merge* state.
   
   # Unresolved merge conflicts:
   # 
   #     a
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
   # To continue:    hg commit
   # To abort:       hg merge --abort
   
   $ hg status -Tjson
   [
    {
     "itemtype": "file",
     "path": "a",
     "status": "M",
     "unresolved": true
    },
    {
     "itemtype": "file",
     "path": "a.orig",
     "status": "?"
    },
    {
     "itemtype": "morestatus",
     "unfinished": "merge",
     "unfinishedmsg": "To continue:    hg commit\nTo abort:       hg merge --abort"
    }
   ]
 
   $ hg status -0
   M a\x00? a.orig\x00 (no-eol) (esc)
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy: 618808747361 - test: branch2
   6
   8
   =======
   4
   5
   >>>>>>> merge rev:    c0c68e4fe667 - test: branch1
   Hop we are done.
 
   $ hg status --config commands.status.verbose=0
   M a
   ? a.orig
 
 Verify custom conflict markers
 
   $ hg up -q --clean .
   $ cat <<EOF >> .hg/hgrc
   > [command-templates]
   > mergemarker = '{author} {rev}'
   > EOF
 
   $ hg merge 1
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy: test 2
   6
   8
   =======
   4
   5
   >>>>>>> merge rev:    test 1
   Hop we are done.
 
 Verify custom conflict markers with legacy config name
 
   $ hg up -q --clean .
   $ cat <<EOF >> .hg/hgrc
   > [ui]
   > mergemarkertemplate = '{author} {rev}'
   > EOF
 
   $ hg merge 1
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy: test 2
   6
   8
   =======
   4
   5
   >>>>>>> merge rev:    test 1
   Hop we are done.
 
 Verify line splitting of custom conflict marker which causes multiple lines
 
   $ hg up -q --clean .
   $ cat >> .hg/hgrc <<EOF
   > [command-templates]
   > mergemarker={author} {rev}\nfoo\nbar\nbaz
   > EOF
 
   $ hg -q merge 1
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
 
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy: test 2
   6
   8
   =======
   4
   5
   >>>>>>> merge rev:    test 1
   Hop we are done.
 
 Verify line trimming of custom conflict marker using multi-byte characters
 
   $ hg up -q --clean .
   $ "$PYTHON" <<EOF
   > fp = open('logfile', 'wb')
   > fp.write(b'12345678901234567890123456789012345678901234567890' +
   >          b'1234567890') # there are 5 more columns for 80 columns
   > 
   > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
   > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
   > 
   > fp.close()
   > EOF
   $ hg add logfile
   $ hg --encoding utf-8 commit --logfile logfile
 
   $ cat >> .hg/hgrc <<EOF
   > [command-templates]
   > mergemarker={desc|firstline}
   > EOF
 
   $ hg -q --encoding utf-8 merge 1
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
 
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345...
   6
   8
   =======
   4
   5
   >>>>>>> merge rev:    branch1
   Hop we are done.
 
 Verify basic conflict markers
 
   $ hg up -q --clean 2
   $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc
 
   $ hg merge 1
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<< working copy
   6
   8
   =======
   4
   5
   >>>>>>> merge rev
   Hop we are done.
 
 internal:merge3
 
   $ hg up -q --clean .
 
   $ hg merge 1 --tool internal:merge3
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ cat a
   Small Mathematical Series.
   <<<<<<< working copy
   1
   2
   3
   6
   8
   ||||||| common ancestor
   One
   Two
   Three
   Four
   Five
   =======
   1
   2
   3
   4
   5
   >>>>>>> merge rev
   Hop we are done.
 
 internal:mergediff
 
   $ hg co -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat << EOF > a
   > Small Mathematical Series.
   > 1
   > 2
   > 3
   > 4
   > 4.5
   > 5
   > Hop we are done.
   > EOF
   $ hg co -m 2 -t internal:mergediff
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ cat a
   Small Mathematical Series.
   1
   2
   3
   <<<<<<<
   ------- working copy parent
   +++++++ working copy
    4
   +4.5
    5
   ======= destination
   6
   8
   >>>>>>>
   Hop we are done.
 Test the same thing as above but modify a bit more so we instead get the working
 copy in full and the diff from base to destination.
   $ hg co -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat << EOF > a
   > Small Mathematical Series.
   > 1
   > 2
   > 3.5
   > 4.5
   > 5.5
   > Hop we are done.
   > EOF
   $ hg co -m 2 -t internal:mergediff
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ cat a
   Small Mathematical Series.
   1
   2
   <<<<<<<
   ======= working copy
   3.5
   4.5
   5.5
   ------- working copy parent
   +++++++ destination
    3
   -4
   -5
   +6
   +8
   >>>>>>>
   Hop we are done.
 
 Add some unconflicting changes on each head, to make sure we really
 are merging, unlike :local and :other
 
   $ hg up -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????"
   1 other heads for branch "default"
   $ printf "\n\nEnd of file\n" >> a
   $ hg ci -m "Add some stuff at the end"
   $ hg up -r 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ printf "Start of file\n\n\n" > tmp
   $ cat a >> tmp
   $ mv tmp a
   $ hg ci -m "Add some stuff at the beginning"
 
 Now test :merge-other and :merge-local
 
   $ hg merge
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg resolve --tool :merge-other a
   merging a
   (no more unresolved files)
   $ cat a
   Start of file
   
   
   Small Mathematical Series.
   1
   2
   3
   6
   8
   Hop we are done.
   
   
   End of file
 
   $ hg up -C
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to "18b51d585961: Add some stuff at the beginning"
   1 other heads for branch "default"
   $ hg merge --tool :merge-local
   merging a
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat a
   Start of file
   
   
   Small Mathematical Series.
   1
   2
   3
   4
   5
   Hop we are done.
   
   
   End of file

tests/test-confused-revert.t

@@ -1,82 +1,83 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > a
   $ hg add a
   $ hg commit -m "1"
 
   $ echo bar > b
   $ hg add b
   $ hg remove a
 
 Should show a removed and b added:
 
   $ hg status
   A b
   R a
 
   $ hg revert --all
   forgetting b
   undeleting a
 
 Should show b unknown and a back to normal:
 
   $ hg status
   ? b
 
   $ rm b
 
   $ hg co -C 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo-a > a
   $ hg commit -m "2a"
 
   $ hg co -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo-b > a
   $ hg commit -m "2b"
   created new head
 
   $ HGMERGE=true hg merge 1
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Should show foo-b:
 
   $ cat a
   foo-b
 
   $ echo bar > b
   $ hg add b
   $ rm a
   $ hg remove a
 
 Should show a removed and b added:
 
   $ hg status
   A b
   R a
 
 Revert should fail:
 
   $ hg revert
   abort: uncommitted merge with no revision specified
   (use 'hg update' or see 'hg help revert')
   [10]
 
 Revert should be ok now:
 
   $ hg revert -r2 --all
   forgetting b
   undeleting a
 
 Should show b unknown and a marked modified (merged):
 
   $ hg status
   M a
   ? b
 
 Should show foo-b:
 
   $ cat a
   foo-b
 

tests/test-custom-filters.t

@@ -1,67 +1,68 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > .hg/hgrc <<EOF
   > [extensions]
   > prefixfilter = prefix.py
   > [encode]
   > *.txt = stripprefix: Copyright 2046, The Masters
   > [decode]
   > *.txt = insertprefix: Copyright 2046, The Masters
   > EOF
 
   $ cat > prefix.py <<EOF
   > from mercurial import error
   > def stripprefix(s, cmd, filename, **kwargs):
   >     header = b'%s\n' % cmd
   >     if s[:len(header)] != header:
   >         raise error.Abort(b'missing header "%s" in %s' % (cmd, filename))
   >     return s[len(header):]
   > def insertprefix(s, cmd):
   >     return b'%s\n%s' % (cmd, s)
   > def reposetup(ui, repo):
   >     repo.adddatafilter(b'stripprefix:', stripprefix)
   >     repo.adddatafilter(b'insertprefix:', insertprefix)
   > EOF
 
   $ cat > .hgignore <<EOF
   > .hgignore
   > prefix.py
   > prefix.pyc
   > __pycache__/
   > EOF
 
   $ cat > stuff.txt <<EOF
   > Copyright 2046, The Masters
   > Some stuff to ponder very carefully.
   > EOF
   $ hg add stuff.txt
   $ hg ci -m stuff
 
 Repository data:
 
   $ hg cat stuff.txt
   Some stuff to ponder very carefully.
 
 Fresh checkout:
 
   $ rm stuff.txt
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat stuff.txt
   Copyright 2046, The Masters
   Some stuff to ponder very carefully.
   $ echo "Very very carefully." >> stuff.txt
   $ hg stat
   M stuff.txt
 
   $ echo "Unauthorized material subject to destruction." > morestuff.txt
 
 Problem encoding:
 
   $ hg add morestuff.txt
   $ hg ci -m morestuff
   abort: missing header "Copyright 2046, The Masters" in morestuff.txt
   [255]
   $ hg stat
   M stuff.txt
   A morestuff.txt

tests/test-debugrename.t

@@ -1,18 +1,19 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am t
   adding a
 
   $ hg mv a b
   $ hg ci -Am t1
   $ hg debugrename b
   b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
   $ hg mv b a
   $ hg ci -Am t2
   $ hg debugrename a
   a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980
 
   $ hg debugrename --rev 1 b
   b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 

tests/test-diff-ignore-whitespace.t

@@ -1,517 +1,518 b''
 GNU diff is the reference for all of these results.
 
 Prepare tests:
 
   $ echo '[alias]' >> $HGRCPATH
   $ echo 'ndiff = diff --nodates' >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ printf 'hello world\ngoodbye world\n' >foo
   $ hg ci -Amfoo -ufoo
   adding foo
 
 
 Test added blank lines:
 
   $ printf '\nhello world\n\ngoodbye world\n\n' >foo
 
 >>> two diffs showing three added lines <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   +
    hello world
   +
    goodbye world
   +
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   +
    hello world
   +
    goodbye world
   +
 
 >>> no diffs <<<
 
   $ hg ndiff -B
   $ hg ndiff -Bb
 
 
 Test added horizontal space first on a line():
 
   $ printf '\t hello world\ngoodbye world\n' >foo
 
 >>> four diffs showing added space first on the first line <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +	 hello world
    goodbye world
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +	 hello world
    goodbye world
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +	 hello world
    goodbye world
 
   $ hg ndiff -Bb
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +	 hello world
    goodbye world
 
 
 Test added horizontal space last on a line:
 
   $ printf 'hello world\t \ngoodbye world\n' >foo
 
 >>> two diffs showing space appended to the first line <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +hello world	 
    goodbye world
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +hello world	 
    goodbye world
 
 >>> no diffs <<<
 
   $ hg ndiff -b
   $ hg ndiff -Bb
 
 
 Test added horizontal space in the middle of a word:
 
   $ printf 'hello world\ngood bye world\n' >foo
 
 >>> four diffs showing space inserted into "goodbye" <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +good bye world
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +good bye world
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +good bye world
 
   $ hg ndiff -Bb
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +good bye world
 
 
 Test increased horizontal whitespace amount:
 
   $ printf 'hello world\ngoodbye\t\t  \tworld\n' >foo
 
 >>> two diffs showing changed whitespace amount in the last line <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +goodbye		  	world
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
    hello world
   -goodbye world
   +goodbye		  	world
 
 >>> no diffs <<<
 
   $ hg ndiff -b
   $ hg ndiff -Bb
 
 
 Test added blank line with horizontal whitespace:
 
   $ printf 'hello world\n \t\ngoodbye world\n' >foo
 
 >>> three diffs showing added blank line with horizontal space <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   + 	
    goodbye world
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   + 	
    goodbye world
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   + 	
    goodbye world
 
 >>> no diffs <<<
 
   $ hg ndiff -Bb
 
 
 Test added blank line with other whitespace:
 
   $ printf 'hello  world\n \t\ngoodbye world \n' >foo
 
 >>> three diffs showing added blank line with other space <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
   -hello world
   -goodbye world
   +hello  world
   + 	
   +goodbye world 
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
   -hello world
   -goodbye world
   +hello  world
   + 	
   +goodbye world 
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   + 	
    goodbye world
 
 >>> no diffs <<<
 
   $ hg ndiff -Bb
 
 
 Test whitespace changes:
 
   $ printf 'helloworld\ngoodbye\tworld \n' >foo
 
 >>> four diffs showing changed whitespace <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   -goodbye world
   +helloworld
   +goodbye	world 
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   -goodbye world
   +helloworld
   +goodbye	world 
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +helloworld
    goodbye world
 
   $ hg ndiff -Bb
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,2 @@
   -hello world
   +helloworld
    goodbye world
 
 >>> no diffs <<<
 
   $ hg ndiff -w
 
 
 Test whitespace changes and blank lines:
 
   $ printf 'helloworld\n\n\n\ngoodbye\tworld \n' >foo
 
 >>> five diffs showing changed whitespace <<<
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   -hello world
   -goodbye world
   +helloworld
   +
   +
   +
   +goodbye	world 
 
   $ hg ndiff -B
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   -hello world
   -goodbye world
   +helloworld
   +
   +
   +
   +goodbye	world 
 
   $ hg ndiff -b
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   -hello world
   +helloworld
   +
   +
   +
    goodbye world
 
   $ hg ndiff -Bb
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
   -hello world
   +helloworld
   +
   +
   +
    goodbye world
 
   $ hg ndiff -w
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,5 @@
    hello world
   +
   +
   +
    goodbye world
 
 >>> no diffs <<<
 
   $ hg ndiff -wB
 
 
 Test \r (carriage return) as used in "DOS" line endings:
 
   $ printf 'hello world\r\n\r\ngoodbye\rworld\n' >foo
 
   $ hg ndiff
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
   -hello world
   -goodbye world
   +hello world\r (esc)
   +\r (esc)
   +goodbye\r (no-eol) (esc)
   world
 
 Test \r (carriage return) as used in "DOS" line endings:
 
   $ printf 'hello world    \r\n\t\ngoodbye world\n' >foo
 
   $ hg ndiff --ignore-space-at-eol
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   +\t (esc)
    goodbye world
 
 No completely blank lines to ignore:
 
   $ printf 'hello world\r\n\r\ngoodbye\rworld\n' >foo
 
   $ hg ndiff --ignore-blank-lines
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
   -hello world
   -goodbye world
   +hello world\r (esc)
   +\r (esc)
   +goodbye\r (no-eol) (esc)
   world
 
 Only new line noticed:
 
   $ hg ndiff --ignore-space-change
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   +\r (esc)
    goodbye world
 
   $ hg ndiff --ignore-all-space
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
    hello world
   +\r (esc)
    goodbye world
 
 New line not noticed when space change ignored:
 
   $ hg ndiff --ignore-blank-lines --ignore-all-space
 
 Do not ignore all newlines, only blank lines
 
   $ printf 'hello \nworld\ngoodbye world\n' > foo
   $ hg ndiff --ignore-blank-lines
   diff -r 540c40a65b78 foo
   --- a/foo
   +++ b/foo
   @@ -1,2 +1,3 @@
   -hello world
   +hello 
   +world
    goodbye world
 
 Test hunk offsets adjustments with --ignore-blank-lines
 
   $ hg revert -aC
   reverting foo
   $ printf '\nb\nx\nd\n' > a
   $ printf 'b\ny\nd\n' > b
   $ hg add a b
   $ hg ci -m add
   $ hg cat -r . a > b
   $ hg cat -r . b > a
   $ hg diff -B --nodates a > ../diffa
   $ cat ../diffa
   diff -r 0e66aa54f318 a
   --- a/a
   +++ b/a
   @@ -1,4 +1,4 @@
    
    b
   -x
   +y
    d
   $ hg diff -B --nodates b > ../diffb
   $ cat ../diffb
   diff -r 0e66aa54f318 b
   --- a/b
   +++ b/b
   @@ -1,3 +1,3 @@
    b
   -y
   +x
    d
   $ hg revert -aC
   reverting a
   reverting b
   $ hg import --no-commit ../diffa
   applying ../diffa
   $ hg revert -aC
   reverting a
   $ hg import --no-commit ../diffb
   applying ../diffb
   $ hg revert -aC
   reverting b

tests/test-diff-indent-heuristic.t

@@ -1,339 +1,340 b''
 #testcases bdiff xdiff
 
 #if xdiff
 #require xdiff
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > xdiff = true
   > EOF
 #endif
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > a.c <<'EOF'
   > /*
   >  * This function returns 1.
   >  */
   > int f() {
   >   return 1;
   > }
   > /*
   >  * This function returns 2.
   >  */
   > int g() {
   >   return 2;
   > }
   > /*
   >  * This function returns 3.
   >  */
   > int h() {
   >   return 3;
   > }
   > EOF
 
   $ cat > b.c <<'EOF'
   > if (x) {
   >    do_something();
   > }
   > 
   > if (y) {
   >    do_something_else();
   > }
   > EOF
 
   $ cat > c.rb <<'EOF'
   > #!ruby
   > ["foo", "bar", "baz"].map do |i|
   >   i.upcase
   > end
   > EOF
 
   $ cat > d.py <<'EOF'
   > try:
   >     import foo
   > except ImportError:
   >     pass
   > try:
   >     import bar
   > except ImportError:
   >     pass
   > EOF
 
 The below two files are taken from git: t/t4061-diff-indent.sh
 
   $ cat > spaces.txt <<'EOF'
   > 1
   > 2
   > a
   > 
   > b
   > 3
   > 4
   > EOF
 
   $ cat > functions.c <<'EOF'
   > 1
   > 2
   > /* function */
   > foo() {
   >     foo
   > }
   > 
   > 3
   > 4
   > EOF
 
   $ hg commit -m 1 -A . -q
 
   $ cat > a.c <<'EOF'
   > /*
   >  * This function returns 1.
   >  */
   > int f() {
   >   return 1;
   > }
   > /*
   >  * This function returns 3.
   >  */
   > int h() {
   >   return 3;
   > }
   > EOF
 
   $ cat > b.c <<'EOF'
   > if (x) {
   >    do_something();
   > }
   > 
   > if (y) {
   >    do_another_thing();
   > }
   > 
   > if (y) {
   >    do_something_else();
   > }
   > EOF
 
   $ cat > c.rb <<'EOF'
   > #!ruby
   > ["foo", "bar", "baz"].map do |i|
   >   i
   > end
   > ["foo", "bar", "baz"].map do |i|
   >   i.upcase
   > end
   > EOF
 
   $ cat > d.py <<'EOF'
   > try:
   >     import foo
   > except ImportError:
   >     pass
   > try:
   >     import baz
   > except ImportError:
   >     pass
   > try:
   >     import bar
   > except ImportError:
   >     pass
   > EOF
 
   $ cat > spaces.txt <<'EOF'
   > 1
   > 2
   > a
   > 
   > b
   > a
   > 
   > b
   > 3
   > 4
   > EOF
 
   $ cat > functions.c <<'EOF'
   > 1
   > 2
   > /* function */
   > bar() {
   >     foo
   > }
   > 
   > /* function */
   > foo() {
   >     foo
   > }
   > 
   > 3
   > 4
   > EOF
 
 #if xdiff
   $ hg diff --git
   diff --git a/a.c b/a.c
   --- a/a.c
   +++ b/a.c
   @@ -4,12 +4,6 @@
    int f() {
      return 1;
    }
   -/*
   - * This function returns 2.
   - */
   -int g() {
   -  return 2;
   -}
    /*
     * This function returns 3.
     */
   diff --git a/b.c b/b.c
   --- a/b.c
   +++ b/b.c
   @@ -2,6 +2,10 @@
       do_something();
    }
    
   +if (y) {
   +   do_another_thing();
   +}
   +
    if (y) {
       do_something_else();
    }
   diff --git a/c.rb b/c.rb
   --- a/c.rb
   +++ b/c.rb
   @@ -1,4 +1,7 @@
    #!ruby
   +["foo", "bar", "baz"].map do |i|
   +  i
   +end
    ["foo", "bar", "baz"].map do |i|
      i.upcase
    end
   diff --git a/d.py b/d.py
   --- a/d.py
   +++ b/d.py
   @@ -2,6 +2,10 @@
        import foo
    except ImportError:
        pass
   +try:
   +    import baz
   +except ImportError:
   +    pass
    try:
        import bar
    except ImportError:
   diff --git a/functions.c b/functions.c
   --- a/functions.c
   +++ b/functions.c
   @@ -1,5 +1,10 @@
    1
    2
   +/* function */
   +bar() {
   +    foo
   +}
   +
    /* function */
    foo() {
        foo
   diff --git a/spaces.txt b/spaces.txt
   --- a/spaces.txt
   +++ b/spaces.txt
   @@ -2,6 +2,9 @@
    2
    a
    
   +b
   +a
   +
    b
    3
    4
 #else
   $ hg diff --git
   diff --git a/a.c b/a.c
   --- a/a.c
   +++ b/a.c
   @@ -5,12 +5,6 @@
      return 1;
    }
    /*
   - * This function returns 2.
   - */
   -int g() {
   -  return 2;
   -}
   -/*
     * This function returns 3.
     */
    int h() {
   diff --git a/b.c b/b.c
   --- a/b.c
   +++ b/b.c
   @@ -3,5 +3,9 @@
    }
    
    if (y) {
   +   do_another_thing();
   +}
   +
   +if (y) {
       do_something_else();
    }
   diff --git a/c.rb b/c.rb
   --- a/c.rb
   +++ b/c.rb
   @@ -1,4 +1,7 @@
    #!ruby
    ["foo", "bar", "baz"].map do |i|
   +  i
   +end
   +["foo", "bar", "baz"].map do |i|
      i.upcase
    end
   diff --git a/d.py b/d.py
   --- a/d.py
   +++ b/d.py
   @@ -3,6 +3,10 @@
    except ImportError:
        pass
    try:
   +    import baz
   +except ImportError:
   +    pass
   +try:
        import bar
    except ImportError:
        pass
   diff --git a/functions.c b/functions.c
   --- a/functions.c
   +++ b/functions.c
   @@ -1,6 +1,11 @@
    1
    2
    /* function */
   +bar() {
   +    foo
   +}
   +
   +/* function */
    foo() {
        foo
    }
   diff --git a/spaces.txt b/spaces.txt
   --- a/spaces.txt
   +++ b/spaces.txt
   @@ -3,5 +3,8 @@
    a
    
    b
   +a
   +
   +b
    3
    4
 #endif

tests/test-diff-issue2761.t

@@ -1,23 +1,24 b''
 Test issue2761
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch to-be-deleted
   $ hg add
   adding to-be-deleted
   $ hg ci -m first
   $ echo a > to-be-deleted
   $ hg ci -m second
   $ rm to-be-deleted
   $ hg diff -r 0
 
 Same issue, different code path
 
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ touch does-not-exist-in-1
   $ hg add
   adding does-not-exist-in-1
   $ hg ci -m third
   $ rm does-not-exist-in-1
   $ hg diff -r 1

tests/test-diff-newlines.t

@@ -1,19 +1,20 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ "$PYTHON" -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'
   $ hg ci -Ama -d '1 0'
   adding a
 
   $ echo clean diff >> a
   $ hg ci -mb -d '2 0'
 
   $ hg diff -r0 -r1
   diff -r 107ba6f817b5 -r 310ce7989cdc a
   --- a/a	Thu Jan 01 00:00:01 1970 +0000
   +++ b/a	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,2 +1,3 @@
    confuse str.splitlines
    embedded\r (no-eol) (esc)
   newline
   +clean diff
 

tests/test-diff-reverse.t

@@ -1,65 +1,66 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > a <<EOF
   > a
   > b
   > c
   > EOF
   $ hg ci -Am adda
   adding a
 
   $ cat > a <<EOF
   > d
   > e
   > f
   > EOF
   $ hg ci -m moda
 
   $ hg diff --reverse -r0 -r1
   diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,3 @@
   -d
   -e
   -f
   +a
   +b
   +c
 
   $ cat >> a <<EOF
   > g
   > h
   > EOF
   $ hg diff --reverse --nodates
   diff -r 2855cdcfcbb7 a
   --- a/a
   +++ b/a
   @@ -1,5 +1,3 @@
    d
    e
    f
   -g
   -h
 
 should show removed file 'a' as being added
   $ hg revert a
   $ hg rm a
   $ hg diff --reverse --nodates a
   diff -r 2855cdcfcbb7 a
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,3 @@
   +d
   +e
   +f
 
 should show added file 'b' as being removed
   $ echo b >> b
   $ hg add b
   $ hg diff --reverse --nodates b
   diff -r 2855cdcfcbb7 b
   --- a/b
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -b

tests/test-editor-filename.t

@@ -1,64 +1,65 b''
 Test temp file used with an editor has the expected suffix.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Create an editor that writes its arguments to stdout and set it to $HGEDITOR.
 
   $ cat > editor.sh << EOF
   > echo "\$@"
   > exit 1
   > EOF
   $ hg add editor.sh
-  $ HGEDITOR="sh $TESTTMP/editor.sh"
+  $ HGEDITOR="sh $TESTTMP/repo/editor.sh"
   $ export HGEDITOR
 
 Verify that the path for a commit editor has the expected suffix.
 
   $ hg commit
   *.commit.hg.txt (glob)
   abort: edit failed: sh exited with status 1
   [250]
 
 Verify that the path for a histedit editor has the expected suffix.
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > histedit=
   > EOF
   $ hg commit --message 'At least one commit for histedit.'
   $ hg histedit
   *.histedit.hg.txt (glob)
   abort: edit failed: sh exited with status 1
   [250]
 
 Verify that when performing an action that has the side-effect of creating an
 editor for a diff, the file ends in .diff.
 
   $ echo 1 > one
   $ echo 2 > two
   $ hg add
   adding one
   adding two
   $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
   > y
   > e
   > q
   > EOF
   diff --git a/one b/one
   new file mode 100644
   examine changes to 'one'?
   (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +1
   record change 1/2 to 'one'?
   (enter ? for help) [Ynesfdaq?] e
   
   *.diff (glob)
   editor exited with exit code 1
   record change 1/2 to 'one'?
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [250]

tests/test-encode.t

@@ -1,72 +1,73 b''
 Test encode/decode filters
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat > .hg/hgrc <<EOF
   > [encode]
   > not.gz = tr [:lower:] [:upper:]
   > *.gz = gzip -d
   > [decode]
   > not.gz = tr [:upper:] [:lower:]
   > *.gz = gzip
   > EOF
   $ echo "this is a test" | gzip > a.gz
   $ echo "this is a test" > not.gz
   $ hg add *
   $ hg ci -m "test"
 
 no changes
 
   $ hg status
   $ touch *
 
 no changes
 
   $ hg status
 
 check contents in repo are encoded
 
   $ hg debugdata a.gz 0
   this is a test
   $ hg debugdata not.gz 0
   THIS IS A TEST
 
 check committed content was decoded
 
   $ gunzip < a.gz
   this is a test
   $ cat not.gz
   this is a test
   $ rm *
   $ hg co -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 check decoding of our new working dir copy
 
   $ gunzip < a.gz
   this is a test
   $ cat not.gz
   this is a test
 
 check hg cat operation
 
   $ hg cat a.gz
   this is a test
   $ hg cat --decode a.gz | gunzip
   this is a test
   $ mkdir subdir
   $ cd subdir
   $ hg -R .. cat ../a.gz
   this is a test
   $ hg -R .. cat --decode ../a.gz | gunzip
   this is a test
   $ cd ..
 
 check tempfile filter
 
   $ hg cat a.gz --decode --config 'decode.*.gz=tempfile:gzip -c INFILE > OUTFILE' | gunzip
   this is a test
   $ hg cat a.gz --decode --config 'decode.*.gz=tempfile:sh -c "exit 1"'
   abort: command '*' failed: exited with status 1 (glob)
   [255]
 
   $ cd ..

tests/test-execute-bit.t

@@ -1,28 +1,29 b''
 #require execbit
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am'not executable'
   adding a
 
   $ chmod +x a
   $ hg ci -m'executable'
   $ hg id
   79abf14474dc tip
 
 Make sure we notice the change of mode if the cached size == -1:
 
   $ hg rm a
   $ hg revert -r 0 a
   $ hg debugstate
   n   0         -1 unset               a
   $ hg status
   M a
 
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   d69afc33ff8a
   $ test -x a && echo executable -- bad || echo not executable -- good
   not executable -- good
 

tests/test-extra-filelog-entry.t

@@ -1,21 +1,22 b''
 Issue351: mq: qrefresh can create extra revlog entry
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
 
   $ echo b > b
   $ hg ci -A -m foo
   adding b
 
   $ echo cc > b
   $ hg qnew -f foo.diff
   $ echo b > b
   $ hg qrefresh
 
   $ hg debugindex b
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 1e88685f5dde 000000000000 000000000000
 

tests/test-fileset-generated.t

@@ -1,198 +1,199 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Set up history and working copy
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
   $ hg addremove -q --similarity 0
   $ hg commit -m first
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
   $ hg addremove -q --similarity 0
   $ hg commit -m second
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
   $ hg addremove -q --similarity 0
   $ hg forget *_*_*-untracked
   $ rm *_*_missing-*
 
 Test status
 
   $ hg st -A 'set:modified()'
   M content1_content1_content3-tracked
   M content1_content2_content1-tracked
   M content1_content2_content3-tracked
   M missing_content2_content3-tracked
 
   $ hg st -A 'set:added()'
   A content1_missing_content1-tracked
   A content1_missing_content3-tracked
   A missing_missing_content3-tracked
 
   $ hg st -A 'set:removed()'
   R content1_content1_content1-untracked
   R content1_content1_content3-untracked
   R content1_content1_missing-untracked
   R content1_content2_content1-untracked
   R content1_content2_content2-untracked
   R content1_content2_content3-untracked
   R content1_content2_missing-untracked
   R missing_content2_content2-untracked
   R missing_content2_content3-untracked
   R missing_content2_missing-untracked
 
   $ hg st -A 'set:deleted()'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked
   ! content1_missing_missing-tracked
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
 
   $ hg st -A 'set:missing()'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked
   ! content1_missing_missing-tracked
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
 
   $ hg st -A 'set:unknown()'
   ? content1_missing_content1-untracked
   ? content1_missing_content3-untracked
   ? missing_missing_content3-untracked
 
   $ hg st -A 'set:clean()'
   C content1_content1_content1-tracked
   C content1_content2_content2-tracked
   C missing_content2_content2-tracked
 
 Test log
 
   $ hg log -T '{rev}\n' --stat 'set:modified()'
   1
    content1_content2_content1-tracked |  2 +-
    content1_content2_content3-tracked |  2 +-
    missing_content2_content3-tracked  |  1 +
    3 files changed, 3 insertions(+), 2 deletions(-)
   
   0
    content1_content1_content3-tracked |  1 +
    content1_content2_content1-tracked |  1 +
    content1_content2_content3-tracked |  1 +
    3 files changed, 3 insertions(+), 0 deletions(-)
   
 Largefiles doesn't crash
   $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   1
    content1_content2_content1-tracked |  2 +-
    content1_content2_content3-tracked |  2 +-
    missing_content2_content3-tracked  |  1 +
    3 files changed, 3 insertions(+), 2 deletions(-)
   
   0
    content1_content1_content3-tracked |  1 +
    content1_content2_content1-tracked |  1 +
    content1_content2_content3-tracked |  1 +
    3 files changed, 3 insertions(+), 0 deletions(-)
   
   $ hg log -T '{rev}\n' --stat 'set:added()'
   1
    content1_missing_content1-tracked |  1 -
    content1_missing_content3-tracked |  1 -
    2 files changed, 0 insertions(+), 2 deletions(-)
   
   0
    content1_missing_content1-tracked |  1 +
    content1_missing_content3-tracked |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   
   $ hg log -T '{rev}\n' --stat 'set:removed()'
   1
    content1_content2_content1-untracked |  2 +-
    content1_content2_content2-untracked |  2 +-
    content1_content2_content3-untracked |  2 +-
    content1_content2_missing-untracked  |  2 +-
    missing_content2_content2-untracked  |  1 +
    missing_content2_content3-untracked  |  1 +
    missing_content2_missing-untracked   |  1 +
    7 files changed, 7 insertions(+), 4 deletions(-)
   
   0
    content1_content1_content1-untracked |  1 +
    content1_content1_content3-untracked |  1 +
    content1_content1_missing-untracked  |  1 +
    content1_content2_content1-untracked |  1 +
    content1_content2_content2-untracked |  1 +
    content1_content2_content3-untracked |  1 +
    content1_content2_missing-untracked  |  1 +
    7 files changed, 7 insertions(+), 0 deletions(-)
   
   $ hg log -T '{rev}\n' --stat 'set:deleted()'
   1
    content1_content2_missing-tracked |  2 +-
    content1_missing_missing-tracked  |  1 -
    missing_content2_missing-tracked  |  1 +
    3 files changed, 2 insertions(+), 2 deletions(-)
   
   0
    content1_content1_missing-tracked |  1 +
    content1_content2_missing-tracked |  1 +
    content1_missing_missing-tracked  |  1 +
    3 files changed, 3 insertions(+), 0 deletions(-)
   
   $ hg log -T '{rev}\n' --stat 'set:unknown()'
   1
    content1_missing_content1-untracked |  1 -
    content1_missing_content3-untracked |  1 -
    2 files changed, 0 insertions(+), 2 deletions(-)
   
   0
    content1_missing_content1-untracked |  1 +
    content1_missing_content3-untracked |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   
   $ hg log -T '{rev}\n' --stat 'set:clean()'
   1
    content1_content2_content2-tracked |  2 +-
    missing_content2_content2-tracked  |  1 +
    2 files changed, 2 insertions(+), 1 deletions(-)
   
   0
    content1_content1_content1-tracked |  1 +
    content1_content2_content2-tracked |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   
 Test revert
 
   $ hg revert 'set:modified()'
   reverting content1_content1_content3-tracked
   reverting content1_content2_content1-tracked
   reverting content1_content2_content3-tracked
   reverting missing_content2_content3-tracked
 
   $ hg revert 'set:added()'
   forgetting content1_missing_content1-tracked
   forgetting content1_missing_content3-tracked
   forgetting missing_missing_content3-tracked
 
   $ hg revert 'set:removed()'
   undeleting content1_content1_content1-untracked
   undeleting content1_content1_content3-untracked
   undeleting content1_content1_missing-untracked
   undeleting content1_content2_content1-untracked
   undeleting content1_content2_content2-untracked
   undeleting content1_content2_content3-untracked
   undeleting content1_content2_missing-untracked
   undeleting missing_content2_content2-untracked
   undeleting missing_content2_content3-untracked
   undeleting missing_content2_missing-untracked
 
   $ hg revert 'set:deleted()'
   forgetting content1_missing_missing-tracked
   forgetting missing_missing_missing-tracked
   reverting content1_content1_missing-tracked
   reverting content1_content2_missing-tracked
   reverting missing_content2_missing-tracked
 
   $ hg revert 'set:unknown()'
 
   $ hg revert 'set:clean()'

tests/test-git-export.t

@@ -1,615 +1,616 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo start > start
   $ hg ci -Amstart
   adding start
 
 New file:
 
   $ mkdir dir1
   $ echo new > dir1/new
   $ hg ci -Amnew
   adding dir1/new
   $ hg diff --git -r 0
   diff --git a/dir1/new b/dir1/new
   new file mode 100644
   --- /dev/null
   +++ b/dir1/new
   @@ -0,0 +1,1 @@
   +new
 
 Copy:
 
   $ mkdir dir2
   $ hg cp dir1/new dir1/copy
   $ echo copy1 >> dir1/copy
   $ hg cp dir1/new dir2/copy
   $ echo copy2 >> dir2/copy
   $ hg ci -mcopy
   $ hg diff --git -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
 Cross and same-directory copies with a relative root:
 
   $ hg diff --git --root .. -r 1:tip
-  abort: .. not under root '$TESTTMP'
+  abort: .. not under root '$TESTTMP/repo'
   [255]
   $ hg diff --git --root doesnotexist -r 1:tip
   $ hg diff --git --root . -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
   $ hg diff --git --root dir1 -r 1:tip
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
 
   $ hg diff --git --root dir2/ -r 1:tip
   diff --git a/copy b/copy
   new file mode 100644
   --- /dev/null
   +++ b/copy
   @@ -0,0 +1,2 @@
   +new
   +copy2
 
   $ hg diff --git --root dir1 -r 1:tip -I '**/copy'
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
 
   $ hg diff --git --root dir1 -r 1:tip dir2
   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
 
   $ cd dir1
   $ hg diff --git --root .. -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
   $ hg diff --git --root ../.. -r 1:tip
-  abort: ../.. not under root '$TESTTMP'
+  abort: ../.. not under root '$TESTTMP/repo'
   [255]
   $ hg diff --git --root ../doesnotexist -r 1:tip
   $ hg diff --git --root .. -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
   $ hg diff --git --root . -r 1:tip
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   $ hg diff --git --root . -r 1:tip copy
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   $ hg diff --git --root . -r 1:tip ../dir2
   warning: ../dir2 not inside relative root .
   $ hg diff --git --root . -r 1:tip '../dir2/*'
   warning: ../dir2/* not inside relative root . (glob)
   $ cd ..
 
 Rename:
 
   $ hg mv dir1/copy dir1/rename1
   $ echo rename1 >> dir1/rename1
   $ hg mv dir2/copy dir1/rename2
   $ echo rename2 >> dir1/rename2
   $ hg ci -mrename
   $ hg diff --git -r 2:tip
   diff --git a/dir1/copy b/dir1/rename1
   rename from dir1/copy
   rename to dir1/rename1
   --- a/dir1/copy
   +++ b/dir1/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/dir2/copy b/dir1/rename2
   rename from dir2/copy
   rename to dir1/rename2
   --- a/dir2/copy
   +++ b/dir1/rename2
   @@ -1,2 +1,3 @@
    new
    copy2
   +rename2
 
 Cross and same-directory renames with a relative root:
 
   $ hg diff --root dir1 --git -r 2:tip
   diff --git a/copy b/rename1
   rename from copy
   rename to rename1
   --- a/copy
   +++ b/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/rename2 b/rename2
   new file mode 100644
   --- /dev/null
   +++ b/rename2
   @@ -0,0 +1,3 @@
   +new
   +copy2
   +rename2
 
   $ hg diff --root dir2 --git -r 2:tip
   diff --git a/copy b/copy
   deleted file mode 100644
   --- a/copy
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -new
   -copy2
 
   $ hg diff --root dir1 --git -r 2:tip -I '**/copy'
   diff --git a/copy b/copy
   deleted file mode 100644
   --- a/copy
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -new
   -copy1
 
   $ hg diff --root dir1 --git -r 2:tip -I '**/rename*'
   diff --git a/copy b/rename1
   copy from copy
   copy to rename1
   --- a/copy
   +++ b/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/rename2 b/rename2
   new file mode 100644
   --- /dev/null
   +++ b/rename2
   @@ -0,0 +1,3 @@
   +new
   +copy2
   +rename2
 
 Delete:
 
   $ hg rm dir1/*
   $ hg ci -mdelete
   $ hg diff --git -r 3:tip
   diff --git a/dir1/new b/dir1/new
   deleted file mode 100644
   --- a/dir1/new
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -new
   diff --git a/dir1/rename1 b/dir1/rename1
   deleted file mode 100644
   --- a/dir1/rename1
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -new
   -copy1
   -rename1
   diff --git a/dir1/rename2 b/dir1/rename2
   deleted file mode 100644
   --- a/dir1/rename2
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -new
   -copy2
   -rename2
 
   $ cat > src <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg ci -Amsrc
   adding src
 
 #if execbit
 
 chmod 644:
 
   $ chmod +x src
   $ hg ci -munexec
   $ hg diff --git -r 5:tip
   diff --git a/src b/src
   old mode 100644
   new mode 100755
 
 Rename+mod+chmod:
 
   $ hg mv src dst
   $ chmod -x dst
   $ echo a >> dst
   $ hg ci -mrenamemod
   $ hg diff --git -r 6:tip
   diff --git a/src b/dst
   old mode 100755
   new mode 100644
   rename from src
   rename to dst
   --- a/src
   +++ b/dst
   @@ -3,3 +3,4 @@
    3
    4
    5
   +a
 
 Nonexistent in tip+chmod:
 
   $ hg diff --git -r 5:6
   diff --git a/src b/src
   old mode 100644
   new mode 100755
 
 #else
 
 Dummy changes when no exec bit, mocking the execbit commit structure
 
   $ echo change >> src
   $ hg ci -munexec
   $ hg mv src dst
   $ hg ci -mrenamemod
 
 #endif
 
 Binary diff:
 
   $ cp "$TESTDIR/binfile.bin" .
   $ hg add binfile.bin
   $ hg diff --git > b.diff
   $ cat b.diff
   diff --git a/binfile.bin b/binfile.bin
   new file mode 100644
   index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
   GIT binary patch
   literal 593
   zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
   z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
   zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
   z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
   zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
   ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
   zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
   z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
   zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
   z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
   zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
   fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4
   
 
 Import binary diff:
 
   $ hg revert binfile.bin
   $ rm binfile.bin
   $ hg import -mfoo b.diff
   applying b.diff
   $ cmp binfile.bin "$TESTDIR/binfile.bin"
 
 Rename binary file:
 
   $ hg mv binfile.bin renamed.bin
   $ hg diff --git
   diff --git a/binfile.bin b/renamed.bin
   rename from binfile.bin
   rename to renamed.bin
 
 Diff across many revisions:
 
   $ hg mv dst dst2
   $ hg ci -m 'mv dst dst2'
 
   $ echo >> start
   $ hg ci -m 'change start'
 
   $ hg revert -r -2 start
   $ hg mv dst2 dst3
   $ hg ci -m 'mv dst2 dst3; revert start'
 
   $ hg diff --git -r 9:11
   diff --git a/dst2 b/dst3
   rename from dst2
   rename to dst3
 
 Reversed:
 
   $ hg diff --git -r 11:9
   diff --git a/dst3 b/dst2
   rename from dst3
   rename to dst2
 
 
   $ echo a >> foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ echo b >> foo
   $ hg ci -m 'change foo'
   $ hg mv foo bar
   $ hg ci -m 'mv foo bar'
   $ echo c >> bar
   $ hg ci -m 'change bar'
 
 File created before r1 and renamed before r2:
 
   $ hg diff --git -r -3:-1
   diff --git a/foo b/bar
   rename from foo
   rename to bar
   --- a/foo
   +++ b/bar
   @@ -1,2 +1,3 @@
    a
    b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-3
   diff --git a/bar b/foo
   rename from bar
   rename to foo
   --- a/bar
   +++ b/foo
   @@ -1,3 +1,2 @@
    a
    b
   -c
 
 File created in r1 and renamed before r2:
 
   $ hg diff --git -r -4:-1
   diff --git a/foo b/bar
   rename from foo
   rename to bar
   --- a/foo
   +++ b/bar
   @@ -1,1 +1,3 @@
    a
   +b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-4
   diff --git a/bar b/foo
   rename from bar
   rename to foo
   --- a/bar
   +++ b/foo
   @@ -1,3 +1,1 @@
    a
   -b
   -c
 
 File created after r1 and renamed before r2:
 
   $ hg diff --git -r -5:-1
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,3 @@
   +a
   +b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-5
   diff --git a/bar b/bar
   deleted file mode 100644
   --- a/bar
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -a
   -b
   -c
 
 
 Comparing with the working dir:
 
   $ echo >> start
   $ hg ci -m 'change start again'
 
   $ echo > created
   $ hg add created
   $ hg ci -m 'add created'
 
   $ hg mv created created2
   $ hg ci -m 'mv created created2'
 
   $ hg mv created2 created3
 
 There's a copy in the working dir:
 
   $ hg diff --git
   diff --git a/created2 b/created3
   rename from created2
   rename to created3
 
 There's another copy between the original rev and the wd:
 
   $ hg diff --git -r -2
   diff --git a/created b/created3
   rename from created
   rename to created3
 
 The source of the copy was created after the original rev:
 
   $ hg diff --git -r -3
   diff --git a/created3 b/created3
   new file mode 100644
   --- /dev/null
   +++ b/created3
   @@ -0,0 +1,1 @@
   +
   $ hg ci -m 'mv created2 created3'
 
 
   $ echo > brand-new
   $ hg add brand-new
   $ hg ci -m 'add brand-new'
   $ hg mv brand-new brand-new2
 
 Created in parent of wd; renamed in the wd:
 
   $ hg diff --git
   diff --git a/brand-new b/brand-new2
   rename from brand-new
   rename to brand-new2
 
 Created between r1 and parent of wd; renamed in the wd:
 
   $ hg diff --git -r -2
   diff --git a/brand-new2 b/brand-new2
   new file mode 100644
   --- /dev/null
   +++ b/brand-new2
   @@ -0,0 +1,1 @@
   +
   $ hg ci -m 'mv brand-new brand-new2'
 
 One file is copied to many destinations and removed:
 
   $ hg cp brand-new2 brand-new3
   $ hg mv brand-new2 brand-new3-2
   $ hg ci -m 'multiple renames/copies'
   $ hg diff --git -r -2 -r -1
   diff --git a/brand-new2 b/brand-new3
   rename from brand-new2
   rename to brand-new3
   diff --git a/brand-new2 b/brand-new3-2
   copy from brand-new2
   copy to brand-new3-2
 
 Reversed:
 
   $ hg diff --git -r -1 -r -2
   diff --git a/brand-new3-2 b/brand-new2
   rename from brand-new3-2
   rename to brand-new2
   diff --git a/brand-new3 b/brand-new3
   deleted file mode 100644
   --- a/brand-new3
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -
 
 There should be a trailing TAB if there are spaces in the file name:
 
   $ echo foo > 'with spaces'
   $ hg add 'with spaces'
   $ hg diff --git
   diff --git a/with spaces b/with spaces
   new file mode 100644
   --- /dev/null
   +++ b/with spaces	
   @@ -0,0 +1,1 @@
   +foo
   $ hg ci -m 'add filename with spaces'
 
 Additions should be properly marked even in the middle of a merge
 
   $ hg up -r -2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "New File" >> inmerge
   $ hg add inmerge
   $ hg ci -m "file in merge"
   created new head
   $ hg up 23
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff -g
   diff --git a/inmerge b/inmerge
   new file mode 100644
   --- /dev/null
   +++ b/inmerge
   @@ -0,0 +1,1 @@
   +New File

tests/test-issue1089.t

@@ -1,26 +1,27 b''
 https://bz.mercurial-scm.org/1089
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir a
   $ echo a > a/b
   $ hg ci -Am m
   adding a/b
 
   $ hg rm a
   removing a/b
   $ hg ci -m m a
 
   $ mkdir a b
   $ echo a > a/b
   $ hg ci -Am m
   adding a/b
 
   $ hg rm a
   removing a/b
   $ cd b
 
 Relative delete:
 
   $ hg ci -m m ../a
 
   $ cd ..

tests/test-issue1175.t

@@ -1,96 +1,97 b''
 https://bz.mercurial-scm.org/1175
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch a
   $ hg ci -Am0
   adding a
 
   $ hg mv a a1
   $ hg ci -m1
 
   $ hg co 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg mv a a2
   $ hg up
   note: possible conflict - a was renamed multiple times to:
    a1
    a2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg ci -m2
 
   $ touch a
   $ hg ci -Am3
   adding a
 
   $ hg mv a b
   $ hg ci -Am4 a
 
   $ hg ci --debug --traceback -Am5 b
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 6 changesets with 4 changes to 4 files
 
   $ hg export --git tip
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
   # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f
   5
   
   diff --git a/b b/b
   new file mode 100644
 
 https://bz.mercurial-scm.org/show_bug.cgi?id=4476
 
   $ hg init foo
   $ cd foo
   $ touch a && hg ci -Aqm a
   $ hg mv a b
   $ echo b1 >> b
   $ hg ci -Aqm b1
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv a b
   $ echo b2 >> b
   $ hg ci -Aqm b2
   $ hg graft 1
   grafting 1:5974126fad84 "b1"
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [1]
   $ echo a > b
   $ echo b3 >> b
   $ hg resolve --mark b
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft --continue
   grafting 1:5974126fad84 "b1"
   $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'
   changeset:   3:376d30ccffc0
   summary:     b1
   
   changeset:   2:416baaa2e5e4
   summary:     b2
   
   changeset:   0:3903775176ed
   summary:     a
   
 
 

tests/test-issue1438.t

@@ -1,23 +1,24 b''
 #require symlink
 
 https://bz.mercurial-scm.org/1438
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ ln -s foo link
   $ hg add link
   $ hg ci -mbad link
   $ hg rm link
   $ hg ci -mok
   $ hg diff -g -r 0:1 > bad.patch
 
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg import --no-commit bad.patch
   applying bad.patch
 
   $ hg status
   R link
   ? bad.patch
 

tests/test-issue522.t

@@ -1,52 +1,53 b''
 https://bz.mercurial-scm.org/522
 
 In the merge below, the file "foo" has the same contents in both
 parents, but if we look at the file-level history, we'll notice that
 the version in p1 is an ancestor of the version in p2. This test makes
 sure that we'll use the version from p2 in the manifest of the merge
 revision.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
 
   $ echo bar >> foo
   $ hg ci -m 'change foo'
 
   $ hg backout -r tip -m 'backout changed foo'
   reverting foo
   changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ touch bar
   $ hg ci -qAm 'add bar'
 
   $ hg merge --debug
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
    foo: remote is newer -> g
   getting foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg debugstate | grep foo
   m   0         -2 unset               foo
 
   $ hg st -A foo
   M foo
 
   $ hg ci -m 'merge'
 
   $ hg manifest --debug | grep foo
   c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
 
   $ hg debugindex foo
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
        1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
        2       2 c6fc755d7e68 6f4310b00b9a 000000000000
 

tests/test-issue612.t

@@ -1,34 +1,35 b''
 https://bz.mercurial-scm.org/612
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir src
   $ echo a > src/a.c
   $ hg ci -Ama
   adding src/a.c
 
   $ hg mv src source
   moving src/a.c to source/a.c
 
   $ hg ci -Ammove
 
   $ hg co -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo new > src/a.c
   $ echo compiled > src/a.o
   $ hg ci -mupdate
   created new head
 
   $ hg status
   ? src/a.o
 
   $ hg merge
   merging src/a.c and source/a.c to source/a.c
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status
   M source/a.c
   R src/a.c
   ? src/a.o
 

tests/test-issue619.t

@@ -1,36 +1,37 b''
 https://bz.mercurial-scm.org/619
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Ama
   adding a
 
   $ echo b > b
   $ hg branch b
   marked working directory as branch b
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Amb
   adding b
 
   $ hg co -C 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Fast-forward:
 
   $ hg merge b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -Ammerge
 
 Bogus fast-forward should fail:
 
   $ hg merge b
   abort: merging with a working directory ancestor has no effect
   [255]
 
 Even with strange revset (issue4465)
 
   $ hg merge ::.
   abort: merging with a working directory ancestor has no effect
   [255]
 

tests/test-issue672.t

@@ -1,99 +1,100 b''
 https://bz.mercurial-scm.org/672
 
 # 0-2-4
 #  \ \ \
 #   1-3-5
 #
 # rename in #1, content change in #4.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch 1
   $ touch 2
   $ hg commit -Am init  # 0
   adding 1
   adding 2
 
   $ hg rename 1 1a
   $ hg commit -m rename # 1
 
   $ hg co -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo unrelated >> 2
   $ hg ci -m unrelated1 # 2
   created new head
 
   $ hg merge --debug 1
     unmatched files in other:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on remote side:
       src: '1' -> dst: '1a' 
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
    1: other deleted -> r
   removing 1
    1a: remote created -> g
   getting 1a
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg ci -m merge1 # 3
 
   $ hg co -C 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo hello >> 1
   $ hg ci -m unrelated2 # 4
   created new head
 
   $ hg co -C 3
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg merge -y --debug 4
     unmatched files in local:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on local side:
       src: '1' -> dst: '1a' *
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
   starting 4 threads for background file closing (?)
    preserving 1a for resolve of 1a
    1a: local copied/moved from 1 -> m
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1a and 1 to 1a
   my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg co -C 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg merge -y --debug 3
     unmatched files in other:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on remote side:
       src: '1' -> dst: '1a' *
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
   starting 4 threads for background file closing (?)
    preserving 1 for resolve of 1a
   removing 1
    1a: remote moved from 1 -> m
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1 and 1a to 1a
   my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 

tests/test-issue842.t

@@ -1,39 +1,40 b''
 https://bz.mercurial-scm.org/842
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > a
   $ hg ci -Ama
   adding a
 
   $ hg up -r0000
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo bar > a
 
 Should issue new head warning:
 
   $ hg ci -Amb
   adding a
   created new head
 
   $ hg up -r0000
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo stuffy > a
 
 Should not issue new head warning:
 
   $ hg ci -q -Amc
 
   $ hg up -r0000
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo crap > a
   $ hg branch testing
   marked working directory as branch testing
   (branches are permanent and global, did you want a bookmark?)
 
 Should not issue warning:
 
   $ hg ci -q -Amd
 

tests/test-journal-exists.t

@@ -1,60 +1,61 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am0
   adding a
 
   $ hg -q clone . foo
 
   $ touch .hg/store/journal
 
   $ echo foo > a
   $ hg ci -Am0
   abort: abandoned transaction found
   (run 'hg recover' to clean up transaction)
   [255]
 
   $ hg recover
   rolling back interrupted transaction
   (verify step skipped, run `hg verify` to check your repository content)
 
 recover, explicit verify
 
   $ touch .hg/store/journal
   $ hg ci -Am0
   abort: abandoned transaction found
   (run 'hg recover' to clean up transaction)
   [255]
   $ hg recover --verify
   rolling back interrupted transaction
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
 
 recover, no verify
 
   $ touch .hg/store/journal
   $ hg ci -Am0
   abort: abandoned transaction found
   (run 'hg recover' to clean up transaction)
   [255]
   $ hg recover --no-verify
   rolling back interrupted transaction
   (verify step skipped, run `hg verify` to check your repository content)
 
 
 Check that zero-size journals are correctly aborted:
 
 #if unix-permissions no-root
   $ hg bundle -qa repo.hg
   $ chmod -w foo/.hg/store/00changelog.i
 
   $ hg -R foo unbundle repo.hg
   adding changesets
-  abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
+  abort: Permission denied: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob)
   [255]
 
   $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
 #endif
 

tests/test-legacy-exit-code.t

@@ -1,49 +1,50 b''
 Tests that the exit code is as expected when ui.detailed-exit-code is *not*
 enabled.
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > detailed-exit-code=no
   > EOF
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
 Expect exit code 0 on success
   $ hg ci -Aqm initial
 
   $ hg co nonexistent
   abort: unknown revision 'nonexistent'
   [255]
 
   $ hg co 'none()'
   abort: empty revision set
   [255]
 
   $ hg co 'invalid('
   hg: parse error at 8: not a prefix: end
   (invalid(
            ^ here)
   [255]
 
   $ hg co 'invalid('
   hg: parse error at 8: not a prefix: end
   (invalid(
            ^ here)
   [255]
 
   $ hg continue
   abort: no operation in progress
   [255]
 
   $ hg st --config a=b
   abort: malformed --config option: 'a=b' (use --config section.name=value)
   [255]
 
   $ echo b > a
   $ hg ci -m second
   $ echo c > a
   $ hg ci -m third
   $ hg --config extensions.rebase= rebase -r . -d 0 -q
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]

tests/test-log-linerange.t

@@ -1,1153 +1,1154 b''
   $ cat >> $HGRCPATH << EOF
   > [diff]
   > git = true
   > EOF
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat > foo << EOF
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -Am init
   adding foo
   $ cat > foo << EOF
   > 0
   > 0
   > 0
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -m 'more 0'
   $ sed 's/2/2+/' foo > foo.new
   $ mv foo.new foo
   $ cat > bar << EOF
   > a
   > b
   > c
   > d
   > e
   > EOF
   $ hg add bar
   $ hg ci -Am "2 -> 2+; added bar"
   $ cat >> foo << EOF
   > 5
   > 6
   > 7
   > 8
   > 9
   > 10
   > 11
   > EOF
   $ hg ci -m "to 11"
 
 Add some changes with two diff hunks
 
   $ sed 's/^1$/ 1/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11$/11+/' foo > foo.new
   $ mv foo.new foo
   $ hg ci -m '11 -> 11+; leading space before "1"'
 (make sure there are two hunks in "foo")
   $ hg diff -c .
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   $ sed 's/3/3+/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11+$/11-/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/a/a+/' bar > bar.new
   $ mv bar.new bar
   $ hg ci -m 'foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+'
 (make sure there are two hunks in "foo")
   $ hg diff -c . foo
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
 
   $ hg log -f -L foo,5:7 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
   $ hg log -f --graph -L foo,5:7 -p
   @  changeset:   5:cfdf972b3971
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   |
   |  diff --git a/foo b/foo
   |  --- a/foo
   |  +++ b/foo
   |  @@ -4,7 +4,7 @@
   |   0
   |    1
   |   2+
   |  -3
   |  +3+
   |   4
   |   5
   |   6
   |
   o  changeset:   4:eaec41c1a0c9
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     11 -> 11+; leading space before "1"
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -2,7 +2,7 @@
   :   0
   :   0
   :   0
   :  -1
   :  + 1
   :   2+
   :   3
   :   4
   :
   o  changeset:   2:63a884426fd0
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     2 -> 2+; added bar
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -3,6 +3,6 @@
   :   0
   :   0
   :   1
   :  -2
   :  +2+
   :   3
   :   4
   :
   o  changeset:   0:5ae1f82b9a00
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     init
   
      diff --git a/foo b/foo
      new file mode 100644
      --- /dev/null
      +++ b/foo
      @@ -0,0 +1,5 @@
      +0
      +1
      +2
      +3
      +4
   
 
 With --template.
 
   $ hg log -f -L foo,5:7 -T '{rev}:{node|short} {desc|firstline}\n'
   5:cfdf972b3971 foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   4:eaec41c1a0c9 11 -> 11+; leading space before "1"
   2:63a884426fd0 2 -> 2+; added bar
   0:5ae1f82b9a00 init
   $ hg log -f -L foo,5:7 -T json
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+",
     "node": "cfdf972b3971a2a59638bf9583c0debbffee5404",
     "parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"],
     "phase": "draft",
     "rev": 5,
     "tags": ["tip"],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "11 -> 11+; leading space before \"1\"",
     "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c",
     "parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"],
     "phase": "draft",
     "rev": 4,
     "tags": [],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "2 -> 2+; added bar",
     "node": "63a884426fd0b277fcd55895bbb2f230434576eb",
     "parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"],
     "phase": "draft",
     "rev": 2,
     "tags": [],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "init",
     "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "rev": 0,
     "tags": [],
     "user": "test"
    }
   ]
 
 With some white-space diff option, respective revisions are skipped.
 
   $ hg log -f -L foo,5:7 -p --config diff.ignorews=true
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Regular file patterns are not allowed.
 
   $ hg log -f -L foo,5:7 -p bar
   abort: FILE arguments are not compatible with --line-range option
   [10]
 
 Option --rev acts as a restriction.
 
   $ hg log -f -L foo,5:7 -p -r 'desc(2)'
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 With several -L patterns, changes touching any files in their respective line
 range are show.
 
   $ hg log -f -L foo,5:7 -L bar,1:2 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/bar b/bar
   --- a/bar
   +++ b/bar
   @@ -1,4 +1,4 @@
   -a
   +a+
    b
    c
    d
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,5 @@
   +a
   +b
   +c
   +d
   +e
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Multiple -L options with the same file yields changes touching any of
 specified line ranges.
 
   $ hg log -f -L foo,5:7 -L foo,14:15 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 A file with a comma in its name.
 
   $ cat > ba,z << EOF
   > q
   > w
   > e
   > r
   > t
   > y
   > EOF
   $ hg ci -Am 'querty'
   adding ba,z
   $ cat >> ba,z << EOF
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'more keys'
   $ cat > ba,z << EOF
   > a
   > z
   > e
   > r
   > t
   > y
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'azerty'
   $ hg log -f -L ba,z,1:2 -p
   changeset:   8:52373265138b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     azerty
   
   diff --git a/ba,z b/ba,z
   --- a/ba,z
   +++ b/ba,z
   @@ -1,5 +1,5 @@
   -q
   -w
   +a
   +z
    e
    r
    t
   
   changeset:   6:96ba8850f316
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     querty
   
   diff --git a/ba,z b/ba,z
   new file mode 100644
   --- /dev/null
   +++ b/ba,z
   @@ -0,0 +1,6 @@
   +q
   +w
   +e
   +r
   +t
   +y
   
 
 Exact prefix kinds work in -L options.
 
   $ mkdir dir
   $ cd dir
   $ hg log -f -L path:foo,5:7 -p
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Renames are followed.
 
   $ hg mv ../foo baz
   $ sed 's/1/1+/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'foo -> dir/baz; 1-1+'
   $ hg diff -c .
   diff --git a/foo b/dir/baz
   rename from foo
   rename to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   @@ -11,5 +11,5 @@
    7
    8
    9
   -10
   -11-
   +1+0
   +1+1-
   $ hg log -f -L relpath:baz,5:7 -p
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   diff --git a/foo b/dir/baz
   copy from foo
   copy to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Uncommitted changes with a rename
 
   $ hg mv baz bazn
   $ hg log -f -L bazn,5:7
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
 
 Uncommitted changes in requested line range
 
   $ sed 's/2/  /' bazn > bazn.new
   $ mv bazn.new bazn
   $ hg diff
   diff --git a/dir/baz b/dir/bazn
   rename from dir/baz
   rename to dir/bazn
   --- a/dir/baz
   +++ b/dir/bazn
   @@ -3,7 +3,7 @@
    0
    0
     1+
   -2+
   +  +
    3+
    4
    5
   $ hg log -f -L bazn,5:7
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
 
 Uncommitted changes in line-range + wdir()
 
   $ hg log -r 'wdir()' -f -L bazn,5:7 --limit 2 -p
   changeset:   2147483647:ffffffffffff
   parent:      9:6af29c3a778f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   diff --git a/dir/baz b/dir/bazn
   copy from dir/baz
   copy to dir/bazn
   --- a/dir/baz
   +++ b/dir/bazn
   @@ -3,7 +3,7 @@
    0
    0
     1+
   -2+
   +  +
    3+
    4
    5
   
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   diff --git a/foo b/dir/baz
   copy from foo
   copy to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   
 
   $ hg revert -a -C -q
 
 Copies.
 
   $ hg copy baz bbaz
   $ sed 's/6/6+/' bbaz > bbaz.new
   $ mv bbaz.new bbaz
   $ hg commit -m 'cp baz bbaz; 6-6+'
   $ hg diff -c .
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   $ hg log --copies -f -L bbaz,10:11 -p
   changeset:   10:91a3d3b6c546
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     cp baz bbaz; 6-6+
   
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
   $ hg log -f -L bbaz,10:11 -p
   changeset:   10:91a3d3b6c546
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     cp baz bbaz; 6-6+
   
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
 
 Binary files work but without diff hunks filtering.
 (Checking w/ and w/o diff.git option.)
 
   >>> open('binary', 'wb').write(b'this\nis\na\nbinary\0') and None
   $ hg add binary
   $ hg ci -m 'add a binary file' --quiet
   $ hg log -f -L binary,1:2 -p
   changeset:   11:dc865b608edf
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff --git a/dir/binary b/dir/binary
   new file mode 100644
   index 0000000000000000000000000000000000000000..c2e1fbed209fe919b3f189a6a31950e9adf61e45
   GIT binary patch
   literal 17
   Wc$_QA$SmdpqC~Ew%)G>+N(KNlNClYy
   
   
   $ hg log -f -L binary,1:2 -p --config diff.git=false
   changeset:   11:dc865b608edf
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff -r 91a3d3b6c546 -r dc865b608edf dir/binary
   Binary file dir/binary has changed
   
 
 Option --follow is required.
 
   $ hg log -L foo,5:7
   abort: --line-range requires --follow
   [10]
 
 Non-exact pattern kinds are not allowed.
 
   $ cd ..
   $ hg log -f -L glob:*a*,1:2
   hg: parse error: line range pattern 'glob:*a*' must match exactly one file
   [10]
 
 We get an error for removed files.
 
   $ hg rm dir/baz
   $ hg ci -m 'remove baz' --quiet
   $ hg log -f -L dir/baz,5:7 -p
   abort: cannot follow file not in parent revision: "dir/baz"
   [20]

tests/test-merge-default.t

@@ -1,190 +1,191 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg commit -A -ma
   adding a
 
   $ echo b >> a
   $ hg commit -mb
 
   $ echo c >> a
   $ hg commit -mc
 
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo d >> a
   $ hg commit -md
   created new head
 
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo e >> a
   $ hg commit -me
   created new head
 
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Should fail because not at a head:
 
   $ hg merge
   abort: working directory not at a head revision
   (use 'hg update' or merge with an explicit revision)
   [255]
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "f25cbe84d8b3: e"
   2 other heads for branch "default"
 
 Should fail because > 2 heads:
 
   $ HGMERGE=internal:other; export HGMERGE
   $ hg merge
   abort: branch 'default' has 3 heads - please merge with an explicit rev
   (run 'hg heads .' to see heads, specify rev with -r)
   [255]
 
 Should succeed (we're specifying commands.merge.require-rev=True just to test
 that it allows merge to succeed if we specify a revision):
 
   $ hg merge 2 --config commands.merge.require-rev=True
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg id -Tjson
   [
    {
     "bookmarks": [],
     "branch": "default",
     "dirty": "+",
     "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
     "node": "ffffffffffffffffffffffffffffffffffffffff",
     "parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"],
     "tags": ["tip"]
    }
   ]
   $ hg commit -mm1
 
 Should fail because we didn't specify a revision (even though it would have
 succeeded without this):
 
   $ hg merge --config commands.merge.require-rev=True
   abort: configuration requires specifying revision to merge with
   [10]
 
 Should succeed - 2 heads:
 
   $ hg merge -P
   changeset:   3:ea9ff125ff88
   parent:      1:1846eede8b68
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     d
   
   $ hg merge
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -mm2
 
   $ hg id -r 1 -Tjson
   [
    {
     "bookmarks": [],
     "branch": "default",
     "id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
     "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
     "tags": []
    }
   ]
 
 Should fail because we didn't specify a revision (even though it would have
 failed without this due to being on tip, but this check comes first):
 
   $ hg merge --config commands.merge.require-rev=True
   abort: configuration requires specifying revision to merge with
   [10]
 
 Should fail because at tip:
 
   $ hg merge
   abort: nothing to merge
   [255]
 
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Should fail because there is only one head:
 
   $ hg merge
   abort: nothing to merge
   (use 'hg update' instead)
   [255]
 
   $ hg up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo f >> a
   $ hg branch foobranch
   marked working directory as branch foobranch
   (branches are permanent and global, did you want a bookmark?)
   $ hg commit -mf
 
 Should fail because merge with other branch:
 
   $ hg merge
   abort: branch 'foobranch' has one head - please merge with an explicit rev
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]
 
 
 Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
 are not ancestors of 7, regardless of where their common ancestors are.
 
 Merge preview not affected by common ancestor:
 
   $ hg up -q 7
   $ hg merge -q -P 6
   2:2d95304fed5d
   4:f25cbe84d8b3
   5:a431fabd6039
   6:e88e33f3bf62
 
 Test experimental destination revset
 
   $ hg log -r '_destmerge()'
   abort: branch 'foobranch' has one head - please merge with an explicit rev
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]
 
 (on a branch with a two heads)
 
   $ hg up 5
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo f >> a
   $ hg commit -mf
   created new head
   $ hg log -r '_destmerge()'
   changeset:   6:e88e33f3bf62
   parent:      5:a431fabd6039
   parent:      3:ea9ff125ff88
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     m2
   
 
 (from the other head)
 
   $ hg log -r '_destmerge(e88e33f3bf62)'
   changeset:   8:b613918999e2
   tag:         tip
   parent:      5:a431fabd6039
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     f
   
 
 (from unrelated branch)
 
   $ hg log -r '_destmerge(foobranch)'
   abort: branch 'foobranch' has one head - please merge with an explicit rev
   (run 'hg heads' to see all heads, specify rev with -r)
   [255]

tests/test-merge-internal-tools-pattern.t

@@ -1,141 +1,142 b''
 Make sure that the internal merge tools (internal:fail, internal:local,
 internal:union and internal:other) are used when matched by a
 merge-pattern in hgrc
 
 Make sure HGMERGE doesn't interfere with the test:
 
   $ unset HGMERGE
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Initial file contents:
 
   $ echo "line 1" > f
   $ echo "line 2" >> f
   $ echo "line 3" >> f
   $ hg ci -Am "revision 0"
   adding f
 
   $ cat f
   line 1
   line 2
   line 3
 
 Branch 1: editing line 1:
 
   $ sed 's/line 1/first line/' f > f.new
   $ mv f.new f
   $ hg ci -Am "edited first line"
 
 Branch 2: editing line 3:
 
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed 's/line 3/third line/' f > f.new
   $ mv f.new f
   $ hg ci -Am "edited third line"
   created new head
 
 Merge using internal:fail tool:
 
   $ echo "[merge-patterns]" > .hg/hgrc
   $ echo "* = internal:fail" >> .hg/hgrc
 
   $ hg merge
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
   $ cat f
   line 1
   line 2
   third line
 
   $ hg stat
   M f
 
 Merge using internal:local tool:
 
   $ hg update -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
   $ mv .hg/hgrc.new .hg/hgrc
 
   $ hg merge
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f
   line 1
   line 2
   third line
 
   $ hg stat
   M f
 
 Merge using internal:other tool:
 
   $ hg update -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
   $ mv .hg/hgrc.new .hg/hgrc
 
   $ hg merge
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f
   first line
   line 2
   line 3
 
   $ hg stat
   M f
 
 Merge using default tool:
 
   $ hg update -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/hgrc
 
   $ hg merge
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f
   first line
   line 2
   third line
 
   $ hg stat
   M f
 
 Merge using internal:union tool:
 
   $ hg update -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "line 4a" >>f
   $ hg ci -Am "Adding fourth line (commit 4)"
   $ hg update 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "line 4b" >>f
   $ hg ci -Am "Adding fourth line v2 (commit 5)"
   created new head
 
   $ echo "[merge-patterns]" > .hg/hgrc
   $ echo "* = internal:union" >> .hg/hgrc
 
   $ hg merge 3
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f
   line 1
   line 2
   third line
   line 4b
   line 4a

tests/test-merge-local.t

@@ -1,151 +1,152 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Revision 0:
 
   $ echo "unchanged" > unchanged
   $ echo "remove me" > remove
   $ echo "copy me" > copy
   $ echo "move me" > move
   $ for i in 1 2 3 4 5 6 7 8 9; do
   >     echo "merge ok $i" >> zzz1_merge_ok
   > done
   $ echo "merge bad" > zzz2_merge_bad
   $ hg ci -Am "revision 0"
   adding copy
   adding move
   adding remove
   adding unchanged
   adding zzz1_merge_ok
   adding zzz2_merge_bad
 
 Revision 1:
 
   $ hg rm remove
   $ hg mv move moved
   $ hg cp copy copied
   $ echo "added" > added
   $ hg add added
   $ echo "new first line" > zzz1_merge_ok
   $ hg cat zzz1_merge_ok >> zzz1_merge_ok
   $ echo "new last line" >> zzz2_merge_bad
   $ hg ci -m "revision 1"
 
 Local changes to revision 0:
 
   $ hg co 0
   4 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo "new last line" >> zzz1_merge_ok
   $ echo "another last line" >> zzz2_merge_bad
 
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok
   +new last line
   --- a/zzz2_merge_bad
   +++ b/zzz2_merge_bad
   +another last line
 
   $ hg st
   M zzz1_merge_ok
   M zzz2_merge_bad
 
 Local merge with bad merge tool:
 
   $ HGMERGE=false hg co
   merging zzz1_merge_ok
   merging zzz2_merge_bad
   merging zzz2_merge_bad failed!
   3 files updated, 1 files merged, 2 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
   $ hg resolve -m
   (no more unresolved files)
 
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
   warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok
   +new last line
   --- a/zzz2_merge_bad
   +++ b/zzz2_merge_bad
   +another last line
   +=======
 
   $ hg st
   M zzz1_merge_ok
   M zzz2_merge_bad
   ? zzz2_merge_bad.orig
 
 Local merge with conflicts:
 
   $ hg resolve -m
   (no more unresolved files)
 
   $ hg co
   merging zzz1_merge_ok
   merging zzz2_merge_bad
   warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   3 files updated, 1 files merged, 2 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
   $ hg resolve -m
   (no more unresolved files)
 
   $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
   merging zzz1_merge_ok
   merging zzz2_merge_bad
   warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
 Are orig files from the last commit where we want them?
   $ ls .hg/origbackups
   zzz2_merge_bad
 
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok
   +new last line
   --- a/zzz2_merge_bad
   +++ b/zzz2_merge_bad
   +another last line
   +=======
   +=======
   +new last line
   +=======
 
   $ hg st
   M zzz1_merge_ok
   M zzz2_merge_bad
   ? zzz2_merge_bad.orig
 
 Local merge without conflicts:
 
   $ hg revert zzz2_merge_bad
 
   $ hg resolve -m
   (no more unresolved files)
 
   $ hg co
   merging zzz1_merge_ok
   4 files updated, 1 files merged, 2 files removed, 0 files unresolved
 
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok
   +new last line
 
   $ hg st
   M zzz1_merge_ok
   ? zzz2_merge_bad.orig
 

tests/test-merge-remove.t

@@ -1,116 +1,117 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo foo > foo
   $ echo bar > bar
   $ hg ci -qAm 'add foo bar'
 
   $ echo foo2 >> foo
   $ echo bleh > bar
   $ hg ci -m 'change foo bar'
 
   $ hg up -qC 0
   $ hg mv foo foo1
   $ echo foo1 > foo1
   $ hg cat foo >> foo1
   $ hg ci -m 'mv foo foo1'
   created new head
 
   $ hg merge
   merging foo1 and foo to foo1
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg debugstate --no-dates
   m   0         -2 unset               bar
   m   0         -2 unset               foo1
   copy: foo -> foo1
 
   $ hg st -q
   M bar
   M foo1
 
 
 Removing foo1 and bar:
 
   $ cp foo1 F
   $ cp bar B
   $ hg rm -f foo1 bar
 
   $ hg debugstate --no-dates
   r   0         -1 set                 bar
   r   0         -1 set                 foo1
   copy: foo -> foo1
 
   $ hg st -qC
   R bar
   R foo1
 
 
 Re-adding foo1 and bar:
 
   $ cp F foo1
   $ cp B bar
   $ hg add -v foo1 bar
   adding bar
   adding foo1
 
   $ hg debugstate --no-dates
   m   0         -2 unset               bar
   m   0         -2 unset               foo1
   copy: foo -> foo1
 
   $ hg st -qC
   M bar
   M foo1
     foo
 
 
 Reverting foo1 and bar:
 
   $ hg revert -vr . foo1 bar
   saving current version of bar as bar.orig
   saving current version of foo1 as foo1.orig
   reverting bar
   reverting foo1
 
   $ hg debugstate --no-dates
   m   0         -2 unset               bar
   m   0         -2 unset               foo1
   copy: foo -> foo1
 
   $ hg st -qC
   M bar
   M foo1
     foo
 
   $ hg diff
 
 Merge should not overwrite local file that is untracked after remove
 
   $ rm *
   $ hg up -qC
   $ hg rm bar
   $ hg ci -m 'remove bar'
   $ echo 'memories of buried pirate treasure' > bar
   $ hg merge
   bar: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [20]
   $ cat bar
   memories of buried pirate treasure
 
 Those who use force will lose
 
   $ hg merge -f
   file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? u
   merging foo1 and foo to foo1
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ cat bar
   bleh
   $ hg st
   M bar
   M foo1

tests/test-merge-revert.t

@@ -1,74 +1,75 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "added file1" > file1
   $ echo "added file2" > file2
   $ hg add file1 file2
   $ hg commit -m "added file1 and file2"
 
   $ echo "changed file1" >> file1
   $ hg commit -m "changed file1"
 
   $ hg -q log
   1:08a16e8e4408
   0:d29c767a4b52
   $ hg id
   08a16e8e4408 tip
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   d29c767a4b52
   $ echo "changed file1" >> file1
   $ hg id
   d29c767a4b52+
 
   $ hg revert --all
   reverting file1
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   d29c767a4b52
 
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   08a16e8e4408 tip
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "changed file1" >> file1
 
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   08a16e8e4408 tip
 
   $ hg revert --all
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   08a16e8e4408 tip
 
   $ hg revert -r tip --all
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   08a16e8e4408 tip
 
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   08a16e8e4408 tip
 

tests/test-merge-revert2.t

@@ -1,93 +1,94 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "added file1" > file1
   $ echo "another line of text" >> file1
   $ echo "added file2" > file2
   $ hg add file1 file2
   $ hg commit -m "added file1 and file2"
 
   $ echo "changed file1" >> file1
   $ hg commit -m "changed file1"
 
   $ hg -q log
   1:dfab7f3c2efb
   0:c3fa057dd86f
   $ hg id
   dfab7f3c2efb tip
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   c3fa057dd86f
 
   $ echo "changed file1" >> file1
   $ hg id
   c3fa057dd86f+
 
   $ hg revert --no-backup --all
   reverting file1
   $ hg diff
   $ hg status
   $ hg id
   c3fa057dd86f
 
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg diff
   $ hg status
   $ hg id
   dfab7f3c2efb tip
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "changed file1 different" >> file1
 
   $ hg update
   merging file1
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
 
   $ hg diff --nodates
   diff -r dfab7f3c2efb file1
   --- a/file1
   +++ b/file1
   @@ -1,3 +1,7 @@
    added file1
    another line of text
   +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
   +changed file1 different
   +=======
    changed file1
   +>>>>>>> destination:  dfab7f3c2efb - test: changed file1
 
   $ hg status
   M file1
   ? file1.orig
   $ hg id
   dfab7f3c2efb+ tip
 
   $ hg revert --no-backup --all
   reverting file1
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   dfab7f3c2efb tip
 
   $ hg revert -r tip --no-backup --all
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   dfab7f3c2efb tip
 
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg diff
   $ hg status
   ? file1.orig
   $ hg id
   dfab7f3c2efb tip
 

tests/test-merge-subrepos.t

@@ -1,148 +1,149 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo a > a
   $ hg ci -qAm 'add a'
 
   $ hg init subrepo
   $ echo 'subrepo = http://example.net/libfoo' > .hgsub
   $ hg ci -qAm 'added subrepo'
 
   $ hg up -qC 0
   $ echo ax > a
   $ hg ci -m 'changed a'
   created new head
 
   $ hg up -qC 1
   $ cd subrepo
   $ echo b > b
   $ hg add b
   $ cd ..
 
 Should fail, since there are added files to subrepo:
 
   $ hg merge
   abort: uncommitted changes in subrepository "subrepo"
   [255]
 
 Deleted files trigger a '+' marker in top level repos.  Deleted files are also
 noticed by `update --check` in the top level repo.
 
   $ hg ci -Sqm 'add b'
   $ echo change > subrepo/b
 
   $ hg ci -Sm 'change b'
   committing subrepository subrepo
 
   $ rm a
   $ hg id
   9bfe45a197d7+ tip
   $ hg sum
   parent: 4:9bfe45a197d7 tip
    change b
   branch: default
   commit: 1 deleted (clean)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 5 draft
 
   $ hg up --check -r '.^'
   abort: uncommitted changes
   [20]
   $ hg st -S
   ! a
   $ hg up -Cq .
 
 Test that dirty is consistent through subrepos
 
   $ rm subrepo/b
 
 A deleted subrepo file is flagged as dirty, like the top level repo
 
   $ hg id --config extensions.blackbox= --config blackbox.dirty=True \
   > --config blackbox.track='command commandfinish'
   9bfe45a197d7+ tip
   $ cat .hg/blackbox.log
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> serve --no-profile --cmdserver chgunix * (glob) (chg !)
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* (glob)
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* exited 0 * (glob)
 
 TODO: a deleted file should be listed as such, like the top level repo
 
   $ hg sum
   parent: 4:9bfe45a197d7 tip
    change b
   branch: default
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 5 draft
 
 Modified subrepo files are noticed by `update --check` and `summary`
 
   $ echo mod > subrepo/b
   $ hg st -S
   M subrepo/b
 
   $ hg up -r '.^' --check
   abort: uncommitted changes in subrepository "subrepo"
   [255]
 
   $ hg sum
   parent: 4:9bfe45a197d7 tip
    change b
   branch: default
   commit: 1 subrepos
   update: 1 new changesets, 2 branch heads (merge)
   phases: 5 draft
 
 TODO: why is -R needed here?  If it's because the subrepo is treated as a
 discrete unit, then this should probably warn or something.
   $ hg revert -R subrepo --no-backup subrepo/b -r .
 
   $ rm subrepo/b
   $ hg st -S
   ! subrepo/b
 
 `hg update --check` notices a subrepo with a missing file, like it notices a
 missing file in the top level repo.
 
   $ hg up -r '.^' --check
   abort: uncommitted changes in subrepository "subrepo"
   [255]
 
   $ hg up -r '.^' --config ui.interactive=True << EOF
   > d
   > EOF
   file 'b' was deleted in local [working copy] but was modified in other [destination].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? d
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 XXX: There's a difference between wdir() and '.', so there should be a status.
 `hg files -S` from the top is also missing 'subrepo/b'. The files should be
 seen as deleted (and, maybe even missing? in which case `hg files` should list
 it)
 
   $ hg st -S
   R subrepo/b (missing-correct-output !)
   $ hg st -R subrepo
   R subrepo/b (missing-correct-output !)
 
 (note: return [1] because no files "match" since the list is empty)
 
   $ hg files -R subrepo
   [1]
   $ hg files -R subrepo -r '.'
   subrepo/b
 
   $ hg bookmark -r tip @other
   $ echo xyz > subrepo/c
   $ hg ci -SAm 'add c'
   adding subrepo/c
   committing subrepository subrepo
   created new head
   $ rm subrepo/c
 
 Merge sees deleted subrepo files as an uncommitted change
 
   $ hg merge @other
   abort: uncommitted changes in subrepository "subrepo"
   [255]

tests/test-merge4.t

@@ -1,59 +1,60 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #2"
   created new head
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm b
   $ echo This is file c22 > c
 
 Test hg behaves when committing with a missing file added by a merge
 
   $ hg commit -m "commit #3"
   abort: cannot commit merge with missing files
   [255]
 
 
 Test conflict*() revsets
 
 # Bad usage
   $ hg log -r 'conflictlocal(foo)'
   hg: parse error: conflictlocal takes no arguments
   [10]
   $ hg log -r 'conflictother(foo)'
   hg: parse error: conflictother takes no arguments
   [10]
   $ hg co -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 # No merge parents when not merging
   $ hg log -r 'conflictlocal() + conflictother()'
 # No merge parents when there is no conflict
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg log -r 'conflictlocal() + conflictother()'
   $ hg co -C .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo conflict > b
   $ hg ci -Aqm 'conflicting change to b'
   $ hg merge 1
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 # Shows merge parents when there is a conflict
   $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
   3 conflicting change to b
   $ hg log -r 'conflictother()' -T '{rev} {desc}\n'
   1 commit #1

tests/test-merge5.t

@@ -1,36 +1,37 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ echo This is file b1 > b
   $ hg add a b
   $ hg commit -m "commit #0"
   $ echo This is file b22 > b
   $ hg commit -m "comment #1"
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm b
   $ hg commit -A -m "comment #2"
   removing b
   created new head
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm b
   $ hg update -c 2
   abort: uncommitted changes
   [20]
   $ hg revert b
   $ hg update -c 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mv a c
 
 Should abort:
 
   $ hg update 1
   abort: uncommitted changes
   (commit or update --clean to discard changes)
   [255]
   $ mv c a
 
 Should succeed:
 
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-mq-guards.t

@@ -1,593 +1,594 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
 
   $ echo x > x
   $ hg ci -Ama
   adding x
 
   $ hg qnew a.patch
   $ echo a > a
   $ hg add a
   $ hg qrefresh
 
   $ hg qnew b.patch
   $ echo b > b
   $ hg add b
   $ hg qrefresh
 
   $ hg qnew c.patch
   $ echo c > c
   $ hg add c
   $ hg qrefresh
 
   $ hg qpop -a
   popping c.patch
   popping b.patch
   popping a.patch
   patch queue now empty
 
 
 should fail
 
   $ hg qguard does-not-exist.patch +bleh
   abort: no patch named does-not-exist.patch
   [255]
 
 
 should fail
 
   $ hg qguard +fail
   abort: no patches applied
   [255]
 
   $ hg qpush
   applying a.patch
   now at: a.patch
 
 should guard a.patch
 
   $ hg qguard +a
 
 should print +a
 
   $ hg qguard
   a.patch: +a
   $ hg qpop
   popping a.patch
   patch queue now empty
 
 
 should fail
 
   $ hg qpush a.patch
   cannot push 'a.patch' - guarded by '+a'
   [1]
 
   $ hg qguard a.patch
   a.patch: +a
 
 should push b.patch
 
   $ hg qpush
   applying b.patch
   now at: b.patch
 
   $ hg qpop
   popping b.patch
   patch queue now empty
 
 test selection of an empty guard
 
   $ hg qselect ""
   abort: guard cannot be an empty string
   [255]
   $ hg qselect a
   number of unguarded, unapplied patches has changed from 2 to 3
 
 should push a.patch
 
   $ hg qpush
   applying a.patch
   now at: a.patch
 
   $ hg qguard -- c.patch -a
 
 should print -a
 
   $ hg qguard c.patch
   c.patch: -a
 
 
 should skip c.patch
 
   $ hg qpush -a
   applying b.patch
   skipping c.patch - guarded by '-a'
   now at: b.patch
   $ hg qnext
   all patches applied
   [1]
 
 should display b.patch
 
   $ hg qtop
   b.patch
 
   $ hg qguard -n c.patch
 
 should push c.patch
 
   $ hg qpush -a
   applying c.patch
   now at: c.patch
 
   $ hg qpop -a
   popping c.patch
   popping b.patch
   popping a.patch
   patch queue now empty
   $ hg qselect -n
   guards deactivated
   number of unguarded, unapplied patches has changed from 3 to 2
 
 should push all
 
   $ hg qpush -a
   applying b.patch
   applying c.patch
   now at: c.patch
 
   $ hg qpop -a
   popping c.patch
   popping b.patch
   patch queue now empty
   $ hg qguard a.patch +1
   $ hg qguard b.patch +2
   $ hg qselect 1
   number of unguarded, unapplied patches has changed from 1 to 2
 
 should push a.patch, not b.patch
 
   $ hg qpush
   applying a.patch
   now at: a.patch
   $ hg qpush
   applying c.patch
   now at: c.patch
   $ hg qpop -a
   popping c.patch
   popping a.patch
   patch queue now empty
 
   $ hg qselect 2
 
 should push b.patch
 
   $ hg qpush
   applying b.patch
   now at: b.patch
   $ hg qpush -a
   applying c.patch
   now at: c.patch
   $ hg qprev
   b.patch
 
 Used to be an issue with holes in the patch sequence
 So, put one hole on the base and ask for topmost patch.
 
   $ hg qtop
   c.patch
   $ hg qpop -a
   popping c.patch
   popping b.patch
   patch queue now empty
 
   $ hg qselect 1 2
   number of unguarded, unapplied patches has changed from 2 to 3
 
 should push a.patch, b.patch
 
   $ hg qpush
   applying a.patch
   now at: a.patch
   $ hg qpush
   applying b.patch
   now at: b.patch
   $ hg qpop -a
   popping b.patch
   popping a.patch
   patch queue now empty
 
   $ hg qguard -- a.patch +1 +2 -3
   $ hg qselect 1 2 3
   number of unguarded, unapplied patches has changed from 3 to 2
 
 
 list patches and guards
 
   $ hg qguard -l
   a.patch: +1 +2 -3
   b.patch: +2
   c.patch: unguarded
 
 have at least one patch applied to test coloring
 
   $ hg qpush
   applying b.patch
   now at: b.patch
 
 list patches and guards with color
 
   $ hg --config extensions.color= qguard --config color.mode=ansi \
   >     -l --color=always
   \x1b[0;30;1ma.patch\x1b[0m: \x1b[0;33m+1\x1b[0m \x1b[0;33m+2\x1b[0m \x1b[0;31m-3\x1b[0m (esc)
   \x1b[0;34;1;4mb.patch\x1b[0m: \x1b[0;33m+2\x1b[0m (esc)
   \x1b[0;30;1mc.patch\x1b[0m: \x1b[0;32munguarded\x1b[0m (esc)
 
 should pop b.patch
 
   $ hg qpop
   popping b.patch
   patch queue now empty
 
 list series
 
   $ hg qseries -v
   0 G a.patch
   1 U b.patch
   2 U c.patch
 
 list guards
 
   $ hg qselect
   1
   2
   3
 
 should push b.patch
 
   $ hg qpush
   applying b.patch
   now at: b.patch
 
   $ hg qpush -a
   applying c.patch
   now at: c.patch
   $ hg qselect -n --reapply -v
   guards deactivated
   popping guarded patches
   popping c.patch
   popping b.patch
   patch queue now empty
   reapplying unguarded patches
   skipping a.patch - guarded by '+1' '+2'
   skipping b.patch - guarded by '+2'
   skipping a.patch - guarded by '+1' '+2'
   skipping b.patch - guarded by '+2'
   applying c.patch
   patching file c
   adding c
   committing files:
   c
   committing manifest
   committing changelog
   now at: c.patch
 
 guards in series file: +1 +2 -3
 
   $ hg qselect -s
   +1
   +2
   -3
 
 should show c.patch
 
   $ hg qapplied
   c.patch
 
   $ hg qrename a.patch new.patch
 
 should show :
 
 
 new.patch: +1 +2 -3
 
 
 b.patch: +2
 
 
 c.patch: unguarded
 
   $ hg qguard -l
   new.patch: +1 +2 -3
   b.patch: +2
   c.patch: unguarded
 
   $ hg qnew d.patch
   $ hg qpop
   popping d.patch
   now at: c.patch
 
 should show new.patch and b.patch as Guarded, c.patch as Applied
 
 
 and d.patch as Unapplied
 
   $ hg qseries -v
   0 G new.patch
   1 G b.patch
   2 A c.patch
   3 U d.patch
 
 qseries again, but with color
 
   $ hg --config extensions.color= --config color.mode=ansi qseries -v --color=always
   0 G \x1b[0;30;1mnew.patch\x1b[0m (esc)
   1 G \x1b[0;30;1mb.patch\x1b[0m (esc)
   2 A \x1b[0;34;1;4mc.patch\x1b[0m (esc)
   3 U \x1b[0;30;1md.patch\x1b[0m (esc)
 
   $ hg qguard d.patch +2
 
 new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
 
   $ hg qseries -v
   0 G new.patch
   1 G b.patch
   2 A c.patch
   3 G d.patch
 
   $ qappunappv()
   > {
   >     for command in qapplied "qapplied -v" qunapplied "qunapplied -v"; do
   >         echo % hg $command
   >         hg $command
   >     done
   > }
 
   $ hg qpop -a
   popping c.patch
   patch queue now empty
   $ hg qguard -l
   new.patch: +1 +2 -3
   b.patch: +2
   c.patch: unguarded
   d.patch: +2
   $ qappunappv
   % hg qapplied
   % hg qapplied -v
   % hg qunapplied
   c.patch
   % hg qunapplied -v
   0 G new.patch
   1 G b.patch
   2 U c.patch
   3 G d.patch
   $ hg qselect 1
   number of unguarded, unapplied patches has changed from 1 to 2
   $ qappunappv
   % hg qapplied
   % hg qapplied -v
   % hg qunapplied
   new.patch
   c.patch
   % hg qunapplied -v
   0 U new.patch
   1 G b.patch
   2 U c.patch
   3 G d.patch
   $ hg qpush -a
   applying new.patch
   skipping b.patch - guarded by '+2'
   applying c.patch
   skipping d.patch - guarded by '+2'
   now at: c.patch
   $ qappunappv
   % hg qapplied
   new.patch
   c.patch
   % hg qapplied -v
   0 A new.patch
   1 G b.patch
   2 A c.patch
   % hg qunapplied
   % hg qunapplied -v
   3 G d.patch
   $ hg qselect 2
   number of unguarded, unapplied patches has changed from 0 to 1
   $ qappunappv
   % hg qapplied
   new.patch
   c.patch
   % hg qapplied -v
   0 A new.patch
   1 U b.patch
   2 A c.patch
   % hg qunapplied
   d.patch
   % hg qunapplied -v
   3 U d.patch
 
   $ for patch in `hg qseries`; do
   >     echo % hg qapplied $patch
   >     hg qapplied $patch
   >     echo % hg qunapplied $patch
   >     hg qunapplied $patch
   > done
   % hg qapplied new.patch
   new.patch
   % hg qunapplied new.patch
   b.patch
   d.patch
   % hg qapplied b.patch
   new.patch
   % hg qunapplied b.patch
   d.patch
   % hg qapplied c.patch
   new.patch
   c.patch
   % hg qunapplied c.patch
   d.patch
   % hg qapplied d.patch
   new.patch
   c.patch
   % hg qunapplied d.patch
 
 
 hg qseries -m: only b.patch should be shown
 the guards file was not ignored in the past
 
   $ hg qdelete -k b.patch
   $ hg qseries -m
   b.patch
 
 hg qseries -m with color
 
   $ hg --config extensions.color= --config color.mode=ansi qseries -m --color=always
   \x1b[0;31;1mb.patch\x1b[0m (esc)
 
 
 excercise corner cases in "qselect --reapply"
 
   $ hg qpop -a
   popping c.patch
   popping new.patch
   patch queue now empty
   $ hg qguard -- new.patch -not-new
   $ hg qguard -- c.patch -not-c
   $ hg qguard -- d.patch -not-d
   $ hg qpush -a
   applying new.patch
   applying c.patch
   applying d.patch
   patch d.patch is empty
   now at: d.patch
   $ hg qguard -l
   new.patch: -not-new
   c.patch: -not-c
   d.patch: -not-d
   $ hg qselect --reapply not-d
   popping guarded patches
   popping d.patch
   now at: c.patch
   reapplying unguarded patches
   cannot push 'd.patch' - guarded by '-not-d'
   $ hg qser -v
   0 A new.patch
   1 A c.patch
   2 G d.patch
   $ hg qselect --reapply -n
   guards deactivated
   $ hg qpush
   applying d.patch
   patch d.patch is empty
   now at: d.patch
   $ hg qser -v
   0 A new.patch
   1 A c.patch
   2 A d.patch
   $ hg qselect --reapply not-c
   popping guarded patches
   popping d.patch
   popping c.patch
   now at: new.patch
   reapplying unguarded patches
   applying d.patch
   patch d.patch is empty
   now at: d.patch
   $ hg qser -v
   0 A new.patch
   1 G c.patch
   2 A d.patch
   $ hg qselect --reapply not-new
   popping guarded patches
   popping d.patch
   popping new.patch
   patch queue now empty
   reapplying unguarded patches
   applying c.patch
   applying d.patch
   patch d.patch is empty
   now at: d.patch
   $ hg qser -v
   0 G new.patch
   1 A c.patch
   2 A d.patch
 
 test that qselect shows "number of guarded, applied patches" correctly
 
   $ hg qimport -q -e b.patch
   adding b.patch to series file
   $ hg qguard -- b.patch -not-b
   $ hg qpop -a -q
   patch queue now empty
   $ hg qunapplied -v
   0 G new.patch
   1 U c.patch
   2 U d.patch
   3 U b.patch
   $ hg qselect not-new not-c
   number of unguarded, unapplied patches has changed from 3 to 2
   $ hg qpush -q -a
   patch d.patch is empty
   now at: b.patch
 
   $ hg qapplied -v
   0 G new.patch
   1 G c.patch
   2 A d.patch
   3 A b.patch
   $ hg qselect --none
   guards deactivated
   $ hg qselect not-new not-c not-d
   number of guarded, applied patches has changed from 0 to 1
 
 test that "qselect --reapply" reapplies patches successfully when the
 already applied patch becomes unguarded and it follows the already
 guarded (= not yet applied) one.
 
   $ hg qpop -q -a
   patch queue now empty
   $ hg qselect not-new not-c
   number of unguarded, unapplied patches has changed from 1 to 2
   $ hg qpush -q -a
   patch d.patch is empty
   now at: b.patch
   $ hg qapplied -v
   0 G new.patch
   1 G c.patch
   2 A d.patch
   3 A b.patch
   $ hg qselect -q --reapply not-c not-b
   now at: d.patch
   cannot push 'b.patch' - guarded by '-not-b'
   $ hg qseries -v
   0 U new.patch
   1 G c.patch
   2 A d.patch
   3 G b.patch
 
 test that "qselect --reapply" checks applied patches correctly when no
 applied patches becomes guarded but some of unapplied ones become
 unguarded.
 
   $ hg qpop -q -a
   patch queue now empty
   $ hg qselect not-new not-c not-d
   number of unguarded, unapplied patches has changed from 2 to 1
   $ hg qpush -q -a
   now at: b.patch
   $ hg qapplied -v
   0 G new.patch
   1 G c.patch
   2 G d.patch
   3 A b.patch
   $ hg qselect -q --reapply not-new not-c
   $ hg qseries -v
   0 G new.patch
   1 G c.patch
   2 U d.patch
   3 A b.patch

tests/test-mq-qsave.t

@@ -1,15 +1,16 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo 'base' > base
   $ hg ci -Ambase
   adding base
 
   $ hg qnew -mmqbase mqbase
 
   $ hg qsave
   $ hg qrestore 2
   restoring status: hg patches saved state
 

tests/test-mq-symlinks.t

@@ -1,112 +1,113 b''
 #require symlink
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
   $ hg qnew base.patch
   $ echo aaa > a
   $ echo bbb > b
   $ echo ccc > c
   $ hg add a b c
   $ hg qrefresh
   $ readlink.py a
   a -> a not a symlink
 
 
 test replacing a file with a symlink
 
   $ hg qnew symlink.patch
   $ rm a
   $ ln -s b a
   $ hg qrefresh --git
   $ readlink.py a
   a -> b
 
   $ hg qpop
   popping symlink.patch
   now at: base.patch
   $ hg qpush
   applying symlink.patch
   now at: symlink.patch
   $ readlink.py a
   a -> b
 
 
 test updating a symlink
 
   $ rm a
   $ ln -s c a
   $ hg qnew --git -f updatelink
   $ readlink.py a
   a -> c
   $ hg qpop
   popping updatelink
   now at: symlink.patch
   $ hg qpush --debug
   applying updatelink
   patching file a
   committing files:
   a
   committing manifest
   committing changelog
   updating the branch cache
   now at: updatelink
   $ readlink.py a
   a -> c
   $ hg st
 
 
 test replacing a symlink with a file
 
   $ ln -s c s
   $ hg add s
   $ hg qnew --git -f addlink
   $ rm s
   $ echo sss > s
   $ hg qnew --git -f replacelinkwithfile
   $ hg qpop
   popping replacelinkwithfile
   now at: addlink
   $ hg qpush
   applying replacelinkwithfile
   now at: replacelinkwithfile
   $ cat s
   sss
   $ hg st
 
 
 test symlink removal
 
   $ hg qnew removesl.patch
   $ hg rm a
   $ hg qrefresh --git
   $ hg qpop
   popping removesl.patch
   now at: replacelinkwithfile
   $ hg qpush
   applying removesl.patch
   now at: removesl.patch
   $ hg st -c
   C b
   C c
   C s
 
 replace broken symlink with another broken symlink
 
   $ ln -s linka linka
   $ hg add linka
   $ hg qnew link
   $ hg mv linka linkb
   $ rm linkb
   $ ln -s linkb linkb
   $ hg qnew movelink
   $ hg qpop
   popping movelink
   now at: link
   $ hg qpush
   applying movelink
   now at: movelink
   $ readlink.py linkb
   linkb -> linkb

tests/test-paths.t

@@ -1,532 +1,527 b''
   $ hg init a
   $ hg clone a b
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
 
 with no paths:
 
   $ hg paths
   $ hg paths unknown
   not found!
   [1]
   $ hg paths -Tjson
   [
   ]
 
 with paths:
 
   $ echo '[paths]' >> .hg/hgrc
   $ echo 'dupe = ../b#tip' >> .hg/hgrc
   $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
   $ hg in dupe
   comparing with $TESTTMP/b
   no changes found
   [1]
   $ cd ..
   $ hg -R a in dupe
   comparing with $TESTTMP/b
   no changes found
   [1]
   $ cd a
   $ hg paths
   dupe = $TESTTMP/b#tip
   expand = $TESTTMP/a/$SOMETHING/bar
   $ SOMETHING=foo hg paths
   dupe = $TESTTMP/b#tip
   expand = $TESTTMP/a/foo/bar
 #if msys
   $ SOMETHING=//foo hg paths
   dupe = $TESTTMP/b#tip
   expand = /foo/bar
 #else
   $ SOMETHING=/foo hg paths
   dupe = $TESTTMP/b#tip
   expand = /foo/bar
 #endif
   $ hg paths -q
   dupe
   expand
   $ hg paths dupe
   $TESTTMP/b#tip
   $ hg paths -q dupe
   $ hg paths unknown
   not found!
   [1]
   $ hg paths -q unknown
   [1]
 
 formatter output with paths:
 
   $ echo 'dupe:pushurl = https://example.com/dupe' >> .hg/hgrc
   $ hg paths -Tjson | sed 's|\\\\|\\|g'
   [
    {
     "name": "dupe",
     "pushurl": "https://example.com/dupe",
     "url": "$TESTTMP/b#tip"
    },
    {
     "name": "expand",
     "url": "$TESTTMP/a/$SOMETHING/bar"
    }
   ]
   $ hg paths -Tjson dupe | sed 's|\\\\|\\|g'
   [
    {
     "name": "dupe",
     "pushurl": "https://example.com/dupe",
     "url": "$TESTTMP/b#tip"
    }
   ]
   $ hg paths -Tjson -q unknown
   [
   ]
   [1]
 
 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
   $ hg log -rnull -T '{join(peerurls, "\n")}\n'
   dupe=$TESTTMP/b#tip
   expand=$TESTTMP/a/$SOMETHING/bar
   $ hg log -rnull -T '{peerurls % "{name}: {url}\n"}'
   dupe: $TESTTMP/b#tip
   expand: $TESTTMP/a/$SOMETHING/bar
   $ hg log -rnull -T '{get(peerurls, "dupe")}\n'
   $TESTTMP/b#tip
 #if windows
   $ hg log -rnull -T '{peerurls % "{urls|json}\n"}'
   [{"pushurl": "https://example.com/dupe", "url": "$STR_REPR_TESTTMP\\b#tip"}]
   [{"url": "$STR_REPR_TESTTMP\\a\\$SOMETHING\\bar"}]
 #else
   $ hg log -rnull -T '{peerurls % "{urls|json}\n"}'
   [{"pushurl": "https://example.com/dupe", "url": "$TESTTMP/b#tip"}]
   [{"url": "$TESTTMP/a/$SOMETHING/bar"}]
 #endif
 
  (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
   pushurl: https://example.com/dupe
   $ hg log -rnull -T '{peerurls.dupe.pushurl}\n'
   https://example.com/dupe
 
  (in JSON, it's a dict of urls)
 
   $ hg log -rnull -T '{peerurls|json}\n' | sed 's|\\\\|/|g'
   {"dupe": "$TESTTMP/b#tip", "expand": "$TESTTMP/a/$SOMETHING/bar"}
 
 password should be masked in plain output, but not in machine-readable/template
 output:
 
   $ echo 'insecure = http://foo:[e-mail]/' >> .hg/hgrc
   $ hg paths insecure
   http://foo:***@example.com/
   $ hg paths -Tjson insecure
   [
    {
     "name": "insecure",
     "url": "http://foo:[e-mail]/"
    }
   ]
   $ hg log -rnull -T '{get(peerurls, "insecure")}\n'
   http://foo:[e-mail]/
 
 zeroconf wraps ui.configitems(), which shouldn't crash at least:
 
 XXX-PYOXIDIZER Pyoxidizer build have trouble with zeroconf for unclear reason,
 we accept the bad output for now as this is the last thing in the way of
 testing the pyoxidizer build.
 
 #if no-pyoxidizer
   $ hg paths --config extensions.zeroconf=
   dupe = $TESTTMP/b#tip
   dupe:pushurl = https://example.com/dupe
   expand = $TESTTMP/a/$SOMETHING/bar
   insecure = http://foo:***@example.com/
 #else
   $ hg paths --config extensions.zeroconf=
   abort: An invalid argument was supplied (known-bad-output !)
   [255]
 #endif
 
 
   $ cd ..
 
 sub-options for an undeclared path are ignored
 
   $ hg init suboptions
   $ cd suboptions
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > path0 = https://example.com/path0
   > path1:pushurl = https://example.com/path1
   > EOF
   $ hg paths
   path0 = https://example.com/path0
 
 unknown sub-options aren't displayed
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > path0 = https://example.com/path0
   > path0:foo = https://example.com/path1
   > EOF
 
   $ hg paths
   path0 = https://example.com/path0
 
 :pushurl must be a URL
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > default = /path/to/nothing
   > default:pushurl = /not/a/url
   > EOF
 
   $ hg paths
   (paths.default:pushurl not a URL; ignoring: "/not/a/url")
   default = /path/to/nothing
 
 #fragment is not allowed in :pushurl
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > default = https://example.com/repo
   > invalid = https://example.com/repo
   > invalid:pushurl = https://example.com/repo#branch
   > EOF
 
   $ hg paths
   ("#fragment" in paths.invalid:pushurl not supported; ignoring)
   default = https://example.com/repo
   invalid = https://example.com/repo
   invalid:pushurl = https://example.com/repo
 
   $ cd ..
 
 'file:' disables [paths] entries for clone destination
 
   $ cat >> $HGRCPATH <<EOF
   > [paths]
   > gpath1 = http://hg.example.com
   > EOF
 
   $ hg clone a gpath1
   abort: cannot create new http repository
   [255]
 
   $ hg clone a file:gpath1
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd gpath1
   $ hg -q id
   000000000000
 
   $ cd ..
 
 Testing path referencing other paths
 ====================================
 
 basic setup
 -----------
 
-  $ ls -1
-  a
-  b
-  gpath1
-  suboptions
   $ hg init chained_path
   $ cd chained_path
   $ cat << EOF > .hg/hgrc
   > [paths]
   > default=../a
   > other_default=path://default
   > path_with_branch=../branchy#foo
   > other_branch=path://path_with_branch
   > other_branched=path://path_with_branch#default
   > pushdest=../push-dest
   > pushdest:pushrev=default
   > pushdest2=path://pushdest
   > pushdest-overwrite=path://pushdest
   > pushdest-overwrite:pushrev=foo
   > EOF
 
   $ hg init ../branchy
   $ hg init ../push-dest
   $ hg debugbuilddag -R ../branchy '.:base+3<base@foo+5'
   $ hg log -G -T '{branch}\n' -R ../branchy
   o  foo
   |
   o  foo
   |
   o  foo
   |
   o  foo
   |
   o  foo
   |
   | o  default
   | |
   | o  default
   | |
   | o  default
   |/
   o  default
   
 
   $ hg paths
   default = $TESTTMP/a
   gpath1 = http://hg.example.com/
   other_branch = $TESTTMP/branchy#foo
   other_branched = $TESTTMP/branchy#default
   other_default = $TESTTMP/a
   path_with_branch = $TESTTMP/branchy#foo
   pushdest = $TESTTMP/push-dest
   pushdest:pushrev = default
   pushdest-overwrite = $TESTTMP/push-dest
   pushdest-overwrite:pushrev = foo
   pushdest2 = $TESTTMP/push-dest
   pushdest2:pushrev = default
 
 test basic chaining
 -------------------
 
   $ hg path other_default
   $TESTTMP/a
   $ hg pull default
   pulling from $TESTTMP/a
   no changes found
   $ hg pull other_default
   pulling from $TESTTMP/a
   no changes found
 
 test inheritance of the #fragment part
 --------------------------------------
 
   $ hg pull path_with_branch
   pulling from $TESTTMP/branchy
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 0 changes to 0 files
   new changesets 1ea73414a91b:bcebb50b77de
   (run 'hg update' to get a working copy)
   $ hg pull other_branch
   pulling from $TESTTMP/branchy
   no changes found
   $ hg pull other_branched
   pulling from $TESTTMP/branchy
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 0 changes to 0 files (+1 heads)
   new changesets 66f7d451a68b:2dc09a01254d
   (run 'hg heads' to see heads)
 
 test inheritance of the suboptions
 ----------------------------------
 
   $ hg push pushdest
   pushing to $TESTTMP/push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 0 changes to 0 files
   $ hg push pushdest2
   pushing to $TESTTMP/push-dest
   searching for changes
   no changes found
   [1]
   $ hg push pushdest-overwrite --new-branch
   pushing to $TESTTMP/push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 0 changes to 0 files (+1 heads)
 
 Test chaining path:// definition
 --------------------------------
 
 This is currently unsupported, but feel free to implement the necessary
 dependency detection.
 
   $ cat << EOF >> .hg/hgrc
   > chain_path=path://other_default
   > EOF
 
   $ hg id
   000000000000
   $ hg path
   abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
   $ hg pull chain_path
   abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
 
 Doing an actual circle should always be an issue
 
   $ cat << EOF >> .hg/hgrc
   > rock=path://cissors
   > cissors=path://paper
   > paper=://rock
   > EOF
 
   $ hg id
   000000000000
   $ hg path
   abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
   $ hg pull chain_path
   abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
 
 Test basic error cases
 ----------------------
 
   $ cat << EOF > .hg/hgrc
   > [paths]
   > error-missing=path://unknown
   > EOF
   $ hg path
   abort: cannot use `path://unknown`, "unknown" is not a known path
   [255]
   $ hg pull error-missing
   abort: cannot use `path://unknown`, "unknown" is not a known path
   [255]
 
 Test path pointing to multiple urls
 ===================================
 
 Simple cases
 ------------
 - one layer
 - one list
 - no special option
 
   $ cat << EOF > .hg/hgrc
   > [paths]
   > one-path=foo
   > multiple-path=foo,bar,baz,https://example.org/
   > multiple-path:multi-urls=yes
   > EOF
   $ hg path
   gpath1 = http://hg.example.com/
   multiple-path = $TESTTMP/chained_path/foo
   multiple-path:multi-urls = yes
   multiple-path = $TESTTMP/chained_path/bar
   multiple-path:multi-urls = yes
   multiple-path = $TESTTMP/chained_path/baz
   multiple-path:multi-urls = yes
   multiple-path = https://example.org/
   multiple-path:multi-urls = yes
   one-path = $TESTTMP/chained_path/foo
 
 Reference to a list
 -------------------
 
   $ cat << EOF >> .hg/hgrc
   > ref-to-multi=path://multiple-path
   > EOF
   $ hg path | grep ref-to-multi
   ref-to-multi = $TESTTMP/chained_path/foo
   ref-to-multi:multi-urls = yes
   ref-to-multi = $TESTTMP/chained_path/bar
   ref-to-multi:multi-urls = yes
   ref-to-multi = $TESTTMP/chained_path/baz
   ref-to-multi:multi-urls = yes
   ref-to-multi = https://example.org/
   ref-to-multi:multi-urls = yes
 
 List with a reference
 ---------------------
 
   $ cat << EOF >> .hg/hgrc
   > multi-with-ref=path://one-path, ssh://babar@savannah/celeste-ville
   > multi-with-ref:multi-urls=yes
   > EOF
   $ hg path | grep multi-with-ref
   multi-with-ref = $TESTTMP/chained_path/foo
   multi-with-ref:multi-urls = yes
   multi-with-ref = ssh://babar@savannah/celeste-ville
   multi-with-ref:multi-urls = yes
 
 List with a reference to a list
 -------------------------------
 
   $ cat << EOF >> .hg/hgrc
   > multi-to-multi-ref = path://multiple-path, ssh://celeste@savannah/celeste-ville
   > multi-to-multi-ref:multi-urls = yes
   > EOF
   $ hg path | grep multi-to-multi-ref
   multi-to-multi-ref = $TESTTMP/chained_path/foo
   multi-to-multi-ref:multi-urls = yes
   multi-to-multi-ref = $TESTTMP/chained_path/bar
   multi-to-multi-ref:multi-urls = yes
   multi-to-multi-ref = $TESTTMP/chained_path/baz
   multi-to-multi-ref:multi-urls = yes
   multi-to-multi-ref = https://example.org/
   multi-to-multi-ref:multi-urls = yes
   multi-to-multi-ref = ssh://celeste@savannah/celeste-ville
   multi-to-multi-ref:multi-urls = yes
 
 individual suboptions are inherited
 -----------------------------------
 
   $ cat << EOF >> .hg/hgrc
   > with-pushurl = foo
   > with-pushurl:pushurl = http://foo.bar/
   > with-pushrev = bar
   > with-pushrev:pushrev = draft()
   > with-both = toto
   > with-both:pushurl = http://ta.ta
   > with-both:pushrev = secret()
   > ref-all-no-opts = path://with-pushurl, path://with-pushrev, path://with-both
   > ref-all-no-opts:multi-urls = yes
   > with-overwrite = path://with-pushurl, path://with-pushrev, path://with-both
   > with-overwrite:multi-urls = yes
   > with-overwrite:pushrev = public()
   > EOF
   $ hg path | grep with-pushurl
   with-pushurl = $TESTTMP/chained_path/foo
   with-pushurl:pushurl = http://foo.bar/
   $ hg path | grep with-pushrev
   with-pushrev = $TESTTMP/chained_path/bar
   with-pushrev:pushrev = draft()
   $ hg path | grep with-both
   with-both = $TESTTMP/chained_path/toto
   with-both:pushrev = secret()
   with-both:pushurl = http://ta.ta/
   $ hg path | grep ref-all-no-opts
   ref-all-no-opts = $TESTTMP/chained_path/foo
   ref-all-no-opts:multi-urls = yes
   ref-all-no-opts:pushurl = http://foo.bar/
   ref-all-no-opts = $TESTTMP/chained_path/bar
   ref-all-no-opts:multi-urls = yes
   ref-all-no-opts:pushrev = draft()
   ref-all-no-opts = $TESTTMP/chained_path/toto
   ref-all-no-opts:multi-urls = yes
   ref-all-no-opts:pushrev = secret()
   ref-all-no-opts:pushurl = http://ta.ta/
   $ hg path | grep with-overwrite
   with-overwrite = $TESTTMP/chained_path/foo
   with-overwrite:multi-urls = yes
   with-overwrite:pushrev = public()
   with-overwrite:pushurl = http://foo.bar/
   with-overwrite = $TESTTMP/chained_path/bar
   with-overwrite:multi-urls = yes
   with-overwrite:pushrev = public()
   with-overwrite = $TESTTMP/chained_path/toto
   with-overwrite:multi-urls = yes
   with-overwrite:pushrev = public()
   with-overwrite:pushurl = http://ta.ta/

tests/test-rename-merge1.t

@@ -1,236 +1,237 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "[merge]" >> .hg/hgrc
   $ echo "followcopies = 1" >> .hg/hgrc
 
   $ echo foo > a
   $ echo foo > a2
   $ hg add a a2
   $ hg ci -m "start"
 
   $ hg mv a b
   $ hg mv a2 b2
   $ hg ci -m "rename"
 
   $ hg co 0
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ echo blahblah > a
   $ echo blahblah > a2
   $ hg mv a2 c2
   $ hg ci -m "modify"
   created new head
 
   $ hg merge -y --debug
     unmatched files in local:
      c2
     unmatched files in other:
      b
      b2
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on local side:
       src: 'a2' -> dst: 'c2' !
      on remote side:
       src: 'a' -> dst: 'b' *
       src: 'a2' -> dst: 'b2' !
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
   note: possible conflict - a2 was renamed multiple times to:
    b2
    c2
    b2: remote created -> g
   getting b2
    preserving a for resolve of b
   removing a
    b: remote moved from a -> m
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status -AC
   M b
     a
   M b2
   R a
   C c2
 
   $ cat b
   blahblah
 
   $ hg ci -m "merge"
 
   $ hg debugindex b
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 57eacc201a7f 000000000000 000000000000
        1       3 4727ba907962 000000000000 57eacc201a7f
 
   $ hg debugrename b
   b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
 
 This used to trigger a "divergent renames" warning, despite no renames
 
   $ hg cp b b3
   $ hg cp b b4
   $ hg ci -A -m 'copy b twice'
   $ hg up '.^'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rm b3 b4
   $ hg ci -m 'clean up a bit of our mess'
 
 We'd rather not warn on divergent renames done in the same changeset (issue2113)
 
   $ hg cp b b3
   $ hg mv b b4
   $ hg ci -A -m 'divergent renames in same changeset'
   $ hg up '.^'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Check for issue2642
 
   $ hg init t
   $ cd t
 
   $ echo c0 > f1
   $ hg ci -Aqm0
 
   $ hg up null -q
   $ echo c1 > f1 # backport
   $ hg ci -Aqm1
   $ hg mv f1 f2
   $ hg ci -qm2
 
   $ hg up 0 -q
   $ hg merge 1 -q --tool internal:local
   $ hg ci -qm3
 
   $ hg merge 2
   merging f1 and f2 to f2
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f2
   c0
 
   $ cd ..
 
 Check for issue2089
 
   $ hg init repo2089
   $ cd repo2089
 
   $ echo c0 > f1
   $ hg ci -Aqm0
 
   $ hg up null -q
   $ echo c1 > f1
   $ hg ci -Aqm1
 
   $ hg up 0 -q
   $ hg merge 1 -q --tool internal:local
   $ echo c2 > f1
   $ hg ci -qm2
 
   $ hg up 1 -q
   $ hg mv f1 f2
   $ hg ci -Aqm3
 
   $ hg up 2 -q
   $ hg merge 3
   merging f1 and f2 to f2
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f2
   c2
 
   $ cd ..
 
 Check for issue3074
 
   $ hg init repo3074
   $ cd repo3074
   $ echo foo > file
   $ hg add file
   $ hg commit -m "added file"
   $ hg mv file newfile
   $ hg commit -m "renamed file"
   $ hg update 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rm file
   $ hg commit -m "deleted file"
   created new head
   $ hg merge --debug
     unmatched files in other:
      newfile
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on remote side:
       src: 'file' -> dst: 'newfile' %
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
   note: possible conflict - file was deleted and renamed to:
    newfile
    newfile: remote created -> g
   getting newfile
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg status
   M newfile
   $ cd ..
 
 Create x and y, then modify y and rename x to z on one side of merge, and
 modify x and rename y to z on the other side.
   $ hg init conflicting-target
   $ cd conflicting-target
   $ echo x > x
   $ echo y > y
   $ hg ci -Aqm 'add x and y'
   $ hg mv x z
   $ echo foo >> y
   $ hg ci -qm 'modify y, rename x to z'
   $ hg co -q 0
   $ hg mv y z
   $ echo foo >> x
   $ hg ci -qm 'modify x, rename y to z'
 # We should probably tell the user about the conflicting rename sources.
 # Depending on which side they pick, we should take that rename and get
 # the changes to the source from the other side. The unchanged file should
 # remain.
   $ hg merge --debug 1 -t :merge3
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      on local side:
       src: 'y' -> dst: 'z' *
      on remote side:
       src: 'x' -> dst: 'z' *
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
   starting 4 threads for background file closing (?)
    preserving z for resolve of z
    z: both renamed from y -> m
   picked tool ':merge3' for z (binary False symlink False changedelete False)
   merging z
   my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ ls
   x
   z
   $ cat x
   x
   foo
 # 'z' should have had the added 'foo' line
   $ cat z
   x

tests/test-rename.t

@@ -1,696 +1,697 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir d1 d1/d11 d2
   $ echo d1/a > d1/a
   $ echo d1/ba > d1/ba
   $ echo d1/a1 > d1/d11/a1
   $ echo d1/b > d1/b
   $ echo d2/b > d2/b
   $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
   $ hg commit -m "1"
 
 rename a single file
 
   $ hg rename d1/d11/a1 d2/c
   $ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml
   abort: filename contains 'con', which is reserved on Windows: d1/con.xml
   [10]
   $ hg sum
   parent: 0:9b4b6e7b2c26 tip
    1
   branch: default
   commit: 1 renamed
   update: (current)
   phases: 1 draft
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename a single file using absolute paths
 
   $ hg rename `pwd`/d1/d11/a1 `pwd`/d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file
 
   $ mv d1/d11/a1 d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file when src and tgt already tracked
 
   $ mv d1/d11/a1 d2/c
   $ hg addrem -s 0
   removing d1/d11/a1
   adding d2/c
   $ hg rename --after d1/d11/a1 d2/c
   $ hg status -C
   A d2/c
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
 rename --after a single file to a nonexistent target filename
 
   $ hg rename --after d1/a dummy
   d1/a: not recording move - dummy does not exist
   [1]
 
 move a single file to an existing directory
 
   $ hg rename d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 move --after a single file to an existing directory
 
   $ mv d1/d11/a1 d2
   $ hg rename --after d1/d11/a1 d2
   $ hg status -C
   A d2/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a1
 
 rename a file using a relative path
 
   $ (cd d1/d11; hg rename ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename --after a file using a relative path
 
   $ (cd d1/d11; mv ../../d2/b e; hg rename --after ../../d2/b e)
   $ hg status -C
   A d1/d11/e
     d2/b
   R d2/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/d11/e
 
 rename directory d1 as d3
 
   $ hg rename d1/ d3
   moving d1/a to d3/a
   moving d1/b to d3/b
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 rename --after directory d1 as d3
 
   $ mv d1 d3
   $ hg rename --after d1 d3
   moving d1/a to d3/a
   moving d1/b to d3/b
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a directory using a relative path
 
   $ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
   moving ../d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move --after a directory using a relative path
 
   $ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
   moving ../d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d2/d3/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d3
 
 move directory d1/d11 to an existing directory d2 (removes empty d1)
 
   $ hg rename d1/d11/ d2
   moving d1/d11/a1 to d2/d11/a1
   $ hg status -C
   A d2/d11/a1
     d1/d11/a1
   R d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d11
 
 move directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ hg rename d1 d2 d3
   moving d1/a to d3/d1/a
   moving d1/b to d3/d1/b
   moving d1/ba to d3/d1/ba
   moving d1/d11/a1 to d3/d1/d11/a1
   moving d2/b to d3/d2/b
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move --after directories d1 and d2 to a new directory d3
 
   $ mkdir d3
   $ mv d1 d2 d3
   $ hg rename --after d1 d2 d3
   moving d1/a to d3/d1/a
   moving d1/b to d3/d1/b
   moving d1/ba to d3/d1/ba
   moving d1/d11/a1 to d3/d1/d11/a1
   moving d2/b to d3/d2/b
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   A d3/d2/b
     d2/b
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   R d2/b
   $ hg update -C
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move everything under directory d1 to existing directory d2, do not
 overwrite existing files (d2/b)
 
   $ hg rename d1/* d2
   d2/b: not overwriting - file already committed
   ('hg rename --force' to replace the file by recording a rename)
   moving d1/d11/a1 to d2/d11/a1
   [1]
   $ hg status -C
   A d2/a
     d1/a
   A d2/ba
     d1/ba
   A d2/d11/a1
     d1/d11/a1
   R d1/a
   R d1/ba
   R d1/d11/a1
   $ diff -u d1/b d2/b
   --- d1/b	* (glob)
   +++ d2/b	* (glob)
   @@ * (glob)
   -d1/b
   +d2/b
   [1]
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/a d2/ba d2/d11/a1
 
 attempt to move one file into a non-existent directory
 
   $ hg rename d1/a dx/
   abort: destination dx/ is not a directory
   [10]
   $ hg status -C
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 attempt to move potentially more than one file into a non-existent directory
 
   $ hg rename 'glob:d1/**' dx
   abort: with multiple sources, destination must be an existing directory
   [10]
 
 move every file under d1 to d2/d21
 
   $ mkdir d2/d21
   $ hg rename 'glob:d1/**' d2/d21
   moving d1/a to d2/d21/a
   moving d1/b to d2/d21/b
   moving d1/ba to d2/d21/ba
   moving d1/d11/a1 to d2/d21/a1
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   A d2/d21/b
     d1/b
   A d2/d21/ba
     d1/ba
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move --after some files under d1 to d2/d21
 
   $ mkdir d2/d21
   $ mv d1/a d1/d11/a1 d2/d21
   $ hg rename --after 'glob:d1/**' d2/d21
   moving d1/a to d2/d21/a
   d1/b: not recording move - d2/d21/b does not exist
   d1/ba: not recording move - d2/d21/ba does not exist
   moving d1/d11/a1 to d2/d21/a1
   [1]
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 move every file under d1 starting with an 'a' to d2/d21 (regexp)
 
   $ mkdir d2/d21
   $ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
   moving d1/a to d2/d21/a
   moving d1/d11/a1 to d2/d21/a1
   $ hg status -C
   A d2/d21/a
     d1/a
   A d2/d21/a1
     d1/d11/a1
   R d1/a
   R d1/d11/a1
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d2/d21
 
 attempt to overwrite an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename d1/ba d1/ca
   d1/ca: not overwriting - file exists
   ('hg rename --after' to record the rename)
   [1]
   $ hg status -C
   ? d1/ca
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 forced overwrite of an existing file
 
   $ echo "ca" > d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 attempt to overwrite an existing broken symlink
 
 #if symlink
   $ ln -s ba d1/ca
   $ hg rename --traceback d1/ba d1/ca
   d1/ca: not overwriting - file exists
   ('hg rename --after' to record the rename)
   [1]
   $ hg status -C
   ? d1/ca
   $ hg update -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 
 replace a symlink with a file
 
   $ ln -s ba d1/ca
   $ hg rename --force d1/ba d1/ca
   $ hg status -C
   A d1/ca
     d1/ba
   R d1/ba
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/ca
 #endif
 
 do not copy more than one source file to the same destination file
 
   $ mkdir d3
   $ hg rename d1/* d2/* d3
   moving d1/d11/a1 to d3/d11/a1
   d3/b: not overwriting - d2/b collides with d1/b
   [1]
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with "hg rename ."
 
   $ mkdir d3
   $ (cd d1; hg rename . ../d3)
   moving a to ../d3/d1/a
   moving b to ../d3/d1/b
   moving ba to ../d3/d1/ba
   moving d11/a1 to ../d3/d1/d11/a1
   $ hg status -C
   A d3/d1/a
     d1/a
   A d3/d1/b
     d1/b
   A d3/d1/ba
     d1/ba
   A d3/d1/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move a whole subtree with "hg rename --after ."
 
   $ mkdir d3
   $ mv d1/* d3
   $ (cd d1; hg rename --after . ../d3)
   moving a to ../d3/a
   moving b to ../d3/b
   moving ba to ../d3/ba
   moving d11/a1 to ../d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 move the parent tree with "hg rename .."
 
   $ (cd d1/d11; hg rename .. ../../d3)
   moving ../a to ../../d3/a
   moving ../b to ../../d3/b
   moving ../ba to ../../d3/ba
   moving a1 to ../../d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/b
     d1/b
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 skip removed files
 
   $ hg remove d1/b
   $ hg rename d1 d3
   moving d1/a to d3/a
   moving d1/ba to d3/ba
   moving d1/d11/a1 to d3/d11/a1
   $ hg status -C
   A d3/a
     d1/a
   A d3/ba
     d1/ba
   A d3/d11/a1
     d1/d11/a1
   R d1/a
   R d1/b
   R d1/ba
   R d1/d11/a1
   $ hg update -C
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf d3
 
 transitive rename
 
   $ hg rename d1/b d1/bb
   $ hg rename d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
 transitive rename --after
 
   $ hg rename d1/b d1/bb
   $ mv d1/bb d1/bc
   $ hg rename --after d1/bb d1/bc
   $ hg status -C
   A d1/bc
     d1/b
   R d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/bc
 
   $ echo "# idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)"
   # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)
   $ hg rename d1/b d1/bb
   $ echo "some stuff added to d1/bb" >> d1/bb
   $ hg rename d1/bb d1/b
   $ hg status -C
   M d1/b
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 overwriting with renames (issue1959)
 
   $ hg rename d1/a d1/c
   $ hg rename d1/b d1/a
   $ hg status -C
   M d1/a
     d1/b
   A d1/c
     d1/a
   R d1/b
   $ hg diff --git
   diff --git a/d1/a b/d1/a
   --- a/d1/a
   +++ b/d1/a
   @@ -1,1 +1,1 @@
   -d1/a
   +d1/b
   diff --git a/d1/b b/d1/b
   deleted file mode 100644
   --- a/d1/b
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -d1/b
   diff --git a/d1/a b/d1/c
   copy from d1/a
   copy to d1/c
   $ hg update -C
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d1/c # The file was marked as added, so 'hg update' action  was 'forget'
 
 check illegal path components
 
   $ hg rename d1/d11/a1 .hg/foo
   abort: path contains illegal component: .hg/foo
   [10]
   $ hg status -C
   $ hg rename d1/d11/a1 ../foo
-  abort: ../foo not under root '$TESTTMP'
+  abort: ../foo not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
   $ mv d1/d11/a1 .hg/foo
   $ hg rename --after d1/d11/a1 .hg/foo
   abort: path contains illegal component: .hg/foo
   [10]
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/foo
 
   $ hg rename d1/d11/a1 .hg
   abort: path contains illegal component: .hg/a1
   [10]
   $ hg --config extensions.largefiles= rename d1/d11/a1 .hg
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   abort: path contains illegal component: .hg/a1
   [10]
   $ hg status -C
   $ hg rename d1/d11/a1 ..
-  abort: ../a1 not under root '$TESTTMP'
+  abort: ../a1 not under root '$TESTTMP/repo'
   [255]
   $ hg --config extensions.largefiles= rename d1/d11/a1 ..
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
-  abort: ../a1 not under root '$TESTTMP'
+  abort: ../a1 not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
   $ mv d1/d11/a1 .hg
   $ hg rename --after d1/d11/a1 .hg
   abort: path contains illegal component: .hg/a1
   [10]
   $ hg status -C
   ! d1/d11/a1
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hg/a1
 
   $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
   abort: path contains illegal component: .hg/foo
   [10]
   $ hg status -C
   $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
-  abort: ../../../foo not under root '$TESTTMP'
+  abort: ../../../foo not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
 check that stat information such as mtime is preserved on rename - it's unclear
 whether the `touch` and `stat` commands are portable, so we mimic them using
 python.  Not all platforms support precision of even one-second granularity, so
 we allow a rather generous fudge factor here; 1234567890 is 2009, and the
 primary thing we care about is that it's not the machine's current time;
 hopefully it's really unlikely for a machine to have such a broken clock that
 this test fails. :)
 
   $ mkdir mtime
 Create the file (as empty), then update its mtime and atime to be 1234567890.
   >>> import os
   >>> filename = "mtime/f"
   >>> mtime = 1234567890
   >>> open(filename, "w").close()
   >>> os.utime(filename, (mtime, mtime))
   $ hg ci -qAm 'add mtime dir'
 "hg cp" does not preserve the mtime, so it should be newer than the 2009
 timestamp.
   $ hg cp -q mtime mtime_cp
   >>> import os
   >>> filename = "mtime_cp/f"
   >>> print(os.stat(filename).st_mtime < 1234567999)
   False
 "hg mv" preserves the mtime, so it should be ~equal to the 2009 timestamp
 (modulo some fudge factor due to not every system supporting 1s-level
 precision).
   $ hg mv -q mtime mtime_mv
   >>> import os
   >>> filename = "mtime_mv/f"
   >>> print(os.stat(filename).st_mtime < 1234567999)
   True

tests/test-revert-unknown.t

@@ -1,30 +1,31 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch unknown
 
   $ touch a
   $ hg add a
   $ hg ci -m "1"
 
   $ touch b
   $ hg add b
   $ hg ci -m "2"
 
 Should show unknown
 
   $ hg status
   ? unknown
   $ hg revert -r 0 --all
   removing b
 
 Should show unknown and b removed
 
   $ hg status
   R b
   ? unknown
 
 Should show a and unknown
 
   $ ls -A
   .hg
   a
   unknown

tests/test-status-rev.t

@@ -1,158 +1,159 b''
 Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
 combined correctly with the dirstate status.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 First commit
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
   $ hg addremove --similarity 0
   adding content1_content1_content1-tracked
   adding content1_content1_content1-untracked
   adding content1_content1_content3-tracked
   adding content1_content1_content3-untracked
   adding content1_content1_missing-tracked
   adding content1_content1_missing-untracked
   adding content1_content2_content1-tracked
   adding content1_content2_content1-untracked
   adding content1_content2_content2-tracked
   adding content1_content2_content2-untracked
   adding content1_content2_content3-tracked
   adding content1_content2_content3-untracked
   adding content1_content2_missing-tracked
   adding content1_content2_missing-untracked
   adding content1_missing_content1-tracked
   adding content1_missing_content1-untracked
   adding content1_missing_content3-tracked
   adding content1_missing_content3-untracked
   adding content1_missing_missing-tracked
   adding content1_missing_missing-untracked
   $ hg commit -m first
 
 Second commit
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
   $ hg addremove --similarity 0
   removing content1_missing_content1-tracked
   removing content1_missing_content1-untracked
   removing content1_missing_content3-tracked
   removing content1_missing_content3-untracked
   removing content1_missing_missing-tracked
   removing content1_missing_missing-untracked
   adding missing_content2_content2-tracked
   adding missing_content2_content2-untracked
   adding missing_content2_content3-tracked
   adding missing_content2_content3-untracked
   adding missing_content2_missing-tracked
   adding missing_content2_missing-untracked
   $ hg commit -m second
 
 Working copy
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
   $ hg addremove --similarity 0
   adding content1_missing_content1-tracked
   adding content1_missing_content1-untracked
   adding content1_missing_content3-tracked
   adding content1_missing_content3-untracked
   adding content1_missing_missing-tracked
   adding content1_missing_missing-untracked
   adding missing_missing_content3-tracked
   adding missing_missing_content3-untracked
   adding missing_missing_missing-tracked
   adding missing_missing_missing-untracked
   $ hg forget *_*_*-untracked
   $ rm *_*_missing-*
 
 Status compared to parent of the working copy, i.e. the dirstate status
 
   $ hg status -A --rev 1 'glob:missing_content2_content3-tracked'
   M missing_content2_content3-tracked
   $ hg status -A --rev 1 'glob:missing_content2_content2-tracked'
   C missing_content2_content2-tracked
   $ hg status -A --rev 1 'glob:missing_missing_content3-tracked'
   A missing_missing_content3-tracked
   $ hg status -A --rev 1 'glob:missing_missing_content3-untracked'
   ? missing_missing_content3-untracked
   $ hg status -A --rev 1 'glob:missing_content2_*-untracked'
   R missing_content2_content2-untracked
   R missing_content2_content3-untracked
   R missing_content2_missing-untracked
   $ hg status -A --rev 1 'glob:missing_*_missing-tracked'
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
 
   $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
   missing_missing_missing-untracked: $ENOENT$
 
 Status between first and second commit. Should ignore dirstate status.
 
   $ hg status -A --rev 0:1 'glob:content1_content2_*'
   M content1_content2_content1-tracked
   M content1_content2_content1-untracked
   M content1_content2_content2-tracked
   M content1_content2_content2-untracked
   M content1_content2_content3-tracked
   M content1_content2_content3-untracked
   M content1_content2_missing-tracked
   M content1_content2_missing-untracked
   $ hg status -A --rev 0:1 'glob:content1_content1_*'
   C content1_content1_content1-tracked
   C content1_content1_content1-untracked
   C content1_content1_content3-tracked
   C content1_content1_content3-untracked
   C content1_content1_missing-tracked
   C content1_content1_missing-untracked
   $ hg status -A --rev 0:1 'glob:missing_content2_*'
   A missing_content2_content2-tracked
   A missing_content2_content2-untracked
   A missing_content2_content3-tracked
   A missing_content2_content3-untracked
   A missing_content2_missing-tracked
   A missing_content2_missing-untracked
   $ hg status -A --rev 0:1 'glob:content1_missing_*'
   R content1_missing_content1-tracked
   R content1_missing_content1-untracked
   R content1_missing_content3-tracked
   R content1_missing_content3-untracked
   R content1_missing_missing-tracked
   R content1_missing_missing-untracked
   $ hg status -A --rev 0:1 'glob:missing_missing_*'
 
 Status compared to one revision back, checking that the dirstate status
 is correctly combined with the inter-revision status
 
   $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked'
   M content1_content1_content3-tracked
   M content1_content2_content2-tracked
   M content1_content2_content3-tracked
   M content1_missing_content3-tracked
   $ hg status -A --rev 0 'glob:content1_*_content1-tracked'
   C content1_content1_content1-tracked
   C content1_content2_content1-tracked
   C content1_missing_content1-tracked
   $ hg status -A --rev 0 'glob:missing_*_content?-tracked'
   A missing_content2_content2-tracked
   A missing_content2_content3-tracked
   A missing_missing_content3-tracked
 BROKEN: missing_content2_content[23]-untracked exist, so should be listed
   $ hg status -A --rev 0 'glob:missing_*_content?-untracked'
   ? missing_missing_content3-untracked
   $ hg status -A --rev 0 'glob:content1_*_*-untracked'
   R content1_content1_content1-untracked
   R content1_content1_content3-untracked
   R content1_content1_missing-untracked
   R content1_content2_content1-untracked
   R content1_content2_content2-untracked
   R content1_content2_content3-untracked
   R content1_content2_missing-untracked
   R content1_missing_content1-untracked
   R content1_missing_content3-untracked
   R content1_missing_missing-untracked
   $ hg status -A --rev 0 'glob:*_*_missing-tracked'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked
   ! content1_missing_missing-tracked
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
   $ hg status -A --rev 0 'glob:missing_*_missing-untracked'

tests/test-strict.t

@@ -1,26 +1,27 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo a > a
   $ hg ci -Ama
   adding a
 
   $ hg an a
   0: a
 
   $ hg --config ui.strict=False an a
   0: a
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "strict=True" >> $HGRCPATH
 
   $ hg an a
   hg: unknown command 'an'
   (use 'hg help' for a list of commands)
   [10]
   $ hg annotate a
   0: a
 
 should succeed - up is an alias, not an abbreviation
 
   $ hg up
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-update-reverse.t

@@ -1,85 +1,86 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch a
   $ hg add a
   $ hg commit -m "Added a"
 
   $ touch main
   $ hg add main
   $ hg commit -m "Added main"
   $ hg checkout 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 'main' should be gone:
 
   $ ls -A
   .hg
   a
 
   $ touch side1
   $ hg add side1
   $ hg commit -m "Added side1"
   created new head
   $ touch side2
   $ hg add side2
   $ hg commit -m "Added side2"
 
   $ hg log
   changeset:   3:91ebc10ed028
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added side2
   
   changeset:   2:b932d7dbb1e1
   parent:      0:c2eda428b523
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added side1
   
   changeset:   1:71a760306caf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added main
   
   changeset:   0:c2eda428b523
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added a
   
 
   $ hg heads
   changeset:   3:91ebc10ed028
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added side2
   
   changeset:   1:71a760306caf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added main
   
   $ ls -A
   .hg
   a
   side1
   side2
 
   $ hg update --debug -C 1
   resolving manifests
    branchmerge: False, force: True, partial: False
    ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
    side1: other deleted -> r
   removing side1
    side2: other deleted -> r
   removing side2
    main: remote created -> g
   getting main
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ ls -A
   .hg
   a
   main
 

tests/test-username-newline.t

@@ -1,27 +1,28 b''
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch a
 
   $ unset HGUSER
   $ echo "[ui]" >> .hg/hgrc
   $ echo "username= foo" >> .hg/hgrc
   $ echo "          bar1" >> .hg/hgrc
 
   $ hg ci -Am m
   adding a
   abort: username 'foo\nbar1' contains a newline
   
   [255]
   $ rm .hg/hgrc
 
   $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
   adding a
   abort: username 'foo\nbar2' contains a newline
   
   [255]
   $ hg ci -Am m -u "`(echo foo; echo bar3)`"
   adding a
   transaction abort!
   rollback completed
   abort: username 'foo\nbar3' contains a newline
   [50]