Mercurial > hg-stable
comparison hgext/mq.py @ 3826:b3b868113d24
fix encoding conversion of branch names when mq is loaded
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Thu, 07 Dec 2006 14:35:43 -0200 |
| parents | 955475d237fc |
| children | f6f16f871049 |
comparison
equal
deleted
inserted
replaced
| 3825:000d122071b5 | 3826:b3b868113d24 |
|---|---|
| 2041 else: | 2041 else: |
| 2042 tagscache[patch[1]] = revlog.bin(patch[0]) | 2042 tagscache[patch[1]] = revlog.bin(patch[0]) |
| 2043 | 2043 |
| 2044 return tagscache | 2044 return tagscache |
| 2045 | 2045 |
| 2046 def branchtags(self): | 2046 def _branchtags(self): |
| 2047 if self.branchcache != None: | |
| 2048 return self.branchcache | |
| 2049 | |
| 2050 q = self.mq | 2047 q = self.mq |
| 2051 if not q.applied: | 2048 if not q.applied: |
| 2052 return super(mqrepo, self).branchtags() | 2049 return super(mqrepo, self)._branchtags() |
| 2053 | 2050 |
| 2054 self.branchcache = {} # avoid recursion in changectx | 2051 self.branchcache = {} # avoid recursion in changectx |
| 2055 cl = self.changelog | 2052 cl = self.changelog |
| 2056 partial, last, lrev = self._readbranchcache() | 2053 partial, last, lrev = self._readbranchcache() |
| 2057 | 2054 |
| 2067 # we might as well use it, but we won't save it. | 2064 # we might as well use it, but we won't save it. |
| 2068 | 2065 |
| 2069 # update the cache up to the tip | 2066 # update the cache up to the tip |
| 2070 self._updatebranchcache(partial, start, cl.count()) | 2067 self._updatebranchcache(partial, start, cl.count()) |
| 2071 | 2068 |
| 2072 self.branchcache = partial | 2069 return partial |
| 2073 return self.branchcache | |
| 2074 | 2070 |
| 2075 if repo.local(): | 2071 if repo.local(): |
| 2076 repo.__class__ = mqrepo | 2072 repo.__class__ = mqrepo |
| 2077 repo.mq = queue(ui, repo.join("")) | 2073 repo.mq = queue(ui, repo.join("")) |
| 2078 | 2074 |