Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 04 Jun 2009 09:16:22 +0200
changeset 557 05cf88057fc5
parent 555 3b4b797ba69d (current diff)
parent 556 a2bf4f77dbec (diff)
child 559 f6af6e742612
Merge with stable
--- a/hgkw/keyword.py	Mon Jun 01 01:51:50 2009 +0200
+++ b/hgkw/keyword.py	Thu Jun 04 09:16:22 2009 +0200
@@ -451,8 +451,8 @@
             data = super(kwrepo, self).wread(filename)
             return kwt.wread(filename, data)
 
-        def commit(self, files=None, text='', user=None, date=None,
-                   match=None, force=False, editor=None, extra={}):
+        def commit(self, text='', user=None, date=None, match=None,
+                   force=False, editor=None, extra={}):
             wlock = lock = None
             _p1 = _p2 = None
             try:
@@ -473,8 +473,8 @@
                     else:
                         _p2 = hex(_p2)
 
-                n = super(kwrepo, self).commit(files, text, user, date, match,
-                                               force, editor, extra)
+                n = super(kwrepo, self).commit(text, user, date, match, force,
+                                               editor, extra)
 
                 # restore commit hooks
                 for name, cmd in commithooks.iteritems():