debugindex: rename the parent column to mention nodeid

We will add new columns with the "revnum" version of the parent. It will be
useful in case we need to inspect a corrupted revlog index.

mercurial/revlogutils/debug.py

@@ -1,51 +1,55 b''
 # revlogutils/debug.py - utility used for revlog debuging
 #
 # Copyright 2005-2007 Olivia Mackall <[e-mail]>
 # Copyright 2022 Octobus <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from .. import (
     node as nodemod,
 )
 
 
 def debug_index(
     ui,
     repo,
     formatter,
     revlog,
     full_node,
 ):
     """display index data for a revlog"""
     if full_node:
         hexfn = nodemod.hex
     else:
         hexfn = nodemod.short
 
     idlen = 12
     for i in revlog:
         idlen = len(hexfn(revlog.node(i)))
         break
 
     fm = formatter
 
     fm.plain(
         b'   rev linkrev %s %s %s\n'
-        % (b'nodeid'.rjust(idlen), b'p1'.rjust(idlen), b'p2'.rjust(idlen))
+        % (
+            b'nodeid'.rjust(idlen),
+            b'p1-nodeid'.rjust(idlen),
+            b'p2-nodeid'.rjust(idlen),
+        )
     )
 
     for rev in revlog:
         node = revlog.node(rev)
         parents = revlog.parents(node)
 
         fm.startitem()
         fm.write(b'rev', b'%6d ', rev)
         fm.write(b'linkrev', b'%7d ', revlog.linkrev(rev))
         fm.write(b'node', b'%s ', hexfn(node))
         fm.write(b'p1', b'%s ', hexfn(parents[0]))
         fm.write(b'p2', b'%s', hexfn(parents[1]))
         fm.plain(b'\n')
 
     fm.end()

tests/test-changelog-exec.t

@@ -1,57 +1,57 b''
 #require execbit
 
 b51a8138292a introduced a regression where we would mention in the
 changelog executable files added by the second parent of a merge. Test
 that that doesn't happen anymore
 
   $ hg init repo
   $ cd repo
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
 
   $ echo bar > bar
   $ chmod +x bar
   $ hg ci -qAm 'add bar'
 
 manifest of p2:
 
   $ hg manifest
   bar
   foo
 
   $ hg up -qC 0
   $ echo >> foo
   $ hg ci -m 'change foo'
   created new head
 
 manifest of p1:
 
   $ hg manifest
   foo
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ chmod +x foo
   $ hg ci -m 'merge'
 
 this should not mention bar but should mention foo:
 
   $ hg tip -v
   changeset:   3:c53d17ff3380
   tag:         tip
   parent:      2:ed1b79f46b9a
   parent:      1:d394a8db219b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo
   description:
   merge
   
   
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b004912a8510 000000000000 000000000000
 
   $ cd ..

tests/test-clone-r.t

@@ -1,254 +1,254 b''
   $ hg init test
   $ cd test
 
   $ echo 0 >> afile
   $ hg add afile
   $ hg commit -m "0.0"
 
   $ echo 1 >> afile
   $ hg commit -m "0.1"
 
   $ echo 2 >> afile
   $ hg commit -m "0.2"
 
   $ echo 3 >> afile
   $ hg commit -m "0.3"
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo 1 >> afile
   $ hg commit -m "1.1"
   created new head
 
   $ echo 2 >> afile
   $ hg commit -m "1.2"
 
   $ echo a line > fred
   $ echo 3 >> afile
   $ hg add fred
   $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
   $ hg commit -m "1.3m"
 
   $ hg update -C 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg mv afile anotherfile
   $ hg commit -m "0.3m"
 
   $ hg debugrevlogindex -f 1 afile
      rev flag     size   link     p1     p2       nodeid
        0 0000        2      0     -1     -1 362fef284ce2
        1 0000        4      1      0     -1 125144f7e028
        2 0000        6      2      1     -1 4c982badb186
        3 0000        8      3      2     -1 19b1fc555737
 
   $ hg debugindex adifferentfile
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       7 2565f3199a74 000000000000 000000000000
 
   $ hg debugindex anotherfile
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       8 2565f3199a74 000000000000 000000000000
 
   $ hg debugindex fred
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       6 12ab3bcc5ea4 000000000000 000000000000
 
   $ hg debugindex --manifest
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 43eadb1d2d06 000000000000 000000000000
        1       1 8b89697eba2c 43eadb1d2d06 000000000000
        2       2 626a32663c2f 8b89697eba2c 000000000000
        3       3 f54c32f13478 626a32663c2f 000000000000
        4       6 de68e904d169 626a32663c2f 000000000000
        5       7 09bb521d218d de68e904d169 000000000000
        6       8 1fde233dfb0f f54c32f13478 000000000000
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 9 changesets with 7 changes to 4 files
 
   $ cd ..
 
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >   echo
   >   echo ---- hg clone -r "$i" test test-"$i"
   >   hg clone -r "$i" test test-"$i"
   >   cd test-"$i"
   >   hg verify
   >   cd ..
   > done
   
   ---- hg clone -r 0 test test-0
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets f9ee2f85a263
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
   
   ---- hg clone -r 1 test test-1
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets f9ee2f85a263:34c2bf6b0626
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 2 changes to 1 files
   
   ---- hg clone -r 2 test test-2
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets f9ee2f85a263:e38ba6f5b7e0
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 3 changes to 1 files
   
   ---- hg clone -r 3 test test-3
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   new changesets f9ee2f85a263:eebf5a27f8ca
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 4 changes to 1 files
   
   ---- hg clone -r 4 test test-4
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets f9ee2f85a263:095197eb4973
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 2 changes to 1 files
   
   ---- hg clone -r 5 test test-5
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets f9ee2f85a263:1bb50a9436a7
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 3 changes to 1 files
   
   ---- hg clone -r 6 test test-6
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 2 files
   new changesets f9ee2f85a263:7373c1169842
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 5 changes to 2 files
   
   ---- hg clone -r 7 test test-7
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 3 files
   new changesets f9ee2f85a263:a6a34bfa0076
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 5 changesets with 6 changes to 3 files
   
   ---- hg clone -r 8 test test-8
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 2 files
   new changesets f9ee2f85a263:aa35859c02ea
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 5 changesets with 5 changes to 2 files
 
   $ cd test-8
   $ hg pull ../test-7
   pulling from ../test-7
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 2 changes to 3 files (+1 heads)
   new changesets 095197eb4973:a6a34bfa0076
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 9 changesets with 7 changes to 4 files
   $ cd ..
 
   $ hg clone test test-9
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-9
   $ hg branch foobar
   marked working directory as branch foobar
   (branches are permanent and global, did you want a bookmark?)
   $ echo file2 >> file2
   $ hg add file2
   $ hg commit -m "changeset9"
   $ echo file3 >> file3
   $ hg add file3
   $ hg commit -m "changeset10"
   $ cd ..
   $ hg clone -r 9 -u foobar test-9 test-10
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 6 changes to 3 files
   new changesets f9ee2f85a263:7100abb79635
   updating to branch foobar
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 

tests/test-commit-amend.t

@@ -1,1330 +1,1330 b''
   $ hg init
 
 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
   $ 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
 
 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
 
   $ 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
   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
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
   saved backup bundle to $TESTTMP/.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
   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
   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
   $ 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
   $ 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
   $ 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
 
 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
   $ 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
   $ 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
   $ 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
   $ 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
   $ 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
   $ hg log -r . --template "{branch}\n"
   a
   $ hg ci --amend -m "a''"
   saved backup bundle to $TESTTMP/.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
   $ 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           p2
+     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           p2
+     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-commit.t

