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 Yuki

Changeset 30d64724df5e…

Parents 4734f4675ed6…

Parents f56bd9a4fe87…

by Steve Borho

Changes to 4 files · Browse files at 30d64724df5e Showing diff from parent 4734f4675ed6 f56bd9a4fe87 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​clone.py Stacked
 
11
12
13
14
 
15
16
17
 
29
30
31
32
 
33
34
35
 
11
12
13
 
14
15
16
17
 
29
30
31
 
32
33
34
35
@@ -11,7 +11,7 @@
   from mercurial import ui, util  from thgutil.i18n import _ -from thgutil import shlib, settings +from thgutil import hglib, shlib, settings  from hggtk import gdialog, gtklib, hgcmd    class CloneDialog(gtk.Window): @@ -29,7 +29,7 @@
  self.recentsrc = self.clonesettings.mrul('src_paths')   self.recentdest = self.clonesettings.mrul('dest_paths')   - srcpath = os.getcwd() + srcpath = hglib.toutf(os.getcwd())   destpath = srcpath   if len(repos) > 1:   srcpath = repos[0]
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
28
29
30
31
 
32
33
34
 
28
29
30
 
31
32
33
34
@@ -28,7 +28,7 @@
    gtklib.set_tortoise_icon(self, 'hg.ico')   gtklib.set_tortoise_keys(self) - self.cmdline = cmdline + self.cmdline = [hglib.fromutf(item) for item in cmdline]   self.returncode = None   self.hgthread = None  
Change 1 of 4 Show Entire File hggtk/​hgignore.py Stacked
 
24
25
26
27
 
28
29
30
 
69
70
71
72
 
73
74
75
 
137
138
139
140
 
141
142
143
 
167
168
169
 
 
170
171
172
173
174
175
 
 
176
177
178
 
24
25
26
 
27
28
29
30
 
69
70
71
 
72
73
74
75
 
137
138
139
 
140
141
142
143
 
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
@@ -24,7 +24,7 @@
  gtklib.set_tortoise_keys(self)     self.root = paths.find_root() - self.set_title(_('Ignore filter for ') + os.path.basename(self.root)) + self.set_title(_('Ignore filter for ') + hglib.toutf(os.path.basename(self.root)))   self.set_default_size(630, 400)   self.notify_func = None   @@ -69,7 +69,7 @@
  if len(ignorefiles) > 1:   combo = gtk.combo_box_new_text()   for f in ignorefiles: - combo.append_text(f) + combo.append_text(hglib.toutf(f))   combo.set_active(0)   combo.connect('changed', self.fileselect)   mainvbox.pack_start(combo, False, False, 4) @@ -137,7 +137,7 @@
    def fileselect(self, combo):   'select another ignore file' - self.ignorefile = combo.get_active_text() + self.ignorefile = hglib.fromutf(combo.get_active_text())   self.refresh()     def unknown_search(self, model, column, key, iter): @@ -167,12 +167,16 @@
    def add_glob(self, widget, glob_entry):   newglob = hglib.fromutf(glob_entry.get_text()) + if newglob == '': + return   self.ignorelines.append('glob:' + newglob)   self.write_ignore_lines()   self.refresh()     def add_regexp(self, widget, regexp_entry):   newregexp = hglib.fromutf(regexp_entry.get_text()) + if newregexp == '': + return   self.ignorelines.append('regexp:' + newregexp)   self.write_ignore_lines()   self.refresh()
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
48
49
50
51
 
52
53
54
 
48
49
50
 
51
52
53
54
@@ -48,7 +48,7 @@
  self.origchangecount = len(self.repo)     name = self.repo.ui.config('web', 'name') or os.path.basename(self.root) - self.set_title(_('TortoiseHg Synchronize - ') + name) + self.set_title(_('TortoiseHg Synchronize - ') + hglib.toutf(name))     self.connect('delete-event', self.delete)