Show More
@@ -233,7 +233,7 b' def resolved(mctx, x):' | |||||
233 | getargs(x, 0, 0, _("resolved takes no arguments")) |
|
233 | getargs(x, 0, 0, _("resolved takes no arguments")) | |
234 | if mctx.ctx.rev() is not None: |
|
234 | if mctx.ctx.rev() is not None: | |
235 | return [] |
|
235 | return [] | |
236 |
ms = merge.mergestate(mctx.ctx. |
|
236 | ms = merge.mergestate(mctx.ctx.repo()) | |
237 | return [f for f in mctx.subset if f in ms and ms[f] == 'r'] |
|
237 | return [f for f in mctx.subset if f in ms and ms[f] == 'r'] | |
238 |
|
238 | |||
239 | def unresolved(mctx, x): |
|
239 | def unresolved(mctx, x): | |
@@ -244,7 +244,7 b' def unresolved(mctx, x):' | |||||
244 | getargs(x, 0, 0, _("unresolved takes no arguments")) |
|
244 | getargs(x, 0, 0, _("unresolved takes no arguments")) | |
245 | if mctx.ctx.rev() is not None: |
|
245 | if mctx.ctx.rev() is not None: | |
246 | return [] |
|
246 | return [] | |
247 |
ms = merge.mergestate(mctx.ctx. |
|
247 | ms = merge.mergestate(mctx.ctx.repo()) | |
248 | return [f for f in mctx.subset if f in ms and ms[f] == 'u'] |
|
248 | return [f for f in mctx.subset if f in ms and ms[f] == 'u'] | |
249 |
|
249 | |||
250 | def hgignore(mctx, x): |
|
250 | def hgignore(mctx, x): | |
@@ -253,7 +253,7 b' def hgignore(mctx, x):' | |||||
253 | """ |
|
253 | """ | |
254 | # i18n: "hgignore" is a keyword |
|
254 | # i18n: "hgignore" is a keyword | |
255 | getargs(x, 0, 0, _("hgignore takes no arguments")) |
|
255 | getargs(x, 0, 0, _("hgignore takes no arguments")) | |
256 |
ignore = mctx.ctx. |
|
256 | ignore = mctx.ctx.repo().dirstate._ignore | |
257 | return [f for f in mctx.subset if ignore(f)] |
|
257 | return [f for f in mctx.subset if ignore(f)] | |
258 |
|
258 | |||
259 | def grep(mctx, x): |
|
259 | def grep(mctx, x): | |
@@ -398,7 +398,7 b' def subrepo(mctx, x):' | |||||
398 | def m(s): |
|
398 | def m(s): | |
399 | return (s == pat) |
|
399 | return (s == pat) | |
400 | else: |
|
400 | else: | |
401 |
m = matchmod.match(ctx. |
|
401 | m = matchmod.match(ctx.repo().root, '', [pat], ctx=ctx) | |
402 | return [sub for sub in sstate if m(sub)] |
|
402 | return [sub for sub in sstate if m(sub)] | |
403 | else: |
|
403 | else: | |
404 | return [sub for sub in sstate] |
|
404 | return [sub for sub in sstate] | |
@@ -493,7 +493,7 b' def getfileset(ctx, expr):' | |||||
493 | unknown = _intree(['unknown'], tree) |
|
493 | unknown = _intree(['unknown'], tree) | |
494 | ignored = _intree(['ignored'], tree) |
|
494 | ignored = _intree(['ignored'], tree) | |
495 |
|
495 | |||
496 |
r = ctx. |
|
496 | r = ctx.repo() | |
497 | status = r.status(ctx.p1(), ctx, |
|
497 | status = r.status(ctx.p1(), ctx, | |
498 | unknown=unknown, ignored=ignored, clean=True) |
|
498 | unknown=unknown, ignored=ignored, clean=True) | |
499 | subset = [] |
|
499 | subset = [] |
General Comments 0
You need to be logged in to leave comments.
Login now