Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset c0d4f8df1c2f…

Parents 9b16eda2d175…

Parents e7a6c9670ccf…

by Steve Borho

Changes to one file · Browse files at c0d4f8df1c2f Showing diff from parent 9b16eda2d175 e7a6c9670ccf Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
107
108
109
110
111
112
 
 
 
 
 
 
 
 
 
 
 
113
114
115
 
107
108
109
 
 
 
110
111
112
113
114
115
116
117
118
119
120
121
122
123
@@ -107,9 +107,17 @@
  '''return a list of live branch names in UTF-8'''   lives = []   deads = getdeadbranch(repo.ui) - for branch in repo.branchtags().keys(): # encoded in UTF-8 - if branch not in deads: - lives.append(branch.replace('\0', '')) + cl = repo.changelog + for branch, heads in repo.branchmap().iteritems(): + # branch encoded in UTF-8 + if branch in deads: + # ignore branch names in tortoisehg.deadbranch + 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(branch.replace('\0', ''))   return lives    _hidetags = None