# HG changeset patch # User Matt Mackall # Date 1243151774 18000 # Node ID 9084fb1593e6a5ad89f05245c9496bfe9e0c8451 # Parent e44b46c85b72289fa043d8d0861d833221ae7aa0 match: change all users of util.matcher to match.match [ original upstream message ] diff -r e44b46c85b72 -r 9084fb1593e6 hgkw/keyword.py --- a/hgkw/keyword.py Tue May 19 03:59:58 2009 +0200 +++ b/hgkw/keyword.py Sun May 24 02:56:14 2009 -0500 @@ -83,7 +83,7 @@ ''' from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions -from mercurial import patch, localrepo, templater, templatefilters, util +from mercurial import patch, localrepo, templater, templatefilters, util, match from mercurial.hgweb import webcommands from mercurial.lock import release from mercurial.node import nullid, hex @@ -127,8 +127,8 @@ def __init__(self, ui, repo): self.ui = ui self.repo = repo - self.matcher = util.matcher(repo.root, - inc=kwtools['inc'], exc=kwtools['exc'])[1] + self.matcher = match.match(repo.root, '', [], + kwtools['inc'], kwtools['exc'], 'glob') self.restrict = kwtools['hgcmd'] in restricted.split() kwmaps = self.ui.configitems('keywordmaps')