Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable history: catch Abort exception when failed to bundle preview

And show error message in status bar. This should be more improved
to appeal for the user. For instance, coloring with red and icons.

Fixes #959

Changeset 3bfea9d64ffd…

Parent 6de640f3f5a1…

by Yuki KODAMA

Changes to one file · Browse files at 3bfea9d64ffd Showing diff from parent 6de640f3f5a1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
 
 
 
 
 
 
 
 
 
1761
1762
1763
 
 
 
 
 
 
1764
1765
1766
 
1750
1751
1752
 
 
 
 
 
 
 
 
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
 
 
1763
1764
1765
1766
1767
1768
1769
1770
1771
@@ -1750,17 +1750,22 @@
    self.bfile = bfile   oldtip = len(self.repo) - self.repo = hg.repository(self.ui, path=bfile) - self.graphview.set_repo(self.repo, self.stbar) - self.changeview.set_repo(self.repo) - self.changeview.bfile = bfile - if hasattr(self, 'mqwidget'): - self.mqwidget.set_repo(self.repo) - self.npreviews = len(self.repo) - oldtip - self.reload_log(**kwopts) + try: + self.repo = hg.repository(self.ui, path=bfile) + self.graphview.set_repo(self.repo, self.stbar) + self.changeview.set_repo(self.repo) + self.changeview.bfile = bfile + if hasattr(self, 'mqwidget'): + self.mqwidget.set_repo(self.repo) + self.npreviews = len(self.repo) - oldtip + self.reload_log(**kwopts)   - self.stbar.set_idle_text(_('Bundle Preview')) - self.bundle_autoreject = False + self.stbar.set_idle_text(_('Bundle Preview')) + self.bundle_autoreject = False + except error.Abort: + self.remove_overlay(False) + gtklib.idle_add_single_call(self.stbar.set_idle_text, + _('Failed to preview, not a Mercurial bundle file'))     def add_bundle_clicked(self, button):   result = gtklib.NativeSaveFileDialogWrapper(