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

history: fix filter issue when used with path contains non-ascii chars

Changeset 87349787ac38…

Parent e166c6f44f5c…

by Yuki KODAMA

Changes to 2 files · Browse files at 87349787ac38 Showing diff from parent e166c6f44f5c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
971
972
973
974
 
 
975
976
977
 
 
978
979
980
 
971
972
973
 
974
975
976
 
 
977
978
979
980
981
@@ -971,10 +971,11 @@
  if self.glog_parent:   # If this changeset browser is embedded in glog, send   # send this event to the main app - opts = {'pats' : [self.curfile]} + fname = hglib.toutf(self.curfile) + opts = {'pats': [fname]}   self.glog_parent.filtercombo.set_active(1) - self.glog_parent.filterentry.set_text(self.curfile) - self.glog_parent.custombutton.set_active(True) + self.glog_parent.filterentry.set_text(fname) + self.glog_parent.filterbar.get_button('custom').set_active(True)   self.glog_parent.filter = 'custom'   self.glog_parent.reload_log(**opts)   else:
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
841
842
843
844
 
845
846
847
848
849
850
 
851
852
853
 
1037
1038
1039
1040
1041
 
 
 
1042
1043
1044
 
841
842
843
 
844
845
846
847
848
849
 
850
851
852
853
 
1037
1038
1039
 
 
1040
1041
1042
1043
1044
1045
@@ -841,13 +841,13 @@
  self.filterbar.get_button('custom').set_active(True)   self.filter = 'custom'   self.filtercombo.set_active(1) - self.filterentry.set_text(opts['filehist']) + self.filterentry.set_text(hglib.toutf(opts['filehist']))   self.filter_entry_activated(self.filterentry, self.filtercombo)   elif self.pats:   self.filterbar.get_button('custom').set_active(True)   self.filter = 'custom'   self.filtercombo.set_active(1) - self.filterentry.set_text(', '.join(self.pats)) + self.filterentry.set_text(hglib.toutf(', '.join(self.pats)))   self.filter_entry_activated(self.filterentry, self.filtercombo)   elif 'bundle' in opts:   self.set_bundlefile(opts['bundle']) @@ -1037,8 +1037,9 @@
  kind, name = match._patsplit(npats[0], None)   if kind == 'path' and not os.path.isdir(name):   ftitle(_('file history: ') + hglib.toutf(name)) - opts['filehist'] = name - self.graphview.refresh(graphcol, [name], opts) + lname = hglib.fromutf(name) + opts['filehist'] = lname + self.graphview.refresh(graphcol, [lname], opts)   if not opts.get('filehist'):   ftitle(self.filtercombo.get_active_text())   self.graphview.refresh(False, npats, opts)