Patchwork [5,of,7,mergedriver] fileset: switch to mergestate.read()

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

Comments

Siddharth Agarwal - Nov. 18, 2015, 5:48 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447797458 28800
#      Tue Nov 17 13:57:38 2015 -0800
# Node ID ec781c2e8e8562fba23de88245e17ab474177e8e
# Parent  1c3f6bcf4b99e8f368b54518287eae3e0ea0fb44
fileset: switch to mergestate.read()

See previous patches for why we're doing this.

Patch

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):