Mercurial > hg
changeset 18136:f23dea2b296e
copies: do not track backward copies, only renames (issue3739)
The inverse of a rename is a rename, but the inverse of a copy is not a copy.
Presenting it as such -- in particular, stuffing it into the same dict as real
copies -- causes bugs because other code starts believing the inverse copies
are real.
The only test whose output changes is test-mv-cp-st-diff.t. When a backwards
status -C command is run where a copy is involved, the inverse copy (which was
hitherto presented as a real copy) is no longer displayed.
Keeping track of inverse copies is useful in some situations -- composability
of diffs, for example, since adding "a" followed by an inverse copy "b" to "a"
is equivalent to a rename "b" to "a". However, representing them would require
a more complex data structure than the same dict in which real copies are also
stored.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 26 Dec 2012 15:04:07 -0800 |
| parents | a6fe1b9cc68f |
| children | d8e7b3a14957 |
| files | mercurial/copies.py tests/test-mv-cp-st-diff.t tests/test-rebase-rename.t |
| diffstat | 3 files changed, 79 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Wed Dec 26 15:03:58 2012 -0800 +++ b/mercurial/copies.py Wed Dec 26 15:04:07 2012 -0800 @@ -145,12 +145,16 @@ return cm -def _backwardcopies(a, b): - # because the forward mapping is 1:n, we can lose renames here - # in particular, we find renames better than copies +def _backwardrenames(a, b): + # Even though we're not taking copies into account, 1:n rename situations + # can still exist (e.g. hg cp a b; hg mv a c). In those cases we + # arbitrarily pick one of the renames. f = _forwardcopies(b, a) r = {} for k, v in f.iteritems(): + # remove copies + if v in a: + continue r[v] = k return r @@ -162,8 +166,8 @@ if a == x: return _forwardcopies(x, y) if a == y: - return _backwardcopies(x, y) - return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y)) + return _backwardrenames(x, y) + return _chain(x, y, _backwardrenames(x, a), _forwardcopies(a, y)) def mergecopies(repo, c1, c2, ca): """
--- a/tests/test-mv-cp-st-diff.t Wed Dec 26 15:03:58 2012 -0800 +++ b/tests/test-mv-cp-st-diff.t Wed Dec 26 15:04:07 2012 -0800 @@ -670,7 +670,6 @@ % hg st -C --rev . --rev 0 M a - b R b % hg diff --git --rev . --rev 0 @@ -728,7 +727,6 @@ % hg st -C --rev . --rev 2 M a - b A x/y R b @@ -1072,7 +1070,6 @@ % hg st -C --rev . --rev 0 M a - b R b R c @@ -1148,7 +1145,6 @@ % hg st -C --rev . --rev 2 M a - b A x/y R b R c
--- a/tests/test-rebase-rename.t Wed Dec 26 15:03:58 2012 -0800 +++ b/tests/test-rebase-rename.t Wed Dec 26 15:04:07 2012 -0800 @@ -20,7 +20,10 @@ $ hg ci -Am B adding b - $ hg up -q -C 0 + $ hg mv b b-renamed + $ hg ci -m 'rename B' + + $ hg up -q -C 1 $ hg mv a a-renamed @@ -28,28 +31,32 @@ created new head $ hg tglog - @ 2: 'rename A' + @ 3: 'rename A' | - | o 1: 'B' + | o 2: 'rename B' |/ + o 1: 'B' + | o 0: 'A' Rename is tracked: $ hg tlog -p --git -r tip - 2: 'rename A' + 3: 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed Rebase the revision containing the rename: - $ hg rebase -s 2 -d 1 + $ hg rebase -s 3 -d 2 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) $ hg tglog - @ 2: 'rename A' + @ 3: 'rename A' + | + o 2: 'rename B' | o 1: 'B' | @@ -59,11 +66,32 @@ Rename is not lost: $ hg tlog -p --git -r tip - 2: 'rename A' + 3: 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed + +Rebased revision does not contain information about b (issue3739) + + $ hg log -r 3 --debug + changeset: 3:3b905b1064f14ace3ad02353b79dd42d32981655 + tag: tip + phase: draft + parent: 2:920a371a5635af23a26a011ca346cecd1cfcb942 + parent: -1:0000000000000000000000000000000000000000 + manifest: 3:c4a62b2b64593c8fe0523d4c1ba2e243a8bd4dce + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + files+: a-renamed + files-: a + extra: branch=default + extra: rebase_source=89af05cb38a281f891c6f5581dd027092da29166 + description: + rename A + + + $ cd .. @@ -78,47 +106,75 @@ $ hg ci -Am B adding b - $ hg up -q -C 0 + $ hg cp b b-copied + $ hg ci -Am 'copy B' + + $ hg up -q -C 1 $ hg cp a a-copied $ hg ci -m 'copy A' created new head $ hg tglog - @ 2: 'copy A' + @ 3: 'copy A' | - | o 1: 'B' + | o 2: 'copy B' |/ + o 1: 'B' + | o 0: 'A' Copy is tracked: $ hg tlog -p --git -r tip - 2: 'copy A' + 3: 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied Rebase the revision containing the copy: - $ hg rebase -s 2 -d 1 + $ hg rebase -s 3 -d 2 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) $ hg tglog - @ 2: 'copy A' + @ 3: 'copy A' + | + o 2: 'copy B' | o 1: 'B' | o 0: 'A' + Copy is not lost: $ hg tlog -p --git -r tip - 2: 'copy A' + 3: 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied + +Rebased revision does not contain information about b (issue3739) + + $ hg log -r 3 --debug + changeset: 3:98f6e6dbf45ab54079c2237fbd11066a5c41a11d + tag: tip + phase: draft + parent: 2:39e588434882ff77d01229d169cdc77f29e8855e + parent: -1:0000000000000000000000000000000000000000 + manifest: 3:2232f329d66fffe3930d43479ae624f66322b04d + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + files+: a-copied + extra: branch=default + extra: rebase_source=0a8162ff18a8900df8df8ef7ac0046955205613e + description: + copy A + + + $ cd ..