Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

Merge with stable

Changeset 09c8717417b0…

Parents dfcd88dc17fd…

Parents 3eb4de611f22…

by Steve Borho

Changes to 2 files · Browse files at 09c8717417b0 Showing diff from parent dfcd88dc17fd 3eb4de611f22 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
19
20
21
22
 
23
24
25
 
1012
1013
1014
1015
 
1016
1017
1018
 
19
20
21
 
22
23
24
25
 
1012
1013
1014
 
1015
1016
1017
1018
@@ -19,7 +19,7 @@
   from tortoisehg.hgtk import csinfo, gdialog, gtklib, hgcmd, statusbar   -MODE_FILEPATS = 1 # mirrored from history.py +MODE_FILEPATS = 4 # mirrored from history.py    class ChangeSet(gdialog.GWindow):   'GTK+ based dialog for displaying repository logs' @@ -1012,7 +1012,7 @@
  opts = {'pats': [fname]}   explorer = self.glog_parent   explorer.filter = 'custom' - explorer.filtercombo.set_active(1) + explorer.filtercombo.set_active(MODE_FILEPATS)   explorer.filterentry.set_text(fname)   explorer.filterbar.get_button('custom').set_active(True)   explorer.activate_filter(path, MODE_FILEPATS)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
786
787
788
789
 
790
791
792
 
786
787
788
 
789
790
791
792
@@ -786,7 +786,7 @@
  return False   elif mode == MODE_FILEPATS:   try: - match.match(self.repo.root, self.repo.root, text) + match.match(self.repo.root, self.repo.root, [text])   except (ValueError, util.Abort), e:   gdialog.Prompt(_('Invalid file pattern'),   str(e), self).run()