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

update: add status parameter to quitsignal

Changeset 59bd4a4ee1c1…

Parent 3a02d4c56815…

by Adrian Buehlmann

Changes to 2 files · Browse files at 59bd4a4ee1c1 Showing diff from parent 3a02d4c56815 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
19
20
21
22
 
 
 
23
24
25
26
27
28
 
29
30
31
 
257
258
259
260
 
 
261
262
263
 
280
281
282
283
 
 
284
285
286
 
19
20
21
 
22
23
24
25
26
27
28
29
 
30
31
32
33
 
259
260
261
 
262
263
264
265
266
 
283
284
285
 
286
287
288
289
290
@@ -19,13 +19,15 @@
   class UpdateDialog(QDialog):   - quitsignal = pyqtSignal() + quitsignal = pyqtSignal( + int # status (0: succeeded, -1: failed) + )     def __init__(self, rev=None, repo=None, parent=None, opts=None):   super(UpdateDialog, self).__init__(parent, Qt.WindowTitleHint or   Qt.WindowSystemMenuHint)   - self.completed = False + self._finished = False     self.ui = ui.ui()   if repo: @@ -257,7 +259,8 @@
  ### Signal Handlers ###     def reject(self): - self.quitsignal.emit() + if not self._finished: + self.quitsignal.emit(-1)   super(UpdateDialog, self).reject()     def cancel_clicked(self): @@ -280,7 +283,8 @@
  self.detail_btn.setShown(True)     def command_finished(self, wrapper): - self.completed = True + self._finished = True + self.quitsignal.emit(0)   if wrapper.data is not 0 or self.cmd.is_show_output():   self.detail_btn.setChecked(True)   self.close_btn.setShown(True)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
461
462
463
464
465
 
 
466
467
468
 
461
462
463
 
 
464
465
466
467
468
@@ -461,8 +461,8 @@
  opts = { 'clean':False }   dlg = UpdateDialog(rev, self.repo, self, opts=opts)   self._updatedlg = dlg - def quit(): - if dlg.completed: + def quit(status): + if status == 0:   self.reload() # TODO: implement something less drastic than a full reload   self.setScanForRepoChanges(saved)   dlg.quitsignal.connect(quit)