# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-17 21:57:38
# Node ID d5a6be56970b60d2dae2efa235be1643f6209946
# Parent  676c3838d21761f21c22940da6c5684cf332cb09

fileset: switch to mergestate.read()

See previous patches for why we're doing this.

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -249,7 +249,7 @@ def resolved(mctx, x):
     getargs(x, 0, 0, _("resolved takes no arguments"))
     if mctx.ctx.rev() is not None:
         return []
-    ms = merge.mergestate(mctx.ctx.repo())
+    ms = merge.mergestate.read(mctx.ctx.repo())
     return [f for f in mctx.subset if f in ms and ms[f] == 'r']
 
 def unresolved(mctx, x):
@@ -260,7 +260,7 @@ def unresolved(mctx, x):
     getargs(x, 0, 0, _("unresolved takes no arguments"))
     if mctx.ctx.rev() is not None:
         return []
-    ms = merge.mergestate(mctx.ctx.repo())
+    ms = merge.mergestate.read(mctx.ctx.repo())
     return [f for f in mctx.subset if f in ms and ms[f] == 'u']
 
 def hgignore(mctx, x):