D1918: localrepo: run cache-warming transaction callback before report callback
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 19 20:52:08 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
See in-code comment for details.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1918
AFFECTED FILES
mercurial/localrepo.py
tests/test-obsolete-changeset-exchange.t
CHANGE DETAILS
diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t
--- a/tests/test-obsolete-changeset-exchange.t
+++ b/tests/test-obsolete-changeset-exchange.t
@@ -171,6 +171,6 @@
bundle2-input-part: total payload size 24
bundle2-input-bundle: 2 parts total
checking for updated bookmarks
+ updating the branch cache
new changesets bec0734cd68e
- updating the branch cache
(run 'hg heads' to see heads, 'hg merge' to merge)
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1320,7 +1320,11 @@
**pycompat.strkwargs(hookargs))
reporef()._afterlock(hookfunc)
tr.addfinalize('txnclose-hook', txnclosehook)
- tr.addpostclose('warms-cache', self._buildcacheupdater(tr))
+ # Include a leading "-" to make it happen before the transaction summary
+ # reports registered via scmutil.registersummarycallback() whose names
+ # are 00-txnreport etc. That way, the caches will be warm when the
+ # callbacks run.
+ tr.addpostclose('-warm-cache', self._buildcacheupdater(tr))
def txnaborthook(tr2):
"""To be run if transaction is aborted
"""
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list