# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1242344270 -7200
# Node ID 492234da500baa7b77efabd8f279e957c3e8c544
# Parent  69c9e89471ae23e0d41b09e14d6a8e3cbb684728# Parent  72477fcc575b65e01298d5d92ef4a4f2728a9a86
Merge with stable

diff -r 69c9e89471ae -r 492234da500b hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Apr 28 09:42:44 2009 +0100
+++ b/hgkw/keyword.py	Fri May 15 01:37:50 2009 +0200
@@ -452,8 +452,7 @@
             return kwt.wread(filename, data)
 
         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):
+                   match=None, force=False, editor=None, extra={}):
             wlock = lock = None
             _p1 = _p2 = None
             try:
@@ -467,10 +466,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,8 +474,7 @@
                         _p2 = hex(_p2)
 
                 n = super(kwrepo, self).commit(files, text, user, date, match,
-                                               force, force_editor, p1, p2,
-                                               extra, empty_ok)
+                                               force, editor, extra)
 
                 # restore commit hooks
                 for name, cmd in commithooks.iteritems():