Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with crew

Changeset 89315add7b6f

Parents 9e74748799c4

Parents a1255bffcc75

by Simon Heimberg

Changes to 2 files · Browse files at 89315add7b6f Showing diff from parent 9e74748799c4 a1255bffcc75 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgignore.py Stacked
 
7
8
9
10
 
11
12
13
 
16
17
18
 
19
20
21
 
7
8
9
 
10
11
12
13
 
16
17
18
19
20
21
22
@@ -7,7 +7,7 @@
 import os  import gtk  from dialog import * -from shlib import shell_notify +from shlib import shell_notify, set_tortoise_icon  from hglib import fromutf, toutf  from mercurial import hg, ui, match   @@ -16,6 +16,7 @@
  def __init__(self, root='', fileglob=''):   'Initialize the Dialog'   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) + set_tortoise_icon(self, 'general.ico')     self.root = root   self.set_title('Ignore filter for ' + os.path.basename(root))
Change 1 of 2 Show Entire File hggtk/​rename.py Stacked
 
16
17
18
 
19
20
21
 
41
42
43
 
44
45
46
 
16
17
18
19
20
21
22
 
42
43
44
45
46
47
48
@@ -16,6 +16,7 @@
 from dialog import error_dialog  from mercurial import hg, ui, mdiff, cmdutil, match, util, commands  from hglib import toutf, fromutf, diffexpand, rootpath +from shlib import set_tortoise_icon  import gtklib  try:   from mercurial.repo import RepoError @@ -41,6 +42,7 @@
  def __init__(self, root=''):   'Initialize the Dialog'   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) + set_tortoise_icon(self, 'general.ico')     self.root = root   self.notify_func = None