Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

synch: disable notifications if rebase is ever used

There's no end to the number of tracebacks this can conjure in
the changelog tool.

Changeset 6f33ec32e601…

Parent ff48a5022b05…

by Steve Borho

Changes to one file · Browse files at 6f33ec32e601 Showing diff from parent ff48a5022b05 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
625
626
627
628
 
 
 
 
 
 
 
629
630
631
 
625
626
627
 
628
629
630
631
632
633
634
635
636
637
@@ -625,7 +625,13 @@
  self.stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write_err(_('[command interrupted]')) - if self.notify_func and self.lastcmd[0] == 'pull': + if not self.notify_func or self.lastcmd[0] != 'pull': + return False + if ' '.join(self.lastcmd[:2]) == 'pull --rebase': + # disable notification; rebase can be poisonous + self.notify_func = None + self.notify_args = None + else:   self.notify_func(self.notify_args)   return False # Stop polling this function