[Request] [+ ] D8626: memctx: add mergestate method

[durin42 (Augie Fackler)]

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

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.



To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200611/d9133f50/attachment.html>