Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 6594:fca1688f0459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: use cmdutil.match
author Matt Mackall <mpm@selenic.com>
date Mon, 12 May 2008 11:37:08 -0500
parents d3463007d368
children cd4db3999ef9
comparison
equal deleted inserted replaced
6593:58b6ee2e6c92 6594:fca1688f0459
2257 2257
2258 if len([x for x in opts if opts[x]]) > 1: 2258 if len([x for x in opts if opts[x]]) > 1:
2259 raise util.Abort(_("too many options specified")) 2259 raise util.Abort(_("too many options specified"))
2260 2260
2261 ms = merge_.mergestate(repo) 2261 ms = merge_.mergestate(repo)
2262 mf = util.matcher(repo.root, "", pats, [], [])[1] 2262 m = cmdutil.match(repo, pats, opts)
2263 2263
2264 for f in ms: 2264 for f in ms:
2265 if mf(f): 2265 if m(f):
2266 if opts.get("list"): 2266 if opts.get("list"):
2267 ui.write("%s %s\n" % (ms[f].upper(), f)) 2267 ui.write("%s %s\n" % (ms[f].upper(), f))
2268 elif opts.get("mark"): 2268 elif opts.get("mark"):
2269 ms.mark(f, "r") 2269 ms.mark(f, "r")
2270 elif opts.get("unmark"): 2270 elif opts.get("unmark"):