Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

merge: add togglebutton for skipping final confirmation page

Changeset e81c7a838b32…

Parent 9ace2e1fb761…

by Steve Borho

Changes to one file · Browse files at e81c7a838b32 Showing diff from parent 9ace2e1fb761 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
512
513
514
 
 
 
 
 
 
515
516
517
 
 
 
518
519
520
 
535
536
537
 
 
 
538
539
540
 
562
563
564
565
566
567
568
569
 
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
 
544
545
546
547
548
549
550
551
552
 
574
575
576
 
 
577
578
579
@@ -512,9 +512,18 @@
  actionEnter.triggered.connect(tryperform)   self.addAction(actionEnter)   + self.skiplast = QCheckBox(_('Skip final confirmation page, ' + 'close after commit.')) + checked = QSettings().value('merge/skiplast', False).toBool() + self.skiplast.setChecked(checked) + self.layout().addWidget(self.skiplast) +   def refresh(self):   pass   + def cleanupPage(self): + QSettings().setValue('merge/skiplast', self.skiplast.isChecked()) +   def currentPage(self):   # TODO: add other branch name, when appropriate   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) @@ -535,6 +544,9 @@
  def validatePage(self):   if len(self.repo.parents()) == 1:   # commit succeeded, repositoryChanged() called wizard().next() + QSettings().setValue('merge/skiplast', self.skiplast.isChecked()) + if self.skiplast.isChecked(): + self.wizard().close()   return True   if self.cmd.core.running():   return False @@ -562,8 +574,6 @@
     class ResultPage(BasePage): - # TODO: Add a checkbox on this page to make it optional -   def __init__(self, repo, parent):   super(ResultPage, self).__init__(repo, parent)   self.setTitle(_('Finished'))