This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6010

context: move equivalent renamed() implementations to superclass
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc7a843aa4b42: context: move equivalent renamed() implementations to superclass
Summary

Now that renamed() in workingfilectx and in overlayfilectx are written
in terms of copysource(), they are functionally identical and can be
reused.

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 (17 lines)

Diff 14213

mercurial/context.py

return True return True
__bool__ = __nonzero__ __bool__ = __nonzero__
def linkrev(self): def linkrev(self):
# linked to self._changectx no matter if file is modified or not # linked to self._changectx no matter if file is modified or not
return self.rev() return self.rev()
def renamed(self):
path = self.copysource()
if not path:
return None
return path, self._changectx._parents[0]._manifest.get(path, nullid)
def parents(self): def parents(self):
'''return parent filectxs, following copies if necessary''' '''return parent filectxs, following copies if necessary'''
def filenode(ctx, path): def filenode(ctx, path):
return ctx._manifest.get(path, nullid) return ctx._manifest.get(path, nullid)
path = self._path path = self._path
fl = self._filelog fl = self._filelog
pcl = self._changectx._parents pcl = self._changectx._parents
super(workingfilectx, self).__init__(repo, path, filelog, workingctx) super(workingfilectx, self).__init__(repo, path, filelog, workingctx)
@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):
rp = self.copysource()
if not rp:
return None
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 date(self): def date(self):
t, tz = self._changectx.date() t, tz = self._changectx.date()
try: try:
return self._parent.filedate(self._path) return self._parent.filedate(self._path)
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):
path = self.copysource()
if not path:
return None
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):
return self._parent.size(self._path) return self._parent.size(self._path)
def markcopied(self, origin): def markcopied(self, origin):
self._parent.markcopied(self._path, origin) self._parent.markcopied(self._path, origin)