# HG changeset patch # User Vadim Gelfer # Date 1139958645 28800 # Node ID 7a4a16a7d21fcd553c45f68bb09e162117a27506 # Parent 40346aa66b0f8c285c65f93be5fdeb21f4f364f6 hooks run after transactions finish must not affect method results. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -465,8 +465,7 @@ class localrepository(object): self.dirstate.update(new, "n") self.dirstate.forget(remove) - if not self.hook("commit", node=hex(n)): - return None + self.hook("commit", node=hex(n)) return n def walk(self, node=None, files=[], match=util.always): @@ -1380,16 +1379,11 @@ class localrepository(object): tr.close() if changesets > 0: - if not self.hook("changegroup", - node=hex(self.changelog.node(cor+1))): - self.ui.warn(_("abort: changegroup hook returned failure!\n")) - return 1 + self.hook("changegroup", node=hex(self.changelog.node(cor+1))) for i in range(cor + 1, cnr + 1): self.hook("incoming", node=hex(self.changelog.node(i))) - return - def update(self, node, allow=False, force=False, choose=None, moddirstate=True, forcemerge=False, wlock=None): pl = self.dirstate.parents()