Mercurial > hg
changeset 26995:d5a6be56970b
fileset: switch to mergestate.read()
See previous patches for why we're doing this.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 17 Nov 2015 13:57:38 -0800 |
| parents | 676c3838d217 |
| children | bf3eec62212f |
| files | mercurial/fileset.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/fileset.py Tue Nov 17 14:20:55 2015 -0800 +++ b/mercurial/fileset.py Tue Nov 17 13:57:38 2015 -0800 @@ -249,7 +249,7 @@ 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 @@ 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):