( )⚙ D1235 overlayworkingctx: track copy information in the context

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1235

overlayworkingctx: track copy information in the context
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8b3a636bb341: overlayworkingctx: track copy information in the context
Summary

We can no longer do so in the dirstate, so add the functions to do so here.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco updated this revision to Diff 4181.Dec 7 2017, 4:22 PM
durin42 accepted this revision.Dec 7 2017, 4:34 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:34 PM
phillco updated this revision to Diff 4200.Dec 7 2017, 4:44 PM
Closed by commit rHG8b3a636bb341: overlayworkingctx: track copy information in the context (authored by phillco). · Explain WhyDec 7 2017, 5:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (25 lines)

Diff 4200

mercurial/context.py

"""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 flushed
at a later time. at a later time.
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)
} }
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): def __init__(self, repo):
super(overlayworkingctx, self).__init__(repo) super(overlayworkingctx, self).__init__(repo)
self._repo = repo self._repo = repo
return True return True
def filedate(self, path): def filedate(self, path):
if self.isdirty(path): if self.isdirty(path):
return self._cache[path]['date'] return self._cache[path]['date']
else: else:
return self._wrappedctx[path].date() return self._wrappedctx[path].date()
def markcopied(self, path, origin):
if self.isdirty(path):
self._cache[path]['copied'] = origin
else:
raise error.ProgrammingError('markcopied() called on clean context')
def copydata(self, path):
if self.isdirty(path):
return self._cache[path]['copied']
else:
raise error.ProgrammingError('copydata() called on clean context')
def flags(self, path): def flags(self, path):
if self.isdirty(path): if self.isdirty(path):
if self._cache[path]['exists']: if self._cache[path]['exists']:
return self._cache[path]['flags'] return self._cache[path]['flags']
else: else:
raise error.ProgrammingError("No such file or directory: %s" % raise error.ProgrammingError("No such file or directory: %s" %
self._path) self._path)
else: else:
self._cache = {} self._cache = {}
def _markdirty(self, path, exists, data=None, date=None, flags=''): def _markdirty(self, path, exists, data=None, date=None, flags=''):
self._cache[path] = { self._cache[path] = {
'exists': exists, 'exists': exists,
'data': data, 'data': data,
'date': date, 'date': date,
'flags': flags, 'flags': flags,
'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(workingfilectx):
"""Wrap a ``workingfilectx`` but intercepts all writes into an in-memory """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory
def exists(self): def exists(self):
return self.lexists() return self.lexists()
def lexists(self): def lexists(self):
return self._parent.exists(self._path) return self._parent.exists(self._path)
def renamed(self): def renamed(self):
# Copies are currently tracked in the dirstate as before. Straight copy path = self._parent.copydata(self._path)
# from workingfilectx. if not path:
rp = self._repo.dirstate.copied(self._path)
if not rp:
return None return None
return rp, self._changectx._parents[0]._manifest.get(rp, nullid) return path, self._changectx._parents[0]._manifest.get(path, nullid)
def size(self): def size(self):
return self._parent.size(self._path) return self._parent.size(self._path)
def markcopied(self, origin):
self._parent.markcopied(self._path, origin)
def audit(self): def audit(self):
pass pass
def flags(self): def flags(self):
return self._parent.flags(self._path) return self._parent.flags(self._path)
def setflags(self, islink, isexec): def setflags(self, islink, isexec):
return self._parent.setflags(self._path, islink, isexec) return self._parent.setflags(self._path, islink, isexec)