This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6159

memfilectx: override copysource() instead of using dummy nodeid
ClosedPublic

Authored by martinvonz on Mar 20 2019, 2:15 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6fef387af1da: memfilectx: override copysource() instead of using dummy nodeid
Summary

The "_copied" property in basefilectx is used by renamed() and
copysource(). committablefilectx (which memfilectx subclasses)
overrides renamed() and writes it in terms of copysource() instead of
_copied. That means that the nodeid part of "_copied" is memfilectx is
unused. Let's instead override copysource() too so we don't need the
"_copied".

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.Mar 20 2019, 2:15 AM
Closed by commit rHG6fef387af1da: memfilectx: override copysource() instead of using dummy nodeid (authored by martinvonz). · Explain WhyMar 21 2019, 7:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (7 lines)

Diff 14578

mercurial/context.py

super(memfilectx, self).__init__(repo, path, None, changectx) super(memfilectx, self).__init__(repo, path, None, changectx)
self._data = data self._data = data
if islink: if islink:
self._flags = 'l' self._flags = 'l'
elif isexec: elif isexec:
self._flags = 'x' self._flags = 'x'
else: else:
self._flags = '' self._flags = ''
self._copied = None self._copysource = copysource
if copysource:
self._copied = (copysource, nullid) def copysource(self):
return self._copysource
def cmp(self, fctx): def cmp(self, fctx):
return self.data() != fctx.data() return self.data() != fctx.data()
def data(self): def data(self):
return self._data return self._data
def remove(self, ignoremissing=False): def remove(self, ignoremissing=False):