Patchwork [3,of,7,mergedriver] commands.resolve: switch to mergestate.read()

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 18, 2015, 5:48 a.m.
Message ID <5f1d5c34efb07bc25567.1447825712@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11467/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 18, 2015, 5:48 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447797406 28800
#      Tue Nov 17 13:56:46 2015 -0800
# Node ID 5f1d5c34efb07bc255677ede7a9568a349f7481c
# Parent  185e1c423b1fd2ff38dc687c5736754968a57d22
commands.resolve: switch to mergestate.read()

See previous patches for why we're doing this.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5589,7 +5589,7 @@  def resolve(ui, repo, *pats, **opts):
 
     if show:
         fm = ui.formatter('resolve', opts)
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
         m = scmutil.match(repo[None], pats, opts)
         for f in ms:
             if not m(f):
@@ -5604,7 +5604,7 @@  def resolve(ui, repo, *pats, **opts):
 
     wlock = repo.wlock()
     try:
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(