# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243355046 -7200
# Node ID ad5b41dddcda06fb359872172024a247261d0e16
# Parent  b7b183546a1572b6b6c0304300aaa6e1c66302ec# Parent  8533c85fe57dac6593d133ba0e668e2f7287de4b
Merge with stable

diff -r b7b183546a15 -r ad5b41dddcda hgkw/keyword.py
--- a/hgkw/keyword.py	Mon May 25 20:05:25 2009 +0200
+++ b/hgkw/keyword.py	Tue May 26 18:24:06 2009 +0200
@@ -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'])
         self.restrict = kwtools['hgcmd'] in restricted.split()
 
         kwmaps = self.ui.configitems('keywordmaps')