Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 87b3c3a13847…

Parents 3e517fc3b196…

Parents 2ef9eb32d886…

by Steve Borho

Changes to 3 files · Browse files at 87b3c3a13847 Showing diff from parent 3e517fc3b196 2ef9eb32d886 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
50
51
52
53
 
54
55
56
 
50
51
52
 
53
54
55
56
@@ -50,7 +50,7 @@
  if '\0' in data:   self.error = p + _('File is binary.\n')   return None - except EnvironmentError, e: + except (EnvironmentError, util.Abort), e:   self.error = p + hglib.tounicode(str(e))   return None   return fctx, data
Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
312
313
314
 
 
 
315
316
317
 
312
313
314
315
316
317
318
319
320
@@ -312,6 +312,9 @@
  self.vdiff()     def menuRequest(self, point): + selmodel = self._treeview.selectionModel() + if not selmodel.selectedRows(): + return   point = self.mapToGlobal(point)     currentindex = self._treeview.currentIndex()