Mercurial > hg

changeset 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 58b6ee2e6c92
children 99a92acafdb9
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon May 12 11:37:08 2008 -0500
+++ b/mercurial/commands.py	Mon May 12 11:37:08 2008 -0500
@@ -2259,10 +2259,10 @@
         raise util.Abort(_("too many options specified"))
 
     ms = merge_.mergestate(repo)
-    mf = util.matcher(repo.root, "", pats, [], [])[1]
+    m = cmdutil.match(repo, pats, opts)
 
     for f in ms:
-        if mf(f):
+        if m(f):
             if opts.get("list"):
                 ui.write("%s %s\n" % (ms[f].upper(), f))
             elif opts.get("mark"):