# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 2010-02-17 16:11:20
# Node ID 2c2d2f1354b44427976c2279e18d7c51a47a921b
# Parent  08064db9f0050395b83b845fc2526c744d7e9594

keyword: do not postpone commit hooks

With 0e64d814d7d0 in place, this hack is not needed any more.

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -480,14 +480,7 @@ def reposetup(ui, repo):
             # other extensions can still wrap repo.commitctx directly
             self.commitctx = self.kwcommitctx
             try:
-                self._kwcommithooks = {}
-                n = super(kwrepo, self).commit(*args, **opts)
-                if self._kwcommithooks:
-                    xp1, xp2 = self._kwxp1, self._kwxp2
-                    for name, cmd in self._kwcommithooks.iteritems():
-                        ui.setconfig('hooks', name, cmd)
-                    self.hook('commit', node=n, parent1=xp1, parent2=xp2)
-                return n
+                return super(kwrepo, self).commit(*args, **opts)
             finally:
                 del self.commitctx
 
@@ -496,18 +489,7 @@ def reposetup(ui, repo):
             try:
                 wlock = self.wlock()
                 lock = self.lock()
-                # store and postpone commit hooks
-                for name, cmd in ui.configitems('hooks'):
-                    if name.split('.', 1)[0] == 'commit':
-                        self._kwcommithooks[name] = cmd
-                        ui.setconfig('hooks', name, None)
-                if self._kwcommithooks:
-                    # store parents for commit hooks
-                    p1, p2 = ctx.p1(), ctx.p2()
-                    self._kwxp1, self._kwxp2 = p1.hex(), p2 and p2.hex() or ''
-
                 n = super(kwrepo, self).commitctx(ctx, error)
-
                 kwt.overwrite(n, True, None)
                 return n
             finally: