Mercurial > hg-stable
changeset 10495:2c2d2f1354b4 stable
keyword: do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Wed, 17 Feb 2010 17:11:20 +0100 |
| parents | 08064db9f005 |
| children | 45734b51c99b |
| files | hgext/keyword.py |
| diffstat | 1 files changed, 1 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/keyword.py Wed Feb 17 20:44:49 2010 +0100 +++ b/hgext/keyword.py Wed Feb 17 17:11:20 2010 +0100 @@ -480,14 +480,7 @@ # 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 @@ 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: