This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1242

overlayworkingctx: add ``tomemctx()`` and ``commit()``
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG71edd38c4bb4: overlayworkingctx: add ``tomemctx()``
Summary

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco updated this revision to Diff 4188.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4207.Dec 7 2017, 4:44 PM
phillco updated this revision to Diff 4215.Dec 7 2017, 4:52 PM
durin42 added a subscriber: durin42.Dec 7 2017, 4:54 PM
durin42 added inline comments.
mercurial/context.py
2167

use a tuple instead of a list here

2191

Let's not put this on this object, and instead ask people to do repo.commitctx(ctx.tomemctx(...)) - it lets us keep the surface area of this just a little smaller.

Also, maybe we can then avoid any proliferation of the allowemptycommit logic by gathering that in commitctx?

durin42 requested changes to this revision.Dec 7 2017, 4:56 PM
This revision now requires changes to proceed.Dec 7 2017, 4:56 PM
phillco marked an inline comment as done.Dec 7 2017, 6:59 PM
phillco updated this revision to Diff 4234.Dec 8 2017, 1:37 AM
phillco marked an inline comment as done.Dec 8 2017, 1:38 AM
Closed by commit rHG71edd38c4bb4: overlayworkingctx: add ``tomemctx()`` (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 (46 lines)

Diff 3115

mercurial/context.py

if self.isdirty(path): if self.isdirty(path):
if self._cache[path]['exists']: if self._cache[path]['exists']:
return len(self._cache[path]['data']) return len(self._cache[path]['data'])
else: else:
raise error.ProgrammingError("No such file or directory: %s" % raise error.ProgrammingError("No such file or directory: %s" %
self._path) self._path)
return self._wrappedctx[path].size() return self._wrappedctx[path].size()
def tomemctx(self, text, branch=None, extra=None, date=None, parents=None, user=None, editor=None):
"""Converts this ``overlayworkingctx`` into a ``memctx`` ready to be
committed."""
if parents == None:
parents = self._wrappedctx.parents()
if len(parents) == 1:
parents = [parents[0], None]
durin42Unsubmitted
Done

use a tuple instead of a list here

durin42: use a tuple instead of a list here
# Covert parents to ``commitctxs``.
if parents[1] is None:
parents = (self._repo[parents[0]], None)
else:
parents = (self._repo[parents[0]], self._repo[parents[1]])
files = self._cache.keys()
def getfile(repo, memctx, path):
if self._cache[path]['exists']:
return memfilectx(repo, path,
self._cache[path]['data'],
'l' in self._cache[path]['flags'],
'x' in self._cache[path]['flags'],
self._cache[path]['copied'],
memctx)
else:
# Returning None, but including the path in `files`, is
# necessary for memctx to register a deletion.
return None
return memctx(self._repo, parents, text, files, getfile, date=date,
extra=extra, user=user, branch=branch, editor=editor)
def commit(self, text, parents=None, date=None, extra=None, editor=None,
durin42Unsubmitted
Done

Let's not put this on this object, and instead ask people to do repo.commitctx(ctx.tomemctx(...)) - it lets us keep the surface area of this just a little smaller.

Also, maybe we can then avoid any proliferation of the allowemptycommit logic by gathering that in commitctx?

durin42: Let's not put this on this object, and instead ask people to do repo.commitctx(ctx.tomemctx(...
user=None, branch=None):
allowemptycommit = (len(self._cache) or
self._repo.ui.configbool('ui', 'allowemptycommit'))
if not allowemptycommit:
return None
# By convention, ``extra['branch']`` clobbers ``branch`` (used when
# passing ``--keepbranches``).
if 'branch' in extra:
branch = extra['branch']
memctx = self.tomemctx(text, parents=parents, date=date, extra=extra,
user=user, branch=branch, editor=editor)
return self._repo.commitctx(memctx)
def isdirty(self, path): def isdirty(self, path):
return path in self._cache return path in self._cache
def clean(self): def clean(self):
self._cache = {} self._cache = {}
self._writeorder = [] self._writeorder = []
def _markdirty(self, path, exists, data=None, date=None, flags=''): def _markdirty(self, path, exists, data=None, date=None, flags=''):