Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

workbench: rename branch actions

Changeset 2893c3101b82…

Parent d723117ef198…

by Steve Borho

Changes to one file · Browse files at 2893c3101b82 Showing diff from parent d723117ef198 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
351
352
353
354
355
356
 
 
 
357
358
359
 
368
369
370
371
372
373
 
 
 
374
375
376
377
378
379
 
 
 
380
381
382
 
384
385
386
387
 
388
389
390
391
392
393
394
 
 
 
 
395
396
397
 
399
400
401
402
403
404
 
 
 
405
406
407
408
409
410
411
 
 
412
413
414
 
639
640
641
642
 
643
644
645
 
351
352
353
 
 
 
354
355
356
357
358
359
 
368
369
370
 
 
 
371
372
373
374
375
376
 
 
 
377
378
379
380
381
382
 
384
385
386
 
387
388
389
390
 
 
 
 
391
392
393
394
395
396
397
 
399
400
401
 
 
 
402
403
404
405
406
407
408
409
 
 
410
411
412
413
414
 
639
640
641
 
642
643
644
645
@@ -351,9 +351,9 @@
  def setupBranchCombo(self, *args):   w = self.repoTabsWidget.currentWidget()   if not w: - self.branch_label_action.setEnabled(False) - self.branch_comboBox_action.setEnabled(False) - self.branch_comboBox.clear() + self.branchLabelAction.setEnabled(False) + self.branchComboAction.setEnabled(False) + self.branchCombo.clear()   return     repo = w.repo @@ -368,15 +368,15 @@
  branches = branches + clbranches     if len(branches) == 1: - self.branch_label_action.setEnabled(False) - self.branch_comboBox_action.setEnabled(False) - self.branch_comboBox.clear() + self.branchLabelAction.setEnabled(False) + self.branchComboAction.setEnabled(False) + self.branchCombo.clear()   else:   branches = [''] + branches   self.branchesmodel = QStringListModel(branches) - self.branch_comboBox.setModel(self.branchesmodel) - self.branch_label_action.setEnabled(True) - self.branch_comboBox_action.setEnabled(True) + self.branchCombo.setModel(self.branchesmodel) + self.branchLabelAction.setEnabled(True) + self.branchComboAction.setEnabled(True)     branch = w.filterbranch()   index = -1 @@ -384,14 +384,14 @@
  if b == branch:   index = i   break - self.branch_comboBox.setCurrentIndex(index) + self.branchCombo.setCurrentIndex(index)     def createToolbars(self):   # tree filters toolbar - self.branch_label = QToolButton() - self.branch_label.setText("Branch") - self.branch_label.setStatusTip("Display graph the named branch only") - self.branch_label.setPopupMode(QToolButton.InstantPopup) + self.branchLabel = QToolButton() + self.branchLabel.setText("Branch") + self.branchLabel.setStatusTip("Display graph the named branch only") + self.branchLabel.setPopupMode(QToolButton.InstantPopup)   self.branch_menu = QMenu()   cbranch_action = self.branch_menu.addAction("Display closed branches")   cbranch_action.setCheckable(True) @@ -399,16 +399,16 @@
  allpar_action = self.branch_menu.addAction("Include all ancestors")   allpar_action.setCheckable(True)   self.allpar_action = allpar_action - self.branch_label.setMenu(self.branch_menu) - self.branch_comboBox = QComboBox() - self.branch_comboBox.activated.connect(self.refreshRevisionTable) + self.branchLabel.setMenu(self.branch_menu) + self.branchCombo = QComboBox() + self.branchCombo.activated.connect(self.refreshRevisionTable)   cbranch_action.toggled.connect(self.setupBranchCombo)   allpar_action.toggled.connect(self.refreshRevisionTable)     self.filterToolbar.layout().setSpacing(3)   - self.branch_label_action = self.filterToolbar.addWidget(self.branch_label) - self.branch_comboBox_action = self.filterToolbar.addWidget(self.branch_comboBox) + self.branchLabelAction = self.filterToolbar.addWidget(self.branchLabel) + self.branchComboAction = self.filterToolbar.addWidget(self.branchCombo)   self.filterToolbar.addSeparator()     # diff mode toolbar @@ -639,7 +639,7 @@
  #@timeit   def refreshRevisionTable(self, *args, **kw):   """Starts the process of filling the HgModel""" - branch = self.branch_comboBox.currentText() + branch = self.branchCombo.currentText()   branch = str(branch)   allparents = self.allpar_action.isChecked()   tw = self.repoTabsWidget