Show More
@@ -2186,20 +2186,17 b' def reposetup(ui, repo):' | |||
|
2186 | 2186 | |
|
2187 | 2187 | return tagscache |
|
2188 | 2188 | |
|
2189 | def _branchtags(self): | |
|
2189 | def _branchtags(self, partial, lrev): | |
|
2190 | 2190 | q = self.mq |
|
2191 | 2191 | if not q.applied: |
|
2192 | return super(mqrepo, self)._branchtags() | |
|
2192 | return super(mqrepo, self)._branchtags(partial, lrev) | |
|
2193 | 2193 | |
|
2194 | 2194 | cl = self.changelog |
|
2195 | 2195 | qbasenode = revlog.bin(q.applied[0].rev) |
|
2196 | 2196 | if qbasenode not in cl.nodemap: |
|
2197 | 2197 | self.ui.warn('mq status file refers to unknown node %s\n' |
|
2198 | 2198 | % revlog.short(qbasenode)) |
|
2199 | return super(mqrepo, self)._branchtags() | |
|
2200 | ||
|
2201 | self.branchcache = {} # avoid recursion in changectx | |
|
2202 | partial, last, lrev = self._readbranchcache() | |
|
2199 | return super(mqrepo, self)._branchtags(partial, lrev) | |
|
2203 | 2200 | |
|
2204 | 2201 | qbase = cl.rev(qbasenode) |
|
2205 | 2202 | start = lrev + 1 |
@@ -345,9 +345,7 b' class localrepository(repo.repository):' | |||
|
345 | 345 | self.nodetagscache.setdefault(n, []).append(t) |
|
346 | 346 | return self.nodetagscache.get(node, []) |
|
347 | 347 | |
|
348 | def _branchtags(self): | |
|
349 | partial, last, lrev = self._readbranchcache() | |
|
350 | ||
|
348 | def _branchtags(self, partial, lrev): | |
|
351 | 349 | tiprev = self.changelog.count() - 1 |
|
352 | 350 | if lrev != tiprev: |
|
353 | 351 | self._updatebranchcache(partial, lrev+1, tiprev+1) |
@@ -360,7 +358,8 b' class localrepository(repo.repository):' | |||
|
360 | 358 | return self.branchcache |
|
361 | 359 | |
|
362 | 360 | self.branchcache = {} # avoid recursion in changectx |
|
363 |
partial = self._branch |
|
|
361 | partial, last, lrev = self._readbranchcache() | |
|
362 | self._branchtags(partial, lrev) | |
|
364 | 363 | |
|
365 | 364 | # the branch cache is stored on disk as UTF-8, but in the local |
|
366 | 365 | # charset internally |
General Comments 0
You need to be logged in to leave comments.
Login now