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

merge: respect cipushafter (refs #509)

Changeset 203127d8220c…

Parent ef70809a429b…

by Steve Borho

Changes to one file · Browse files at 203127d8220c Showing diff from parent ef70809a429b Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
521
522
523
524
 
 
 
525
526
527
 
550
551
552
553
554
555
556
557
558
 
565
566
567
 
 
 
 
 
568
569
570
 
571
572
573
 
521
522
523
 
524
525
526
527
528
529
 
552
553
554
 
 
 
555
556
557
 
564
565
566
567
568
569
570
571
572
573
 
574
575
576
577
@@ -521,7 +521,9 @@
  pass     def cleanupPage(self): - QSettings().setValue('merge/skiplast', self.skiplast.isChecked()) + s = QSettings() + s.setValue('merge/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'merge/message')     def currentPage(self):   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) @@ -550,9 +552,6 @@
  def validatePage(self):   if len(self.repo.parents()) == 1:   # commit succeeded, repositoryChanged() called wizard().next() - s = QSettings() - s.setValue('merge/skiplast', self.skiplast.isChecked()) - self.msgEntry.saveSettings(s, 'merge/message')   if self.skiplast.isChecked():   self.wizard().close()   return True @@ -565,9 +564,14 @@
  message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['commit', '--verbose', '--message', message,   '--repository', self.repo.root] + commandlines = [cmdline] + pushafter = self.repo.ui.config('tortoisehg', 'cipushafter') + if pushafter: + cmd = ['push', '--repository', self.repo.root, pushafter] + commandlines.append(cmd)   self.repo.incrementBusyCount()   self.cmd.setShowOutput(True) - self.cmd.run(cmdline) + self.cmd.run(*commandlines)   return False     def repositoryChanged(self):