This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6219

context: reuse changectx._copies() in all but workingctx
ClosedPublic

Authored by martinvonz on Apr 8 2019, 12:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa13b30555ffb: context: reuse changectx._copies() in all but workingctx
Summary

This moves the dirstate-specific _copies() implementation from
committablectx into workingctx where it should be (I think all
dirstate-specific stuff should be moved into workingctx). The part of
changectx._copies() that is for producing changeset-wide copy dicts
from the filectxs is moved into basectx so it's reused by the other
subclasses. The part of changectx._copies() that's about reading copy
information from the changeset remains there. This fixes in-memory
rebase (and makes hg convert able to write copies to changesets).

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.Apr 8 2019, 12:08 PM
martinvonz added a subscriber: pulkit.Apr 8 2019, 12:09 PM
martinvonz planned changes to this revision.

Not for review, sharing for @pulkit

martinvonz retitled this revision from memctx: make p[12]copies() correct to context: reuse changectx._copies() in all but workingctx.May 10 2019, 5:44 PM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 15055.
martinvonz added a comment.May 10 2019, 5:45 PM

This is quite rewritten and now ready for review.

Closed by commit rHGa13b30555ffb: context: reuse changectx._copies() in all but workingctx (authored by martinvonz). · Explain WhyMay 15 2019, 2:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 15103

mercurial/context.py

return self._fileinfo(path)[0] return self._fileinfo(path)[0]
def flags(self, path): def flags(self, path):
try: try:
return self._fileinfo(path)[1] return self._fileinfo(path)[1]
except error.LookupError: except error.LookupError:
return '' return ''
@propertycache
def _copies(self):
p1copies = {}
p2copies = {}
p1 = self.p1()
p2 = self.p2()
narrowmatch = self._repo.narrowmatch()
for dst in self.files():
if not narrowmatch(dst) or dst not in self:
continue
copied = self[dst].renamed()
if not copied:
continue
src, srcnode = copied
if src in p1 and p1[src].filenode() == srcnode:
p1copies[dst] = src
elif src in p2 and p2[src].filenode() == srcnode:
p2copies[dst] = src
return p1copies, p2copies
def p1copies(self):
return self._copies[0]
def p2copies(self):
return self._copies[1]
def sub(self, path, allowcreate=True): def sub(self, path, allowcreate=True):
'''return a subrepo for the stored revision of path, never wdir()''' '''return a subrepo for the stored revision of path, never wdir()'''
return subrepo.subrepo(self, path, allowcreate=allowcreate) return subrepo.subrepo(self, path, allowcreate=allowcreate)
def nullsub(self, path, pctx): def nullsub(self, path, pctx):
return subrepo.nullsubrepo(self, path, pctx) return subrepo.nullsubrepo(self, path, pctx)
def workingsub(self, path): def workingsub(self, path):
# the filelogs (below). # the filelogs (below).
if (source == 'changeset-only' or if (source == 'changeset-only' or
(source == 'compatibility' and p1copies is not None)): (source == 'compatibility' and p1copies is not None)):
return p1copies or {}, p2copies or {} return p1copies or {}, p2copies or {}
# Otherwise (config said to read only from filelog, or we are in # Otherwise (config said to read only from filelog, or we are in
# compatiblity mode and there is not data in the changeset), we get # compatiblity mode and there is not data in the changeset), we get
# the copy metadata from the filelogs. # the copy metadata from the filelogs.
p1copies = {} return super(changectx, self)._copies
p2copies = {}
p1 = self.p1()
p2 = self.p2()
narrowmatch = self._repo.narrowmatch()
for dst in self.files():
if not narrowmatch(dst) or dst not in self:
continue
copied = self[dst].renamed()
if not copied:
continue
src, srcnode = copied
if src in p1 and p1[src].filenode() == srcnode:
p1copies[dst] = src
elif src in p2 and p2[src].filenode() == srcnode:
p2copies[dst] = src
return p1copies, p2copies
def p1copies(self):
return self._copies[0]
def p2copies(self):
return self._copies[1]
def description(self): def description(self):
return self._changeset.description return self._changeset.description
def branch(self): def branch(self):
return encoding.tolocal(self._changeset.extra.get("branch")) return encoding.tolocal(self._changeset.extra.get("branch"))
def closesbranch(self): def closesbranch(self):
return 'close' in self._changeset.extra return 'close' in self._changeset.extra
def extra(self): def extra(self):
"""Return a dict of extra information.""" """Return a dict of extra information."""
def modified(self): def modified(self):
return self._status.modified return self._status.modified
def added(self): def added(self):
return self._status.added return self._status.added
def removed(self): def removed(self):
return self._status.removed return self._status.removed
def deleted(self): def deleted(self):
return self._status.deleted return self._status.deleted
@propertycache
def _copies(self):
p1copies = {}
p2copies = {}
parents = self._repo.dirstate.parents()
p1manifest = self._repo[parents[0]].manifest()
p2manifest = self._repo[parents[1]].manifest()
narrowmatch = self._repo.narrowmatch()
for dst, src in self._repo.dirstate.copies().items():
if not narrowmatch(dst):
continue
if src in p1manifest:
p1copies[dst] = src
elif src in p2manifest:
p2copies[dst] = src
return p1copies, p2copies
def p1copies(self):
return self._copies[0]
def p2copies(self):
return self._copies[1]
def branch(self): def branch(self):
return encoding.tolocal(self._extra['branch']) return encoding.tolocal(self._extra['branch'])
def closesbranch(self): def closesbranch(self):
return 'close' in self._extra return 'close' in self._extra
def extra(self): def extra(self):
return self._extra return self._extra
def isinmemory(self): def isinmemory(self):
self._status = scmutil.status(s.modified, s.added, s.removed, self._status = scmutil.status(s.modified, s.added, s.removed,
s.deleted, [], [], []) s.deleted, [], [], [])
else: else:
self._status = s self._status = s
return s return s
@propertycache @propertycache
def _copies(self):
p1copies = {}
p2copies = {}
parents = self._repo.dirstate.parents()
p1manifest = self._repo[parents[0]].manifest()
p2manifest = self._repo[parents[1]].manifest()
narrowmatch = self._repo.narrowmatch()
for dst, src in self._repo.dirstate.copies().items():
if not narrowmatch(dst):
continue
if src in p1manifest:
p1copies[dst] = src
elif src in p2manifest:
p2copies[dst] = src
return p1copies, p2copies
def p1copies(self):
return self._copies[0]
def p2copies(self):
return self._copies[1]
@propertycache
def _manifest(self): def _manifest(self):
"""generate a manifest corresponding to the values in self._status """generate a manifest corresponding to the values in self._status
This reuse the file nodeid from parent, but we use special node This reuse the file nodeid from parent, but we use special node
identifiers for added and modified files. This is used by manifests identifiers for added and modified files. This is used by manifests
merge to see that files are different and by update logic to avoid merge to see that files are different and by update logic to avoid
deleting newly added files. deleting newly added files.
""" """

tests/test-copies-in-changeset.t

$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 --config rebase.experimental.inmemory=yes $ hg rebase -d 1 --config rebase.experimental.inmemory=yes
rebasing 2:55d0b405c1b2 "rename a to b" (tip) rebasing 2:55d0b405c1b2 "rename a to b" (tip)
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg
BROKEN: should show the rename
$ hg st --change . --copies $ hg st --change . --copies
A b A b
a
R a R a
$ cd .. $ cd ..