Mercurial > hg
diff mercurial/localrepo.py @ 43778:888bd39ed555
lock: pass "success" boolean to _afterlock callbacks
This lets the callback decide if it should actually run or not. I suspect that
most callbacks (and hooks) *should not* run in this scenario, but I'm trying
to not break any existing behavior. `persistmanifestcache`, however, seems
actively dangerous to run: we just encountered an exception and the repo is in
an unknown state (hopefully a consistent one due to transactions, but this is
not 100% guaranteed), and the data we cache may be based on this unknown
state.
This was observed by our users since we wrap some of the functions that
persistmanifestcache calls and it expects that the repo object is in a certain
state that we'd set up earlier. If the user hits ctrl-c before we establish
that state, we end up crashing there. I'm going to make that extension
resilient to this issue, but figured it might be a common issue and should be
handled here as well instead of just working around the issue.
Differential Revision: https://phab.mercurial-scm.org/D7459
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 19 Nov 2019 18:38:17 -0800 |
parents | e89e3275f658 |
children | 8042856c90b6 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Nov 22 11:08:59 2019 -0800 +++ b/mercurial/localrepo.py Tue Nov 19 18:38:17 2019 -0800 @@ -2203,7 +2203,7 @@ # fixes the function accumulation. hookargs = tr2.hookargs - def hookfunc(): + def hookfunc(unused_success): repo = reporef() if hook.hashook(repo.ui, b'txnclose-bookmark'): bmchanges = sorted(tr.changes[b'bookmarks'].items()) @@ -2615,7 +2615,7 @@ l.postrelease.append(callback) break else: # no lock have been found. - callback() + callback(True) def lock(self, wait=True): '''Lock the repository store (.hg/store) and return a weak reference @@ -2953,7 +2953,7 @@ ) raise - def commithook(): + def commithook(unused_success): # hack for command that use a temporary commit (eg: histedit) # temporary commit got stripped before hook release if self.changelog.hasnode(ret): @@ -3399,7 +3399,7 @@ self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) ret = pushkey.push(self, namespace, key, old, new) - def runhook(): + def runhook(unused_success): self.hook( b'pushkey', namespace=namespace,