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

sync: emit messages when most commands complete

Provide useful feedback, especially when log widget is hidden

Changeset b77fef20a94e…

Parent 3c8aa7505908…

by Steve Borho

Changes to 2 files · Browse files at b77fef20a94e Showing diff from parent 3c8aa7505908 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
159
160
161
 
162
163
164
165
166
167
168
169
 
159
160
161
162
163
164
165
166
 
167
168
169
@@ -159,11 +159,11 @@
  sw = SyncWidget(root=self.repo.root, log=self.workbench.log)   sw.outgoingNodes.connect(self.setOutgoingNodes)   sw.invalidate.connect(self.reload) + sw.showMessage.connect(self.showMessage)   return sw     def setOutgoingNodes(self, nodes):   self.repo._outgoing = nodes - self.showMessage(_('%d outgoing changesets') % len(nodes))   self.refresh()     def createGrepWidget(self):
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
27
28
29
 
30
31
32
 
142
143
144
145
 
146
147
 
148
149
150
 
300
301
302
303
 
 
 
304
305
306
307
308
309
310
 
 
 
 
311
312
313
 
319
320
321
322
323
 
 
 
 
 
 
 
 
324
325
326
 
329
330
331
332
 
 
 
333
334
335
 
27
28
29
30
31
32
33
 
143
144
145
 
146
147
 
148
149
150
151
 
301
302
303
 
304
305
306
307
308
309
 
 
 
 
310
311
312
313
314
315
316
 
322
323
324
 
 
325
326
327
328
329
330
331
332
333
334
335
 
338
339
340
 
341
342
343
344
345
346
@@ -27,6 +27,7 @@
 class SyncWidget(QWidget):   invalidate = pyqtSignal()   outgoingNodes = pyqtSignal(object) + showMessage = pyqtSignal(str)     def __init__(self, root, parent=None, log=None, **opts):   QWidget.__init__(self, parent) @@ -142,9 +143,9 @@
  def commandFinished(self, wrapper):   for b in self.opbuttons:   b.setEnabled(True) - if wrapper.data == 0 and self.finishfunc: + if self.finishfunc:   output = self.cmd.get_rawoutput() - self.finishfunc( output ) + self.finishfunc(wrapper.data, output)     def commandCanceled(self):   for b in self.opbuttons: @@ -300,14 +301,16 @@
  self.cmd.run(cmdline, display=display)     def inclicked(self): - self.finishfunc = None + def finished(ret, output): + self.showMessage.emit(_('Incoming finished, ret %d') % ret) + self.finishfunc = finished   self.run(['--repository', self.root, 'incoming'])     def pullclicked(self): - if self.log: - self.finishfunc = lambda output: self.invalidate.emit() - else: - self.finishfunc = None + def finished(ret, output): + self.invalidate.emit() + self.showMessage.emit(_('Pull finished, ret %d') % ret) + self.finishfunc = finished   cmdline = ['--repository', self.root, 'pull']   if self.cachedpp == 'rebase':   cmdline.append('--rebase') @@ -319,8 +322,14 @@
    def outclicked(self):   if self.log: - def outputnodes(data): - self.outgoingNodes.emit(data.splitlines()) + def outputnodes(ret, data): + if ret == 0: + nodes = data.splitlines() + self.outgoingNodes.emit(nodes) + self.showMessage.emit(_('%d outgoing changesets') % + len(nodes)) + else: + self.showMessage.emit(_('Outgoing finished, ret %d') % ret)   self.finishfunc = outputnodes   self.run(['--repository', self.root, 'outgoing',   '--quiet', '--template', '{node}\n']) @@ -329,7 +338,9 @@
  self.run(['--repository', self.root, 'outgoing'])     def pushclicked(self): - self.finishfunc = None + def finished(ret, output): + self.showMessage.emit(_('Push finished, ret %d') % ret) + self.finishfunc = finished   self.run(['--repository', self.root, 'push'])     def postpullclicked(self):