( )⚙ D6750 context: filter out invalid copies from workingctx.p[12]copies()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6750

context: filter out invalid copies from workingctx.p[12]copies()
ClosedPublic

Authored by martinvonz on Aug 20 2019, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2b869a515ba6: context: filter out invalid copies from workingctx.p[12]copies()
Summary

workingctx normally gets its lists of modified, added, removed files
etc. based on the dirstate status. Its constructor also accepts a
"changes" argument to override the status from the dirstate. This is
used for partial commits. If a "changed" argument was passed, we
should clearly also filter out copies to those paths, which I had
previously missed. This patch adds that filtering and fixes the bugs
demonstrated in the previous patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 20 2019, 12:29 PM
martinvonz added a commit: rHG2b869a515ba6: context: filter out invalid copies from workingctx.p[12]copies().Sep 5 2019, 3:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2b869a515ba6: context: filter out invalid copies from workingctx.p[12]copies() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)
Mtests/test-copies-in-changeset.t (31 lines)

Diff 16283

mercurial/context.py

@propertycache @propertycache
def _copies(self): def _copies(self):
p1copies = {} p1copies = {}
p2copies = {} p2copies = {}
parents = self._repo.dirstate.parents() parents = self._repo.dirstate.parents()
p1manifest = self._repo[parents[0]].manifest() p1manifest = self._repo[parents[0]].manifest()
p2manifest = self._repo[parents[1]].manifest() p2manifest = self._repo[parents[1]].manifest()
changedset = set(self.added()) | set(self.modified())
narrowmatch = self._repo.narrowmatch() narrowmatch = self._repo.narrowmatch()
for dst, src in self._repo.dirstate.copies().items(): for dst, src in self._repo.dirstate.copies().items():
if not narrowmatch(dst): if dst not in changedset or not narrowmatch(dst):
continue continue
if src in p1manifest: if src in p1manifest:
p1copies[dst] = src p1copies[dst] = src
elif src in p2manifest: elif src in p2manifest:
p2copies[dst] = src p2copies[dst] = src
return p1copies, p2copies return p1copies, p2copies
@propertycache @propertycache

tests/test-copies-in-changeset.t

$ hg init split $ hg init split
$ cd split $ cd split
$ echo a > a $ echo a > a
$ echo b > b $ echo b > b
$ hg ci -Aqm 'add a and b' $ hg ci -Aqm 'add a and b'
$ echo a2 > a $ echo a2 > a
$ hg mv b c $ hg mv b c
$ hg ci -m 'modify a, move b to c' $ hg ci -m 'modify a, move b to c'
$ (hg --config ui.interactive=yes split 2>&1 | grep mercurial.error) <<EOF $ hg --config ui.interactive=yes split <<EOF
> y > y
> y > y
> n > n
> y > y
> EOF > EOF
mercurial.error.ProgrammingError: some copy targets missing from file list 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/9a396d463e04-2d9e6864-split.hg
$ cd .. $ cd ..
Test committing half a rename Test committing half a rename
$ hg init partial $ hg init partial
$ cd partial $ cd partial
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ hg mv a b $ hg mv a b
$ hg ci -m 'remove a' a 2>&1 | grep mercurial.error $ hg ci -m 'remove a' a
mercurial.error.ProgrammingError: some copy targets missing from file list
$ cd .. $ cd ..