This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6009

context: rewrite renamed() in terms of new copysource() where appropriate
ClosedPublic

Authored by martinvonz on Feb 23 2019, 12:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe9413a3be093: context: rewrite renamed() in terms of new copysource() where appropriate
Summary

It's only the filectx for committed files that have the copy source's
nodeid easily available; workingfilectx's and overlayfilectx's
renamed() simply find the nodeid by looking in the changeset's p1's
manifest.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)

Diff 14212

mercurial/context.py

@propertycache @propertycache
def _changectx(self): def _changectx(self):
return workingctx(self._repo) return workingctx(self._repo)
def data(self): def data(self):
return self._repo.wread(self._path) return self._repo.wread(self._path)
def renamed(self): def renamed(self):
rp = self._repo.dirstate.copied(self._path) rp = self.copysource()
if not rp: if not rp:
return None return None
return rp, self._changectx._parents[0]._manifest.get(rp, nullid) return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
def copysource(self): def copysource(self):
return self._repo.dirstate.copied(self._path) return self._repo.dirstate.copied(self._path)
def size(self): def size(self):
return self._repo.wvfs.lstat(self._path).st_size return self._repo.wvfs.lstat(self._path).st_size
def exists(self): def exists(self):
return self.lexists() return self.lexists()
def lexists(self): def lexists(self):
return self._parent.exists(self._path) return self._parent.exists(self._path)
def renamed(self): def renamed(self):
path = self._parent.copydata(self._path) path = self.copysource()
if not path: if not path:
return None return None
return path, self._changectx._parents[0]._manifest.get(path, nullid) return path, self._changectx._parents[0]._manifest.get(path, nullid)
def copysource(self): def copysource(self):
return self._parent.copydata(self._path) return self._parent.copydata(self._path)
def size(self): def size(self):