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

stable backout: respect cipushafter (refs #509)

Changeset 5360a2741540…

Parent 0ade63bb9904…

by Steve Borho

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

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
159
160
161
162
 
 
 
 
 
 
163
164
165
166
 
167
168
169
170
171
 
172
173
174
175
176
 
177
 
 
 
 
 
178
179
 
180
181
182
 
219
220
221
222
 
223
224
225
 
159
160
161
 
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
 
177
178
179
180
181
 
182
183
184
185
186
187
188
189
 
190
191
192
193
 
230
231
232
 
233
234
235
236
@@ -159,24 +159,35 @@
  (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]   if self.backoutParent:   msg = self.msgTextEdit.text() - cmdline += ['--message', hglib.fromunicode(msg)] + cmdline += ['--message='+hglib.fromunicode(msg)] + commandlines = [cmdline] + pushafter = self.repo.ui.config('tortoisehg', 'cipushafter') + if pushafter: + cmd = ['push', '--repository', self.repo.root, pushafter] + commandlines.append(cmd)   elif self.mergeChk.isChecked():   cmdline += ['--merge']   msg = self.msgTextEdit.text()   cmdline += ['--message', hglib.fromunicode(msg)] + commandlines = [cmdline]     # start backing out   self.cmdline = cmdline   self.repo.incrementBusyCount() - self.cmd.run(cmdline) + self.cmd.run(*commandlines)     def commit(self):   cmdline = ['commit', '--repository', self.repo.root]   msg = self.msgTextEdit.text() - cmdline += ['--message', hglib.fromunicode(msg)] + cmdline += ['--message='+hglib.fromunicode(msg)]   self.cmdline = cmdline + 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.run(cmdline) + self.cmd.run(*commandlines)     ### Signal Handlers ###   @@ -219,7 +230,7 @@
  self.backoutBtn.clicked.connect(self.commit)   self.checkResolve()   - if finished: + if finished:   if not self.cmd.outputShown():   self.accept()   else: