Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
8565:268d16b2ec25 8566:744d6322b05b
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference. 6 # GNU General Public License version 2, incorporated herein by reference.
7 7
8 from node import short 8 from node import short
9 from i18n import _ 9 from i18n import _
10 import util, simplemerge 10 import util, simplemerge, match
11 import os, tempfile, re, filecmp 11 import os, tempfile, re, filecmp
12 12
13 def _toolstr(ui, tool, part, default=""): 13 def _toolstr(ui, tool, part, default=""):
14 return ui.config("merge-tools", tool + "." + part, default) 14 return ui.config("merge-tools", tool + "." + part, default)
15 15
53 if hgmerge: 53 if hgmerge:
54 return (hgmerge, hgmerge) 54 return (hgmerge, hgmerge)
55 55
56 # then patterns 56 # then patterns
57 for pat, tool in ui.configitems("merge-patterns"): 57 for pat, tool in ui.configitems("merge-patterns"):
58 mf = util.matcher(repo.root, "", [pat], [], [])[1] 58 mf = match.match(repo.root, '', [pat], [], [], 'glob')
59 if mf(path) and check(tool, pat, symlink, False): 59 if mf(path) and check(tool, pat, symlink, False):
60 toolpath = _findtool(ui, tool) 60 toolpath = _findtool(ui, tool)
61 return (tool, '"' + toolpath + '"') 61 return (tool, '"' + toolpath + '"')
62 62
63 # then merge tools 63 # then merge tools