This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6380

copies: fix duplicatecopies() with overlay context
ClosedPublic

Authored by martinvonz on May 15 2019, 7:24 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG313812cbf4ca: copies: fix duplicatecopies() with overlay context
rHGac1dc92dc516: copies: fix duplicatecopies() with overlay context
Summary

The reasoning for this check is in 78d760aa3607 (duplicatecopies: do
not mark items not in the dirstate as copies, 2013-03-28). The check
was then moved to workingfilectx in 754b5117622f (context: add
workingfilectx.markcopied, 2017-10-15) and no corresponding check was
added later when overlayworkingfilectx was added. Rather than adding
the check there, this patch adds a more generic check on the callers
side and removes the check in workingfilectx.markcopied().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.May 15 2019, 7:24 PM
pulkit accepted this revision.May 16 2019, 7:16 AM
Closed by commit rHGac1dc92dc516: copies: fix duplicatecopies() with overlay context (authored by martinvonz). · Explain WhyMay 16 2019, 7:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)
Mmercurial/copies.py (3 lines)
Mtests/test-rebase-inmemory.t (4 lines)

Diff 15140

mercurial/context.py

def write(self, data, flags, backgroundclose=False, **kwargs): def write(self, data, flags, backgroundclose=False, **kwargs):
"""wraps repo.wwrite""" """wraps repo.wwrite"""
self._repo.wwrite(self._path, data, flags, self._repo.wwrite(self._path, data, flags,
backgroundclose=backgroundclose, backgroundclose=backgroundclose,
**kwargs) **kwargs)
def markcopied(self, src): def markcopied(self, src):
"""marks this file a copy of `src`""" """marks this file a copy of `src`"""
if self._repo.dirstate[self._path] in "nma":
self._repo.dirstate.copy(src, self._path) self._repo.dirstate.copy(src, self._path)
def clearunknown(self): def clearunknown(self):
"""Removes conflicting items in the working directory so that """Removes conflicting items in the working directory so that
``write()`` can be called successfully. ``write()`` can be called successfully.
""" """
wvfs = self._repo.wvfs wvfs = self._repo.wvfs
f = self._path f = self._path
wvfs.audit(f) wvfs.audit(f)

mercurial/copies.py

# copytrace='off' skips this line, but not the entire function because # copytrace='off' skips this line, but not the entire function because
# the line below is O(size of the repo) during a rebase, while the rest # the line below is O(size of the repo) during a rebase, while the rest
# of the function is much faster (and is required for carrying copy # of the function is much faster (and is required for carrying copy
# metadata across the rebase anyway). # metadata across the rebase anyway).
exclude = pathcopies(repo[fromrev], repo[skiprev]) exclude = pathcopies(repo[fromrev], repo[skiprev])
for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems():
if dst in exclude: if dst in exclude:
continue continue
if dst in wctx:
wctx[dst].markcopied(src) wctx[dst].markcopied(src)

tests/test-rebase-inmemory.t

$ cd rebase-rename-collapse $ cd rebase-rename-collapse
$ 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 'rename a to b' $ hg ci -m 'rename a to b'
$ hg co -q 0 $ hg co -q 0
$ echo a2 > a $ echo a2 > a
$ hg ci -qm 'modify a' $ hg ci -qm 'modify a'
BROKEN: obviously...
$ hg rebase -r . -d 1 --collapse $ hg rebase -r . -d 1 --collapse
rebasing 2:41c4ea50d4cf "modify a" (tip) rebasing 2:41c4ea50d4cf "modify a" (tip)
merging b and a to b merging b and a to b
abort: a@b977edf6f839: not found in manifest! saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg
[255]
$ cd .. $ cd ..
Test rebasing when the file we are merging in destination is empty Test rebasing when the file we are merging in destination is empty
$ hg init test $ hg init test
$ cd test $ cd test
$ echo a > foo $ echo a > foo
$ hg ci -Aqm 'added a to foo' $ hg ci -Aqm 'added a to foo'