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

workbench: connect to quitsignal of update dialog

Changeset 0fbcab262795

Parent 1ef222ca78b3

by Adrian Buehlmann

Changes to one file · Browse files at 0fbcab262795 Showing diff from parent 1ef222ca78b3 Diff from another changeset...

 
55
56
57
 
58
59
60
 
100
101
102
103
 
104
105
106
 
454
455
456
 
 
 
 
 
457
 
458
459
 
 
 
 
 
 
460
461
462
463
464
 
55
56
57
58
59
60
61
 
101
102
103
 
104
105
106
107
 
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
 
474
475
476
@@ -55,6 +55,7 @@
  self._reload_rev = None   self._reload_file = None   self._loading = True + self._scanForRepoChanges = True     QtGui.QMainWindow.__init__(self)   HgDialogMixin.__init__(self) @@ -100,7 +101,7 @@
    def timerEvent(self, event):   if event.timerId() == self._watchrepotimer: - if self.loading(): + if not self._scanForRepoChanges or self.loading():   return   mtime = self._getrepomtime()   if mtime > self._repodate: @@ -454,11 +455,22 @@
  self._manifestdlg = ManifestDialog(self.repo, rev)   self._manifestdlg.show()   + def setScanForRepoChanges(self, enable): + saved = self._scanForRepoChanges + self._scanForRepoChanges = enable + return saved +   def updateToRevision(self, rev): + saved = self.setScanForRepoChanges(False)   opts = {}   dlg = UpdateDialog(rev, self.repo, self, opts=opts) + self._updatedlg = dlg + def quit(): + if dlg.completed: + self.reload() # TODO: implement something less drastic than a full reload + self.setScanForRepoChanges(saved) + dlg.quitsignal.connect(quit)   dlg.show() - self._updatedlg = dlg     def file_displayed(self, filename):   self.actionPrevDiff.setEnabled(False)