Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable update, thgstrip, branchop: show sorted branch names (closes #103)

Changeset d3c9339974df…

Parent cc866f2fcafa…

by Steve Borho

Changes to 3 files · Browse files at d3c9339974df Showing diff from parent cc866f2fcafa Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​branchop.py Stacked
 
43
44
45
46
47
 
 
 
 
48
49
 
50
 
51
52
53
 
43
44
45
 
 
46
47
48
49
50
 
51
52
53
54
55
56
@@ -43,11 +43,14 @@
  closebranch = QRadioButton(_('Close current branch'))   branchCombo = QComboBox()   branchCombo.setEditable(True) - for name in hglib.getlivebranch(repo): - if name == wctx.branch(): + + wbu = hglib.tounicode(wctx.branch()) + for name in repo.livebranches: + if name == wbu:   continue - branchCombo.addItem(hglib.tounicode(name)) + branchCombo.addItem(name)   branchCombo.activated.connect(self.accept) +   grid.addWidget(nochange, 0, 0)   grid.addWidget(newbranch, 1, 0)   grid.addWidget(branchCombo, 1, 1)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgstrip.py Stacked
 
58
59
60
61
62
 
 
63
64
65
 
58
59
60
 
 
61
62
63
64
65
@@ -58,8 +58,8 @@
  rev = str(rev)   combo.addItem(hglib.tounicode(rev))   combo.setCurrentIndex(0) - for name in hglib.getlivebranch(self.repo): - combo.addItem(hglib.tounicode(name)) + for name in self.repo.livebranches: + combo.addItem(name)     tags = list(self.repo.tags())   tags.sort()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
51
52
53
54
55
 
 
 
56
57
58
59
 
60
61
62
 
51
52
53
 
 
54
55
56
57
58
 
 
59
60
61
62
@@ -51,12 +51,12 @@
  rev = str(rev)   combo.addItem(hglib.tounicode(rev))   combo.setCurrentIndex(0) - for name in hglib.getlivebranch(self.repo): - combo.addItem(hglib.tounicode(name)) + + for name in repo.livebranches: + combo.addItem(name)     tags = list(self.repo.tags()) - tags.sort() - tags.reverse() + tags.sort(reverse=True)   for tag in tags:   combo.addItem(hglib.tounicode(tag))