247 """ |
247 """ |
248 # i18n: "resolved" is a keyword |
248 # i18n: "resolved" is a keyword |
249 getargs(x, 0, 0, _("resolved takes no arguments")) |
249 getargs(x, 0, 0, _("resolved takes no arguments")) |
250 if mctx.ctx.rev() is not None: |
250 if mctx.ctx.rev() is not None: |
251 return [] |
251 return [] |
252 ms = merge.mergestate(mctx.ctx.repo()) |
252 ms = merge.mergestate.read(mctx.ctx.repo()) |
253 return [f for f in mctx.subset if f in ms and ms[f] == 'r'] |
253 return [f for f in mctx.subset if f in ms and ms[f] == 'r'] |
254 |
254 |
255 def unresolved(mctx, x): |
255 def unresolved(mctx, x): |
256 """``unresolved()`` |
256 """``unresolved()`` |
257 File that is marked unresolved according to :hg:`resolve -l`. |
257 File that is marked unresolved according to :hg:`resolve -l`. |
258 """ |
258 """ |
259 # i18n: "unresolved" is a keyword |
259 # i18n: "unresolved" is a keyword |
260 getargs(x, 0, 0, _("unresolved takes no arguments")) |
260 getargs(x, 0, 0, _("unresolved takes no arguments")) |
261 if mctx.ctx.rev() is not None: |
261 if mctx.ctx.rev() is not None: |
262 return [] |
262 return [] |
263 ms = merge.mergestate(mctx.ctx.repo()) |
263 ms = merge.mergestate.read(mctx.ctx.repo()) |
264 return [f for f in mctx.subset if f in ms and ms[f] == 'u'] |
264 return [f for f in mctx.subset if f in ms and ms[f] == 'u'] |
265 |
265 |
266 def hgignore(mctx, x): |
266 def hgignore(mctx, x): |
267 """``hgignore()`` |
267 """``hgignore()`` |
268 File that matches the active .hgignore pattern. |
268 File that matches the active .hgignore pattern. |