Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 8566:744d6322b05b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
match: change all users of util.matcher to match.match
author Matt Mackall <mpm@selenic.com>
date Sun, 24 May 2009 02:56:14 -0500
parents b87a50b7125c
children fea40a677d43
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat May 23 17:04:41 2009 +0200
+++ b/mercurial/filemerge.py	Sun May 24 02:56:14 2009 -0500
@@ -7,7 +7,7 @@
 
 from node import short
 from i18n import _
-import util, simplemerge
+import util, simplemerge, match
 import os, tempfile, re, filecmp
 
 def _toolstr(ui, tool, part, default=""):
@@ -55,7 +55,7 @@
 
     # then patterns
     for pat, tool in ui.configitems("merge-patterns"):
-        mf = util.matcher(repo.root, "", [pat], [], [])[1]
+        mf = match.match(repo.root, '', [pat], [], [], 'glob')
         if mf(path) and check(tool, pat, symlink, False):
                 toolpath = _findtool(ui, tool)
                 return (tool, '"' + toolpath + '"')