This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8626

memctx: add mergestate method
AbandonedPublic

Authored by durin42 on Jun 11 2020, 1:04 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Jun 11 2020, 1:04 PM
marmoute requested changes to this revision.Jul 31 2020, 12:02 PM
marmoute added a subscriber: marmoute.

According to IRC discussion, this series is not ready for review, so moving it out of yadda.

This revision now requires changes to proceed.Jul 31 2020, 12:02 PM
durin42 updated this revision to Diff 23025.Oct 2 2020, 2:45 PM
durin42 planned changes to this revision.Oct 2 2020, 2:47 PM
durin42 abandoned this revision.Jan 19 2021, 1:50 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)

Diff 23025

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 mergestate(self):
return mergestatemod.memmergestate(self._repo, self)
def parents(self): def parents(self):
if self._parents[1].node() == nullid: if self._parents[1].node() == nullid:
return [self._parents[0]] return [self._parents[0]]
return self._parents 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.