Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 6016:288ec2f6faa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix pattern matching
author dhruva <dhruvakm@gmail.com>
date Mon, 04 Feb 2008 09:56:01 -0600
parents 26ef792f834e
children f2335246e5c7
comparison
equal deleted inserted replaced
6015:26ef792f834e 6016:288ec2f6faa2
45 # HGMERGE takes precedence 45 # HGMERGE takes precedence
46 if os.environ.get("HGMERGE"): 46 if os.environ.get("HGMERGE"):
47 return os.environ.get("HGMERGE") 47 return os.environ.get("HGMERGE")
48 48
49 # then patterns 49 # then patterns
50 for pattern, tool in ui.configitems("merge-patterns"): 50 for pat, tool in ui.configitems("merge-patterns"):
51 mf = util.matcher(repo.root, "", [pat], [], [])[1] 51 mf = util.matcher(repo.root, "", [pat], [], [])[1]
52 if mf(path) and check(tool, pat, symlink, False): 52 if mf(path) and check(tool, pat, symlink, False):
53 return tool 53 return tool
54 54
55 # then merge tools 55 # then merge tools