--- a/hgkw/keyword.py	Sun Apr 26 01:08:54 2009 +0200
+++ b/hgkw/keyword.py	Thu May 14 13:20:40 2009 -0500
@@ -453,7 +453,7 @@
 
         def commit(self, files=None, text='', user=None, date=None,
                    match=None, force=False, force_editor=False,
-                   p1=None, p2=None, extra={}, empty_ok=False):
+                   extra={}, empty_ok=False):
             wlock = lock = None
             _p1 = _p2 = None
             try:
@@ -467,10 +467,7 @@
                         ui.setconfig('hooks', name, None)
                 if commithooks:
                     # store parents for commit hook environment
-                    if p1 is None:
-                        _p1, _p2 = repo.dirstate.parents()
-                    else:
-                        _p1, _p2 = p1, p2 or nullid
+                    _p1, _p2 = repo.dirstate.parents()
                     _p1 = hex(_p1)
                     if _p2 == nullid:
                         _p2 = ''
@@ -478,7 +475,7 @@
                         _p2 = hex(_p2)
 
                 n = super(kwrepo, self).commit(files, text, user, date, match,
-                                               force, force_editor, p1, p2,
+                                               force, force_editor,
                                                extra, empty_ok)
 
                 # restore commit hooks