[PATCH 2 of 4] destroyed: drop complex branchcache rebuilt logic
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Jan 15 17:20:29 CST 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1358291366 -3600
# Node ID 324ad5ba3de993f37342385a8369a5829b59011a
# Parent ce99c3d8f0d8e5c9322c4b777356f75202e90460
destroyed: drop complex branchcache rebuilt logic
The strip code used a trick to lower the cost of branchcache update after a
strip. However is less necessary since we have branchcache collaboration.
Invalid branchcache are likely to be cheaply rebuilt again a near subset of the
repo.
Moreover, this trick would need update to be relevant in the now filtered
repository world. It currently update the unfiltered branchcache that few people
cares about. Make it smarter on that aspect would need complexes update of the
calling logic
So this mechanism is:
- Arguably needed,
- Currently irrelevant,
- Hard to update
and I'm dropping it.
We now update the branchcache in all case by courtesy of the read only reader.
This changeset have a few expected impact on the testsuite are different cache
are updated.
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1396,11 +1396,11 @@ class localrepository(object):
# causing those changes to disappear.
if '_phasecache' in vars(self):
self._phasecache.write()
@unfilteredmethod
- def destroyed(self, newheadnodes=None):
+ def destroyed(self):
'''Inform the repository that nodes have been destroyed.
Intended for use by strip and rollback, so there's a common
place for anything that has to be done after destroying history.
If you know the branchheadcache was uptodate before nodes were removed
@@ -1419,20 +1419,13 @@ class localrepository(object):
# the removed nodes now and write the updated cache.
if '_phasecache' in self._filecache:
self._phasecache.filterunknown(self)
self._phasecache.write()
- # If we have info, newheadnodes, on how to update the branch cache, do
- # it, Otherwise, since nodes were destroyed, the cache is stale and this
- # will be caught the next time it is read.
- if newheadnodes:
- cl = self.changelog
- revgen = (cl.rev(node) for node in newheadnodes
- if cl.hasnode(node))
- cache = self._branchcaches[None]
- cache.update(self, revgen)
- cache.write(self)
+ # update branchcache information likely invalidated by the strip.
+ # We rely on branchcache collaboration for this call to be fast
+ branchmap.updatecache(self)
# Ensure the persistent tag cache is updated. Doing it now
# means that the tag cache only has to worry about destroyed
# heads immediately after a strip/rollback. That in turn
# guarantees that "cachetip == currenttip" (comparing both rev
diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -64,21 +64,10 @@ def strip(ui, repo, nodelist, backup="al
if isinstance(nodelist, str):
nodelist = [nodelist]
striplist = [cl.rev(node) for node in nodelist]
striprev = min(striplist)
- # Generate set of branches who will have nodes stripped.
- striprevs = repo.revs("%ld::", striplist)
- stripbranches = set([repo[rev].branch() for rev in striprevs])
-
- # Set of potential new heads resulting from the strip. The parents of any
- # node removed could be a new head because the node to be removed could have
- # been the only child of the parent.
- newheadrevs = repo.revs("parents(%ld::) - %ld::", striprevs, striprevs)
- newheadnodes = set([cl.node(rev) for rev in newheadrevs])
- newheadbranches = set([repo[rev].branch() for rev in newheadrevs])
-
keeppartialbundle = backup == 'strip'
# Some revisions with rev > striprev may not be descendants of striprev.
# We have to find these revisions and put them in a bundle, so that
# we can restore them after the truncations.
@@ -189,12 +178,6 @@ def strip(ui, repo, nodelist, backup="al
elif saveheads:
ui.warn(_("strip failed, partial bundle stored in '%s'\n")
% chgrpfile)
raise
- if len(stripbranches) == 1 and len(newheadbranches) == 1 \
- and stripbranches == newheadbranches:
- repo.destroyed(newheadnodes)
- else:
- # Multiple branches involved in strip. Will allow branchcache to become
- # invalid and later on rebuilt from scratch
- repo.destroyed()
+ repo.destroyed()
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -1525,11 +1525,10 @@ Branch acl deny test
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache (served): tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
@@ -1837,11 +1836,10 @@ push foobar into the remote
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache (served): tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
@@ -1925,11 +1923,10 @@ Branch acl conflicting deny
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache (served): tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
@@ -2081,11 +2078,10 @@ Non-astro users must be denied
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache (served): tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -505,10 +505,11 @@ amend
$ echo amend >> a
$ echo amend >> b
$ hg -q commit -d '14 1' -m 'prepare amend'
$ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords
+ invalid branchheads cache (served): tip differs
overwriting a expanding keywords
$ hg -q id
67d8c481a6be
$ head -1 a
expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $
diff --git a/tests/test-mq-symlinks.t b/tests/test-mq-symlinks.t
--- a/tests/test-mq-symlinks.t
+++ b/tests/test-mq-symlinks.t
@@ -43,11 +43,10 @@ test updating a symlink
a -> c
$ hg qpop
popping updatelink
now at: symlink.patch
$ hg qpush --debug
- invalid branchheads cache (served): tip differs
applying updatelink
patching file a
a
now at: updatelink
$ "$TESTDIR/readlink.py" a
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -261,13 +261,14 @@ Rebase and collapse - E onto H:
Test that branchheads cache is updated correctly when doing a strip in which
-the parent of the ancestor node to be stripped does not become a head and
-also, the parent of a node that is a child of the node stripped becomes a head
-(node 3).
+the parent of the ancestor node to be stripped does not become a head and also,
+the parent of a node that is a child of the node stripped becomes a head (node
+3). The code is now much simpler and we could just test a simpler scenario
+We keep it the test this way in case new complexity is injected.
$ hg clone -q -u . b b2
$ cd b2
$ hg heads --template="{rev}:{node} {branch}\n"
@@ -280,11 +281,11 @@ also, the parent of a node that is a chi
c65502d4178782309ce0574c5ae6ee9485a9bafa default
$ hg strip 4
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
- $ cat $TESTTMP/b2/.hg/cache/branchheads
+ $ cat $TESTTMP/b2/.hg/cache/branchheads-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 4
2870ad076e541e714f3c2bc32826b5c6a6e5b040 default
c65502d4178782309ce0574c5ae6ee9485a9bafa default
$ hg heads --template="{rev}:{node} {branch}\n"
More information about the Mercurial-devel
mailing list