# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305372409 -7200
# Node ID c5c61ae378de992469b25203a4de5a14834133e8
# Parent  80fc9699c7eb9e0a783c7c29a2875742116792d6# Parent  4bd06014631e7aaa86fdf24caaade1f4495054c7
Merge with stable

diff -r 80fc9699c7eb -r c5c61ae378de hgkw/keyword.py
--- a/hgkw/keyword.py	Thu May 12 19:45:46 2011 +0200
+++ b/hgkw/keyword.py	Sat May 14 13:26:49 2011 +0200
@@ -326,7 +326,7 @@
     '''Bails out if [keyword] configuration is not active.
     Returns status of working directory.'''
     if kwt:
-        return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
+        return repo.status(match=scmutil.match(repo, pats, opts), clean=True,
                            unknown=opts.get('unknown') or opts.get('all'))
     if ui.configitems('keyword'):
         raise util.Abort(_('[keyword] patterns cannot match'))