Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

status: Fix display of merged file with non-ascii encoding

I got rid of all uses of FM_PATH_UTF8 except for display
Fixes #7

Changeset 4ec490bf54d9…

Parent 498981a6bc3f…

by Steve Borho

Changes to one file · Browse files at 4ec490bf54d9 Showing diff from parent 498981a6bc3f Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​status.py Stacked
 
555
556
557
558
559
 
 
560
561
562
 
575
576
577
578
 
579
580
581
 
824
825
826
827
 
828
829
830
 
555
556
557
 
 
558
559
560
561
562
 
575
576
577
 
578
579
580
581
 
824
825
826
 
827
828
829
830
@@ -555,8 +555,8 @@
    # List of the currently checked and selected files to pass on to the new data   model, paths = self.filetree.get_selection().get_selected_rows() - recheck = [entry[FM_PATH_UTF8] for entry in model if entry[FM_CHECKED]] - reselect = [model[path][FM_PATH_UTF8] for path in paths] + recheck = [entry[FM_PATH] for entry in model if entry[FM_CHECKED]] + reselect = [model[path][FM_PATH] for path in paths]     # merge-state of files   ms = merge_.mergestate(self.repo) @@ -575,7 +575,7 @@
  selection = self.filetree.get_selection()   selected = False   for row in model: - if row[FM_PATH_UTF8] in reselect: + if row[FM_PATH] in reselect:   selection.select_iter(row.iter)   selected = True   @@ -824,7 +824,7 @@
  if not sel:   self._last_file = None   return False - wfile = self.filemodel[sel[0]][FM_PATH_UTF8] + wfile = self.filemodel[sel[0]][FM_PATH]   if force or wfile != self._last_file:   self._last_file = wfile   self._hg_call_wrapper('Diff', dohgdiff)