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

stable merge: respect cipushafter (refs #509)

Changeset 754605a9f2b2…

Parent 5360a2741540…

by Steve Borho

Changes to one file · Browse files at 754605a9f2b2 Showing diff from parent 5360a2741540 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
688
689
690
 
691
692
693
 
 
 
 
 
 
694
695
 
696
697
698
 
688
689
690
691
692
693
 
694
695
696
697
698
699
700
 
701
702
703
704
@@ -688,11 +688,17 @@
  self.setSubTitle(_('Please wait while committing merged files.'))     # merges must be committed without specifying file list + repo = self.wizard().repo   message = hglib.fromunicode(self.msg_text.text())   cmdline = ['commit', '--verbose', '--message', message, - '--repository', self.wizard().repo.root] + '--repository', repo.root] + commandlines = [cmdline] + pushafter = repo.ui.config('tortoisehg', 'cipushafter') + if pushafter: + cmd = ['push', '--repository', repo.root, pushafter] + commandlines.append(cmd)   self.wizard().repo.incrementBusyCount() - self.cmd.run(cmdline) + self.cmd.run(*commandlines)     def isComplete(self):   if not self.nextEnabled: