This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1211

context: switch ctx() use to changectx()
ClosedPublic

Authored by phillco on Oct 23 2017, 3:44 PM.

Details

Reviewers
dlax
Group Reviewers
hg-reviewers
Commits
rHG010179e21e91: context: switch ctx() use to changectx()
Summary

I added ctx() to overlayworkingfilectx, (and before that, absentfilectx),
because absentfilectx had reference to this function in its cmp() function.

But the standard is actually changectx(), and no other class implements
ctx(). So let's use the standard name.

(As a result, I'm not sure that part of the absentfilectx comparator ever
worked! It was written before I added either function.)

This will be necessary in the next patch.

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

phillco added a reviewer: hg-reviewers.Nov 15 2017, 10:46 PM
phillco set the repository for this revision to rHG Mercurial.
phillco updated this revision to Diff 3550.Nov 16 2017, 12:08 AM
phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 12:12 AM
phillco added a subscriber: mercurial-devel.
phillco edited the summary of this revision. (Show Details)Dec 1 2017, 2:59 AM
phillco retitled this revision from context: add ctx() to workingfilectx and absentfilectx to context: switch ctx() use to changectx().
phillco updated this revision to Diff 4036.
phillco updated this revision to Diff 4037.Dec 1 2017, 3:02 AM
phillco edited parent revisions, added: D1527: context: add an abstract base class for filectx; removed: D1210: error: add InMemoryMergeConflictsError.Dec 1 2017, 3:03 AM
phillco added a subscriber: martinvonz.

I made D1527 the new bottom of the stack, per @martinvonz's request. It actually caught a mistake that made me significantly change this commit :)

phillco edited the summary of this revision. (Show Details)Dec 1 2017, 3:05 AM
phillco edited the summary of this revision. (Show Details)Dec 1 2017, 3:09 AM
dlax accepted this revision.Dec 1 2017, 3:56 AM
phillco edited the summary of this revision. (Show Details)Dec 1 2017, 2:21 PM
phillco added a subscriber: sid0.

cc @sid0 on the absentfilectx thing, maybe he knows more

Closed by commit rHG010179e21e91: context: switch ctx() use to changectx() (authored by phillco). · Explain WhyDec 7 2017, 2:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
Mmercurial/filemerge.py (2 lines)

Diff 4168

mercurial/context.py

parent) parent)
self._repo = repo self._repo = repo
self._parent = parent self._parent = parent
self._path = path self._path = path
def cmp(self, fctx): def cmp(self, fctx):
return self.data() != fctx.data() return self.data() != fctx.data()
def ctx(self): def changectx(self):
return self._parent return self._parent
def data(self): def data(self):
return self._parent.data(self._path) return self._parent.data(self._path)
def date(self): def date(self):
return self._parent.filedate(self._path) return self._parent.filedate(self._path)

mercurial/filemerge.py

""" """
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
fd = fcd.path() fd = fcd.path()
# Run ``flushall()`` to make any missing folders the following wwrite # Run ``flushall()`` to make any missing folders the following wwrite
# calls might be depending on. # calls might be depending on.
from . import context from . import context
if isinstance(fcd, context.overlayworkingfilectx): if isinstance(fcd, context.overlayworkingfilectx):
fcd.ctx().flushall() fcd.changectx().flushall()
util.writefile(a + ".local", fcd.decodeddata()) util.writefile(a + ".local", fcd.decodeddata())
repo.wwrite(fd + ".other", fco.data(), fco.flags()) repo.wwrite(fd + ".other", fco.data(), fco.flags())
repo.wwrite(fd + ".base", fca.data(), fca.flags()) repo.wwrite(fd + ".base", fca.data(), fca.flags())
return False, 1, False return False, 1, False
@internaltool('forcedump', mergeonly) @internaltool('forcedump', mergeonly)
def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,