This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1231

overlayworkingctx: move _wrappedctx out of the constructor
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2f8c476c49fe: overlayworkingctx: move _wrappedctx out of the constructor
Summary

With rebase, we will be setting the _wrappedctx at a different point from the
wctx construction (somewhat later, and possibly several times). Move it to a
public function.

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 16 2017, 1:01 AM
phillco set the repository for this revision to rHG Mercurial.
phillco added a subscriber: mercurial-devel.
phillco updated this revision to Diff 3558.Nov 16 2017, 1:01 AM
phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 1:14 AM
phillco updated this revision to Diff 3563.Nov 16 2017, 1:16 AM
phillco updated this revision to Diff 4041.Dec 1 2017, 3:09 AM
durin42 accepted this revision.Dec 7 2017, 2:51 PM
This revision is now accepted and ready to land.Dec 7 2017, 2:51 PM
phillco updated this revision to Diff 4177.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4197.Dec 7 2017, 4:44 PM
Closed by commit rHG2f8c476c49fe: overlayworkingctx: move _wrappedctx out of the constructor (authored by phillco). · Explain WhyDec 7 2017, 5:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (5 lines)

Diff 4219

mercurial/context.py

'date': date? 'date': date?
'data': str? 'data': str?
'flags': str? 'flags': str?
} }
If `exists` is True, `flags` must be non-None and 'date' is non-None. If it If `exists` is True, `flags` must be non-None and 'date' is non-None. If it
is `False`, the file was deleted. is `False`, the file was deleted.
""" """
def __init__(self, repo, wrappedctx): def __init__(self, repo):
super(overlayworkingctx, self).__init__(repo) super(overlayworkingctx, self).__init__(repo)
self._repo = repo self._repo = repo
self.clean() self.clean()
def setbase(self, wrappedctx):
self._wrappedctx = wrappedctx self._wrappedctx = wrappedctx
self._parents = [wrappedctx]
def data(self, path): def data(self, path):
if self.isdirty(path): if self.isdirty(path):
if self._cache[path]['exists']: if self._cache[path]['exists']:
if self._cache[path]['data']: if self._cache[path]['data']:
return self._cache[path]['data'] return self._cache[path]['data']
else: else:
# Must fallback here, too, because we only set flags. # Must fallback here, too, because we only set flags.