This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8731

memctx: make `parents()` return list of one element if it’s not a merge
ClosedPublic

Authored by mjacob on Jul 11 2020, 5:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd085fcb11c56: memctx: make `parents()` return list of one element if it’s not a merge
Summary

It is part of the contract of parents() that non-merges return a list of one
element. self._parents is always a list of two elements in memctx.

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 (5 lines)

Diff 21882

mercurial/context.py

added.append(f) added.append(f)
elif self[f]: elif self[f]:
modified.append(f) modified.append(f)
else: else:
removed.append(f) removed.append(f)
return scmutil.status(modified, added, removed, [], [], [], []) return scmutil.status(modified, added, removed, [], [], [], [])
def parents(self):
if self._parents[1].node() == nullid:
return [self._parents[0]]
return self._parents
class memfilectx(committablefilectx): class memfilectx(committablefilectx):
"""memfilectx represents an in-memory file to commit. """memfilectx represents an in-memory file to commit.
See memctx and committablefilectx for more details. See memctx and committablefilectx for more details.
""" """
def __init__( def __init__(