This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2967

context: avoid using a context object as a changeid
ClosedPublic

Authored by martinvonz on Mar 30 2018, 2:09 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdaef13da66fe: context: avoid using a context object as a changeid
Summary

I find it misleading to pass changeid=changectx. It currently works to
do that because there's weird (IMO) handling of it in
basectx.new. I'm planning on removing that code. Passing changeid
as "changeid" and context as "context" makes it more readable.

Note that the documentation of filectx.init doesn't even seem to
be aware that a changeid can be a context ("changeset revision, node,
or tag").

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 30 2018, 2:09 AM
indygreg accepted this revision.Mar 30 2018, 1:20 PM
indygreg added a subscriber: indygreg.

Oh wow. Thanks for cleaning this up.

This revision is now accepted and ready to land.Mar 30 2018, 1:20 PM
Closed by commit rHGdaef13da66fe: context: avoid using a context object as a changeid (authored by martinvonz). · Explain WhyMar 30 2018, 1:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (5 lines)
Mmercurial/merge.py (2 lines)

Diff 7369

mercurial/localrepo.py

for f in copies: for f in copies:
if f not in pctx and copies[f] in pctx: if f not in pctx and copies[f] in pctx:
self.dirstate.copy(copies[f], f) self.dirstate.copy(copies[f], f)
if p2 == nullid: if p2 == nullid:
for f, s in sorted(self.dirstate.copies().items()): for f, s in sorted(self.dirstate.copies().items()):
if f not in pctx and s not in pctx: if f not in pctx and s not in pctx:
self.dirstate.copy(None, f) self.dirstate.copy(None, f)
def filectx(self, path, changeid=None, fileid=None): def filectx(self, path, changeid=None, fileid=None, changectx=None):
"""changeid can be a changeset revision, node, or tag. """changeid can be a changeset revision, node, or tag.
fileid can be a file revision or node.""" fileid can be a file revision or node."""
return context.filectx(self, path, changeid, fileid) return context.filectx(self, path, changeid, fileid,
changectx=changectx)
def getcwd(self): def getcwd(self):
return self.dirstate.getcwd() return self.dirstate.getcwd()
def pathto(self, f, cwd=None): def pathto(self, f, cwd=None):
return self.dirstate.pathto(f, cwd) return self.dirstate.pathto(f, cwd)
def _loadfilter(self, filter): def _loadfilter(self, filter):

mercurial/merge.py

anccommitnode = extras.get('ancestorlinknode') anccommitnode = extras.get('ancestorlinknode')
if anccommitnode: if anccommitnode:
actx = self._repo[anccommitnode] actx = self._repo[anccommitnode]
else: else:
actx = None actx = None
fcd = self._filectxorabsent(hash, wctx, dfile) fcd = self._filectxorabsent(hash, wctx, dfile)
fco = self._filectxorabsent(onode, octx, ofile) fco = self._filectxorabsent(onode, octx, ofile)
# TODO: move this to filectxorabsent # TODO: move this to filectxorabsent
fca = self._repo.filectx(afile, fileid=anode, changeid=actx) fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
# "premerge" x flags # "premerge" x flags
flo = fco.flags() flo = fco.flags()
fla = fca.flags() fla = fca.flags()
if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:
if fca.node() == nullid and flags != flo: if fca.node() == nullid and flags != flo:
if preresolve: if preresolve:
self._repo.ui.warn( self._repo.ui.warn(
_('warning: cannot merge flags for %s ' _('warning: cannot merge flags for %s '