Mercurial > public > mercurial-scm > hg

comparison mercurial/fileset.py @ 26195:5a3338e0faf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: filesets show hg resolve command
author timeless@mozdev.org
date Tue, 08 Sep 2015 11:35:22 -0400
parents fc65d63ef3b9
children d3dbb65c8dc6
comparison
equal deleted inserted replaced
26194:fc65d63ef3b9 26195:5a3338e0faf7
241 getargs(x, 0, 0, _("symlink takes no arguments")) 241 getargs(x, 0, 0, _("symlink takes no arguments"))
242 return [f for f in mctx.existing() if mctx.ctx.flags(f) == 'l'] 242 return [f for f in mctx.existing() if mctx.ctx.flags(f) == 'l']
243 243
244 def resolved(mctx, x): 244 def resolved(mctx, x):
245 """``resolved()`` 245 """``resolved()``
246 File that is marked resolved according to the resolve state. 246 File that is marked resolved according to :hg:`resolve -l`.
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(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 the resolve state. 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 []