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 e5b6dc69d36d…

Parents 1ec645c00a96…

Parents 52ac8fe83a98…

by Steve Borho

Changes to 3 files · Browse files at e5b6dc69d36d Showing diff from parent 1ec645c00a96 52ac8fe83a98 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
988
989
990
991
 
 
992
993
994
995
996
997
 
 
 
 
 
 
 
998
999
1000
 
988
989
990
 
991
992
993
 
 
 
 
 
994
995
996
997
998
999
1000
1001
1002
1003
@@ -988,13 +988,16 @@
  if self.glog_parent:   # If this changeset browser is embedded in glog, send   # send this event to the main app - fname = hglib.toutf(self.curfile) + path = hglib.escapepath(self.curfile) + fname = hglib.toutf(path)   opts = {'pats': [fname]} - self.glog_parent.filtercombo.set_active(1) - 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) + explorer = self.glog_parent + explorer.filter = 'custom' + explorer.filtercombo.set_active(1) + explorer.filterentry.set_text(fname) + explorer.filterbar.get_button('custom').set_active(True) + explorer.filter_entry_activated(explorer.filterentry, + explorer.filtercombo)   else:   # Else launch our own glog instance   from tortoisehg.hgtk import history
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
883
884
885
886
 
 
887
888
889
890
891
892
 
 
893
894
895
 
883
884
885
 
886
887
888
889
890
891
892
 
893
894
895
896
897
@@ -883,13 +883,15 @@
  self.filterbar.get_button('custom').set_active(True)   self.filter = 'custom'   self.filtercombo.set_active(1) - self.filterentry.set_text(hglib.toutf(opts['filehist'])) + path = hglib.escapepath(opts['filehist']) + self.filterentry.set_text(hglib.toutf(path))   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(hglib.toutf(', '.join(self.pats))) + paths = [hglib.escapepath(p) for p in self.pats] + self.filterentry.set_text(hglib.toutf(', '.join(paths)))   self.filter_entry_activated(self.filterentry, self.filtercombo)   elif 'bundle' in opts:   self.set_bundlefile(opts['bundle'])
Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
219
220
221
 
 
 
 
 
 
 
 
222
223
224
 
219
220
221
222
223
224
225
226
227
228
229
230
231
232
@@ -219,6 +219,14 @@
  canonpats.append(f)   return canonpats   +def escapepath(path): + 'Before passing a file path to hg API, it may need escaping' + p = path + if '[' in p or '{' in p or '*' in p or '?' in p: + return 'path:' + p + else: + return p +  def normpats(pats):   'Normalize file patterns'   normpats = []