D8556: commands: get mergestate via context

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

D8556: commands: get mergestate via context

valentin.gatienbaron (Valentin Gatien-Baron)
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/D8556

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5939,7 +5939,7 @@
     if show:
         ui.pager(b'resolve')
         fm = ui.formatter(b'resolve', opts)
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
         wctx = repo[None]
         m = scmutil.match(wctx, pats, opts)
 
@@ -5982,7 +5982,7 @@
         return 0
 
     with repo.wlock():
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(
@@ -6949,7 +6949,7 @@
     marks = []
 
     try:
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
     except error.UnsupportedMergeRecords as e:
         s = b' '.join(e.recordtypes)
         ui.warn(



To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel