branchmap: disable fallback to unfiltered branchcache
Disables this simple optimisation to allow coming more powerfull approach: cache
collaboration.
Our goal is to have branchcache collaborate. This means that unfiltered
branchcache will fallback to some filtered branchcache if invalid. We can't have
the filtered branchcache to use the unfiltered one. That would loop.
--- a/mercurial/localrepo.py Fri Dec 21 17:19:52 2012 +0100
+++ b/mercurial/localrepo.py Wed Jan 02 01:36:57 2013 +0100
@@ -652,8 +652,6 @@
def branchmap(self):
'''returns a dictionary {branch: [branchheads]}'''
- if self.filtername and not self.changelog.filteredrevs:
- return self.unfiltered().branchmap()
branchmap.updatecache(self)
return self._branchcaches[self.filtername]
--- a/tests/test-acl.t Fri Dec 21 17:19:52 2012 +0100
+++ b/tests/test-acl.t Wed Jan 02 01:36:57 2013 +0100
@@ -140,7 +140,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -202,7 +201,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -274,7 +272,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -773,7 +770,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1091,7 +1087,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1167,7 +1162,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1319,7 +1313,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1517,7 +1510,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1829,7 +1821,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1917,7 +1908,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -2073,7 +2063,6 @@
query 1; heads
searching for changes
all remote heads known locally
- invalid branchheads cache: tip differs
listing keys for "bookmarks"
4 changesets found
list of changesets: