Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 10f862cc7e64…

Parents f372b674f9d4…

Parents bf07c24f9694…

by Yuki KODAMA

Changes to one file · Browse files at 10f862cc7e64 Showing diff from parent f372b674f9d4 bf07c24f9694 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
 
 
 
 
 
 
 
 
 
1833
1834
1835
 
 
 
 
 
 
 
 
 
 
 
1836
1837
1838
 
1822
1823
1824
 
 
 
 
 
 
 
 
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
 
 
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
@@ -1822,17 +1822,27 @@
    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.LookupError: + self.remove_overlay(False) + gtklib.idle_add_single_call(self.stbar.set_idle_text, + _('Failed to preview, a bundle file unrelated ' + 'to this repository')) + 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(