Commit b8abcaef authored by Steve Borho's avatar Steve Borho
Browse files

thgrepo: livebranches was already implemented as namedbranches

--HG--
branch : stable
parent 0ff506605e74
......@@ -45,7 +45,7 @@ class BranchOpDialog(QDialog):
branchCombo.setEditable(True)
wbu = hglib.tounicode(wctx.branch())
for name in repo.livebranches:
for name in repo.namedbranches:
if name == wbu:
continue
branchCombo.addItem(name)
......
......@@ -209,7 +209,7 @@ class ThgRepoWrapper(QObject):
_uiprops = '''_uifiles _uimtime _shell postpull tabwidth maxdiff
deadbranches _exts _thghiddentags displayname summarylen
shortname mergetools livebranches namedbranches'''.split()
shortname mergetools namedbranches'''.split()
_thgrepoprops = '''_thgmqpatchnames thgmqunappliedpatches
_branchheads'''.split()
......@@ -240,22 +240,6 @@ def _extendrepo(repo):
changectx.__class__ = _extendchangectx(changectx)
return changectx
@propertycache
def livebranches(self):
'''return a list of live branch names in unicode'''
lives = []
cl = self.changelog
for branch, heads in self.branchmap().iteritems():
if branch in self.deadbranches:
continue
bheads = [h for h in heads if ('close' not in cl.read(h)[5])]
if not bheads:
# ignore branches with all heads closed
continue
lives.append(hglib.tounicode(branch))
lives.sort()
return lives
@propertycache
def _thghiddentags(self):
ht = self.ui.config('tortoisehg', 'hidetags', '')
......
......@@ -58,7 +58,7 @@ class StripDialog(QDialog):
rev = str(rev)
combo.addItem(hglib.tounicode(rev))
combo.setCurrentIndex(0)
for name in self.repo.livebranches:
for name in self.repo.namedbranches:
combo.addItem(name)
tags = list(self.repo.tags())
......
......@@ -52,7 +52,7 @@ class UpdateDialog(QDialog):
combo.addItem(hglib.tounicode(rev))
combo.setCurrentIndex(0)
for name in repo.livebranches:
for name in repo.namedbranches:
combo.addItem(name)
tags = list(self.repo.tags())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment