# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-17 21:56:46
# Node ID d240ae897ba6f063ff6a52209bcbddb1b4c08d96
# Parent  b3b5ed56028372364820b125c7d4eb3a3721db3a

commands.resolve: switch to mergestate.read()

See previous patches for why we're doing this.

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(