Patchwork D8626: memctx: add mergestate method

login
register
mail settings
Submitter phabricator
Date June 11, 2020, 5:04 p.m.
Message ID <differential-rev-PHID-DREV-mdh3s7silnic6q4a3453-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46495/
State New
Headers show

Comments

phabricator - June 11, 2020, 5:04 p.m.
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8626

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -2879,6 +2879,9 @@ 
 
         return scmutil.status(modified, added, removed, [], [], [], [])
 
+    def mergestate(self):
+        return mergestatemod.memmergestate(self._repo, self)
+
 
 class memfilectx(committablefilectx):
     """memfilectx represents an in-memory file to commit.