facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

fix encoding conversion of branch names when mq is loaded

Browse Source
This commit is contained in:
Alexis S. L. Carvalho 2006-12-07 14:35:43 -02:00
parent 8e669882ac
commit 3b575d7b19
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hgext/mq.py
View File

@ -2043,13 +2043,10 @@ def reposetup(ui, repo):
return tagscache
def branchtags(self):
if self.branchcache != None:
return self.branchcache
def _branchtags(self):
q = self.mq
if not q.applied:
return super(mqrepo, self).branchtags()
return super(mqrepo, self)._branchtags()
self.branchcache = {} # avoid recursion in changectx
cl = self.changelog
@ -2069,8 +2066,7 @@ def reposetup(ui, repo):
# update the cache up to the tip
self._updatebranchcache(partial, start, cl.count())
self.branchcache = partial
return self.branchcache
return partial
if repo.local():
repo.__class__ = mqrepo

16
mercurial/localrepo.py
View File

@ -312,12 +312,7 @@ class localrepository(repo.repository):
self.nodetagscache.setdefault(n, []).append(t)
return self.nodetagscache.get(node, [])
def branchtags(self):
if self.branchcache != None:
return self.branchcache
self.branchcache = {} # avoid recursion in changectx
def _branchtags(self):
partial, last, lrev = self._readbranchcache()
tiprev = self.changelog.count() - 1
@ -325,6 +320,15 @@ class localrepository(repo.repository):
self._updatebranchcache(partial, lrev+1, tiprev+1)
self._writebranchcache(partial, self.changelog.tip(), tiprev)
return partial
def branchtags(self):
if self.branchcache is not None:
return self.branchcache
self.branchcache = {} # avoid recursion in changectx
partial = self._branchtags()
# the branch cache is stored on disk as UTF-8, but in the local
# charset internally
for k, v in partial.items():