Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 14 May 2011 13:26:49 +0200
changeset 941 c5c61ae378de
parent 939 80fc9699c7eb (current diff)
parent 940 4bd06014631e (diff)
child 948 65b0318770d1
Merge with stable
--- 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'))