facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

fileset: switch to mergestate.read()

Browse Source 
See previous patches for why we're doing this.
This commit is contained in:
Siddharth Agarwal 2015-11-17 13:57:38 -08:00
parent 2204a499bc
commit 178aa21f0d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/fileset.py
View File

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