This is an archive of the discontinued Mercurial Phabricator instance.

Differential D548

context: make parents and text optional in metadataonlyctx
ClosedPublic

Authored by quark on Aug 28 2017, 8:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbecce02036e1: context: make parents and text optional in metadataonlyctx
Summary

The metadataonlyctx is to copy an existing context with some minor metadata
changes. If the caller only wants to change "extra", or "user", ideally it
does not have to read and pass "parents" and "text" information.

This patch makes "parents" and "text" optionally to convenient callers.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (16 lines)

Diff 1391

mercurial/context.py

user receives the committer name and defaults to current repository user receives the committer name and defaults to current repository
username, date is the commit date in any format supported by username, date is the commit date in any format supported by
util.parsedate() and defaults to current date, extra is a dictionary of util.parsedate() and defaults to current date, extra is a dictionary of
metadata or is left empty. metadata or is left empty.
""" """
def __new__(cls, repo, originalctx, *args, **kwargs): def __new__(cls, repo, originalctx, *args, **kwargs):
return super(metadataonlyctx, cls).__new__(cls, repo) return super(metadataonlyctx, cls).__new__(cls, repo)
def __init__(self, repo, originalctx, parents, text, user=None, date=None, def __init__(self, repo, originalctx, parents=None, text=None, user=None,
extra=None, editor=False): date=None, extra=None, editor=False):
if text is None:
text = originalctx.description()
super(metadataonlyctx, self).__init__(repo, text, user, date, extra) super(metadataonlyctx, self).__init__(repo, text, user, date, extra)
self._rev = None self._rev = None
self._node = None self._node = None
self._originalctx = originalctx self._originalctx = originalctx
self._manifestnode = originalctx.manifestnode() self._manifestnode = originalctx.manifestnode()
parents = [(p or nullid) for p in parents] if parents is None:
p1, p2 = self._parents = [changectx(self._repo, p) for p in parents] parents = originalctx.parents()
else:
parents = [repo[p] for p in parents if p is not None]
parents = parents[:]
while len(parents) < 2:
parents.append(repo[nullid])
p1, p2 = self._parents = parents
# sanity check to ensure that the reused manifest parents are # sanity check to ensure that the reused manifest parents are
# manifests of our commit parents # manifests of our commit parents
mp1, mp2 = self.manifestctx().parents mp1, mp2 = self.manifestctx().parents
if p1 != nullid and p1.manifestnode() != mp1: if p1 != nullid and p1.manifestnode() != mp1:
raise RuntimeError('can\'t reuse the manifest: ' raise RuntimeError('can\'t reuse the manifest: '
'its p1 doesn\'t match the new ctx p1') 'its p1 doesn\'t match the new ctx p1')
if p2 != nullid and p2.manifestnode() != mp2: if p2 != nullid and p2.manifestnode() != mp2: