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

sync: further improvements to status messages

Changeset 70b105a3e6de…

Parent de6c55c65fcd…

by Steve Borho

Changes to one file · Browse files at 70b105a3e6de Showing diff from parent de6c55c65fcd Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
368
369
370
371
 
372
373
374
375
376
377
 
 
 
 
378
379
380
 
396
397
398
399
 
400
401
402
 
445
446
447
448
 
 
 
 
449
450
451
 
368
369
370
 
371
372
373
374
375
376
 
377
378
379
380
381
382
383
 
399
400
401
 
402
403
404
405
 
448
449
450
 
451
452
453
454
455
456
457
@@ -368,13 +368,16 @@
  elif ret == 1:   self.showMessage.emit(_('No incoming changesets'))   else: - self.showMessage.emit(_('Incoming finished, ret %d') % ret) + self.showMessage.emit(_('Incoming aborted, ret %d') % ret)   self.finishfunc = finished   self.run(['--repository', self.root, 'incoming'])     def pullclicked(self):   def finished(ret, output): - self.showMessage.emit(_('Pull finished, ret %d') % ret) + if ret == 0: + self.showMessage.emit(_('Pull completed successfully')) + else: + self.showMessage.emit(_('Pull aborted, ret %d') % ret)   self.finishfunc = finished   cmdline = ['--repository', self.root, 'pull', '--verbose']   if self.cachedpp == 'rebase': @@ -396,7 +399,7 @@
  elif ret == 1:   self.showMessage.emit(_('No outgoing changesets'))   else: - self.showMessage.emit(_('Outgoing finished, ret %d') % ret) + self.showMessage.emit(_('Outgoing aborted, ret %d') % ret)   self.finishfunc = outputnodes   self.run(['--repository', self.root, 'outgoing',   '--quiet', '--template', '{node}\n']) @@ -445,7 +448,10 @@
    def pushclicked(self):   def finished(ret, output): - self.showMessage.emit(_('Push finished, ret %d') % ret) + if ret == 0: + self.showMessage.emit(_('Push completed successfully')) + else: + self.showMessage.emit(_('Push aborted, ret %d') % ret)   self.finishfunc = finished   self.run(['--repository', self.root, 'push', '--verbose'])