This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1240

overlayworkingctx: inherit from committablectx instead of workingctx
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8e1386b342f7: overlayworkingctx: inherit from committablectx instead of workingctx
Summary

We should find a better name for this context at some point. (mutablememctx?)

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 updated this revision to Diff 4186.Dec 7 2017, 4:22 PM
durin42 accepted this revision.Dec 7 2017, 4:38 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:38 PM
phillco updated this revision to Diff 4205.Dec 7 2017, 4:44 PM
phillco updated this revision to Diff 4232.Dec 8 2017, 1:37 AM
Closed by commit rHG8e1386b342f7: overlayworkingctx: inherit from committablectx instead of workingctx (authored by phillco). · Explain WhyDec 8 2017, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (8 lines)

Diff 4269

mercurial/context.py

for p in reversed(list(util.finddirs(f))): for p in reversed(list(util.finddirs(f))):
if wvfs.isfileorlink(p): if wvfs.isfileorlink(p):
wvfs.unlink(p) wvfs.unlink(p)
break break
def setflags(self, l, x): def setflags(self, l, x):
self._repo.wvfs.setflags(self._path, l, x) self._repo.wvfs.setflags(self._path, l, x)
class overlayworkingctx(workingctx): class overlayworkingctx(committablectx):
"""Wraps another mutable context with a write-back cache that can be flushed """Wraps another mutable context with a write-back cache that can be
at a later time. converted into a commit context.
self._cache[path] maps to a dict with keys: { self._cache[path] maps to a dict with keys: {
'exists': bool? 'exists': bool?
'date': date? 'date': date?
'data': str? 'data': str?
'flags': str? 'flags': str?
'copied': str? (path or None) 'copied': str? (path or None)
} }
'flags': flags, 'flags': flags,
'copied': None, 'copied': None,
} }
def filectx(self, path, filelog=None): def filectx(self, path, filelog=None):
return overlayworkingfilectx(self._repo, path, parent=self, return overlayworkingfilectx(self._repo, path, parent=self,
filelog=filelog) filelog=filelog)
class overlayworkingfilectx(workingfilectx): class overlayworkingfilectx(committablefilectx):
"""Wrap a ``workingfilectx`` but intercepts all writes into an in-memory """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory
cache, which can be flushed through later by calling ``flush()``.""" cache, which can be flushed through later by calling ``flush()``."""
def __init__(self, repo, path, filelog=None, parent=None): def __init__(self, repo, path, filelog=None, parent=None):
super(overlayworkingfilectx, self).__init__(repo, path, filelog, super(overlayworkingfilectx, self).__init__(repo, path, filelog,
parent) parent)
self._repo = repo self._repo = repo
self._parent = parent self._parent = parent