@@ -1,876 +1,876 b''
 commit date test
 
   $ hg init test
   $ cd test
   $ echo foo > foo
   $ hg add foo
   $ cat > $TESTTMP/checkeditform.sh <<EOF
   > env | grep HGEDITFORM
   > true
   > EOF
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m ""
   HGEDITFORM=commit.normal.normal
   abort: empty commit message
   [10]
   $ hg commit -d '0 0' -m commit-1
   $ echo foo >> foo
   $ hg commit -d '1 4444444' -m commit-3
   hg: parse error: impossible time zone offset: 4444444
   [10]
   $ hg commit -d '1	15.1' -m commit-4
   hg: parse error: invalid date: '1\t15.1'
   [10]
   $ hg commit -d 'foo bar' -m commit-5
   hg: parse error: invalid date: 'foo bar'
   [10]
   $ hg commit -d ' 1 4444' -m commit-6
   $ hg commit -d '111111111111 0' -m commit-7
   hg: parse error: date exceeds 32 bits: 111111111111
   [10]
   $ hg commit -d '-111111111111 0' -m commit-7
   hg: parse error: date exceeds 32 bits: -111111111111
   [10]
   $ echo foo >> foo
   $ hg commit -d '1901-12-13 20:45:52 +0000' -m commit-7-2
   $ echo foo >> foo
   $ hg commit -d '-2147483648 0' -m commit-7-3
   $ hg log -T '{rev} {date|isodatesec}\n' -l2
   3 1901-12-13 20:45:52 +0000
   2 1901-12-13 20:45:52 +0000
   $ hg commit -d '1901-12-13 20:45:51 +0000' -m commit-7
   hg: parse error: date exceeds 32 bits: -2147483649
   [10]
   $ hg commit -d '-2147483649 0' -m commit-7
   hg: parse error: date exceeds 32 bits: -2147483649
   [10]
 
 commit added file that has been deleted
 
   $ echo bar > bar
   $ hg add bar
   $ rm bar
   $ hg commit -m commit-8
   nothing changed (1 missing files, see 'hg status')
   [1]
   $ hg commit -m commit-8-2 bar
   abort: bar: file not found!
   [10]
 
   $ hg -q revert -a --no-backup
 
   $ mkdir dir
   $ echo boo > dir/file
   $ hg add
   adding dir/file
   $ hg -v commit -m commit-9 dir
   committing files:
   dir/file
   committing manifest
   committing changelog
   committed changeset 4:1957363f1ced
 
   $ echo > dir.file
   $ hg add
   adding dir.file
   $ hg commit -m commit-10 dir dir.file
   abort: dir: no match under directory!
   [10]
 
   $ echo >> dir/file
   $ mkdir bleh
   $ mkdir dir2
   $ cd bleh
   $ hg commit -m commit-11 .
   abort: bleh: no match under directory!
   [10]
   $ hg commit -m commit-12 ../dir ../dir2
   abort: dir2: no match under directory!
   [10]
   $ hg -v commit -m commit-13 ../dir
   committing files:
   dir/file
   committing manifest
   committing changelog
   committed changeset 5:a31d8f87544a
   $ cd ..
 
   $ hg commit -m commit-14 does-not-exist
   abort: does-not-exist: * (glob)
   [10]
 
 #if symlink
   $ ln -s foo baz
   $ hg commit -m commit-15 baz
   abort: baz: file not tracked!
   [10]
   $ rm baz
 #endif
 
   $ touch quux
   $ hg commit -m commit-16 quux
   abort: quux: file not tracked!
   [10]
   $ echo >> dir/file
   $ hg -v commit -m commit-17 dir/file
   committing files:
   dir/file
   committing manifest
   committing changelog
   committed changeset 6:32d054c9d085
 
 An empty date was interpreted as epoch origin
 
   $ echo foo >> foo
   $ hg commit -d '' -m commit-no-date --config devel.default-date=
   $ hg tip --template '{date|isodate}\n' | grep '1970'
   [1]
 
 Using the advanced --extra flag
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "commitextras=" >> $HGRCPATH
   $ hg status
   ? quux
   $ hg add quux
   $ hg commit -m "adding internal used extras" --extra amend_source=hash
   abort: key 'amend_source' is used internally, can't be set manually
   [10]
   $ hg commit -m "special chars in extra" --extra id@phab=214
   abort: keys can only contain ascii letters, digits, '_' and '-'
   [10]
   $ hg commit -m "empty key" --extra =value
   abort: unable to parse '=value', keys can't be empty
   [10]
   $ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar
   $ hg log -r . -T '{extras % "{extra}\n"}'
   branch=default
   oldhash=bar
   sourcehash=foo
 
 Failed commit with --addremove should not update dirstate
 
   $ echo foo > newfile
   $ hg status
   ? newfile
   $ HGEDITOR=false hg ci --addremove
   adding newfile
   abort: edit failed: false exited with status 1
   [250]
   $ hg status
   ? newfile
 
 Make sure we do not obscure unknown requires file entries (issue2649)
 
   $ echo foo >> foo
   $ echo fake >> .hg/requires
   $ hg commit -m bla
   abort: repository requires features unknown to this Mercurial: fake
   (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
   [255]
 
   $ cd ..
 
 
 partial subdir commit test
 
   $ hg init test2
   $ cd test2
   $ mkdir foo
   $ echo foo > foo/foo
   $ mkdir bar
   $ echo bar > bar/bar
   $ hg add
   adding bar/bar
   adding foo/foo
   $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo
   commit-subdir-1
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: added foo/foo
 
 
   $ hg ci -m commit-subdir-2 bar
 
 subdir log 1
 
   $ hg log -v foo
   changeset:   0:f97e73a25882
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
 
 subdir log 2
 
   $ hg log -v bar
   changeset:   1:aa809156d50d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
 
 full log
 
   $ hg log -v
   changeset:   1:aa809156d50d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bar/bar
   description:
   commit-subdir-2
   
   
   changeset:   0:f97e73a25882
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/foo
   description:
   commit-subdir-1
   
   
   $ cd ..
 
 
 dot and subdir commit test
 
   $ hg init test3
   $ echo commit-foo-subdir > commit-log-test
   $ cd test3
   $ mkdir foo
   $ echo foo content > foo/plain-file
   $ hg add foo/plain-file
   $ HGEDITOR=cat hg ci --edit -l ../commit-log-test foo
   commit-foo-subdir
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: added foo/plain-file
 
 
   $ echo modified foo content > foo/plain-file
   $ hg ci -m commit-foo-dot .
 
 full log
 
   $ hg log -v
   changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-dot
   
   
   changeset:   0:65d4e9386227
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo/plain-file
   description:
   commit-foo-subdir
   
   
 
 subdir log
 
   $ cd foo
   $ hg log .
   changeset:   1:95b38e3a5b2e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-dot
   
   changeset:   0:65d4e9386227
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-foo-subdir
   
   $ cd ..
   $ cd ..
 
 Issue1049: Hg permits partial commit of merge without warning
 
   $ hg init issue1049
   $ cd issue1049
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ echo a >> a
   $ hg ci -mb
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b >> a
   $ hg ci -mc
   created new head
   $ HGMERGE=true hg merge
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 should fail because we are specifying a file name
 
   $ hg ci -mmerge a
   abort: cannot partially commit a merge (do not specify files or patterns)
   [255]
 
 should fail because we are specifying a pattern
 
   $ hg ci -mmerge -I a
   abort: cannot partially commit a merge (do not specify files or patterns)
   [255]
 
 should succeed
 
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit
   HGEDITFORM=commit.normal.merge
   $ cd ..
 
 
 test commit message content
 
   $ hg init commitmsg
   $ cd commitmsg
   $ echo changed > changed
   $ echo removed > removed
   $ hg book activebookmark
   $ hg ci -qAm init
 
   $ hg rm removed
   $ echo changed >> changed
   $ echo added > added
   $ hg add added
   $ HGEDITOR=cat hg ci -A
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: bookmark 'activebookmark'
   HG: added added
   HG: changed changed
   HG: removed removed
   abort: empty commit message
   [10]
 
 test saving last-message.txt
 
   $ hg init sub
   $ echo a > sub/a
   $ hg -R sub add sub/a
   $ cat > sub/.hg/hgrc <<EOF
   > [hooks]
   > precommit.test-saving-last-message = false
   > EOF
 
   $ echo 'sub = sub' > .hgsub
   $ hg add .hgsub
 
   $ cat > $TESTTMP/editor.sh <<EOF
   > echo "==== before editing:"
   > cat \$1
   > echo "===="
   > echo "test saving last-message.txt" >> \$1
   > EOF
 
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg commit -S -q
   ==== before editing:
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: bookmark 'activebookmark'
   HG: subrepo sub
   HG: added .hgsub
   HG: added added
   HG: changed .hgsubstate
   HG: changed changed
   HG: removed removed
   ====
   abort: precommit.test-saving-last-message hook exited with status 1 (in subrepository "sub")
   [255]
   $ cat .hg/last-message.txt
   
   
   test saving last-message.txt
 
 test that '[committemplate] changeset' definition and commit log
 specific template keywords work well
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit.normal = 'HG: this is "commit.normal" template
   >     HG: {extramsg}
   >     {if(activebookmark,
   >    "HG: bookmark '{activebookmark}' is activated\n",
   >    "HG: no bookmark is activated\n")}{subrepos %
   >    "HG: subrepo '{subrepo}' is changed\n"}'
   > 
   > changeset.commit = HG: this is "commit" template
   >     HG: {extramsg}
   >     {if(activebookmark,
   >    "HG: bookmark '{activebookmark}' is activated\n",
   >    "HG: no bookmark is activated\n")}{subrepos %
   >    "HG: subrepo '{subrepo}' is changed\n"}
   > 
   > changeset = HG: this is customized commit template
   >     HG: {extramsg}
   >     {if(activebookmark,
   >    "HG: bookmark '{activebookmark}' is activated\n",
   >    "HG: no bookmark is activated\n")}{subrepos %
   >    "HG: subrepo '{subrepo}' is changed\n"}
   > EOF
 
   $ hg init sub2
   $ echo a > sub2/a
   $ hg -R sub2 add sub2/a
   $ echo 'sub2 = sub2' >> .hgsub
 
   $ HGEDITOR=cat hg commit -S -q
   HG: this is "commit.normal" template
   HG: Leave message empty to abort commit.
   HG: bookmark 'activebookmark' is activated
   HG: subrepo 'sub' is changed
   HG: subrepo 'sub2' is changed
   abort: empty commit message
   [10]
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit.normal =
   > # now, "changeset.commit" should be chosen for "hg commit"
   > EOF
 
   $ hg bookmark --inactive activebookmark
   $ hg forget .hgsub
   $ HGEDITOR=cat hg commit -q
   HG: this is "commit" template
   HG: Leave message empty to abort commit.
   HG: no bookmark is activated
   abort: empty commit message
   [10]
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit =
   > # now, "changeset" should be chosen for "hg commit"
   > EOF
 
   $ HGEDITOR=cat hg commit -q
   HG: this is customized commit template
   HG: Leave message empty to abort commit.
   HG: no bookmark is activated
   abort: empty commit message
   [10]
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset = {desc}
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}
   >     HG:
   >     {splitlines(diff()) % 'HG: {line}\n'
   >    }HG:
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}\n
   > EOF
   $ hg status -amr
   M changed
   A added
   R removed
   $ HGEDITOR=cat hg commit -q -e -m "foo bar" changed
   foo bar
   HG: mods=changed
   HG: adds=
   HG: dels=
   HG: files=changed
   HG:
   HG: diff -r d2313f97106f changed
   HG: --- a/changed	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/changed	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,1 +1,2 @@
   HG:  changed
   HG: +changed
   HG:
   HG: mods=changed
   HG: adds=
   HG: dels=
   HG: files=changed
   $ hg status -amr
   A added
   R removed
   $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n"
   M changed
   A 
   R 
   $ hg rollback -q
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset = {desc}
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}
   >     HG:
   >     {splitlines(diff("changed")) % 'HG: {line}\n'
   >    }HG:
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}
   >     HG:
   >     {splitlines(diff("added")) % 'HG: {line}\n'
   >    }HG:
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}
   >     HG:
   >     {splitlines(diff("removed")) % 'HG: {line}\n'
   >    }HG:
   >     HG: mods={file_mods}
   >     HG: adds={file_adds}
   >     HG: dels={file_dels}
   >     HG: files={files}\n
   > EOF
   $ HGEDITOR=cat hg commit -q -e -m "foo bar" added removed
   foo bar
   HG: mods=
   HG: adds=added
   HG: dels=removed
   HG: files=added removed
   HG:
   HG:
   HG: mods=
   HG: adds=added
   HG: dels=removed
   HG: files=added removed
   HG:
   HG: diff -r d2313f97106f added
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/added	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +added
   HG:
   HG: mods=
   HG: adds=added
   HG: dels=removed
   HG: files=added removed
   HG:
   HG: diff -r d2313f97106f removed
   HG: --- a/removed	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: -removed
   HG:
   HG: mods=
   HG: adds=added
   HG: dels=removed
   HG: files=added removed
   $ hg status -amr
   M changed
   $ hg parents --template "M {file_mods}\nA {file_adds}\nR {file_dels}\n"
   M 
   A added
   R removed
   $ hg rollback -q
 
   $ cat >> .hg/hgrc <<EOF
   > # disable customizing for subsequent tests
   > [committemplate]
   > changeset =
   > EOF
 
   $ cd ..
 
 
 commit copy
 
   $ hg init dir2
   $ cd dir2
   $ echo bleh > bar
   $ hg add bar
   $ hg ci -m 'add bar'
 
   $ hg cp bar foo
   $ echo >> bar
   $ hg ci -m 'cp bar foo; change bar'
 
   $ hg debugrename foo
   foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 26d3ca0dfd18 000000000000 000000000000
        1       1 d267bddd54f7 26d3ca0dfd18 000000000000
 
 Test making empty commits
   $ hg commit --config ui.allowemptycommit=True -m "empty commit"
   $ hg log -r . -v --stat
   changeset:   2:d809f3644287
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   description:
   empty commit
   
   
   
 verify pathauditor blocks evil filepaths
   $ cat > evil-commit.py <<EOF
   > from mercurial import context, hg, ui as uimod
   > notrc = u".h\u200cg".encode('utf-8') + b'/hgrc'
   > u = uimod.ui.load()
   > r = hg.repository(u, b'.')
   > def filectxfn(repo, memctx, path):
   >     return context.memfilectx(repo, memctx, path,
   >         b'[hooks]\nupdate = echo owned')
   > c = context.memctx(r, [r.changelog.tip(), r.nullid],
   >                    b'evil', [notrc], filectxfn, 0)
   > r.commitctx(c)
   > EOF
   $ "$PYTHON" evil-commit.py
 #if windows
   $ hg co --clean tip
   abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc)
   [10]
 #else
   $ hg co --clean tip
   abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc)
   [10]
 #endif
 
   $ hg rollback -f
   repository tip rolled back to revision 2 (undo commit)
   $ cat > evil-commit.py <<EOF
   > from mercurial import context, hg, ui as uimod
   > notrc = b"HG~1/hgrc"
   > u = uimod.ui.load()
   > r = hg.repository(u, b'.')
   > def filectxfn(repo, memctx, path):
   >     return context.memfilectx(repo, memctx, path,
   >         b'[hooks]\nupdate = echo owned')
   > c = context.memctx(r, [r[b'tip'].node(), r.nullid],
   >                    b'evil', [notrc], filectxfn, 0)
   > r.commitctx(c)
   > EOF
   $ "$PYTHON" evil-commit.py
   $ hg co --clean tip
   abort: path contains illegal component: HG~1/hgrc
   [10]
 
   $ hg rollback -f
   repository tip rolled back to revision 2 (undo commit)
   $ cat > evil-commit.py <<EOF
   > from mercurial import context, hg, ui as uimod
   > notrc = b"HG8B6C~2/hgrc"
   > u = uimod.ui.load()
   > r = hg.repository(u, b'.')
   > def filectxfn(repo, memctx, path):
   >     return context.memfilectx(repo, memctx, path,
   >         b'[hooks]\nupdate = echo owned')
   > c = context.memctx(r, [r[b'tip'].node(), r.nullid],
   >                    b'evil', [notrc], filectxfn, 0)
   > r.commitctx(c)
   > EOF
   $ "$PYTHON" evil-commit.py
   $ hg co --clean tip
   abort: path contains illegal component: HG8B6C~2/hgrc
   [10]
 
   $ cd ..
 
 # test that an unmodified commit template message aborts
 
   $ hg init unmodified_commit_template
   $ cd unmodified_commit_template
   $ echo foo > foo
   $ hg add foo
   $ hg commit -m "foo"
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit = HI THIS IS NOT STRIPPED
   >     HG: this is customized commit template
   >     HG: {extramsg}
   >     {if(activebookmark,
   >    "HG: bookmark '{activebookmark}' is activated\n",
   >    "HG: no bookmark is activated\n")}{subrepos %
   >    "HG: subrepo '{subrepo}' is changed\n"}
   > EOF
   $ cat > $TESTTMP/notouching.sh <<EOF
   > true
   > EOF
   $ echo foo2 > foo2
   $ hg add foo2
   $ HGEDITOR="sh $TESTTMP/notouching.sh" hg commit
   abort: commit message unchanged
   [10]
 
   $ cd ..
 
 test that text below the --- >8 --- special string is ignored
 
   $ cat <<'EOF' > $TESTTMP/lowercaseline.sh
   > cat $1 | sed s/LINE/line/ | tee $1.new
   > mv $1.new $1
   > EOF
 
   $ hg init ignore_below_special_string
   $ cd ignore_below_special_string
   $ echo foo > foo
   $ hg add foo
   $ hg commit -m "foo"
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit = first LINE
   >     HG: this is customized commit template
   >     HG: {extramsg}
   >     HG: ------------------------ >8 ------------------------
   >     {diff()}
   > EOF
   $ echo foo2 > foo2
   $ hg add foo2
   $ HGEDITOR="sh $TESTTMP/notouching.sh" hg ci
   abort: commit message unchanged
   [10]
   $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line
   HG: this is customized commit template
   HG: Leave message empty to abort commit.
   HG: ------------------------ >8 ------------------------
   diff -r e63c23eaa88a foo2
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/foo2	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +foo2
   $ hg log -T '{desc}\n' -r .
   first line
 
 test that the special string --- >8 --- isn't used when not at the beginning of
 a line
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit = first LINE2
   >     another line HG: ------------------------ >8 ------------------------
   >     HG: this is customized commit template
   >     HG: {extramsg}
   >     HG: ------------------------ >8 ------------------------
   >     {diff()}
   > EOF
   $ echo foo >> foo
   $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line2
   another line HG: ------------------------ >8 ------------------------
   HG: this is customized commit template
   HG: Leave message empty to abort commit.
   HG: ------------------------ >8 ------------------------
   diff -r 3661b22b0702 foo
   --- a/foo	Thu Jan 01 00:00:00 1970 +0000
   +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    foo
   +foo
   $ hg log -T '{desc}\n' -r .
   first line2
   another line HG: ------------------------ >8 ------------------------
 
 also test that this special string isn't accepted when there is some extra text
 at the end
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit = first LINE3
   >     HG: ------------------------ >8 ------------------------foobar
   >     second line
   >     HG: this is customized commit template
   >     HG: {extramsg}
   >     HG: ------------------------ >8 ------------------------
   >     {diff()}
   > EOF
   $ echo foo >> foo
   $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line3
   HG: ------------------------ >8 ------------------------foobar
   second line
   HG: this is customized commit template
   HG: Leave message empty to abort commit.
   HG: ------------------------ >8 ------------------------
   diff -r ce648f5f066f foo
   --- a/foo	Thu Jan 01 00:00:00 1970 +0000
   +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,3 @@
    foo
    foo
   +foo
   $ hg log -T '{desc}\n' -r .
   first line3
   second line
 
   $ cd ..
 
 testing commands.commit.post-status config option
 
   $ hg init ci-post-st
   $ cd ci-post-st
   $ echo '[commands]' > .hg/hgrc
   $ echo 'commit.post-status = 1' >> .hg/hgrc
 
   $ echo 'ignored-file' > .hgignore
   $ hg ci -qAm 0
 
   $ echo 'c' > clean-file
   $ echo 'a' > added-file
   $ echo '?' > unknown-file
   $ echo 'i' > ignored-file
   $ hg add clean-file added-file
   $ hg ci -m 1 clean-file
   A added-file
   ? unknown-file
   $ hg st -mardu
   A added-file
   ? unknown-file
 
   $ touch modified-file
   $ hg add modified-file
   $ hg ci -m 2 modified-file -q
 
   $ echo 'm' > modified-file
   $ hg ci --amend -m 'reworded' -X 're:'
   saved backup bundle to $TESTTMP/ci-post-st/.hg/strip-backup/*-amend.hg (glob)
   M modified-file
   A added-file
   ? unknown-file
   $ hg st -mardu
   M modified-file
   A added-file
   ? unknown-file
 
   $ cd ..

tests/test-copies-chain-merge.t

@@ -1,3846 +1,3846 b''
 #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push pull-upgrade push-upgrade
 
 =====================================================
 Test Copy tracing for chain of copies involving merge
 =====================================================
 
 This test files covers copies/rename case for a chains of commit where merges
 are involved. It cheks we do not have unwanted update of behavior and that the
 different options to retrieve copies behave correctly.
 
 
 Setup
 =====
 
 use git diff to see rename
 
   $ cat << EOF >> ./no-linkrev
   > #!$PYTHON
   > # filter out linkrev part of the debugindex command
   > import sys
   > for line in sys.stdin:
   >     if " linkrev " in line:
   >         print(line.rstrip())
   >     else:
   >         l = "%s       *%s" % (line[:6], line[14:].rstrip())
   >         print(l)
   > EOF
 
   $ cat << EOF >> $HGRCPATH
   > [diff]
   > git=yes
   > [command-templates]
   > log={desc}\n
   > EOF
 
 #if compatibility
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > copies.read-from = compatibility
   > EOF
 #endif
 
 #if changeset
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > copies.read-from = changeset-only
   > copies.write-to = changeset-only
   > EOF
 #endif
 
 #if sidedata
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
 #endif
 
 #if pull
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
 #endif
 
 #if push
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
 #endif
 
 #if pull-upgrade
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = no
   > [experimental]
   > changegroup4 = yes
   > EOF
 #endif
 
 #if push-upgrade
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = no
   > [experimental]
   > changegroup4 = yes
   > EOF
 #endif
 
   $ cat > same-content.txt << EOF
   > Here is some content that will be the same accros multiple file.
   > 
   > This is done on purpose so that we end up in some merge situation, were the
   > resulting content is the same as in the parent(s), but a new filenodes still
   > need to be created to record some file history information (especially
   > about copies).
   > EOF
 
   $ hg init repo-chain
   $ cd repo-chain
 
 Add some linear rename initialy
 
   $ cp ../same-content.txt a
   $ cp ../same-content.txt b
   $ cp ../same-content.txt h
   $ echo "original content for P" > p
   $ echo "original content for Q" > q
   $ echo "original content for R" > r
   $ hg ci -Am 'i-0 initial commit: a b h p q r'
   adding a
   adding b
   adding h
   adding p
   adding q
   adding r
   $ hg mv a c
   $ hg mv p s
   $ hg ci -Am 'i-1: a -move-> c, p -move-> s'
   $ hg mv c d
   $ hg mv s t
   $ hg ci -Am 'i-2: c -move-> d, s -move-> t'
   $ hg log -G
   @  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 And having another branch with renames on the other side
 
   $ hg mv d e
   $ hg ci -Am 'a-1: d -move-> e'
   $ hg mv e f
   $ hg ci -Am 'a-2: e -move-> f'
   $ hg log -G --rev '::.'
   @  a-2: e -move-> f
   |
   o  a-1: d -move-> e
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Have a branching with nothing on one side
 
   $ hg up 'desc("i-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo foo > b
   $ hg ci -m 'b-1: b update'
   created new head
   $ hg log -G --rev '::.'
   @  b-1: b update
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Create a branch that delete a file previous renamed
 
   $ hg up 'desc("i-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rm d
   $ hg ci -m 'c-1 delete d'
   created new head
   $ hg log -G --rev '::.'
   @  c-1 delete d
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Create a branch that delete a file previous renamed and recreate it
 
   $ hg up 'desc("i-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rm d
   $ hg ci -m 'd-1 delete d'
   created new head
   $ echo bar > d
   $ hg add d
   $ hg ci -m 'd-2 re-add d'
   $ hg log -G --rev '::.'
   @  d-2 re-add d
   |
   o  d-1 delete d
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Having another branch renaming a different file to the same filename as another
 
   $ hg up 'desc("i-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv b g
   $ hg ci -m 'e-1 b -move-> g'
   created new head
   $ hg mv g f
   $ hg ci -m 'e-2 g -move-> f'
   $ hg log -G --rev '::.'
   @  e-2 g -move-> f
   |
   o  e-1 b -move-> g
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
 Having a branch similar to the 'a' one, but moving the 'p' file around.
 
   $ hg up 'desc("i-2")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv t u
   $ hg ci -Am 'p-1: t -move-> u'
   created new head
   $ hg mv u v
   $ hg ci -Am 'p-2: u -move-> v'
   $ hg log -G --rev '::.'
   @  p-2: u -move-> v
   |
   o  p-1: t -move-> u
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
 Having another branch renaming a different file to the same filename as another
 
   $ hg up 'desc("i-2")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv r w
   $ hg ci -m 'q-1 r -move-> w'
   created new head
   $ hg mv w v
   $ hg ci -m 'q-2 w -move-> v'
   $ hg log -G --rev '::.'
   @  q-2 w -move-> v
   |
   o  q-1 r -move-> w
   |
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
 Setup all merge
 ===============
 
 This is done beforehand to validate that the upgrade process creates valid copy
 information.
 
 merging with unrelated change does not interfere with the renames
 ---------------------------------------------------------------
 
 - rename on one side
 - unrelated change on the other side
 
   $ case_desc="simple merge - A side: multiple renames, B side: unrelated update"
 
   $ hg up 'desc("b-1")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("a-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mBAm-0 $case_desc - one way"
   $ hg up 'desc("a-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mABm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
   @    mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   |\
   +---o  mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
   | |/
   | o  b-1: b update
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 merging with the side having a delete
 -------------------------------------
 
 case summary:
 - one with change to an unrelated file
 - one deleting the change
 and recreate an unrelated file after the merge
 
   $ case_desc="simple merge - C side: delete a file with copies history , B side: unrelated update"
 
   $ hg up 'desc("b-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("c-1")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mBCm-0 $case_desc - one way"
   $ echo bar > d
   $ hg add d
   $ hg ci -m 'mBCm-1 re-add d'
   $ hg up 'desc("c-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mCBm-0 $case_desc - the other way"
   created new head
   $ echo bar > d
   $ hg add d
   $ hg ci -m 'mCBm-1 re-add d'
   $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
   @  mCBm-1 re-add d
   |
   o    mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
   |\
   | | o  mBCm-1 re-add d
   | | |
   +---o  mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Comparing with a merge re-adding the file afterward
 ---------------------------------------------------
 
 Merge:
 - one with change to an unrelated file
 - one deleting and recreating the change
 
   $ case_desc="simple merge - B side: unrelated update, D side: delete and recreate a file (with different content)"
 
   $ hg up 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("d-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mBDm-0 $case_desc - one way"
   $ hg up 'desc("d-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mDBm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
   @    mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   |\
   +---o  mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   | |/
   | o  d-2 re-add d
   | |
   | o  d-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 Comparing with a merge with colliding rename
 --------------------------------------------
 
 Subcase: new copy information on both side
 ``````````````````````````````````````````
 
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 
   $ case_desc="merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)"
 
   $ hg up 'desc("a-2")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("e-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mAEm-0 $case_desc - one way"
   $ hg up 'desc("e-2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("a-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mEAm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
   @    mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
   |\
   +---o  mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   | |/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: new copy information on both side with an actual merge happening
 `````````````````````````````````````````````````````````````````````````
 
 - the "p-" branch renaming 't' to 'v' (through 'u')
 - the "q-" branch renaming 'r' to 'v' (through 'w')
 
   $ case_desc="merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content)"
 
   $ hg up 'desc("p-2")'
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg merge 'desc("q-2")' --tool ':union'
   merging v
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mPQm-0 $case_desc - one way"
   $ hg up 'desc("q-2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("p-2")' --tool ':union'
   merging v
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mQPm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
   o    mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
   |\
   +---o  mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   | |/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: existing copy information overwritten on one branch
 ````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (d) with a rename (from h to i to d)
 
   $ case_desc="simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
 
   $ hg up 'desc("i-2")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv h i
   $ hg commit -m "f-1: rename h -> i"
   created new head
   $ hg mv --force i d
   $ hg commit -m "f-2: rename i -> d"
   $ hg debugindex d | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
        1       * b004912a8510 000000000000 000000000000
        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
   $ hg up 'desc("b-1")'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("f-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mBFm-0 $case_desc - one way"
   $ hg up 'desc("f-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mFBm-0 $case_desc - the other way"
   created new head
   $ hg up null --quiet
   $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
   o    mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   |\
   +---o  mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   | |/
   | o  f-2: rename i -> d
   | |
   | o  f-1: rename h -> i
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: existing copy information overwritten on one branch, with different content)
 `````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch
 
   $ case_desc="simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content"
 
   $ hg up 'desc("i-2")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv r x
   $ hg commit -m "r-1: rename r -> x"
   created new head
   $ hg mv --force x t
   $ hg commit -m "r-2: rename t -> x"
   $ hg debugindex t | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * d74efbf65309 000000000000 000000000000 (no-changeset !)
        1       * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
        0       * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
        1       * a38b2fa17021 000000000000 000000000000 (changeset !)
   $ hg up 'desc("b-1")'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("r-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mBRm-0 $case_desc - one way"
   $ hg up 'desc("r-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mRBm-0 $case_desc - the other way"
   created new head
   $ hg up null --quiet
   $ hg log -G --rev '::(desc("mBRm")+desc("mRBm"))'
   o    mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way
   |\
   +---o  mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way
   | |/
   | o  r-2: rename t -> x
   | |
   | o  r-1: rename r -> x
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 Subcase: reset of the copy history on one side
 ``````````````````````````````````````````````
 
 Merge:
 - one with change to a file
 - one deleting and recreating the file
 
 Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
 consider history and rename on both branch of the merge.
 
   $ case_desc="actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content"
 
   $ hg up 'desc("i-2")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "some update" >> d
   $ hg commit -m "g-1: update d"
   created new head
   $ hg up 'desc("d-2")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("g-1")' --tool :union
   merging d
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mDGm-0 $case_desc - one way"
   $ hg up 'desc("g-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("d-2")' --tool :union
   merging d
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mGDm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
   @    mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
   |\
   +---o  mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   | |/
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   | |
   o |  d-1 delete d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
 ````````````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to a file (d)
 - one overwriting that file with a rename (from h to i, to d)
 
 This case is similar to BF/FB, but an actual merge happens, so both side of the
 history are relevant.
 
 Note:
 | In this case, the merge get conflicting information since on one side we have
 | "a -> c -> d". and one the other one we have "h -> i -> d".
 |
 | The current code arbitrarily pick one side
 
   $ case_desc="merge - G side: content change, F side: copy overwrite, no content change"
 
   $ hg up 'desc("f-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("g-1")' --tool :union
   merging d (no-changeset !)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mFGm-0 $case_desc - one way"
   created new head
   $ hg up 'desc("g-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("f-2")' --tool :union
   merging d (no-changeset !)
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mGFm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
   @    mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
   |\
   +---o  mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
   | |/
   | o  g-1: update d
   | |
   o |  f-2: rename i -> d
   | |
   o |  f-1: rename h -> i
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 Comparing with merging with a deletion (and keeping the file)
 -------------------------------------------------------------
 
 Merge:
 - one removing a file (d)
 - one updating that file
 - the merge keep the modified version of the file (canceling the delete)
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ case_desc="merge updated/deleted - revive the file (updated content)"
 
   $ hg up 'desc("c-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("g-1")'
   file 'd' 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
   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 resolve -t :other d
   (no more unresolved files)
   $ hg ci -m "mCGm-0 $case_desc - one way"
   created new head
 
   $ hg up 'desc("g-1")'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("c-1")'
   file 'd' 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? u
   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 resolve -t :local d
   (no more unresolved files)
   $ hg ci -m "mGCm-0 $case_desc - the other way"
   created new head
 
   $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
   @    mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
   |\
   +---o  mCGm-0 merge updated/deleted - revive the file (updated content) - one way
   | |/
   | o  g-1: update d
   | |
   o |  c-1 delete d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 
 Comparing with merge restoring an untouched deleted file
 --------------------------------------------------------
 
 Merge:
 - one removing a file (d)
 - one leaving the file untouched
 - the merge actively restore the file to the same content.
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)"
 
   $ hg up 'desc("c-1")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
   $ hg ci -m "mCB-revert-m-0 $case_desc - one way"
   created new head
 
   $ hg up 'desc("b-1")'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("c-1")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
   $ hg ci -m "mBC-revert-m-0 $case_desc - the other way"
   created new head
 
   $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
   @    mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
   +---o  mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
   $ hg up null --quiet
 
 Merging a branch where a rename was deleted with a branch where the same file was renamed
 ------------------------------------------------------------------------------------------
 
 Create a "conflicting" merge where `d` get removed on one branch before its
 rename information actually conflict with the other branch.
 
 (the copy information from the branch that was not deleted should win).
 
   $ case_desc="simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch)"
 
   $ hg up 'desc("i-0")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv b d
   $ hg ci -m "h-1: b -(move)-> d"
   created new head
 
   $ hg up 'desc("c-1")'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg merge 'desc("h-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mCH-delete-before-conflict-m-0 $case_desc - one way"
 
   $ hg up 'desc("h-1")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("c-1")'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
   @    mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way
   |\
   +---o  mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way
   | |/
   | o  h-1: b -(move)-> d
   | |
   o |  c-1 delete d
   | |
   o |  i-2: c -move-> d, s -move-> t
   | |
   o |  i-1: a -move-> c, p -move-> s
   |/
   o  i-0 initial commit: a b h p q r
   
 
 Variant of previous with extra changes introduced by the merge
 --------------------------------------------------------------
 
 Multiple cases above explicitely test cases where content are the same on both side during merge. In this section we will introduce variants for theses cases where new change are introduced to these file content during the merges.
 
 
 Subcase: merge has same initial content on both side, but merge introduced a change
 ```````````````````````````````````````````````````````````````````````````````````
 
 Same as `mAEm` and `mEAm` but with extra change to the file before commiting
 
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 
   $ case_desc="merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent)"
 
   $ hg up 'desc("a-2")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("e-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ echo "content change for mAE-change-m" > f
   $ hg ci -m "mAE-change-m-0 $case_desc - one way"
   created new head
   $ hg up 'desc("e-2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("a-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ echo "content change for mEA-change-m" > f
   $ hg ci -m "mEA-change-m-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mAE-change-m")+desc("mEA-change-m"))'
   @    mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way
   |\
   +---o  mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way
   | |/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: merge overwrite common copy information, but with extra change during the merge
 ````````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (d) with a rename (from h to i to d)
 - the merge update f content
 
   $ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
 
   $ hg up 'desc("f-2")'
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 #if no-changeset
   $ hg debugindex d | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * d8252ab2e760 000000000000 000000000000
        1       * b004912a8510 000000000000 000000000000
        2       * 7b79e2fe0c89 000000000000 000000000000
        3       * 17ec97e60577 d8252ab2e760 000000000000
        4       * 06dabf50734c b004912a8510 17ec97e60577
        5       * 19c0e3924691 17ec97e60577 b004912a8510
        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
        7       * d55cb4e9ef57 000000000000 000000000000
 #else
   $ hg debugindex d | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * ae258f702dfe 000000000000 000000000000
        1       * b004912a8510 000000000000 000000000000
        2       * 5cce88bf349f ae258f702dfe 000000000000
        3       * cc269dd788c8 b004912a8510 5cce88bf349f
        4       * 51c91a115080 5cce88bf349f b004912a8510
 #endif
   $ hg up 'desc("b-1")'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("f-2")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ echo "extra-change to (formelly h) during the merge" > d
   $ hg ci -m "mBF-change-m-0 $case_desc - one way"
   created new head
   $ hg manifest --rev . --debug | grep "  d"
   1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644   d (no-changeset !)
   cea2d99c0fde64672ef61953786fdff34f16e230 644   d (changeset !)
 
   $ hg up 'desc("f-2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo "extra-change to (formelly h) during the merge" > d
   $ hg ci -m "mFB-change-m-0 $case_desc - the other way"
   created new head
   $ hg manifest --rev . --debug | grep "  d"
   1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644   d (no-changeset !)
   cea2d99c0fde64672ef61953786fdff34f16e230 644   d (changeset !)
 #if no-changeset
   $ hg debugindex d | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * d8252ab2e760 000000000000 000000000000
        1       * b004912a8510 000000000000 000000000000
        2       * 7b79e2fe0c89 000000000000 000000000000
        3       * 17ec97e60577 d8252ab2e760 000000000000
        4       * 06dabf50734c b004912a8510 17ec97e60577
        5       * 19c0e3924691 17ec97e60577 b004912a8510
        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
        7       * d55cb4e9ef57 000000000000 000000000000
        8       * 1c334238bd42 7b79e2fe0c89 000000000000
 #else
   $ hg debugindex d | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * ae258f702dfe 000000000000 000000000000
        1       * b004912a8510 000000000000 000000000000
        2       * 5cce88bf349f ae258f702dfe 000000000000
        3       * cc269dd788c8 b004912a8510 5cce88bf349f
        4       * 51c91a115080 5cce88bf349f b004912a8510
        5       * cea2d99c0fde ae258f702dfe 000000000000
 #endif
   $ hg log -G --rev '::(desc("mBF-change-m")+desc("mFB-change-m"))'
   @    mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   |\
   +---o  mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   | |/
   | o  f-2: rename i -> d
   | |
   | o  f-1: rename h -> i
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: restoring and untouched deleted file, while touching it
 ````````````````````````````````````````````````````````````````
 
 Merge:
 - one removing a file (d)
 - one leaving the file untouched
 - the merge actively restore the file to the same content.
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)"
 
   $ hg up 'desc("c-1")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
   $ echo "new content for d after the revert" > d
   $ hg ci -m "mCB-change-m-0 $case_desc - one way"
   created new head
   $ hg manifest --rev . --debug | grep "  d"
   e333780c17752a3b0dd15e3ad48aa4e5c745f621 644   d (no-changeset !)
   4b540a18ad699234b2b2aa18cb69555ac9c4b1df 644   d (changeset !)
 
   $ hg up 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("c-1")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
   $ echo "new content for d after the revert" > d
   $ hg ci -m "mBC-change-m-0 $case_desc - the other way"
   created new head
   $ hg manifest --rev . --debug | grep "  d"
   e333780c17752a3b0dd15e3ad48aa4e5c745f621 644   d (no-changeset !)
   4b540a18ad699234b2b2aa18cb69555ac9c4b1df 644   d (changeset !)
 
 
   $ hg up null --quiet
   $ hg log -G --rev '::(desc("mCB-change-m")+desc("mBC-change-m"))'
   o    mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
   +---o  mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Decision from previous merge are properly chained with later merge
 ------------------------------------------------------------------
 
 Subcase: chaining conflicting rename resolution
 ```````````````````````````````````````````````
 
 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
 about that file should stay unchanged.
 
 We also touch J during some of the merge to check for unrelated change to new file during merge.
 
   $ case_desc="chained merges (conflict -> simple) - same content everywhere"
 
 (extra unrelated changes)
 
   $ hg up 'desc("a-2")'
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo j > unrelated-j
   $ hg add unrelated-j
   $ hg ci -m 'j-1: unrelated changes (based on the "a" series of changes)'
   created new head
 
   $ hg up 'desc("e-2")'
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
   $ echo k > unrelated-k
   $ hg add unrelated-k
   $ hg ci -m 'k-1: unrelated changes (based on "e" changes)'
   created new head
 
 (merge variant 1)
 
   $ hg up 'desc("mAEm")'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("k-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mAE,Km: $case_desc"
 
 (merge variant 2)
 
   $ hg up 'desc("k-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
 
   $ hg merge 'desc("mAEm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mK,AEm: $case_desc"
   created new head
 
 (merge variant 3)
 
   $ hg up 'desc("mEAm")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("j-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo jj > unrelated-j
   $ hg ci -m "mEA,Jm: $case_desc"
 
 (merge variant 4)
 
   $ hg up 'desc("j-1")'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("mEAm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ echo jj > unrelated-j
   $ hg ci -m "mJ,EAm: $case_desc"
   created new head
 
 
   $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))'
   @    mJ,EAm: chained merges (conflict -> simple) - same content everywhere
   |\
   +---o  mEA,Jm: chained merges (conflict -> simple) - same content everywhere
   | |/
   | | o    mK,AEm: chained merges (conflict -> simple) - same content everywhere
   | | |\
   | | +---o  mAE,Km: chained merges (conflict -> simple) - same content everywhere
   | | | |/
   | | | o  k-1: unrelated changes (based on "e" changes)
   | | | |
   | o | |  j-1: unrelated changes (based on the "a" series of changes)
   | | | |
   o-----+  mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
   |/ / /
   | o /  mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   |/|/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: chaining conflicting rename resolution, with actual merging happening
 ``````````````````````````````````````````````````````````````````````````````
 
 The "mPQm" and "mQPm" case create a rename tracking conflict on file 't'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 't' and the arbitration done within "mPQm" and "mQP"
 about that file should stay unchanged.
 
   $ case_desc="chained merges (conflict -> simple) - different content"
 
 (extra unrelated changes)
 
   $ hg up 'desc("p-2")'
   3 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo s > unrelated-s
   $ hg add unrelated-s
   $ hg ci -m 's-1: unrelated changes (based on the "p" series of changes)'
   created new head
 
   $ hg up 'desc("q-2")'
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo t > unrelated-t
   $ hg add unrelated-t
   $ hg ci -m 't-1: unrelated changes (based on "q" changes)'
   created new head
 
 (merge variant 1)
 
   $ hg up 'desc("mPQm")'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg merge 'desc("t-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mPQ,Tm: $case_desc"
 
 (merge variant 2)
 
   $ hg up 'desc("t-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge 'desc("mPQm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mT,PQm: $case_desc"
   created new head
 
 (merge variant 3)
 
   $ hg up 'desc("mQPm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("s-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mQP,Sm: $case_desc"
 
 (merge variant 4)
 
   $ hg up 'desc("s-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("mQPm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mS,QPm: $case_desc"
   created new head
   $ hg up null --quiet
 
 
   $ hg log -G --rev '::(desc("mPQ,Tm") + desc("mT,PQm") + desc("mQP,Sm") + desc("mS,QPm"))'
   o    mS,QPm: chained merges (conflict -> simple) - different content
   |\
   +---o  mQP,Sm: chained merges (conflict -> simple) - different content
   | |/
   | | o    mT,PQm: chained merges (conflict -> simple) - different content
   | | |\
   | | +---o  mPQ,Tm: chained merges (conflict -> simple) - different content
   | | | |/
   | | | o  t-1: unrelated changes (based on "q" changes)
   | | | |
   | o | |  s-1: unrelated changes (based on the "p" series of changes)
   | | | |
   o-----+  mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way
   |/ / /
   | o /  mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way
   |/|/
   | o  q-2 w -move-> v
   | |
   | o  q-1 r -move-> w
   | |
   o |  p-2: u -move-> v
   | |
   o |  p-1: t -move-> u
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: chaining salvage information during a merge
 ````````````````````````````````````````````````````
 
 We add more change on the branch were the file was deleted. merging again
 should preserve the fact eh file was salvaged.
 
   $ case_desc="chained merges (salvaged -> simple) - same content (when the file exists)"
 
 (creating the change)
 
   $ hg up 'desc("c-1")'
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo l > unrelated-l
   $ hg add unrelated-l
   $ hg ci -m 'l-1: unrelated changes (based on "c" changes)'
   created new head
 
 (Merge variant 1)
 
   $ hg up 'desc("mBC-revert-m")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("l-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mBC+revert,Lm: $case_desc"
 
 (Merge variant 2)
 
   $ hg up 'desc("mCB-revert-m")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("l-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mCB+revert,Lm: $case_desc"
 
 (Merge variant 3)
 
   $ hg up 'desc("l-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg merge 'desc("mBC-revert-m")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mL,BC+revertm: $case_desc"
   created new head
 
 (Merge variant 4)
 
   $ hg up 'desc("l-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg merge 'desc("mCB-revert-m")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mL,CB+revertm: $case_desc"
   created new head
 
   $ hg log -G --rev '::(desc("mBC+revert,Lm") + desc("mCB+revert,Lm") + desc("mL,BC+revertm") + desc("mL,CB+revertm"))'
   @    mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
   |\
   | | o  mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
   | |/|
   +-+---o  mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
   | | |
   | +---o  mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
   | | |/
   | o |  l-1: unrelated changes (based on "c" changes)
   | | |
   | | o  mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   | |/|
   o---+  mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   |/ /
   o |  c-1 delete d
   | |
   | o  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 
 Subcase: chaining "merged" information during a merge
 ``````````````````````````````````````````````````````
 
 When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.
 
   $ case_desc="chained merges (copy-overwrite -> simple) - same content"
 
 (extra unrelated changes)
 
   $ hg up 'desc("f-2")'
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
   $ echo n > unrelated-n
   $ hg add unrelated-n
   $ hg ci -m 'n-1: unrelated changes (based on the "f" series of changes)'
   created new head
 
   $ hg up 'desc("g-1")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo o > unrelated-o
   $ hg add unrelated-o
   $ hg ci -m 'o-1: unrelated changes (based on "g" changes)'
   created new head
 
 (merge variant 1)
 
   $ hg up 'desc("mFGm")'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("o-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mFG,Om: $case_desc"
 
 (merge variant 2)
 
   $ hg up 'desc("o-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
   $ hg merge 'desc("FGm")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
   (branch merge, don't forget to commit)
   $ hg ci -m "mO,FGm: $case_desc"
   created new head
 
 (merge variant 3)
 
   $ hg up 'desc("mGFm")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("n-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mGF,Nm: $case_desc"
 
 (merge variant 4)
 
   $ hg up 'desc("n-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("mGFm")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mN,GFm: $case_desc"
   created new head
 
   $ hg log -G --rev '::(desc("mFG,Om") + desc("mO,FGm") + desc("mGF,Nm") + desc("mN,GFm"))'
   @    mN,GFm: chained merges (copy-overwrite -> simple) - same content
   |\
   +---o  mGF,Nm: chained merges (copy-overwrite -> simple) - same content
   | |/
   | | o    mO,FGm: chained merges (copy-overwrite -> simple) - same content
   | | |\
   | | +---o  mFG,Om: chained merges (copy-overwrite -> simple) - same content
   | | | |/
   | | | o  o-1: unrelated changes (based on "g" changes)
   | | | |
   | o | |  n-1: unrelated changes (based on the "f" series of changes)
   | | | |
   o-----+  mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
   |/ / /
   | o /  mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
   |/|/
   | o  g-1: update d
   | |
   o |  f-2: rename i -> d
   | |
   o |  f-1: rename h -> i
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Subcase: chaining conflicting rename resolution, with extra change during the merge
 ```````````````````````````````````````````````````````````````````````````````````
 
 The "mEA-change-m-0" and "mAE-change-m-0" case create a rename tracking conflict on file 'f'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
 about that file should stay unchanged.
 
   $ case_desc="chained merges (conflict+change -> simple) - same content on both branch in the initial merge"
 
 
 (merge variant 1)
 
   $ hg up 'desc("mAE-change-m")'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg merge 'desc("k-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mAE-change,Km: $case_desc"
 
 (merge variant 2)
 
   $ hg up 'desc("k-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge 'desc("mAE-change-m")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mK,AE-change-m: $case_desc"
   created new head
 
 (merge variant 3)
 
   $ hg up 'desc("mEA-change-m")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("j-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mEA-change,Jm: $case_desc"
 
 (merge variant 4)
 
   $ hg up 'desc("j-1")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 'desc("mEA-change-m")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "mJ,EA-change-m: $case_desc"
   created new head
 
 
   $ hg log -G --rev '::(desc("mAE-change,Km") + desc("mK,AE-change-m") + desc("mEA-change,Jm") + desc("mJ,EA-change-m"))'
   @    mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   |\
   +---o  mEA-change,Jm: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   | |/
   | | o    mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   | | |\
   | | +---o  mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   | | | |/
   | | | o  k-1: unrelated changes (based on "e" changes)
   | | | |
   | o | |  j-1: unrelated changes (based on the "a" series of changes)
   | | | |
   o-----+  mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way
   |/ / /
   | o /  mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way
   |/|/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Summary of all created cases
 ----------------------------
 
   $ hg up --quiet null
 
 (This exists to help keeping a compact list of the various cases we have built)
 
   $ hg log -T '{desc|firstline}\n'| sort
   a-1: d -move-> e
   a-2: e -move-> f
   b-1: b update
   c-1 delete d
   d-1 delete d
   d-2 re-add d
   e-1 b -move-> g
   e-2 g -move-> f
   f-1: rename h -> i
   f-2: rename i -> d
   g-1: update d
   h-1: b -(move)-> d
   i-0 initial commit: a b h p q r
   i-1: a -move-> c, p -move-> s
   i-2: c -move-> d, s -move-> t
   j-1: unrelated changes (based on the "a" series of changes)
   k-1: unrelated changes (based on "e" changes)
   l-1: unrelated changes (based on "c" changes)
   mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   mAE,Km: chained merges (conflict -> simple) - same content everywhere
   mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way
   mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
   mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
   mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
   mBCm-1 re-add d
   mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way
   mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
   mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
   mCBm-1 re-add d
   mCGm-0 merge updated/deleted - revive the file (updated content) - one way
   mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way
   mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   mEA,Jm: chained merges (conflict -> simple) - same content everywhere
   mEA-change,Jm: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way
   mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
   mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   mFG,Om: chained merges (copy-overwrite -> simple) - same content
   mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
   mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
   mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
   mGF,Nm: chained merges (copy-overwrite -> simple) - same content
   mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
   mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way
   mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   mJ,EAm: chained merges (conflict -> simple) - same content everywhere
   mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
   mK,AEm: chained merges (conflict -> simple) - same content everywhere
   mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
   mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
   mN,GFm: chained merges (copy-overwrite -> simple) - same content
   mO,FGm: chained merges (copy-overwrite -> simple) - same content
   mPQ,Tm: chained merges (conflict -> simple) - different content
   mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way
   mQP,Sm: chained merges (conflict -> simple) - different content
   mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way
   mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way
   mS,QPm: chained merges (conflict -> simple) - different content
   mT,PQm: chained merges (conflict -> simple) - different content
   n-1: unrelated changes (based on the "f" series of changes)
   o-1: unrelated changes (based on "g" changes)
   p-1: t -move-> u
   p-2: u -move-> v
   q-1 r -move-> w
   q-2 w -move-> v
   r-1: rename r -> x
   r-2: rename t -> x
   s-1: unrelated changes (based on the "p" series of changes)
   t-1: unrelated changes (based on "q" changes)
 
 
 Test that sidedata computations during upgrades are correct
 ===========================================================
 
 We upgrade a repository that is not using sidedata (the filelog case) and
  check that the same side data have been generated as if they were computed at
  commit time.
 
 
 #if upgraded
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
   $ hg debugformat -v | egrep 'changelog-v2|revlog-v2|copies-sdc'
   copies-sdc:          no    yes      no
   revlog-v2:           no     no      no
   changelog-v2:        no    yes      no
   $ hg debugupgraderepo --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - changelog
   
 #endif
 
 #if upgraded-parallel
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > [experimental]
   > worker.repository-upgrade=yes
   > [worker]
   > enabled=yes
   > numcpus=8
   > EOF
   $ hg debugformat -v  | egrep 'changelog-v2|revlog-v2|copies-sdc'
   copies-sdc:          no    yes      no
   revlog-v2:           no     no      no
   changelog-v2:        no    yes      no
   $ hg debugupgraderepo --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - changelog
   
 #endif
 
 #if pull
   $ cd ..
   $ mv repo-chain repo-source
   $ hg init repo-chain
   $ cd repo-chain
   $ hg pull ../repo-source
   pulling from ../repo-source
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 80 changesets with 44 changes to 25 files (+39 heads)
   new changesets a3a31bbefea6:908ce9259ffa
   (run 'hg heads' to see heads, 'hg merge' to merge)
 #endif
 
 #if pull-upgrade
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > [experimental]
   > changegroup4 = yes
   > EOF
   $ cd ..
   $ mv repo-chain repo-source
   $ hg init repo-chain
   $ cd repo-chain
   $ hg pull ../repo-source
   pulling from ../repo-source
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 80 changesets with 44 changes to 25 files (+39 heads)
   new changesets a3a31bbefea6:908ce9259ffa
   (run 'hg heads' to see heads, 'hg merge' to merge)
 #endif
 
 #if push
   $ cd ..
   $ mv repo-chain repo-source
   $ hg init repo-chain
   $ cd repo-source
   $ hg push ../repo-chain
   pushing to ../repo-chain
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 80 changesets with 44 changes to 25 files (+39 heads)
   $ cd ../repo-chain
 #endif
 
 #if push-upgrade
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > [experimental]
   > changegroup4 = yes
   > EOF
   $ cd ..
   $ mv repo-chain repo-source
   $ hg init repo-chain
   $ cd repo-source
   $ hg push ../repo-chain
   pushing to ../repo-chain
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 80 changesets with 44 changes to 25 files (+39 heads)
   $ cd ../repo-chain
 #endif
 
 #if no-compatibility no-filelog no-changeset
 
   $ hg debugchangedfiles --compute 0
   added      : a, ;
   added      : b, ;
   added      : h, ;
   added      : p, ;
   added      : q, ;
   added      : r, ;
 
   $ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do
   >     case_id=`hg log -r $rev -T '{word(0, desc, ":")}\n'`
   >     echo "##### revision \"$case_id\" #####"
   >     hg debugsidedata -c -v -- $rev
   >     hg debugchangedfiles $rev
   > done
   ##### revision "i-0 initial commit" #####
   1 sidedata entries
    entry-0014 size 64
     '\x00\x00\x00\x06\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00\x04\x00\x00\x00\x04\x00\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x00abhpqr'
   added      : a, ;
   added      : b, ;
   added      : h, ;
   added      : p, ;
   added      : q, ;
   added      : r, ;
   ##### revision "i-1" #####
   1 sidedata entries
    entry-0014 size 44
     '\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02acps'
   removed    : a, ;
   added    p1: c, a;
   removed    : p, ;
   added    p1: s, p;
   ##### revision "i-2" #####
   1 sidedata entries
    entry-0014 size 44
     '\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02cdst'
   removed    : c, ;
   added    p1: d, c;
   removed    : s, ;
   added    p1: t, s;
   ##### revision "a-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de'
   removed    : d, ;
   added    p1: e, d;
   ##### revision "a-2" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ef'
   removed    : e, ;
   added    p1: f, e;
   ##### revision "b-1" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00b'
   touched    : b, ;
   ##### revision "c-1 delete d" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
   removed    : d, ;
   ##### revision "d-1 delete d" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
   removed    : d, ;
   ##### revision "d-2 re-add d" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
   added      : d, ;
   ##### revision "e-1 b -move-> g" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bg'
   removed    : b, ;
   added    p1: g, b;
   ##### revision "e-2 g -move-> f" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg'
   added    p1: f, g;
   removed    : g, ;
   ##### revision "p-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00tu'
   removed    : t, ;
   added    p1: u, t;
   ##### revision "p-2" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00uv'
   removed    : u, ;
   added    p1: v, u;
   ##### revision "q-1 r -move-> w" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00rw'
   removed    : r, ;
   added    p1: w, r;
   ##### revision "q-2 w -move-> v" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00vw'
   added    p1: v, w;
   removed    : w, ;
   ##### revision "mBAm-0 simple merge - A side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mABm-0 simple merge - A side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mBCm-0 simple merge - C side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mBCm-1 re-add d" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
   added      : d, ;
   ##### revision "mCBm-0 simple merge - C side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mCBm-1 re-add d" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
   added      : d, ;
   ##### revision "mBDm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mDBm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mAEm-0 merge with copies info on both side - A side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
   merged     : f, ;
   ##### revision "mEAm-0 merge with copies info on both side - A side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
   merged     : f, ;
   ##### revision "mPQm-0 merge with copies info on both side - P side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v'
   merged     : v, ;
   ##### revision "mQPm-0 merge with copies info on both side - P side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v'
   merged     : v, ;
   ##### revision "f-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi'
   removed    : h, ;
   added    p1: i, h;
   ##### revision "f-2" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00di'
   touched  p1: d, i;
   removed    : i, ;
   ##### revision "mBFm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mFBm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "r-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00rx'
   removed    : r, ;
   added    p1: x, r;
   ##### revision "r-2" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00tx'
   touched  p1: t, x;
   removed    : x, ;
   ##### revision "mBRm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mRBm-0 simple merge - B side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "g-1" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
   touched    : d, ;
   ##### revision "mDGm-0 actual content merge, copies on one side - D side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
   merged     : d, ;
   ##### revision "mGDm-0 actual content merge, copies on one side - D side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
   merged     : d, ;
   ##### revision "mFGm-0 merge - G side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
   merged     : d, ;
   ##### revision "mGFm-0 merge - G side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
   merged     : d, ;
   ##### revision "mCGm-0 merge updated/deleted - revive the file (updated content) - one way" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "mGCm-0 merge updated/deleted - revive the file (updated content) - the other way" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "mCB-revert-m-0 merge explicitely revive deleted file - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "mBC-revert-m-0 merge explicitely revive deleted file - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "h-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bd'
   removed    : b, ;
   added    p1: d, b;
   ##### revision "mCH-delete-before-conflict-m-0 simple merge - C side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mHC-delete-before-conflict-m-0 simple merge - C side" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mAE-change-m-0 merge with file update and copies info on both side - A side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
   merged     : f, ;
   ##### revision "mEA-change-m-0 merge with file update and copies info on both side - A side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
   merged     : f, ;
   ##### revision "mBF-change-m-0 merge with extra change - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
   touched    : d, ;
   ##### revision "mFB-change-m-0 merge with extra change - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
   touched    : d, ;
   ##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "mBC-change-m-0 merge explicitely revive deleted file - B side" #####
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
   salvaged   : d, ;
   ##### revision "j-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
   added      : unrelated-j, ;
   ##### revision "k-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-k'
   added      : unrelated-k, ;
   ##### revision "mAE,Km" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mK,AEm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mEA,Jm" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
   touched    : unrelated-j, ;
   ##### revision "mJ,EAm" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
   touched    : unrelated-j, ;
   ##### revision "s-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s'
   added      : unrelated-s, ;
   ##### revision "t-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-t'
   added      : unrelated-t, ;
   ##### revision "mPQ,Tm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mT,PQm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mQP,Sm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mS,QPm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "l-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-l'
   added      : unrelated-l, ;
   ##### revision "mBC+revert,Lm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mCB+revert,Lm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mL,BC+revertm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mL,CB+revertm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "n-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-n'
   added      : unrelated-n, ;
   ##### revision "o-1" #####
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-o'
   added      : unrelated-o, ;
   ##### revision "mFG,Om" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mO,FGm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mGF,Nm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mN,GFm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mAE-change,Km" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mK,AE-change-m" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mEA-change,Jm" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
   ##### revision "mJ,EA-change-m" #####
   1 sidedata entries
    entry-0014 size 4
     '\x00\x00\x00\x00'
 
 #endif
 
 
 Test copy information chaining
 ==============================
 
 Check that matching only affect the destination and not intermediate path
 -------------------------------------------------------------------------
 
 The two status call should give the same value for f
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")'
   A f
     a
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f
   A f
     a (no-changeset no-compatibility !)
 
 merging with unrelated change does not interfere with the renames
 ---------------------------------------------------------------
 
 - rename on one side
 - unrelated change on the other side
 
   $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
   o    mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   |\
   +---o  mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
   | |/
   | o  b-1: b update
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")'
   A f
     d
   R d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")'
   A f
     d
   R d
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")'
   M b
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")'
   M b
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")'
   M b
   A f
     d
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")'
   M b
   A f
     d
   R d
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")'
   M b
   A f
     a
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")'
   M b
   A f
     a
   A t
     p
   R a
   R p
 
 merging with the side having a delete
 -------------------------------------
 
 case summary:
 - one with change to an unrelated file
 - one deleting the change
 and recreate an unrelated file after the merge
 
   $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
   o  mCBm-1 re-add d
   |
   o    mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
   |\
   | | o  mBCm-1 re-add d
   | | |
   +---o  mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 - comparing from the merge
 
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")'
   R d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")'
   R d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")'
   M b
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")'
   M b
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")'
   M b
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")'
   M b
   R d
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")'
   M b
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")'
   M b
   A t
     p
   R a
   R p
 
 - comparing with the merge children re-adding the file
 
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")'
   M d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")'
   M d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")'
   M b
   A d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")'
   M b
   A d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")'
   M b
   M d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")'
   M b
   M d
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")'
   M b
   A d
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")'
   M b
   A d
   A t
     p
   R a
   R p
 
 Comparing with a merge re-adding the file afterward
 ---------------------------------------------------
 
 Merge:
 - one with change to an unrelated file
 - one deleting and recreating the change
 
   $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
   o    mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   |\
   +---o  mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   | |/
   | o  d-2 re-add d
   | |
   | o  d-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'
   M d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")'
   M d
   $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")'
   M b
   $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")'
   M b
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")'
   M b
   M d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")'
   M b
   M d
 
 The bugs makes recorded copy is different depending of where we started the merge from since
 
   $ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644   d'
   b004912a8510032a0350a74daa2803dadfb00e12 644   d
   $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644   d'
   b004912a8510032a0350a74daa2803dadfb00e12 644   d
 
   $ hg manifest --debug --rev 'desc("d-2")' | grep '644   d'
   b004912a8510032a0350a74daa2803dadfb00e12 644   d
   $ hg manifest --debug --rev 'desc("b-1")' | grep '644   d'
   d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644   d (no-changeset !)
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   d (changeset !)
   $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
        1       * b004912a8510 000000000000 000000000000
        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
        2       * 5cce88bf349f ae258f702dfe 000000000000 (changeset !)
 
 Log output should not include a merge commit as it did not happen
 
   $ hg log -Gfr 'desc("mBDm-0")' d
   o  d-2 re-add d
   |
   ~
 
   $ hg log -Gfr 'desc("mDBm-0")' d
   o  d-2 re-add d
   |
   ~
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
   M b
   A d
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
   M b
   A d
   A t
     p
   R a
   R p
 
 
 Comparing with a merge with colliding rename
 --------------------------------------------
 
 Subcase: new copy information on both side
 ``````````````````````````````````````````
 
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 
   $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
   o    mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
   |\
   +---o  mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   | |/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #if no-changeset
   $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644   f'
   2ff93c643948464ee1f871867910ae43a45b0bea 644   f
   $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644   f'
   2ff93c643948464ee1f871867910ae43a45b0bea 644   f
   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
   e8825b386367b29fec957283a80bb47b47483fe1 644   f
   $ hg debugindex f | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * b76eb76580df 000000000000 000000000000
        1       * e8825b386367 000000000000 000000000000
        2       * 2ff93c643948 b76eb76580df e8825b386367
        3       * 2f649fba7eb2 b76eb76580df e8825b386367
        4       * 774e7c1637d5 e8825b386367 b76eb76580df
 #else
   $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg debugindex f | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * ae258f702dfe 000000000000 000000000000
        1       * d3613c1ec831 ae258f702dfe 000000000000
        2       * 05e03c868bbc ae258f702dfe 000000000000
 #endif
 
 # Here the filelog based implementation is not looking at the rename
 # information (because the file exist on both side). However the changelog
 # based on works fine. We have different output.
 
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")'
   M f (no-changeset !)
     b (no-filelog no-changeset !)
   R b
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")'
   M f (no-changeset !)
     b (no-filelog no-changeset !)
   R b
   $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")'
   M f (no-changeset !)
     d (no-filelog no-changeset !)
   R d
   $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEAm-0")'
   M f (no-changeset !)
     d (no-filelog no-changeset !)
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("a-2")'
   A f
     d
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("e-2")'
   A f
     b
   R b
 
 # From here, we run status against revision where both source file exists.
 #
 # The filelog based implementation picks an arbitrary side based on revision
 # numbers. So the same side "wins" whatever the parents order is. This is
 # sub-optimal because depending on revision numbers means the result can be
 # different from one repository to the next.
 #
 # The changeset based algorithm use the parent order to break tie on conflicting
 # information and will have a different order depending on who is p1 and p2.
 # That order is stable accross repositories. (data from p1 prevails)
 
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mAEm-0")'
   A f
     d
   R b
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mEAm-0")'
   A f
     d (filelog !)
     b (no-filelog !)
   R b
   R d
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm-0")'
   A f
     a
   A t
     p
   R a
   R b
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")'
   A f
     a (filelog !)
     b (no-filelog !)
   A t
     p
   R a
   R b
   R p
 
 
 Subcase: existing copy information overwritten on one branch
 ````````````````````````````````````````````````````````````
 
 Note:
 | In this case, one of the merge wrongly record a merge while there is none.
 | This lead to bad copy tracing information to be dug up.
 
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (d) with a rename (from h to i to d)
 
   $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
   o    mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   |\
   +---o  mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   | |/
   | o  f-2: rename i -> d
   | |
   | o  f-1: rename h -> i
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
   M b
   A d
     h
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
   M b
   A d
     h
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")'
   M d (no-changeset !)
     h (no-filelog no-changeset !)
   R h
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")'
   M b
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")'
   M b
   M d (no-changeset !)
     i (no-filelog no-changeset !)
   R i
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")'
   M d (no-changeset !)
     h (no-filelog no-changeset !)
   R h
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")'
   M b
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
   M b
   M d (no-changeset !)
     i (no-filelog no-changeset !)
   R i
 
 #if no-changeset
   $ hg log -Gfr 'desc("mBFm-0")' d
   o  f-2: rename i -> d
   |
   o  f-1: rename h -> i
   :
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mBFm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 #if no-changeset
   $ hg log -Gfr 'desc("mFBm-0")' d
   o  f-2: rename i -> d
   |
   o  f-1: rename h -> i
   :
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mFBm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 
 Subcase: existing copy information overwritten on one branch, with different content)
 `````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch
 
   $ hg log -G --rev '::(desc("mBRm")+desc("mRBm"))'
   o    mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way
   |\
   +---o  mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way
   | |/
   | o  r-2: rename t -> x
   | |
   | o  r-1: rename r -> x
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")'
   M b
   A d
     a
   A t
     r
   R a
   R p
   R r
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mRBm-0")'
   M b
   A d
     a
   A t
     r
   R a
   R p
   R r
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBRm-0")'
   M t
     r (no-filelog !)
   R r
   $ hg status --copies --rev 'desc("r-2")' --rev 'desc("mBRm-0")'
   M b
   $ hg status --copies --rev 'desc("r-1")' --rev 'desc("mBRm-0")'
   M b
   M t
     x (no-filelog !)
   R x
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mRBm-0")'
   M t
     r (no-filelog !)
   R r
   $ hg status --copies --rev 'desc("r-2")' --rev 'desc("mRBm-0")'
   M b
   $ hg status --copies --rev 'desc("r-1")' --rev 'desc("mRBm-0")'
   M b
   M t
     x (no-filelog !)
   R x
 
 #if no-changeset
   $ hg log -Gfr 'desc("mBRm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mBRm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 #if no-changeset
   $ hg log -Gfr 'desc("mRBm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mRBm-0")' d
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 Subcase: reset of the copy history on one side
 ``````````````````````````````````````````````
 
 Merge:
 - one with change to a file
 - one deleting and recreating the file
 
 Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
 consider history and rename on both branch of the merge.
 
   $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
   o    mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
   |\
   +---o  mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   | |/
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   | |
   o |  d-1 delete d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 One side of the merge have a long history with rename. The other side of the
 merge point to a new file with a smaller history. Each side is "valid".
 
 (and again the filelog based algorithm only explore one, with a pick based on
 revision numbers)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")'
   A d
     a (filelog !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")'
   A d
     a
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDGm-0")'
   M d
   $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")'
   M d
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")'
   M d
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")'
   M d
 
 #if no-changeset
   $ hg log -Gfr 'desc("mDGm-0")' d
   o    mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   |\
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mDGm-0")' d
   o    mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   |\
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 
 #if no-changeset
   $ hg log -Gfr 'desc("mDGm-0")' d
   o    mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   |\
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mDGm-0")' d
   o    mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
   |\
   | o  g-1: update d
   | |
   o |  d-2 re-add d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
 ````````````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to a file (d)
 - one overwriting that file with a rename (from h to i, to d)
 
 This case is similar to BF/FB, but an actual merge happens, so both side of the
 history are relevant.
 
 
   $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
   o    mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
   |\
   +---o  mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
   | |/
   | o  g-1: update d
   | |
   o |  f-2: rename i -> d
   | |
   o |  f-1: rename h -> i
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 Note:
 | In this case, the merge get conflicting information since on one side we have
 | "a -> c -> d". and one the other one we have "h -> i -> d".
 |
 | The current code arbitrarily pick one side depending the ordering of the merged hash:
 
 In this case, the file hash from "f-2" is lower, so it will be `p1` of the resulting filenode its copy tracing information will win (and trace back to "h"):
 
 Details on this hash ordering pick:
 
   $ hg manifest --debug 'desc("g-1")' | egrep 'd$'
   17ec97e605773eb44a117d1136b3849bcdc1924f 644   d (no-changeset !)
   5cce88bf349f7c742bb440f2c53f81db9c294279 644   d (changeset !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("g-1")' d
   A d
     a (no-changeset no-compatibility !)
 
   $ hg manifest --debug 'desc("f-2")' | egrep 'd$'
   7b79e2fe0c8924e0e598a82f048a7b024afa4d96 644   d (no-changeset !)
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   d (changeset !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("f-2")' d
   A d
     h (no-changeset no-compatibility !)
 
 Copy tracing data on the resulting merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")'
   A d
     h (no-filelog !)
     a (filelog !)
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")'
   A d
     a (no-changeset !)
     h (changeset !)
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")'
   M d
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")'
   M d
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFGm-0")'
   M d
     i (no-filelog !)
   R i
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mGFm-0")'
   M d
     i (no-filelog !)
   R i
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mFGm-0")'
   M d (no-changeset !)
     h (no-filelog no-changeset !)
   R h
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")'
   M d (no-changeset !)
     h (no-filelog no-changeset !)
   R h
 
 #if no-changeset
   $ hg log -Gfr 'desc("mFGm-0")' d
   o    mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
   |\
   | o  g-1: update d
   | |
   o |  f-2: rename i -> d
   | |
   o |  f-1: rename h -> i
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mFGm-0")' d
   o  g-1: update d
   |
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 #if no-changeset
   $ hg log -Gfr 'desc("mGFm-0")' d
   o    mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
   |\
   | o  g-1: update d
   | |
   o |  f-2: rename i -> d
   | |
   o |  f-1: rename h -> i
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mGFm-0")' d
   o  g-1: update d
   |
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 Subcase: new copy information on both side with an actual merge happening
 `````````````````````````````````````````````````````````````````````````
 
 - the "p-" branch renaming 't' to 'v' (through 'u')
 - the "q-" branch renaming 'r' to 'v' (through 'w')
 
 
   $ hg log -G --rev '::(desc("mPQm")+desc("mQPm"))'
   o    mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way
   |\
   +---o  mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way
   | |/
   | o  q-2 w -move-> v
   | |
   | o  q-1 r -move-> w
   | |
   o |  p-2: u -move-> v
   | |
   o |  p-1: t -move-> u
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 #if no-changeset
   $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644   v'
   0946c662ef16e4e67397fd717389eb6693d41749 644   v
   $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644   v'
   0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644   v
   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
   3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644   v
   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
   c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644   v
   $ hg debugindex v | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * 3f91841cd75c 000000000000 000000000000
        1       * c43c088b811f 000000000000 000000000000
        2       * 0946c662ef16 3f91841cd75c c43c088b811f
        3       * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
 #else
   $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644   v'
   65fde9f6e4d4da23b3f610e07b53673ea9541d75 644   v
   $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644   v'
   a098dda6413aecf154eefc976afc38b295acb7e5 644   v
   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
   5aed6a8dbff0301328c08360d24354d3d064cf0d 644   v
   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
   a38b2fa170219750dac9bc7d19df831f213ba708 644   v
   $ hg debugindex v | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * 5aed6a8dbff0 000000000000 000000000000
        1       * a38b2fa17021 000000000000 000000000000
        2       * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
        3       * a098dda6413a a38b2fa17021 5aed6a8dbff0
 #endif
 
 # Here the filelog based implementation is not looking at the rename
 # information (because the file exist on both side). However the changelog
 # based on works fine. We have different output.
 
   $ hg status --copies --rev 'desc("p-2")' --rev 'desc("mPQm-0")'
   M v
     r (no-filelog !)
   R r
   $ hg status --copies --rev 'desc("p-2")' --rev 'desc("mQPm-0")'
   M v
     r (no-filelog !)
   R r
   $ hg status --copies --rev 'desc("q-2")' --rev 'desc("mPQm-0")'
   M v
     t (no-filelog !)
   R t
   $ hg status --copies --rev 'desc("q-2")' --rev 'desc("mQPm-0")'
   M v
     t (no-filelog !)
   R t
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("p-2")'
   A v
     t
   R t
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("q-2")'
   A v
     r
   R r
 
 # From here, we run status against revision where both source file exists.
 #
 # The filelog based implementation picks an arbitrary side based on revision
 # numbers. So the same side "wins" whatever the parents order is. This is
 # sub-optimal because depending on revision numbers means the result can be
 # different from one repository to the next.
 #
 # The changeset based algorithm use the parent order to break tie on conflicting
 # information and will have a different order depending on who is p1 and p2.
 # That order is stable accross repositories. (data from p1 prevails)
 
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mPQm-0")'
   A v
     t
   R r
   R t
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mQPm-0")'
   A v
     t (filelog !)
     r (no-filelog !)
   R r
   R t
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm-0")'
   A d
     a
   A v
     r (filelog !)
     p (no-filelog !)
   R a
   R p
   R r
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm-0")'
   A d
     a
   A v
     r
   R a
   R p
   R r
 
 
 Comparing with merging with a deletion (and keeping the file)
 -------------------------------------------------------------
 
 Merge:
 - one removing a file (d)
 - one updating that file
 - the merge keep the modified version of the file (canceling the delete)
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
   o    mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
   |\
   +---o  mCGm-0 merge updated/deleted - revive the file (updated content) - one way
   | |/
   | o  g-1: update d
   | |
   o |  c-1 delete d
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 'a' is the copy source of 'd'
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
   A d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mGCm-0")'
   A d
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mCGm-0")'
   $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGCm-0")'
 
 
 Comparing with merge restoring an untouched deleted file
 --------------------------------------------------------
 
 Merge:
 - one removing a file (d)
 - one leaving the file untouched
 - the merge actively restore the file to the same content.
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
   o    mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
   +---o  mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 'a' is the the copy source of 'd'
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
   M b
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
   M b
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
   M b
   A d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'
   M b
   A d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")'
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")'
 
 
 Merging a branch where a rename was deleted with a branch where the same file was renamed
 ------------------------------------------------------------------------------------------
 
 Create a "conflicting" merge where `d` get removed on one branch before its
 rename information actually conflict with the other branch.
 
 (the copy information from the branch that was not deleted should win).
 
   $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
   o    mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way
   |\
   +---o  mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way
   | |/
   | o  h-1: b -(move)-> d
   | |
   o |  c-1 delete d
   | |
   o |  i-2: c -move-> d, s -move-> t
   | |
   o |  i-1: a -move-> c, p -move-> s
   |/
   o  i-0 initial commit: a b h p q r
   
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")'
   A d
     b (no-compatibility no-changeset !)
   A t
     p
   R a
   R b
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")'
   A d
     b
   A t
     p
   R a
   R b
   R p
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")'
   A d
     b
   R b
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mHC-delete-before-conflict-m")'
   A d
     b
   R b
   $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")'
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")'
   A t
     p
   R a
   R p
 
 Variant of previous with extra changes introduced by the merge
 --------------------------------------------------------------
 
 (see case declaration for details)
 
 Subcase: merge has same initial content on both side, but merge introduced a change
 ```````````````````````````````````````````````````````````````````````````````````
 
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 - the merge add new change to b
 
   $ hg log -G --rev '::(desc("mAE-change-m")+desc("mEA-change-m"))'
   o    mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way
   |\
   +---o  mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way
   | |/
   | o  e-2 g -move-> f
   | |
   | o  e-1 b -move-> g
   | |
   o |  a-2: e -move-> f
   | |
   o |  a-1: d -move-> e
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 #if no-changeset
   $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644   f'
   2f649fba7eb284e720d02b61f0546fcef694c045 644   f
   $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644   f'
   774e7c1637d536b99e2d8ef16fd731f87a82bd09 644   f
   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
   e8825b386367b29fec957283a80bb47b47483fe1 644   f
   $ hg debugindex f | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * b76eb76580df 000000000000 000000000000
        1       * e8825b386367 000000000000 000000000000
        2       * 2ff93c643948 b76eb76580df e8825b386367
        3       * 2f649fba7eb2 b76eb76580df e8825b386367
        4       * 774e7c1637d5 e8825b386367 b76eb76580df
 #else
   $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644   f'
   d3613c1ec8310a812ac4268fd853ac576b6caea5 644   f
   $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644   f'
   05e03c868bbcab4a649cb33a238d7aa07398a469 644   f
   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
   $ hg debugindex f | "$PYTHON" ../no-linkrev
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       * ae258f702dfe 000000000000 000000000000
        1       * d3613c1ec831 ae258f702dfe 000000000000
        2       * 05e03c868bbc ae258f702dfe 000000000000
 #endif
 
 # Here the filelog based implementation is not looking at the rename
 # information (because the file exist on both side). However the changelog
 # based on works fine. We have different output.
 
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAE-change-m-0")'
   M f
     b (no-filelog !)
   R b
   $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEA-change-m-0")'
   M f
     b (no-filelog !)
   R b
   $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAE-change-m-0")'
   M f
     d (no-filelog !)
   R d
   $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEA-change-m-0")'
   M f
     d (no-filelog !)
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("a-2")'
   A f
     d
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("e-2")'
   A f
     b
   R b
 
 # From here, we run status against revision where both source file exists.
 #
 # The filelog based implementation picks an arbitrary side based on revision
 # numbers. So the same side "wins" whatever the parents order is. This is
 # sub-optimal because depending on revision numbers means the result can be
 # different from one repository to the next.
 #
 # The changeset based algorithm use the parent order to break tie on conflicting
 # information and will have a different order depending on who is p1 and p2.
 # That order is stable accross repositories. (data from p1 prevails)
 
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mAE-change-m-0")'
   A f
     d
   R b
   R d
   $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mEA-change-m-0")'
   A f
     d (filelog !)
     b (no-filelog !)
   R b
   R d
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m-0")'
   A f
     a
   A t
     p
   R a
   R b
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m-0")'
   A f
     a (filelog !)
     b (no-filelog !)
   A t
     p
   R a
   R b
   R p
 
 
 Subcase: merge overwrite common copy information, but with extra change during the merge
 ```````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
 - one overwriting a file (d) with a rename (from h to i to d)
 
   $ hg log -G --rev '::(desc("mBF-change-m")+desc("mFB-change-m"))'
   o    mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   |\
   +---o  mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   | |/
   | o  f-2: rename i -> d
   | |
   | o  f-1: rename h -> i
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBF-change-m-0")'
   M b
   A d
     h
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")'
   M b
   A d
     h
   A t
     p
   R a
   R h
   R p
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBF-change-m-0")'
   M d
     h (no-filelog !)
   R h
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBF-change-m-0")'
   M b
   M d
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBF-change-m-0")'
   M b
   M d
     i (no-filelog !)
   R i
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFB-change-m-0")'
   M d
     h (no-filelog !)
   R h
   $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFB-change-m-0")'
   M b
   M d
   $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFB-change-m-0")'
   M b
   M d
     i (no-filelog !)
   R i
 
 #if no-changeset
   $ hg log -Gfr 'desc("mBF-change-m-0")' d
   o    mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   |\
   o :  f-2: rename i -> d
   | :
   o :  f-1: rename h -> i
   :/
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mBF-change-m-0")' d
   o  mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
   :
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 #if no-changeset
   $ hg log -Gfr 'desc("mFB-change-m-0")' d
   o    mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   |\
   o :  f-2: rename i -> d
   | :
   o :  f-1: rename h -> i
   :/
   o  i-0 initial commit: a b h p q r
   
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
   $ hg log -Gfr 'desc("mFB-change-m-0")' d
   o  mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
   :
   o  i-2: c -move-> d, s -move-> t
   |
   ~
 #endif
 
 
 Subcase: restoring and untouched deleted file, while touching it
 ````````````````````````````````````````````````````````````````
 
 Merge:
 - one removing a file (d)
 - one leaving the file untouched
 - the merge actively restore the file to the same content.
 
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
   $ hg log -G --rev '::(desc("mCB-change-m")+desc("mBC-change-m"))'
   o    mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
   +---o  mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  c-1 delete d
   | |
   o |  b-1: b update
   |/
   o  i-2: c -move-> d, s -move-> t
   |
   o  i-1: a -move-> c, p -move-> s
   |
   o  i-0 initial commit: a b h p q r
   
 
 'a' is the the copy source of 'd'
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-change-m-0")'
   M b
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-change-m-0")'
   M b
   A d
     a (no-compatibility no-changeset !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-change-m-0")'
   M b
   A d
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-change-m-0")'
   M b
   A d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-change-m-0")'
   M d
   $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-change-m-0")'
   M d
 
 
 Decision from previous merge are properly chained with later merge
 ------------------------------------------------------------------
 
 
 Subcase: chaining conflicting rename resolution
 ```````````````````````````````````````````````
 
 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
 about that file should stay unchanged.
 
 The result from mAEm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm")' f
   A f
     a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE,Km")' f
   A f
     a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AEm")' f
   A f
     a (no-changeset no-compatibility !)
 
 
 The result from mEAm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA,Jm")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EAm")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)
 
 Subcase: chaining conflicting rename resolution
 ```````````````````````````````````````````````
 
 The "mPQm" and "mQPm" case create a rename tracking conflict on file 'v'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 'v' and the arbitration done within "mPQm" and "mQP"
 about that file should stay unchanged.
 
 The result from mPQm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm")' v
   A v
     r (filelog !)
     p (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQ,Tm")' v
   A v
     r (filelog !)
     p (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mT,PQm")' v
   A v
     r (filelog !)
     p (no-changeset no-compatibility no-filelog !)
 
 The result from mQPm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm")' v
   A v
     r (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQP,Sm")' v
   A v
     r (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mS,QPm")' v
   A v
     r (filelog !)
     r (no-changeset no-compatibility no-filelog !)
 
 
 Subcase: chaining salvage information during a merge
 ````````````````````````````````````````````````````
 
 We add more change on the branch were the file was deleted. merging again
 should preserve the fact eh file was salvaged.
 
 reference output:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   R a
   R p
 
 chained output
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC+revert,Lm")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   A unrelated-l
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB+revert,Lm")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   A unrelated-l
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,BC+revertm")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   A unrelated-l
   R a
   R p
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,CB+revertm")'
   M b
   A d
     a (no-changeset no-compatibility !)
   A t
     p
   A unrelated-l
   R a
   R p
 
 Subcase: chaining "merged" information during a merge
 ``````````````````````````````````````````````````````
 
 When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.
 
 
 reference output:
 
  (for details about the filelog pick, check the mFGm/mGFm case)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm")' d
   A d
     a (filelog !)
     h (no-changeset no-compatibility no-filelog !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm")' d
   A d
     a (filelog !)
     a (no-changeset no-compatibility no-filelog !)
 
 Chained output
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mO,FGm")' d
   A d
     a (filelog !)
     h (no-changeset no-compatibility no-filelog !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFG,Om")' d
   A d
     a (filelog !)
     h (no-changeset no-compatibility no-filelog !)
 
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d
   A d
     a (no-changeset no-compatibility !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mN,GFm")' d
   A d
     a (no-changeset no-compatibility !)
 
 
 Subcase: chaining conflicting rename resolution, with extra change during the merge
 ```````````````````````````````````````````````````````````````````````````````````
 
 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We
 add more change on the respective branch and merge again. These second merge
 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
 about that file should stay unchanged.
 
 The result from mAEm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m")' f
   A f
     a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change,Km")' f
   A f
     a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AE-change-m")' f
   A f
     a (no-changeset no-compatibility !)
 
 
 The result from mEAm is the same for the subsequent merge:
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change,Jm")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EA-change-m")' f
   A f
     a (filelog !)
     b (no-changeset no-compatibility no-filelog !)

tests/test-copies-in-changeset.t

@@ -1,488 +1,488 b''
 #testcases extra sidedata
 
 #if extra
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > copies.write-to=changeset-only
   > copies.read-from=changeset-only
   > [alias]
   > changesetcopies = log -r . -T 'files: {files}
   >   {extras % "{ifcontains("files", key, "{key}: {value}\n")}"}
   >   {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}'
   > EOF
 #endif
 
 #if sidedata
   $ cat >> $HGRCPATH << EOF
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
 #endif
 
   $ cat >> $HGRCPATH << EOF
   > [alias]
   > showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}'
   > [extensions]
   > rebase =
   > split =
   > EOF
 
 Check that copies are recorded correctly
 
   $ hg init repo
   $ cd repo
 #if sidedata
   $ hg debugformat -v | egrep 'format-variant|revlog-v2|copies-sdc|changelog-v2'
   format-variant     repo config default
   copies-sdc:         yes    yes      no
   revlog-v2:           no     no      no
   changelog-v2:       yes    yes      no
 #else
   $ hg debugformat -v | egrep 'format-variant|revlog-v2|copies-sdc|changelog-v2'
   format-variant     repo config default
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
 #endif
   $ echo a > a
   $ hg add a
   $ hg ci -m initial
   $ hg cp a b
   $ hg cp a c
   $ hg cp a d
   $ hg ci -m 'copy a to b, c, and d'
 
 #if extra
 
   $ hg changesetcopies
   files: b c d
   filesadded: 0
   1
   2
   
   p1copies: 0\x00a (esc)
   1\x00a (esc)
   2\x00a (esc)
 #else
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 44
     '\x00\x00\x00\x04\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x06\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x00abcd'
 #endif
 
   $ hg showcopies
   a -> b
   a -> c
   a -> d
 
 #if extra
 
   $ hg showcopies --config experimental.copies.read-from=compatibility
   a -> b
   a -> c
   a -> d
   $ hg showcopies --config experimental.copies.read-from=filelog-only
 
 #endif
 
 Check that renames are recorded correctly
 
   $ hg mv b b2
   $ hg ci -m 'rename b to b2'
 
 #if extra
 
   $ hg changesetcopies
   files: b b2
   filesadded: 1
   filesremoved: 0
   
   p1copies: 1\x00b (esc)
 
 #else
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 25
     '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x03\x00\x00\x00\x00bb2'
 #endif
 
   $ hg showcopies
   b -> b2
 
 
 Rename onto existing file. This should get recorded in the changeset files list and in the extras,
 even though there is no filelog entry.
 
   $ hg cp b2 c --force
   $ hg st --copies
   M c
     b2
 
 #if extra
 
   $ hg debugindex c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b789fdd96dc2 000000000000 000000000000
 
 #else
 
   $ hg debugindex c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 37d9b5d994ea 000000000000 000000000000
 
 #endif
 
 
   $ hg ci -m 'move b onto d'
 
 #if extra
 
   $ hg changesetcopies
   files: c
   
   p1copies: 0\x00b2 (esc)
 
 #else
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 25
     '\x00\x00\x00\x02\x00\x00\x00\x00\x02\x00\x00\x00\x00\x16\x00\x00\x00\x03\x00\x00\x00\x00b2c'
 #endif
 
   $ hg showcopies
   b2 -> c
 
 #if extra
 
   $ hg debugindex c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b789fdd96dc2 000000000000 000000000000
 
 #else
 
   $ hg debugindex c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 37d9b5d994ea 000000000000 000000000000
        1       3 029625640347 000000000000 000000000000
 
 #endif
 
 Create a merge commit with copying done during merge.
 
   $ hg co 0
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg cp a e
   $ hg cp a f
   $ hg ci -m 'copy a to e and f'
   created new head
   $ hg merge 3
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 File 'a' exists on both sides, so 'g' could be recorded as being from p1 or p2, but we currently
 always record it as being from p1
   $ hg cp a g
 File 'd' exists only in p2, so 'h' should be from p2
   $ hg cp d h
 File 'f' exists only in p1, so 'i' should be from p1
   $ hg cp f i
   $ hg ci -m 'merge'
 
 #if extra
 
   $ hg changesetcopies
   files: g h i
   filesadded: 0
   1
   2
   
   p1copies: 0\x00a (esc)
   2\x00f (esc)
   p2copies: 1\x00d (esc)
 
 #else
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 64
     '\x00\x00\x00\x06\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x00\x07\x00\x00\x00\x05\x00\x00\x00\x01\x06\x00\x00\x00\x06\x00\x00\x00\x02adfghi'
 #endif
 
   $ hg showcopies
   a -> g
   d -> h
   f -> i
 
 Test writing to both changeset and filelog
 
   $ hg cp a j
 #if extra
   $ hg ci -m 'copy a to j' --config experimental.copies.write-to=compatibility
   $ hg changesetcopies
   files: j
   filesadded: 0
   filesremoved: 
   
   p1copies: 0\x00a (esc)
   p2copies: 
 #else
   $ hg ci -m 'copy a to j'
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00aj'
 #endif
   $ hg debugdata j 0
   \x01 (esc)
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
   \x01 (esc)
   a
   $ hg showcopies
   a -> j
   $ hg showcopies --config experimental.copies.read-from=compatibility
   a -> j
   $ hg showcopies --config experimental.copies.read-from=filelog-only
   a -> j
 Existing copy information in the changeset gets removed on amend and writing
 copy information on to the filelog
 #if extra
   $ hg ci --amend -m 'copy a to j, v2' \
   > --config experimental.copies.write-to=filelog-only
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
   $ hg changesetcopies
   files: j
   
 #else
   $ hg ci --amend -m 'copy a to j, v2'
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00aj'
 #endif
   $ hg showcopies --config experimental.copies.read-from=filelog-only
   a -> j
 The entries should be written to extras even if they're empty (so the client
 won't have to fall back to reading from filelogs)
   $ echo x >> j
 #if extra
   $ hg ci -m 'modify j' --config experimental.copies.write-to=compatibility
   $ hg changesetcopies
   files: j
   filesadded: 
   filesremoved: 
   
   p1copies: 
   p2copies: 
 #else
   $ hg ci -m 'modify j'
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 14
     '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00j'
 #endif
 
 Test writing only to filelog
 
   $ hg cp a k
 #if extra
   $ hg ci -m 'copy a to k' --config experimental.copies.write-to=filelog-only
 
   $ hg changesetcopies
   files: k
   
 #else
   $ hg ci -m 'copy a to k'
   $ hg debugsidedata -c -v -- -1
   1 sidedata entries
    entry-0014 size 24
     '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ak'
 #endif
 
   $ hg debugdata k 0
   \x01 (esc)
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
   \x01 (esc)
   a
 #if extra
   $ hg showcopies
 
   $ hg showcopies --config experimental.copies.read-from=compatibility
   a -> k
   $ hg showcopies --config experimental.copies.read-from=filelog-only
   a -> k
 #else
   $ hg showcopies
   a -> k
 #endif
 
 Existing copy information is preserved by amend
   $ hg cp a l
   $ hg ci -m 'copy a to l'
   $ hg showcopies
   a -> l
   $ hg ci --amend -m 'new description'
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
   $ hg showcopies
   a -> l
 
 No crash on partial amend
   $ hg st --change .
   A l
   $ echo modified >> a
   $ hg rm l
   $ hg commit --amend a
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
 
   $ cd ..
 
 Test rebasing a commit with copy information
 
   $ hg init rebase-rename
   $ cd rebase-rename
   $ echo a > a
   $ hg ci -Aqm 'add a'
   $ echo a2 > a
   $ hg ci -m 'modify a'
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'rename a to b'
 Not only do we want this to run in-memory, it shouldn't fall back to
 on-disk merge (no conflicts), so we force it to be in-memory
 with no fallback.
   $ hg rebase -d 1 --config rebase.experimental.inmemory=yes --config devel.rebase.force-in-memory-merge=yes
   rebasing 2:* tip "rename a to b" (glob)
   merging a and b to b
   saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)
   $ hg st --change . --copies
   A b
     a
   R a
   $ cd ..
 
 Test splitting a commit
 
   $ hg init split
   $ cd split
   $ echo a > a
   $ echo b > b
   $ hg ci -Aqm 'add a and b'
   $ echo a2 > a
   $ hg mv b c
   $ hg ci -m 'modify a, move b to c'
   $ hg --config ui.interactive=yes split <<EOF
   > y
   > y
   > n
   > y
   > EOF
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'?
   (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -a
   +a2
   record this change to 'a'?
   (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/b b/c
   rename from b
   rename to c
   examine changes to 'b' and 'c'?
   (enter ? for help) [Ynesfdaq?] n
   
   created new head
   diff --git a/b b/c
   rename from b
   rename to c
   examine changes to 'b' and 'c'?
   (enter ? for help) [Ynesfdaq?] y
   
   saved backup bundle to $TESTTMP/split/.hg/strip-backup/*-*-split.hg (glob)
   $ cd ..
 
 Test committing half a rename
 
   $ hg init partial
   $ cd partial
   $ echo a > a
   $ hg ci -Aqm 'add a'
   $ hg mv a b
   $ hg ci -m 'remove a' a
 
 #if sidedata
 
 Test upgrading/downgrading to sidedata storage
 ==============================================
 
 downgrading
 
   $ hg debugformat -v | egrep 'format-variant|revlog-v2|copies-sdc|changelog-v2'
   format-variant     repo config default
   copies-sdc:         yes    yes      no
   revlog-v2:           no     no      no
   changelog-v2:       yes    yes      no
   $ hg debugsidedata -c -- 0
   1 sidedata entries
    entry-0014 size 14
   $ hg debugsidedata -c -- 1
   1 sidedata entries
    entry-0014 size 14
   $ hg debugsidedata -m -- 0
   $ cat << EOF > .hg/hgrc
   > [format]
   > exp-use-copies-side-data-changeset = no
   > EOF
   $ hg debugupgraderepo --run --quiet --no-backup
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      removed: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - changelog
   
   $ hg debugformat -v | egrep 'format-variant|revlog-v2|copies-sdc|changelog-v2'
   format-variant     repo config default
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   $ hg debugsidedata -c -- 0
   $ hg debugsidedata -c -- 1
   $ hg debugsidedata -m -- 0
 
 upgrading
 
   $ cat << EOF > .hg/hgrc
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
   $ hg debugupgraderepo --run --quiet --no-backup
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - changelog
   
   $ hg debugformat -v | egrep 'format-variant|revlog-v2|copies-sdc|changelog-v2'
   format-variant     repo config default
   copies-sdc:         yes    yes      no
   revlog-v2:           no     no      no
   changelog-v2:       yes    yes      no
   $ hg debugsidedata -c -- 0
   1 sidedata entries
    entry-0014 size 14
   $ hg debugsidedata -c -- 1
   1 sidedata entries
    entry-0014 size 14
   $ hg debugsidedata -m -- 0
 
 #endif
 
   $ cd ..

tests/test-copy.t

@@ -1,416 +1,416 b''
   $ mkdir part1
   $ cd part1
 
   $ hg init
   $ echo a > a
   $ hg add a
   $ hg commit -m "1"
   $ hg status
   $ hg copy a b
   $ hg --config ui.portablefilenames=abort copy a con.xml
   abort: filename contains 'con', which is reserved on Windows: con.xml
   [10]
   $ hg status
   A b
   $ hg sum
   parent: 0:c19d34741b0a tip
    1
   branch: default
   commit: 1 copied
   update: (current)
   phases: 1 draft
   $ hg --debug commit -m "2"
   committing files:
   b
    b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
 
 we should see two history entries
 
   $ hg history -v
   changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b
   description:
   2
   
   
   changeset:   0:c19d34741b0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   1
   
   
 
 we should see one log entry for a
 
   $ hg log a
   changeset:   0:c19d34741b0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 this should show a revision linked to changeset 0
 
   $ hg debugindex a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b789fdd96dc2 000000000000 000000000000
 
 we should see one log entry for b
 
   $ hg log b
   changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 
 this should show a revision linked to changeset 1
 
   $ hg debugindex b
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 37d9b5d994ea 000000000000 000000000000
 
 this should show the rename information in the metadata
 
   $ hg debugdata b 0 | head -3 | tail -2
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
 #if reporevlogstore
   $ md5sum.py .hg/store/data/b.i
   44913824c8f5890ae218f9829535922e  .hg/store/data/b.i
 #endif
   $ hg cat b > bsum
   $ md5sum.py bsum
   60b725f10c9c85c70d97880dfe8191b3  bsum
   $ hg cat a > asum
   $ md5sum.py asum
   60b725f10c9c85c70d97880dfe8191b3  asum
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 2 changes to 2 files
 
   $ cd ..
 
 
   $ mkdir part2
   $ cd part2
 
   $ hg init
   $ echo foo > foo
 should fail - foo is not managed
   $ hg mv foo bar
   foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg st -A
   ? foo
 respects ui.relative-paths
   $ mkdir dir
   $ cd dir
   $ hg mv ../foo ../bar
   ../foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=yes
   ../foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=no
   foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ cd ..
   $ rmdir dir
   $ hg add foo
 dry-run; print a warning that this is not a real copy; foo is added
   $ hg mv --dry-run foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A foo
 should print a warning that this is not a real copy; bar is added
   $ hg mv foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A bar
 should print a warning that this is not a real copy; foo is added
   $ hg cp bar foo
   bar has not been committed yet, so no copy data will be stored for foo.
   $ hg rm -f bar
   $ rm bar
   $ hg st -A
   A foo
   $ hg commit -m1
 
 moving a missing file
   $ rm foo
   $ hg mv foo foo3
   foo: deleted in working directory
   foo3 does not exist!
   $ hg up -qC .
 
 copy --after to a nonexistent target filename
   $ hg cp -A foo dummy
   foo: not recording copy - dummy does not exist
   [1]
 
 dry-run; should show that foo is clean
   $ hg copy --dry-run foo bar
   $ hg st -A
   C foo
 should show copy
   $ hg copy foo bar
   $ hg st -C
   A bar
     foo
 
 shouldn't show copy
   $ hg commit -m2
   $ hg st -C
 
 should match
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
   $ hg debugrename bar
   bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
   $ echo bleah > foo
   $ echo quux > bar
   $ hg commit -m3
 
 should not be renamed
   $ hg debugrename bar
   bar not renamed
 
   $ hg copy -f foo bar
 should show copy
   $ hg st -C
   M bar
     foo
 
 XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be
 displayed.
   $ hg st -C --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   M bar
     foo
 
   $ hg commit -m3
 
 should show no parents for tip
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 7711d36246cc 000000000000 000000000000
        1       2 bdf70a2b8d03 7711d36246cc 000000000000
        2       3 b2558327ea8d 000000000000 000000000000
 should match
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
        1       2 dd12c926cf16 2ed2a3912a0b 000000000000
   $ hg debugrename bar
   bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
 
 should show no copies
   $ hg st -C
 
 note: since filelog based copy tracing only trace copy for new file, the copy information here is not displayed.
 
   $ hg status --copies --change .
   M bar
 
 They are a devel option to walk all file and fine this information anyway.
 
   $ hg status --copies --change . --config devel.copy-tracing.trace-all-files=yes
   M bar
     foo
 
 copy --after on an added file
   $ cp bar baz
   $ hg add baz
   $ hg cp -A bar baz
   $ hg st -C
   A baz
     bar
 
 foo was clean:
   $ hg st -AC foo
   C foo
 Trying to copy on top of an existing file fails,
   $ hg copy -A bar foo
   foo: not overwriting - file already committed
   ('hg copy --after --force' to replace the file by recording a copy)
   [1]
 same error without the --after, so the user doesn't have to go through
 two hints:
   $ hg copy bar foo
   foo: not overwriting - file already committed
   ('hg copy --force' to replace the file by recording a copy)
   [1]
 but it's considered modified after a copy --after --force
   $ hg copy -Af bar foo
   $ hg st -AC foo
   M foo
     bar
 The hint for a file that exists but is not in file history doesn't
 mention --force:
   $ touch xyzzy
   $ hg cp bar xyzzy
   xyzzy: not overwriting - file exists
   ('hg copy --after' to record the copy)
   [1]
   $ hg co -qC .
   $ rm baz xyzzy
 
 
 Test unmarking copy/rename of a single file
 
 # Set up by creating a copy
   $ hg cp bar baz
 # Test unmarking as copy a non-existent file
   $ hg copy --forget non-existent
   non-existent: $ENOENT$
   $ hg rename --forget non-existent
   non-existent: $ENOENT$
 # Test unmarking as copy an tracked but unrelated file
   $ hg copy --forget foo
   foo: not unmarking as copy - file is not marked as copied
   $ hg rename --forget foo
   foo: not unmarking as copy - file is not marked as copied
 # Test unmarking as copy a copy source
   $ hg copy --forget bar
   bar: not unmarking as copy - file is not marked as copied
   $ hg rename --forget bar
   bar: not unmarking as copy - file is not marked as copied
 # baz should still be marked as a copy
   $ hg st -C
   A baz
     bar
 # Test the normal case
   $ hg copy --forget baz
   $ hg st -C
   A baz
   $ rm bar
   $ hg rename --after bar baz
   $ hg st -C
   A baz
     bar
   R bar
   $ hg rename --forget baz
   $ hg st -C
   A baz
   R bar
   $ hg revert bar
 # Test unmarking as copy with matching an non-matching patterns
   $ hg cp bar baz --after
   $ hg copy --forget bar baz
   bar: not unmarking as copy - file is not marked as copied
   $ hg cp bar baz --after
   $ hg rename --forget bar baz
   bar: not unmarking as copy - file is not marked as copied
   $ hg st -C
   A baz
 # Test unmarking as copy with no exact matches
   $ hg cp bar baz --after
   $ hg copy --forget .
   $ hg st -C
   A baz
   $ hg cp bar baz --after
   $ hg st -C
   A baz
     bar
   $ hg rename --forget .
   $ hg st -C
   A baz
   $ hg forget baz
   $ rm baz
 
 Test unmarking copy of a directory
 
   $ mkdir dir
   $ echo foo > dir/foo
   $ echo bar > dir/bar
   $ hg add dir
   adding dir/bar
   adding dir/foo
   $ hg ci -m 'add dir/'
   $ hg cp dir dir2
   copying dir/bar to dir2/bar
   copying dir/foo to dir2/foo
   $ touch dir2/untracked
   $ hg copy --forget dir2
   $ hg st -C
   A dir2/bar
   A dir2/foo
   ? dir2/untracked
 # Clean up for next test
   $ hg forget dir2
   removing dir2/bar
   removing dir2/foo
   $ rm -r dir2
 
 Test uncopy on committed copies
 
 # Commit some copies
   $ hg cp bar baz
   $ hg cp bar qux
   $ hg ci -m copies
   $ hg st -C --change .
   A baz
     bar
   A qux
     bar
   $ base=$(hg log -r '.^' -T '{rev}')
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
   @  5:a612dc2edfda copies
   |
   o  4:4800b1f1f38e add dir/
   |
   ~
 # Add a dirty change on top to show that it's unaffected
   $ echo dirty >> baz
   $ hg st
   M baz
   $ cat baz
   bleah
   dirty
   $ hg copy --forget --at-rev . baz
   saved backup bundle to $TESTTMP/part2/.hg/strip-backup/a612dc2edfda-e36b4448-uncopy.hg
 # The unwanted copy is no longer recorded, but the unrelated one is
   $ hg st -C --change .
   A baz
   A qux
     bar
 # The old commit is gone and we have updated to the new commit
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
   @  5:c45090e5effe copies
   |
   o  4:4800b1f1f38e add dir/
   |
   ~
 # Working copy still has the uncommitted change
   $ hg st
   M baz
   $ cat baz
   bleah
   dirty
 
   $ cd ..

tests/test-debugcommands.t

@@ -1,717 +1,717 b''
   $ cat << EOF >> $HGRCPATH
   > [ui]
   > interactive=yes
   > EOF
 
   $ hg init debugrevlog
   $ cd debugrevlog
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ hg rm .
   removing a
   $ hg ci -Am make-it-empty
   $ hg revert --all -r 0
   adding a
   $ hg ci -Am make-it-full
 #if reporevlogstore
   $ hg debugrevlog -c
   format : 1
   flags  : inline
   
   revisions     :   3
       merges    :   0 ( 0.00%)
       normal    :   3 (100.00%)
   revisions     :   3
       empty     :   0 ( 0.00%)
                      text  :   0 (100.00%)
                      delta :   0 (100.00%)
       snapshot  :   3 (100.00%)
         lvl-0   :         3 (100.00%)
       deltas    :   0 ( 0.00%)
   revision size : 191
       snapshot  : 191 (100.00%)
         lvl-0   :       191 (100.00%)
       deltas    :   0 ( 0.00%)
   
   chunks        :   3
       0x75 (u)  :   3 (100.00%)
   chunks size   : 191
       0x75 (u)  : 191 (100.00%)
   
   avg chain length  :  0
   max chain length  :  0
   max chain reach   : 67
   compression ratio :  0
   
   uncompressed data size (min/max/avg) : 57 / 66 / 62
   full revision size (min/max/avg)     : 58 / 67 / 63
   inter-snapshot size (min/max/avg)    : 0 / 0 / 0
   delta size (min/max/avg)             : 0 / 0 / 0
   $ hg debugrevlog -m
   format : 1
   flags  : inline, generaldelta
   
   revisions     :  3
       merges    :  0 ( 0.00%)
       normal    :  3 (100.00%)
   revisions     :  3
       empty     :  1 (33.33%)
                      text  :  1 (100.00%)
                      delta :  0 ( 0.00%)
       snapshot  :  2 (66.67%)
         lvl-0   :        2 (66.67%)
       deltas    :  0 ( 0.00%)
   revision size : 88
       snapshot  : 88 (100.00%)
         lvl-0   :       88 (100.00%)
       deltas    :  0 ( 0.00%)
   
   chunks        :  3
       empty     :  1 (33.33%)
       0x75 (u)  :  2 (66.67%)
   chunks size   : 88
       empty     :  0 ( 0.00%)
       0x75 (u)  : 88 (100.00%)
   
   avg chain length  :  0
   max chain length  :  0
   max chain reach   : 44
   compression ratio :  0
   
   uncompressed data size (min/max/avg) : 0 / 43 / 28
   full revision size (min/max/avg)     : 44 / 44 / 44
   inter-snapshot size (min/max/avg)    : 0 / 0 / 0
   delta size (min/max/avg)             : 0 / 0 / 0
   $ hg debugrevlog a
   format : 1
   flags  : inline, generaldelta
   
   revisions     : 1
       merges    : 0 ( 0.00%)
       normal    : 1 (100.00%)
   revisions     : 1
       empty     : 0 ( 0.00%)
                      text  : 0 (100.00%)
                      delta : 0 (100.00%)
       snapshot  : 1 (100.00%)
         lvl-0   :       1 (100.00%)
       deltas    : 0 ( 0.00%)
   revision size : 3
       snapshot  : 3 (100.00%)
         lvl-0   :       3 (100.00%)
       deltas    : 0 ( 0.00%)
   
   chunks        : 1
       0x75 (u)  : 1 (100.00%)
   chunks size   : 3
       0x75 (u)  : 3 (100.00%)
   
   avg chain length  : 0
   max chain length  : 0
   max chain reach   : 3
   compression ratio : 0
   
   uncompressed data size (min/max/avg) : 2 / 2 / 2
   full revision size (min/max/avg)     : 3 / 3 / 3
   inter-snapshot size (min/max/avg)    : 0 / 0 / 0
   delta size (min/max/avg)             : 0 / 0 / 0
 #endif
 
 Test debugindex, with and without the --verbose/--debug flag
   $ hg debugrevlogindex a
      rev linkrev nodeid       p1           p2
        0       0 b789fdd96dc2 000000000000 000000000000
 
 #if no-reposimplestore
   $ hg --verbose debugrevlogindex a
      rev    offset  length linkrev nodeid       p1           p2
        0         0       3       0 b789fdd96dc2 000000000000 000000000000
 
   $ hg --debug debugrevlogindex a
      rev    offset  length linkrev nodeid                                   p1                                       p2
        0         0       3       0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
 #endif
 
   $ hg debugrevlogindex -f 1 a
      rev flag     size   link     p1     p2       nodeid
        0 0000        2      0     -1     -1 b789fdd96dc2
 
 #if no-reposimplestore
   $ hg --verbose debugrevlogindex -f 1 a
      rev flag   offset   length     size   link     p1     p2       nodeid
        0 0000        0        3        2      0     -1     -1 b789fdd96dc2
 
   $ hg --debug debugrevlogindex -f 1 a
      rev flag   offset   length     size   link     p1     p2                                   nodeid
        0 0000        0        3        2      0     -1     -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 #endif
 
   $ hg debugindex -c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 07f494440405 000000000000 000000000000
        1       1 8cccb4b5fec2 07f494440405 000000000000
        2       2 b1e228c512c5 8cccb4b5fec2 000000000000
   $ hg debugindex -c --debug
-     rev linkrev                                   nodeid                                       p1                                       p2
+     rev linkrev                                   nodeid                                p1-nodeid                                p2-nodeid
        0       0 07f4944404050f47db2e5c5071e0e84e7a27bba9 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
        1       1 8cccb4b5fec20cafeb99dd01c26d4dee8ea4388a 07f4944404050f47db2e5c5071e0e84e7a27bba9 0000000000000000000000000000000000000000
        2       2 b1e228c512c5d7066d70562ed839c3323a62d6d2 8cccb4b5fec20cafeb99dd01c26d4dee8ea4388a 0000000000000000000000000000000000000000
   $ hg debugindex -m
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 a0c8bcbbb45c 000000000000 000000000000
        1       1 57faf8a737ae a0c8bcbbb45c 000000000000
        2       2 a35b10320954 57faf8a737ae 000000000000
   $ hg debugindex -m --debug
-     rev linkrev                                   nodeid                                       p1                                       p2
+     rev linkrev                                   nodeid                                p1-nodeid                                p2-nodeid
        0       0 a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
        1       1 57faf8a737ae7faf490582941a82319ba6529dca a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 0000000000000000000000000000000000000000
        2       2 a35b103209548032201c16c7688cb2657f037a38 57faf8a737ae7faf490582941a82319ba6529dca 0000000000000000000000000000000000000000
   $ hg debugindex a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b789fdd96dc2 000000000000 000000000000
   $ hg debugindex --debug a
-     rev linkrev                                   nodeid                                       p1                                       p2
+     rev linkrev                                   nodeid                                p1-nodeid                                p2-nodeid
        0       0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
 
 debugdelta chain basic output
 
 #if reporevlogstore pure
   $ hg debugindexstats
   abort: debugindexstats only works with native code
   [255]
 #endif
 #if reporevlogstore no-pure
   $ hg debugindexstats
   node trie capacity: 4
   node trie count: 2
   node trie depth: 1
   node trie last rev scanned: -1 (no-rust !)
   node trie last rev scanned: 3 (rust !)
   node trie lookups: 4 (no-rust !)
   node trie lookups: 2 (rust !)
   node trie misses: 1
   node trie splits: 1
   revs in memory: 3
 #endif
 
 #if reporevlogstore no-pure
   $ hg debugdeltachain -m
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks
         0      -1      -1       1        1       -1    base         44         43         44   1.02326        44         0    0.00000         44         44   1.00000        1
         1       0      -1       2        1       -1    base          0          0          0   0.00000         0         0    0.00000          0          0   1.00000        1
         2       1      -1       3        1       -1    base         44         43         44   1.02326        44         0    0.00000         44         44   1.00000        1
 
   $ hg debugdeltachain -m -T '{rev} {chainid} {chainlen}\n'
   0 1 1
   1 2 1
   2 3 1
 
   $ hg debugdeltachain -m -Tjson
   [
    {
     "chainid": 1,
     "chainlen": 1,
     "chainratio": 1.0232558139534884, (py3 !)
     "chainsize": 44,
     "compsize": 44,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0.0,
     "largestblock": 44,
     "lindist": 44,
     "p1": -1,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1.0,
     "readsize": 44,
     "rev": 0,
     "srchunks": 1,
     "uncompsize": 43
    },
    {
     "chainid": 2,
     "chainlen": 1,
     "chainratio": 0,
     "chainsize": 0,
     "compsize": 0,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0,
     "largestblock": 0,
     "lindist": 0,
     "p1": 0,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1,
     "readsize": 0,
     "rev": 1,
     "srchunks": 1,
     "uncompsize": 0
    },
    {
     "chainid": 3,
     "chainlen": 1,
     "chainratio": 1.0232558139534884, (py3 !)
     "chainsize": 44,
     "compsize": 44,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0.0,
     "largestblock": 44,
     "lindist": 44,
     "p1": 1,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1.0,
     "readsize": 44,
     "rev": 2,
     "srchunks": 1,
     "uncompsize": 43
    }
   ]
 
 debugdelta chain with sparse read enabled
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > sparse-read = True
   > EOF
   $ hg debugdeltachain -m
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks
         0      -1      -1       1        1       -1    base         44         43         44   1.02326        44         0    0.00000         44         44   1.00000        1
         1       0      -1       2        1       -1    base          0          0          0   0.00000         0         0    0.00000          0          0   1.00000        1
         2       1      -1       3        1       -1    base         44         43         44   1.02326        44         0    0.00000         44         44   1.00000        1
 
   $ hg debugdeltachain -m -T '{rev} {chainid} {chainlen} {readsize} {largestblock} {readdensity}\n'
   0 1 1 44 44 1.0
   1 2 1 0 0 1
   2 3 1 44 44 1.0
 
   $ hg debugdeltachain -m -Tjson
   [
    {
     "chainid": 1,
     "chainlen": 1,
     "chainratio": 1.0232558139534884, (py3 !)
     "chainsize": 44,
     "compsize": 44,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0.0,
     "largestblock": 44,
     "lindist": 44,
     "p1": -1,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1.0,
     "readsize": 44,
     "rev": 0,
     "srchunks": 1,
     "uncompsize": 43
    },
    {
     "chainid": 2,
     "chainlen": 1,
     "chainratio": 0,
     "chainsize": 0,
     "compsize": 0,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0,
     "largestblock": 0,
     "lindist": 0,
     "p1": 0,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1,
     "readsize": 0,
     "rev": 1,
     "srchunks": 1,
     "uncompsize": 0
    },
    {
     "chainid": 3,
     "chainlen": 1,
     "chainratio": 1.0232558139534884, (py3 !)
     "chainsize": 44,
     "compsize": 44,
     "deltatype": "base",
     "extradist": 0,
     "extraratio": 0.0,
     "largestblock": 44,
     "lindist": 44,
     "p1": 1,
     "p2": -1,
     "prevrev": -1,
     "readdensity": 1.0,
     "readsize": 44,
     "rev": 2,
     "srchunks": 1,
     "uncompsize": 43
    }
   ]
 
   $ printf "This test checks things.\n" >> a
   $ hg ci -m a
   $ hg branch other
   marked working directory as branch other
   (branches are permanent and global, did you want a bookmark?)
   $ for i in `$TESTDIR/seq.py 5`; do
   >   printf "shorter ${i}" >> a
   >   hg ci -m "a other:$i"
   >   hg up -q default
   >   printf "for the branch default we want longer chains: ${i}" >> a
   >   hg ci -m "a default:$i"
   >   hg up -q other
   > done
   $ hg debugdeltachain a -T '{rev} {srchunks}\n' \
   >    --config experimental.sparse-read.density-threshold=0.50 \
   >    --config experimental.sparse-read.min-gap-size=0
   0 1
   1 1
   2 1
   3 1
   4 1
   5 1
   6 1
   7 1
   8 1
   9 1
   10 2 (no-zstd !)
   10 1 (zstd !)
   11 1
   $ hg --config extensions.strip= strip --no-backup -r 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Test max chain len
   $ cat >> $HGRCPATH << EOF
   > [format]
   > maxchainlen=4
   > EOF
 
   $ printf "This test checks if maxchainlen config value is respected also it can serve as basic test for debugrevlog -d <file>.\n" >> a
   $ hg ci -m a
   $ printf "b\n" >> a
   $ hg ci -m a
   $ printf "c\n" >> a
   $ hg ci -m a
   $ printf "d\n" >> a
   $ hg ci -m a
   $ printf "e\n" >> a
   $ hg ci -m a
   $ printf "f\n" >> a
   $ hg ci -m a
   $ printf 'g\n' >> a
   $ hg ci -m a
   $ printf 'h\n' >> a
   $ hg ci -m a
 
   $ hg debugrevlog -d a
   # rev p1rev p2rev start   end deltastart base   p1   p2 rawsize totalsize compression heads chainlen
       0    -1    -1     0   ???          0    0    0    0     ???      ????           ?     1        0 (glob)
       1     0    -1   ???   ???          0    0    0    0     ???      ????           ?     1        1 (glob)
       2     1    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        2 (glob)
       3     2    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        3 (glob)
       4     3    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        4 (glob)
       5     4    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        0 (glob)
       6     5    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        1 (glob)
       7     6    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        2 (glob)
       8     7    -1   ???   ???        ???  ???  ???    0     ???      ????           ?     1        3 (glob)
 #endif
 
 Test debuglocks command:
 
   $ hg debuglocks
   lock:  free
   wlock: free
 
 * Test setting the lock
 
 waitlock <file> will wait for file to be created. If it isn't in a reasonable
 amount of time, displays error message and returns 1
   $ waitlock() {
   >     start=`date +%s`
   >     timeout=5
   >     while [ \( ! -f $1 \) -a \( ! -L $1 \) ]; do
   >         now=`date +%s`
   >         if [ "`expr $now - $start`" -gt $timeout ]; then
   >             echo "timeout: $1 was not created in $timeout seconds"
   >             return 1
   >         fi
   >         sleep 0.1
   >     done
   > }
   $ dolock() {
   >     {
   >         waitlock .hg/unlock
   >         rm -f .hg/unlock
   >         echo y
   >     } | hg debuglocks "$@" > /dev/null
   > }
   $ dolock -s &
   $ waitlock .hg/store/lock
 
   $ hg debuglocks
   lock:  user *, process * (*s) (glob)
   wlock: free
   [1]
   $ touch .hg/unlock
   $ wait
   $ [ -f .hg/store/lock ] || echo "There is no lock"
   There is no lock
 
 * Test setting the wlock
 
   $ dolock -S &
   $ waitlock .hg/wlock
 
   $ hg debuglocks
   lock:  free
   wlock: user *, process * (*s) (glob)
   [1]
   $ touch .hg/unlock
   $ wait
   $ [ -f .hg/wlock ] || echo "There is no wlock"
   There is no wlock
 
 * Test setting both locks
 
   $ dolock -Ss &
   $ waitlock .hg/wlock && waitlock .hg/store/lock
 
   $ hg debuglocks
   lock:  user *, process * (*s) (glob)
   wlock: user *, process * (*s) (glob)
   [2]
 
 * Test failing to set a lock
 
   $ hg debuglocks -s
   abort: lock is already held
   [255]
 
   $ hg debuglocks -S
   abort: wlock is already held
   [255]
 
   $ touch .hg/unlock
   $ wait
 
   $ hg debuglocks
   lock:  free
   wlock: free
 
 * Test forcing the lock
 
   $ dolock -s &
   $ waitlock .hg/store/lock
 
   $ hg debuglocks
   lock:  user *, process * (*s) (glob)
   wlock: free
   [1]
 
   $ hg debuglocks -L
 
   $ hg debuglocks
   lock:  free
   wlock: free
 
   $ touch .hg/unlock
   $ wait
 
 * Test forcing the wlock
 
   $ dolock -S &
   $ waitlock .hg/wlock
 
   $ hg debuglocks
   lock:  free
   wlock: user *, process * (*s) (glob)
   [1]
 
   $ hg debuglocks -W
 
   $ hg debuglocks
   lock:  free
   wlock: free
 
   $ touch .hg/unlock
   $ wait
 
 Test WdirUnsupported exception
 
   $ hg debugdata -c ffffffffffffffffffffffffffffffffffffffff
   abort: working directory revision cannot be specified
   [255]
 
 Test cache warming command
 
   $ rm -rf .hg/cache/
   $ hg debugupdatecaches --debug
   updating the branch cache
   $ ls -r .hg/cache/*
   .hg/cache/tags2-served
   .hg/cache/tags2
   .hg/cache/rbc-revs-v1
   .hg/cache/rbc-names-v1
   .hg/cache/hgtagsfnodes1
   .hg/cache/branch2-visible-hidden
   .hg/cache/branch2-visible
   .hg/cache/branch2-served.hidden
   .hg/cache/branch2-served
   .hg/cache/branch2-immutable
   .hg/cache/branch2-base
 
 Test debugcolor
 
 #if no-windows
   $ hg debugcolor --style --color always | egrep 'mode|style|log\.'
   color mode: 'ansi'
   available style:
   \x1b[0;33mlog.changeset\x1b[0m:                      \x1b[0;33myellow\x1b[0m (esc)
 #endif
 
   $ hg debugcolor --style --color never
   color mode: None
   available style:
 
   $ cd ..
 
 Test internal debugstacktrace command
 
   $ cat > debugstacktrace.py << EOF
   > from mercurial import (
   >     util,
   > )
   > from mercurial.utils import (
   >     procutil,
   > )
   > def f():
   >     util.debugstacktrace(f=procutil.stdout)
   >     g()
   > def g():
   >     util.dst(b'hello from g\\n', skip=1)
   >     h()
   > def h():
   >     util.dst(b'hi ...\\nfrom h hidden in g', 1, depth=2)
   > f()
   > EOF
   $ "$PYTHON" debugstacktrace.py
   stacktrace at:
    *debugstacktrace.py:15 in * (glob)
    *debugstacktrace.py:8  in f (glob)
   hello from g at:
    *debugstacktrace.py:15 in * (glob)
    *debugstacktrace.py:9  in f (glob)
   hi ...
   from h hidden in g at:
    *debugstacktrace.py:9  in f (glob)
    *debugstacktrace.py:12 in g (glob)
 
 Test debugcapabilities command:
 
   $ hg debugcapabilities ./debugrevlog/
   Main capabilities:
     branchmap
     $USUAL_BUNDLE2_CAPS$
     getbundle
     known
     lookup
     pushkey
     unbundle
   Bundle2 capabilities:
     HG20
     bookmarks
     changegroup
       01
       02
     checkheads
       related
     digests
       md5
       sha1
       sha512
     error
       abort
       unsupportedcontent
       pushraced
       pushkey
     hgtagsfnodes
     listkeys
     phases
       heads
     pushkey
     remote-changegroup
       http
       https
     stream
       v2
 
 Test debugpeer
 
   $ hg debugpeer ssh://user@dummy/debugrevlog
   url: ssh://user@dummy/debugrevlog
   local: no
   pushable: yes
 
 #if rust
 
   $ hg --debug debugpeer ssh://user@dummy/debugrevlog
   running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R debugrevlog serve --stdio['"] (re)
   devel-peer-request: hello+between
   devel-peer-request:   pairs: 81 bytes
   sending hello command
   sending between command
   remote: 468
   remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlog-compression-zstd,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
   remote: 1
   devel-peer-request: protocaps
   devel-peer-request:   caps: * bytes (glob)
   sending protocaps command
   url: ssh://user@dummy/debugrevlog
   local: no
   pushable: yes
 
 #endif
 
 #if no-rust zstd
 
   $ hg --debug debugpeer ssh://user@dummy/debugrevlog
   running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R debugrevlog serve --stdio['"] (re)
   devel-peer-request: hello+between
   devel-peer-request:   pairs: 81 bytes
   sending hello command
   sending between command
   remote: 468
   remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlog-compression-zstd,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
   remote: 1
   devel-peer-request: protocaps
   devel-peer-request:   caps: * bytes (glob)
   sending protocaps command
   url: ssh://user@dummy/debugrevlog
   local: no
   pushable: yes
 
 #endif
 
 #if no-rust no-zstd
 
   $ hg --debug debugpeer ssh://user@dummy/debugrevlog
   running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R debugrevlog serve --stdio['"] (re)
   devel-peer-request: hello+between
   devel-peer-request:   pairs: 81 bytes
   sending hello command
   sending between command
   remote: 444
   remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
   remote: 1
   devel-peer-request: protocaps
   devel-peer-request:   caps: * bytes (glob)
   sending protocaps command
   url: ssh://user@dummy/debugrevlog
   local: no
   pushable: yes
 
 #endif

tests/test-excessive-merge.t

@@ -1,101 +1,101 b''
   $ hg init
 
   $ echo foo > a
   $ echo foo > b
   $ hg add a b
 
   $ hg ci -m "test"
 
   $ echo blah > a
 
   $ hg ci -m "branch a"
 
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo blah > b
 
   $ hg ci -m "branch b"
   created new head
   $ HGMERGE=true hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg ci -m "merge b/a -> blah"
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ HGMERGE=true hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "merge a/b -> blah"
   created new head
 
   $ hg log
   changeset:   4:2ee31f665a86
   tag:         tip
   parent:      1:96155394af80
   parent:      2:92cc4c306b19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge a/b -> blah
   
   changeset:   3:e16a66a37edd
   parent:      2:92cc4c306b19
   parent:      1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge b/a -> blah
   
   changeset:   2:92cc4c306b19
   parent:      0:5e0375449e74
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch b
   
   changeset:   1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch a
   
   changeset:   0:5e0375449e74
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ hg debugindex --changelog
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 5e0375449e74 000000000000 000000000000
        1       1 96155394af80 5e0375449e74 000000000000
        2       2 92cc4c306b19 5e0375449e74 000000000000
        3       3 e16a66a37edd 92cc4c306b19 96155394af80
        4       4 2ee31f665a86 96155394af80 92cc4c306b19
 
 revision 1
   $ hg manifest --debug 1
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   b
 revision 2
   $ hg manifest --debug 2
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 3
   $ hg manifest --debug 3
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 4
   $ hg manifest --debug 4
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 
   $ hg debugindex a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
        1       1 79d7492df40a 2ed2a3912a0b 000000000000
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 5 changesets with 4 changes to 2 files

tests/test-extra-filelog-entry.t

@@ -1,21 +1,21 b''
 Issue351: mq: qrefresh can create extra revlog entry
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init
   $ 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           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 1e88685f5dde 000000000000 000000000000
 

tests/test-filebranch.t

@@ -1,145 +1,145 b''
 This test makes sure that we don't mark a file as merged with its ancestor
 when we do a merge.
 
   $ cat <<EOF > merge
   > import sys, os
   > print("merging for", os.path.basename(sys.argv[1]))
   > EOF
   $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
 
 Creating base:
 
   $ hg init a
   $ cd a
   $ echo 1 > foo
   $ echo 1 > bar
   $ echo 1 > baz
   $ echo 1 > quux
   $ hg add foo bar baz quux
   $ hg commit -m "base"
 
   $ cd ..
   $ hg clone a b
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Creating branch a:
 
   $ cd a
   $ echo 2a > foo
   $ echo 2a > bar
   $ hg commit -m "branch a"
 
 Creating branch b:
 
   $ cd ..
   $ cd b
   $ echo 2b > foo
   $ echo 2b > baz
   $ hg commit -m "branch b"
 
 We shouldn't have anything but n state here:
 
   $ hg debugstate --no-dates | grep -v "^n"
   [1]
 
 Merging:
 
   $ hg pull ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   new changesets bdd988058d16
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge -v
   resolving manifests
   getting bar
   merging foo
   merging for foo
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ echo 2m > foo
   $ echo 2b > baz
   $ echo new > quux
 
   $ hg ci -m "merge"
 
 main: we should have a merge here:
 
   $ hg debugindex --changelog
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 cdca01651b96 000000000000 000000000000
        1       1 f6718a9cb7f3 cdca01651b96 000000000000
        2       2 bdd988058d16 cdca01651b96 000000000000
        3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
 
 log should show foo and quux changed:
 
   $ hg log -v -r tip
   changeset:   3:d8a521142a3c
   tag:         tip
   parent:      1:f6718a9cb7f3
   parent:      2:bdd988058d16
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo quux
   description:
   merge
   
   
 
 foo: we should have a merge here:
 
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
        2       2 33d1fb69067a b8e02f643373 000000000000
        3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
 
 bar: we should not have a merge here:
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       2 33d1fb69067a b8e02f643373 000000000000
 
 baz: we should not have a merge here:
 
   $ hg debugindex baz
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
 
 quux: we should not have a merge here:
 
   $ hg debugindex quux
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       3 6128c0f33108 b8e02f643373 000000000000
 
 Manifest entries should match tips of all files:
 
   $ hg manifest --debug
   33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
   2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
   aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
   6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux
 
 Everything should be clean now:
 
   $ hg status
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 10 changes to 4 files
 
   $ cd ..

tests/test-flags.t

@@ -1,158 +1,158 b''
 #require execbit
 
   $ umask 027
 
   $ hg init test1
   $ cd test1
   $ touch a b
   $ hg add a b
   $ hg ci -m "added a b"
 
   $ cd ..
   $ hg clone test1 test3
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg init test2
   $ cd test2
   $ hg pull ../test1
   pulling from ../test1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 22a449e20da5
   (run 'hg update' to get a working copy)
   $ hg co
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ chmod +x a
   $ hg ci -m "chmod +x a"
 
 the changelog should mention file a:
 
   $ hg tip --template '{files}\n'
   a
 
   $ cd ../test1
   $ echo 123 >>a
   $ hg ci -m "a updated"
 
   $ hg pull ../test2
   pulling from ../test2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   new changesets 7f4313b42a34
   1 local changesets published
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg heads
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:c6ecefc45368
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
   $ hg history
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:c6ecefc45368
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a updated
   
   changeset:   0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added a b
   
 
   $ hg -v merge
   resolving manifests
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat a
   123
   $ [ -x a ]
 
   $ cd ../test3
   $ echo 123 >>b
   $ hg ci -m "b updated"
 
   $ hg pull ../test2
   pulling from ../test2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   new changesets 7f4313b42a34
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg heads
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:dc57ead75f79
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
   $ hg history
   changeset:   2:7f4313b42a34
   tag:         tip
   parent:      0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod +x a
   
   changeset:   1:dc57ead75f79
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b updated
   
   changeset:   0:22a449e20da5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added a b
   
 
   $ hg -v merge
   resolving manifests
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ ls -l ../test[123]/a > foo
   $ cut -b 1-10 < foo
   -rwxr-x---
   -rwxr-x---
   -rwxr-x---
 
   $ hg debugindex a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b80de5d13875 000000000000 000000000000
   $ hg debugindex -R ../test2 a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b80de5d13875 000000000000 000000000000
   $ hg debugindex -R ../test1 a
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b80de5d13875 000000000000 000000000000
        1       1 7fe919cc0336 b80de5d13875 000000000000
 
   $ cd ..

tests/test-issue522.t

@@ -1,52 +1,52 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
 
   $ 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           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
        1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
        2       2 c6fc755d7e68 6f4310b00b9a 000000000000
 

tests/test-merge-commit.t

@@ -1,183 +1,183 b''
 Check that renames are correctly saved by a commit after a merge
 
 Test with the merge on 3 having the rename on the local parent
 
   $ hg init a
   $ cd a
 
   $ echo line1 > foo
   $ hg add foo
   $ hg ci -m '0: add foo'
 
   $ echo line2 >> foo
   $ hg ci -m '1: change foo'
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg mv foo bar
   $ rm bar
   $ echo line0 > bar
   $ echo line1 >> bar
   $ hg ci -m '2: mv foo bar; change bar'
   created new head
 
   $ hg merge 1
   merging bar and foo to bar
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line0
   line1
   line2
 
   $ hg ci -m '3: merge with local rename'
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 d35118874825 000000000000 000000000000
        1       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 690b295714ae 000000000000 000000000000
        1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
 
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
   $ echo line1 > bar
   $ hg ci -m '4: revert content change from rev 2'
   created new head
 
   $ hg log --template '{rev}:{node|short} {parents}\n'
   4:2263c1be0967 2:0f2ff26688b9 
   3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 
   2:0f2ff26688b9 0:2665aaee66e9 
   1:5cd961e4045d 
   0:2665aaee66e9 
 
 This should use bar@rev2 as the ancestor:
 
   $ hg --debug merge 3
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
   starting 4 threads for background file closing (?)
    preserving bar for resolve of bar
    bar: versions differ -> m
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar
   my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line1
   line2
 
   $ hg ci -m '5: merge'
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 d35118874825 000000000000 000000000000
        1       3 5345f5ab8abd 000000000000 d35118874825
        2       4 ff4b45017382 d35118874825 000000000000
        3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
 
 Same thing, but with the merge on 3 having the rename
 on the remote parent:
 
   $ cd ..
   $ hg clone -U -r 1 -r 2 a b
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files (+1 heads)
   new changesets 2665aaee66e9:0f2ff26688b9
   $ cd b
 
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge 2
   merging foo and bar to bar
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line0
   line1
   line2
 
   $ hg ci -m '3: merge with remote rename'
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 d35118874825 000000000000 000000000000
        1       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 690b295714ae 000000000000 000000000000
        1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
 
   $ hg up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm bar
   $ echo line1 > bar
   $ hg ci -m '4: revert content change from rev 2'
   created new head
 
   $ hg log --template '{rev}:{node|short} {parents}\n'
   4:2263c1be0967 2:0f2ff26688b9 
   3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 
   2:0f2ff26688b9 0:2665aaee66e9 
   1:5cd961e4045d 
   0:2665aaee66e9 
 
 This should use bar@rev2 as the ancestor:
 
   $ hg --debug merge 3
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
   starting 4 threads for background file closing (?)
    preserving bar for resolve of bar
    bar: versions differ -> m
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar
   my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
    premerge successful
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat bar
   line1
   line2
 
   $ hg ci -m '5: merge'
 
   $ hg debugindex bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 d35118874825 000000000000 000000000000
        1       3 5345f5ab8abd 000000000000 d35118874825
        2       4 ff4b45017382 d35118874825 000000000000
        3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
   $ cd ..

tests/test-merge7.t

@@ -1,147 +1,147 b''
 initial
   $ hg init test-a
   $ cd test-a
   $ cat >test.txt <<"EOF"
   > 1
   > 2
   > 3
   > EOF
   $ hg add test.txt
   $ hg commit -m "Initial"
 
 clone
   $ cd ..
   $ hg clone test-a test-b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 change test-a
   $ cd test-a
   $ cat >test.txt <<"EOF"
   > one
   > two
   > three
   > EOF
   $ hg commit -m "Numbers as words"
 
 change test-b
   $ cd ../test-b
   $ cat >test.txt <<"EOF"
   > 1
   > 2.5
   > 3
   > EOF
   $ hg commit -m "2 -> 2.5"
 
 now pull and merge from test-a
   $ hg pull ../test-a
   pulling from ../test-a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 96b70246a118
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   merging test.txt
   warning: conflicts while merging test.txt! (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]
 resolve conflict
   $ cat >test.txt <<"EOF"
   > one
   > two-point-five
   > three
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
   (no more unresolved files)
   $ hg commit -m "Merge 1"
 
 change test-a again
   $ cd ../test-a
   $ cat >test.txt <<"EOF"
   > one
   > two-point-one
   > three
   > EOF
   $ hg commit -m "two -> two-point-one"
 
 pull and merge from test-a again
   $ cd ../test-b
   $ hg pull ../test-a
   pulling from ../test-a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 40d11a4173a8
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge --debug
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
   starting 4 threads for background file closing (?)
    preserving test.txt for resolve of test.txt
    test.txt: versions differ -> m
   picked tool ':merge' for test.txt (binary False symlink False changedelete False)
   merging test.txt
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   warning: conflicts while merging test.txt! (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 test.txt
   one
   <<<<<<< working copy: 50c3a7e29886 - test: Merge 1
   two-point-five
   =======
   two-point-one
   >>>>>>> merge rev:    40d11a4173a8 - test: two -> two-point-one
   three
 
   $ hg debugindex test.txt
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 01365c4cca56 000000000000 000000000000
        1       1 7b013192566a 01365c4cca56 000000000000
        2       2 8fe46a3eb557 01365c4cca56 000000000000
        3       3 fc3148072371 7b013192566a 8fe46a3eb557
        4       4 d40249267ae3 8fe46a3eb557 000000000000
 
   $ hg log
   changeset:   4:40d11a4173a8
   tag:         tip
   parent:      2:96b70246a118
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     two -> two-point-one
   
   changeset:   3:50c3a7e29886
   parent:      1:d1e159716d41
   parent:      2:96b70246a118
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge 1
   
   changeset:   2:96b70246a118
   parent:      0:b1832b9d912a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Numbers as words
   
   changeset:   1:d1e159716d41
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2.5
   
   changeset:   0:b1832b9d912a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Initial
   
 
   $ cd ..

tests/test-narrow-debugcommands.t

@@ -1,44 +1,44 b''
   $ . "$TESTDIR/narrow-library.sh"
   $ hg init repo
   $ cd repo
   $ cat << EOF > .hg/store/narrowspec
   > [include]
   > path:foo
   > [exclude]
   > EOF
   $ cp .hg/store/narrowspec .hg/narrowspec.dirstate
   $ echo treemanifest >> .hg/requires
   $ echo narrowhg-experimental >> .hg/requires
   $ mkdir -p foo/bar
   $ echo b > foo/f
   $ echo c > foo/bar/f
   $ hg commit -Am hi
   adding foo/bar/f
   adding foo/f
   $ hg debugindex -m
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 14a5d056d75a 000000000000 000000000000
   $ hg debugindex --dir foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 e635c7857aef 000000000000 000000000000
   $ hg debugindex --dir foo/
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 e635c7857aef 000000000000 000000000000
   $ hg debugindex --dir foo/bar
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 e091d4224761 000000000000 000000000000
   $ hg debugindex --dir foo/bar/
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 e091d4224761 000000000000 000000000000
   $ hg debugdata -m 0
   foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
   $ hg debugdata --dir foo 0
   bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
   f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
   $ hg debugdata --dir foo/ 0
   bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
   f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
   $ hg debugdata --dir foo/bar 0
   f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   $ hg debugdata --dir foo/bar/ 0
   f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)

tests/test-narrow-update.t

@@ -1,76 +1,76 b''
 
   $ . "$TESTDIR/narrow-library.sh"
 
 create full repo
 
   $ hg init master
   $ cd master
   $ echo init > init
   $ hg ci -Aqm 'initial'
 
   $ mkdir inside
   $ echo inside > inside/f1
   $ mkdir outside
   $ echo outside > outside/f1
   $ hg ci -Aqm 'add inside and outside'
 
   $ echo modified > inside/f1
   $ hg ci -qm 'modify inside'
 
   $ echo modified > outside/f1
   $ hg ci -qm 'modify outside'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ hg debugindex -c
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 9958b1af2add 000000000000 000000000000
        1       1 2db4ce2a3bfe 9958b1af2add 000000000000
        2       2 0980ee31a742 2db4ce2a3bfe 000000000000
        3       3 4410145019b7 0980ee31a742 000000000000
 
   $ hg update -q 0
 
 Can update to revision with changes inside
 
   $ hg update -q 'desc("add inside and outside")'
   $ hg update -q 'desc("modify inside")'
   $ find *
   inside
   inside/f1
   $ cat inside/f1
   modified
 
 Can update to revision with changes outside
 
   $ hg update -q 'desc("modify outside")'
   $ find *
   inside
   inside/f1
   $ cat inside/f1
   modified
 
 Can update with a deleted file inside
 
   $ hg rm inside/f1
   $ hg update -q 'desc("modify inside")'
   $ hg update -q 'desc("modify outside")'
   $ hg update -q 'desc("initial")'
   $ hg update -q 'desc("modify inside")'
 
 Can update with a moved file inside
 
   $ hg mv inside/f1 inside/f2
   $ hg update -q 'desc("modify outside")'
   $ hg update -q 'desc("add inside and outside")'
   $ hg update -q 'desc("modify inside")'

tests/test-rename-merge1.t

@@ -1,236 +1,236 b''
   $ hg init
 
   $ 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           p2
+     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-revlog-packentry.t

@@ -1,23 +1,23 b''
   $ hg init repo
   $ cd repo
 
   $ touch foo
   $ hg ci -Am 'add foo'
   adding foo
 
   $ hg up -C null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 this should be stored as a delta against rev 0
 
   $ echo foo bar baz > foo
   $ hg ci -Am 'add foo again'
   adding foo
   created new head
 
   $ hg debugindex foo
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b80de5d13875 000000000000 000000000000
        1       1 0376abec49b8 000000000000 000000000000
 
   $ cd ..

tests/test-strip-cross.t

@@ -1,220 +1,220 b''
 test stripping of filelogs where the linkrev doesn't always increase
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'strip =' >> $HGRCPATH
   $ commit()
   > {
   >     hg up -qC null
   >     count=1
   >     for i in "$@"; do
   >         for f in $i; do
   >             mkdir -p `dirname $f`
   >             echo $count > $f
   >         done
   >         count=`expr $count + 1`
   >     done
   >     hg commit -qAm "$*"
   > }
 
 2 1 0 2 0 1 2
 
   $ mkdir files
   $ cd files
   $ hg init orig
   $ cd orig
   $ commit '201 210'
   $ commit '102 120' '210'
   $ commit '021'
   $ commit '201' '021 120'
   $ commit '012 021' '102 201' '120 210'
   $ commit '102 120' '012 210' '021 201'
   $ commit '201 210' '021 120' '012 102'
   $ cd ..
   $ hg clone -q -U -r 4 -r 5 -r 6 orig crossed
   $ cd crossed
 
   $ for i in 012 021 102 120 201 210; do
   >     echo $i
   >     hg debugindex $i
   >     echo
   > done
   012
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 5d9299349fc0 000000000000 000000000000
        2       2 2661d26c6496 000000000000 000000000000
   
   021
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       2 5d9299349fc0 000000000000 000000000000
        2       1 2661d26c6496 000000000000 000000000000
   
   102
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b8e02f643373 000000000000 000000000000
        1       0 5d9299349fc0 000000000000 000000000000
        2       2 2661d26c6496 000000000000 000000000000
   
   120
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b8e02f643373 000000000000 000000000000
        1       2 5d9299349fc0 000000000000 000000000000
        2       0 2661d26c6496 000000000000 000000000000
   
   201
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 b8e02f643373 000000000000 000000000000
        1       0 5d9299349fc0 000000000000 000000000000
        2       1 2661d26c6496 000000000000 000000000000
   
   210
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 b8e02f643373 000000000000 000000000000
        1       1 5d9299349fc0 000000000000 000000000000
        2       0 2661d26c6496 000000000000 000000000000
   
   $ cd ..
   $ for i in 0 1 2; do
   >     hg clone -q -U --pull crossed $i
   >     echo "% Trying to strip revision $i"
   >     hg --cwd $i strip $i
   >     echo "% Verifying"
   >     hg --cwd $i verify
   >     echo
   > done
   % Trying to strip revision 0
   saved backup bundle to $TESTTMP/files/0/.hg/strip-backup/cbb8c2f0a2e3-239800b9-backup.hg
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 12 changes to 6 files
   
   % Trying to strip revision 1
   saved backup bundle to $TESTTMP/files/1/.hg/strip-backup/124ecc0cbec9-6104543f-backup.hg
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 12 changes to 6 files
   
   % Trying to strip revision 2
   saved backup bundle to $TESTTMP/files/2/.hg/strip-backup/f6439b304a1a-c6505a5f-backup.hg
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 2 changesets with 12 changes to 6 files
   
   $ cd ..
 
 Do a similar test where the manifest revlog has unordered linkrevs
   $ mkdir manifests
   $ cd manifests
   $ hg init orig
   $ cd orig
   $ commit 'file'
   $ commit 'other'
   $ commit '' 'other'
   $ HGUSER=another-user; export HGUSER
   $ commit 'file'
   $ commit 'other' 'file'
   $ cd ..
   $ hg clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
   $ cd crossed
   $ hg debugindex --manifest
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 6bbc6fee55c2 000000000000 000000000000
        1       0 1c556153fe54 000000000000 000000000000
        2       1 1f76dba919fd 000000000000 000000000000
        3       3 bbee06ad59d5 000000000000 000000000000
 
   $ cd ..
   $ for i in 2 3; do
   >     hg clone -q -U --pull crossed $i
   >     echo "% Trying to strip revision $i"
   >     hg --cwd $i strip $i
   >     echo "% Verifying"
   >     hg --cwd $i verify
   >     echo
   > done
   % Trying to strip revision 2
   saved backup bundle to $TESTTMP/manifests/2/.hg/strip-backup/f3015ad03c03-4d98bdc2-backup.hg
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 3 changes to 2 files
   
   % Trying to strip revision 3
   saved backup bundle to $TESTTMP/manifests/3/.hg/strip-backup/9632aa303aa4-69192e3f-backup.hg
   % Verifying
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 3 changes to 2 files
   
   $ cd ..
 
 Now a similar test for a non-root manifest revlog
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > treemanifests = yes
   > EOF
   $ mkdir treemanifests
   $ cd treemanifests
   $ 
   $ hg --config experimental.treemanifest=True init orig
   $ cd orig
   $ commit 'dir/file'
   $ commit 'dir/other'
   $ commit '' 'dir/other'
   $ HGUSER=yet-another-user; export HGUSER
   $ commit 'otherdir dir/file'
   $ commit 'otherdir dir/other' 'otherdir dir/file'
   $ cd ..
   $ hg --config experimental.treemanifest=True clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
   $ cd crossed
   $ hg debugindex --dir dir
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 6bbc6fee55c2 000000000000 000000000000
        1       0 1c556153fe54 000000000000 000000000000
        2       1 1f76dba919fd 000000000000 000000000000
        3       3 bbee06ad59d5 000000000000 000000000000
 
   $ cd ..
   $ for i in 2 3; do
   >     hg --config experimental.treemanifest=True clone -q -U --pull crossed $i
   >     echo "% Trying to strip revision $i"
   >     hg --cwd $i strip $i
   >     echo "% Verifying"
   >     hg --cwd $i verify
   >     echo
   > done
   % Trying to strip revision 2
   saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg
   % Verifying
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 4 changes to 3 files
   
   % Trying to strip revision 3
   saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg
   % Verifying
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 4 changes to 3 files
   
   $ cd ..

tests/test-treemanifest.t

@@ -1,896 +1,896 b''
 Set up repo
 
   $ hg --config experimental.treemanifest=True init repo
   $ cd repo
 
 Requirements get set on init
 
   $ hg debugrequires | grep treemanifest
   treemanifest
 
 Without directories, looks like any other repo
 
   $ echo 0 > a
   $ echo 0 > b
   $ hg ci -Aqm initial
   $ hg debugdata -m 0
   a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
 
 Submanifest is stored in separate revlog
 
   $ mkdir dir1
   $ echo 1 > dir1/a
   $ echo 1 > dir1/b
   $ echo 1 > e
   $ hg ci -Aqm 'add dir1'
   $ hg debugdata -m 1
   a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   dir1\x008b3ffd73f901e83304c83d33132c8e774ceac44et (esc)
   e\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
   $ hg debugdata --dir dir1 0
   a\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
   b\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
 
 Can add nested directories
 
   $ mkdir dir1/dir1
   $ echo 2 > dir1/dir1/a
   $ echo 2 > dir1/dir1/b
   $ mkdir dir1/dir2
   $ echo 2 > dir1/dir2/a
   $ echo 2 > dir1/dir2/b
   $ hg ci -Aqm 'add dir1/dir1'
   $ hg files -r .
   a
   b
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
   e
 
 The manifest command works
 
   $ hg manifest
   a
   b
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
   e
 
 Revision is not created for unchanged directory
 
   $ mkdir dir2
   $ echo 3 > dir2/a
   $ hg add dir2
   adding dir2/a
   $ hg debugindex --dir dir1 > before
   $ hg ci -qm 'add dir2'
   $ hg debugindex --dir dir1 > after
   $ diff before after
   $ rm before after
 
 Removing directory does not create an revlog entry
 
   $ hg rm dir1/dir1
   removing dir1/dir1/a
   removing dir1/dir1/b
   $ hg debugindex --dir dir1/dir1 > before
   $ hg ci -qm 'remove dir1/dir1'
   $ hg debugindex --dir dir1/dir1 > after
   $ diff before after
   $ rm before after
 
 Check that hg files (calls treemanifest.walk()) works
 without loading all directory revlogs
 
   $ hg co 'desc("add dir2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mv .hg/store/meta/dir2 .hg/store/meta/dir2-backup
   $ hg files -r . dir1
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
 
 Check that status between revisions works (calls treemanifest.matches())
 without loading all directory revlogs
 
   $ hg status --rev 'desc("add dir1")' --rev . dir1
   A dir1/dir1/a
   A dir1/dir1/b
   A dir1/dir2/a
   A dir1/dir2/b
   $ mv .hg/store/meta/dir2-backup .hg/store/meta/dir2
 
 Merge creates 2-parent revision of directory revlog
 
   $ echo 5 > dir1/a
   $ hg ci -Aqm 'modify dir1/a'
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 6 > dir1/b
   $ hg ci -Aqm 'modify dir1/b'
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'conflict-free merge involving dir1/'
   $ cat dir1/a
   5
   $ cat dir1/b
   6
   $ hg debugindex --dir dir1
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 8b3ffd73f901 000000000000 000000000000
        1       2 68e9d057c5a8 8b3ffd73f901 000000000000
        2       4 4698198d2624 68e9d057c5a8 000000000000
        3       5 44844058ccce 68e9d057c5a8 000000000000
        4       6 bf3d9b744927 68e9d057c5a8 000000000000
        5       7 dde7c0af2a03 bf3d9b744927 44844058ccce
 
 Merge keeping directory from parent 1 does not create revlog entry. (Note that
 dir1's manifest does change, but only because dir1/a's filelog changes.)
 
   $ hg co 'desc("add dir2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 8 > dir2/a
   $ hg ci -m 'modify dir2/a'
   created new head
 
   $ hg debugindex --dir dir2 > before
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert -r 'desc("modify dir2/a")' .
   reverting dir1/a
   $ hg ci -m 'merge, keeping parent 1'
   $ hg debugindex --dir dir2 > after
   $ diff before after
   $ rm before after
 
 Merge keeping directory from parent 2 does not create revlog entry. (Note that
 dir2's manifest does change, but only because dir2/a's filelog changes.)
 
   $ hg co 'desc("modify dir2/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugindex --dir dir1 > before
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert -r 'desc("modify dir1/a")' .
   reverting dir2/a
   $ hg ci -m 'merge, keeping parent 2'
   created new head
   $ hg debugindex --dir dir1 > after
   $ diff before after
   $ rm before after
 
 Create flat source repo for tests with mixed flat/tree manifests
 
   $ cd ..
   $ hg init repo-flat
   $ cd repo-flat
 
 Create a few commits with flat manifest
 
   $ echo 0 > a
   $ echo 0 > b
   $ echo 0 > e
   $ for d in dir1 dir1/dir1 dir1/dir2 dir2
   > do
   >   mkdir $d
   >   echo 0 > $d/a
   >   echo 0 > $d/b
   > done
   $ hg ci -Aqm initial
 
   $ echo 1 > a
   $ echo 1 > dir1/a
   $ echo 1 > dir1/dir1/a
   $ hg ci -Aqm 'modify on branch 1'
 
   $ hg co 0
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 2 > b
   $ echo 2 > dir1/b
   $ echo 2 > dir1/dir1/b
   $ hg ci -Aqm 'modify on branch 2'
 
   $ hg merge 1
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge of flat manifests to new flat manifest'
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 Create clone with tree manifests enabled
 
   $ cd ..
   $ hg clone --config experimental.treemanifest=1 \
   >   http://localhost:$HGPORT repo-mixed -r 1
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 14 changes to 11 files
   new changesets 5b02a3e8db7e:581ef6037d8b
   updating to branch default
   11 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-mixed
   $ test -d .hg/store/meta
   [1]
   $ hg debugrequires | grep treemanifest
   treemanifest
 
 Should be possible to push updates from flat to tree manifest repo
 
   $ hg -R ../repo-flat push ssh://user@dummy/repo-mixed
   pushing to ssh://user@dummy/repo-mixed
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 3 changes to 3 files
 
 Commit should store revlog per directory
 
   $ hg co 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 3 > a
   $ echo 3 > dir1/a
   $ echo 3 > dir1/dir1/a
   $ hg ci -m 'first tree'
   created new head
   $ find .hg/store/meta | sort
   .hg/store/meta
   .hg/store/meta/dir1
   .hg/store/meta/dir1/00manifest.i
   .hg/store/meta/dir1/dir1
   .hg/store/meta/dir1/dir1/00manifest.i
   .hg/store/meta/dir1/dir2
   .hg/store/meta/dir1/dir2/00manifest.i
   .hg/store/meta/dir2
   .hg/store/meta/dir2/00manifest.i
 
 Merge of two trees
 
   $ hg co 2
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 1
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge of flat manifests to new tree manifest'
   created new head
   $ hg diff -r 3
 
 Parent of tree root manifest should be flat manifest, and two for merge
 
   $ hg debugindex -m
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 40536115ed9e 000000000000 000000000000
        1       1 f3376063c255 40536115ed9e 000000000000
        2       2 5d9b9da231a2 40536115ed9e 000000000000
        3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255
        4       4 51e32a8c60ee f3376063c255 000000000000
        5       5 cc5baa78b230 5d9b9da231a2 f3376063c255
 
 
 Status across flat/tree boundary should work
 
   $ hg status --rev '.^' --rev .
   M a
   M dir1/a
   M dir1/dir1/a
 
 
 Turning off treemanifest config has no effect
 
   $ hg debugindex --dir dir1
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
   $ echo 2 > dir1/a
   $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
   $ hg debugindex --dir dir1
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
        2       6 5b16163a30c6 25ecb8cb8618 000000000000
 
 Stripping and recovering changes should work
 
   $ hg st --change tip
   M dir1/a
   $ hg --config extensions.strip= strip tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
   $ hg debugindex --dir dir1
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
 
 #if repobundlerepo
   $ hg incoming .hg/strip-backup/*
   comparing with .hg/strip-backup/*-backup.hg (glob)
   searching for changes
   changeset:   6:51cfd7b1e13b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify dir1/a
   
 #endif
 
   $ hg unbundle .hg/strip-backup/*
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 51cfd7b1e13b (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg --config extensions.strip= strip tip
   saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle -q .hg/strip-backup/*
   $ hg debugindex --dir dir1
-     rev linkrev       nodeid           p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
        2       6 5b16163a30c6 25ecb8cb8618 000000000000
   $ hg st --change tip
   M dir1/a
 
 Shelving and unshelving should work
 
   $ echo foo >> dir1/a
   $ hg shelve
   shelved as default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg unshelve
   unshelving change 'default'
   $ hg diff --nodates
   diff -r 708a273da119 dir1/a
   --- a/dir1/a
   +++ b/dir1/a
   @@ -1,1 +1,2 @@
    1
   +foo
 
 Pushing from treemanifest repo to an empty repo makes that a treemanifest repo
 
   $ cd ..
   $ hg init empty-repo
   $ cat << EOF >> empty-repo/.hg/hgrc
   > [experimental]
   > changegroup3=yes
   > EOF
   $ hg debugrequires -R empty-repo | grep treemanifest
   [1]
   $ hg push -R repo -r 0 empty-repo
   pushing to empty-repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   $ hg debugrequires -R empty-repo | grep treemanifest
   treemanifest
 
 Pushing to an empty repo works
 
   $ hg --config experimental.treemanifest=1 init clone
   $ hg debugrequires -R clone | grep treemanifest
   treemanifest
   $ hg push -R repo clone
   pushing to clone
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 15 changes to 10 files (+3 heads)
   $ hg debugrequires -R clone | grep treemanifest
   treemanifest
   $ hg -R clone verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 11 changesets with 15 changes to 10 files
 
 Create deeper repo with tree manifests.
 
   $ hg --config experimental.treemanifest=True init deeprepo
   $ cd deeprepo
 
   $ mkdir .A
   $ mkdir b
   $ mkdir b/bar
   $ mkdir b/bar/orange
   $ mkdir b/bar/orange/fly
   $ mkdir b/foo
   $ mkdir b/foo/apple
   $ mkdir b/foo/apple/bees
 
   $ touch .A/one.txt
   $ touch .A/two.txt
   $ touch b/bar/fruits.txt
   $ touch b/bar/orange/fly/gnat.py
   $ touch b/bar/orange/fly/housefly.txt
   $ touch b/foo/apple/bees/flower.py
   $ touch c.txt
   $ touch d.py
 
   $ hg ci -Aqm 'initial'
 
   $ echo >> .A/one.txt
   $ echo >> .A/two.txt
   $ echo >> b/bar/fruits.txt
   $ echo >> b/bar/orange/fly/gnat.py
   $ echo >> b/bar/orange/fly/housefly.txt
   $ echo >> b/foo/apple/bees/flower.py
   $ echo >> c.txt
   $ echo >> d.py
   $ hg ci -Aqm 'second'
 
 We'll see that visitdir works by removing some treemanifest revlogs and running
 the files command with various parameters.
 
 Test files from the root.
 
   $ hg files -r .
   .A/one.txt
   .A/two.txt
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   b/foo/apple/bees/flower.py
   c.txt
   d.py
 
 Excludes with a glob should not exclude everything from the glob's root
 
   $ hg files -r . -X 'b/fo?' b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ cp -R .hg/store .hg/store-copy
 
 Test files for a subdirectory.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ hg files -r . b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   b/foo/apple/bees/flower.py
   $ hg diff -r '.^' -r . --stat b
    b/bar/fruits.txt              |  1 +
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    b/foo/apple/bees/flower.py    |  1 +
    4 files changed, 4 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files with just includes and excludes.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/bar/orange/fly
   $ rm -r .hg/store/meta/b/foo/apple/bees
   $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
   b/bar/fruits.txt
   $ hg diff -r '.^' -r . --stat -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
    b/bar/fruits.txt |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a subdirectory, excluding a directory within it.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -X path:b/foo b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ hg diff -r '.^' -r . --stat -X path:b/foo b
    b/bar/fruits.txt              |  1 +
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    3 files changed, 3 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a sub directory, including only a directory within it, and
 including an unrelated directory.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -I path:b/bar/orange -I path:a b
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ hg diff -r '.^' -r . --stat -I path:b/bar/orange -I path:a b
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a pattern, including a directory, and excluding a directory
 within that.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ rm -r .hg/store/meta/b/bar/orange
   $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
   b/bar/fruits.txt
   $ hg diff -r '.^' -r . --stat glob:**.txt -I path:b/bar -X path:b/bar/orange
    b/bar/fruits.txt |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Add some more changes to the deep repo
   $ echo narf >> b/bar/fruits.txt
   $ hg ci -m narf
   $ echo troz >> b/bar/orange/fly/gnat.py
   $ hg ci -m troz
 
 Verify works
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 #if repofncache
 Dirlogs are included in fncache
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
 
 Rebuilt fncache includes dirlogs
   $ rm .hg/store/fncache
   $ hg debugrebuildfncache
   adding data/.A/one.txt.i
   adding data/.A/two.txt.i
   adding data/b/bar/fruits.txt.i
   adding data/b/bar/orange/fly/gnat.py.i
   adding data/b/bar/orange/fly/housefly.txt.i
   adding data/b/foo/apple/bees/flower.py.i
   adding data/c.txt.i
   adding data/d.py.i
   adding meta/.A/00manifest.i
   adding meta/b/00manifest.i
   adding meta/b/bar/00manifest.i
   adding meta/b/bar/orange/00manifest.i
   adding meta/b/bar/orange/fly/00manifest.i
   adding meta/b/foo/00manifest.i
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
 #endif
 
 Finish first server
   $ killdaemons.py
 
 Back up the recently added revlogs
   $ cp -R .hg/store .hg/store-newcopy
 
 Verify reports missing dirlog
   $ rm .hg/store/meta/b/00manifest.*
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
    0: empty or missing b/
    b/@0: parent-directory manifest refers to unknown revision 67688a370455
    b/@1: parent-directory manifest refers to unknown revision f065da70369e
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
   warning: orphan data file 'meta/b/bar/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/bar/orange/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/apple/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i' (reporevlogstore !)
   crosschecking files in changesets and manifests
    b/bar/fruits.txt@0: in changeset but not in manifest
    b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
    b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest
    b/foo/apple/bees/flower.py@0: in changeset but not in manifest
   checking files
   checked 4 changesets with 18 changes to 8 files
   6 warnings encountered! (reporevlogstore !)
   9 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-newcopy/. .hg/store
 
 Verify reports missing dirlog entry
   $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
    b/bar/@?: rev 2 points to unexpected changeset 2
    b/bar/@?: 44d7e1146e0d not in parent-directory manifest
    b/bar/@?: rev 3 points to unexpected changeset 3
    b/bar/@?: 70b10c6b17b7 not in parent-directory manifest
    b/bar/orange/@?: rev 2 points to unexpected changeset 3
    (expected None)
    b/bar/orange/fly/@?: rev 2 points to unexpected changeset 3
    (expected None)
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
   2 warnings encountered!
   8 integrity errors encountered!
   (first damaged changeset appears to be 2)
   [1]
   $ cp -R .hg/store-newcopy/. .hg/store
 
 Test cloning a treemanifest repo over http.
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 We can clone even with the knob turned off and we'll get a treemanifest repo.
   $ hg clone --config experimental.treemanifest=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deepclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
 No server errors.
   $ cat deeprepo/errors.log
 requires got updated to include treemanifest
   $ hg debugrequires -R deepclone | grep treemanifest
   treemanifest
 Tree manifest revlogs exist.
   $ find deepclone/.hg/store/meta | sort
   deepclone/.hg/store/meta
   deepclone/.hg/store/meta/._a (reposimplestore !)
   deepclone/.hg/store/meta/._a/00manifest.i (reposimplestore !)
   deepclone/.hg/store/meta/b
   deepclone/.hg/store/meta/b/00manifest.i
   deepclone/.hg/store/meta/b/bar
   deepclone/.hg/store/meta/b/bar/00manifest.i
   deepclone/.hg/store/meta/b/bar/orange
   deepclone/.hg/store/meta/b/bar/orange/00manifest.i
   deepclone/.hg/store/meta/b/bar/orange/fly
   deepclone/.hg/store/meta/b/bar/orange/fly/00manifest.i
   deepclone/.hg/store/meta/b/foo
   deepclone/.hg/store/meta/b/foo/00manifest.i
   deepclone/.hg/store/meta/b/foo/apple
   deepclone/.hg/store/meta/b/foo/apple/00manifest.i
   deepclone/.hg/store/meta/b/foo/apple/bees
   deepclone/.hg/store/meta/b/foo/apple/bees/00manifest.i
   deepclone/.hg/store/meta/~2e_a (reporevlogstore !)
   deepclone/.hg/store/meta/~2e_a/00manifest.i (reporevlogstore !)
 Verify passes.
   $ cd deepclone
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
   $ cd ..
 
 #if reporevlogstore
 Create clones using old repo formats to use in later tests
   $ hg clone --config format.usestore=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deeprepo-basicstore
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd deeprepo-basicstore
   $ hg debugrequires | grep store
   [1]
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone --config format.usefncache=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deeprepo-encodedstore
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd deeprepo-encodedstore
   $ hg debugrequires | grep fncache
   [1]
   $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
 Local clone with basicstore
   $ hg clone -U deeprepo-basicstore local-clone-basicstore
   $ hg -R local-clone-basicstore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Local clone with encodedstore
   $ hg clone -U deeprepo-encodedstore local-clone-encodedstore
   $ hg -R local-clone-encodedstore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Local clone with fncachestore
   $ hg clone -U deeprepo local-clone-fncachestore
   $ hg -R local-clone-fncachestore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Stream clone with basicstore
   $ hg clone --config experimental.changegroup3=True --stream -U \
   >   http://localhost:$HGPORT1 stream-clone-basicstore
   streaming all changes
   28 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
   $ hg -R stream-clone-basicstore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Stream clone with encodedstore
   $ hg clone --config experimental.changegroup3=True --stream -U \
   >   http://localhost:$HGPORT2 stream-clone-encodedstore
   streaming all changes
   28 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
   $ hg -R stream-clone-encodedstore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Stream clone with fncachestore
   $ hg clone --config experimental.changegroup3=True --stream -U \
   >   http://localhost:$HGPORT stream-clone-fncachestore
   streaming all changes
   22 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
   $ hg -R stream-clone-fncachestore verify
   checking changesets
   checking manifests
   checking directory manifests
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
 
 Packed bundle
   $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg
   writing 5330 bytes for 18 files (no-zstd !)
   writing 5400 bytes for 18 files (zstd !)
   bundle requirements:.* treemanifest(,.*)? (re)
   $ hg debugbundle --spec repo-packed.hg
   none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
 
 #endif
 
 Bundle with changegroup2 is not supported
 
   $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
   abort: repository does not support bundle version 02
   [255]
 
 Pull does not include changegroup for manifest the client already has from
 other branch
 
   $ mkdir grafted-dir-repo
   $ cd grafted-dir-repo
   $ hg --config experimental.treemanifest=1 init
   $ mkdir dir
   $ echo a > dir/file
   $ echo a > file
   $ hg ci -Am initial
   adding dir/file
   adding file
   $ echo b > dir/file
   $ hg ci -m updated
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -r tip dir/
   reverting dir/file
   $ echo b > file # to make sure root manifest is sent
   $ hg ci -m grafted
   created new head
   $ cd ..
 
   $ hg --config experimental.treemanifest=1 clone --pull -r 1 \
   >   grafted-dir-repo grafted-dir-repo-clone
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 2 files
   new changesets d84f4c419457:09ab742f3b0f
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd grafted-dir-repo-clone
   $ hg pull -r 2
   pulling from $TESTTMP/grafted-dir-repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 73699489fb7c
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Committing a empty commit does not duplicate root treemanifest
   $ echo z >> z
   $ hg commit -Aqm 'pre-empty commit'
   $ hg rm z
   $ hg commit --amend -m 'empty commit'
   saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg
   $ hg log -r 'tip + tip^' -T '{manifest}\n'
   1:678d3574b88c
   1:678d3574b88c
   $ hg --config extensions.strip= strip -r . -q