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

update: copy cmdfinished signal pattern from clone

Changeset 8e39144e455f…

Parent 9303d88d89be…

by Adrian Buehlmann

Changes to 2 files · Browse files at 8e39144e455f Showing diff from parent 9303d88d89be Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
203
204
205
206
 
207
208
209
210
 
211
212
213
 
203
204
205
 
206
207
208
209
 
210
211
212
213
@@ -203,11 +203,11 @@
  saved = self.setScanForRepoChanges(False)   dlg = update.UpdateDialog(rev, self.repo, self)   self._updatedlg = dlg - def quit(status): + def cmdfinished(status):   if status == 0:   self.reload() # TODO: implement something less drastic than a full reload   self.setScanForRepoChanges(saved) - dlg.quitsignal.connect(quit) + dlg.cmdfinished.connect(cmdfinished)   dlg.show()     def mergeWithRevision(self, rev):
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
18
19
20
21
 
22
23
24
 
255
256
257
258
259
260
261
262
263
264
 
265
266
267
 
280
281
282
283
284
 
 
 
 
 
285
286
287
 
289
290
291
292
 
293
294
295
 
18
19
20
 
21
22
23
24
 
255
256
257
 
 
 
 
 
258
259
260
261
262
263
 
276
277
278
 
 
279
280
281
282
283
284
285
286
 
288
289
290
 
291
292
293
294
@@ -18,7 +18,7 @@
   class UpdateDialog(QDialog):   - quitsignal = pyqtSignal( + cmdfinished = pyqtSignal(   int # status (0: succeeded, -1: failed)   )   @@ -255,13 +255,9 @@
    ### Signal Handlers ###   - def reject(self): - if not self._finished: - self.quitsignal.emit(-1) - super(UpdateDialog, self).reject() -   def cancel_clicked(self):   self.cmd.cancel() + self.reject()     def detail_toggled(self, checked):   self.cmd.show_output(checked) @@ -280,8 +276,11 @@
  self.detail_btn.setShown(True)     def command_finished(self, wrapper): - self._finished = True - self.quitsignal.emit(0) + if wrapper.data is 0: + res = 0 + else: + res = -1 + self.cmdfinished.emit(res)   if wrapper.data is not 0 or self.cmd.is_show_output():   self.detail_btn.setChecked(True)   self.close_btn.setShown(True) @@ -289,7 +288,7 @@
  self.close_btn.setFocus()   self.cancel_btn.setHidden(True)   else: - self.reject() + self.accept()     def command_canceling(self):   self.cancel_btn.setDisabled(True)