Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc2, 0.4rc3, and 0.4rc4

merge

Changeset 87c6731d7175…

Parents 5aa431c9b9c4…

Parents 6ea5bb77fa8c…

by TK Soh

Changes to 3 files · Browse files at 87c6731d7175 Showing diff from parent 5aa431c9b9c4 6ea5bb77fa8c Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​clone.py Stacked
 
50
51
52
53
 
54
55
56
 
166
167
168
 
169
170
171
 
172
173
 
 
 
 
 
174
175
176
 
279
280
281
 
 
 
282
283
284
 
50
51
52
 
53
54
55
56
 
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
 
286
287
288
289
290
291
292
293
294
@@ -50,7 +50,7 @@
  self._create()     def _create(self): - self.set_default_size(400, 180) + self.set_default_size(520, 180)   self.connect('destroy', gtk.main_quit)   ewidth = 16   @@ -166,11 +166,18 @@
  self._opt_update = gtk.CheckButton("do not update the new working directory")   self._opt_pull = gtk.CheckButton("use pull protocol to copy metadata")   self._opt_uncomp = gtk.CheckButton("use uncompressed transfer") + self._opt_proxy = gtk.CheckButton("use proxy server")   option_box.pack_start(self._opt_update, False, False)   option_box.pack_start(self._opt_pull, False, False)   option_box.pack_start(self._opt_uncomp, False, False) + option_box.pack_start(self._opt_proxy, False, False)   vbox.pack_start(option_box, False, False, 15)   + if ui.ui().config('http_proxy', 'host', ''): + self._opt_proxy.set_active(True) + else: + self._opt_proxy.set_sensitive(False) +   # remote cmd   lbl = gtk.Label("Remote Cmd:")   lbl.set_alignment(0, 0.5) @@ -279,6 +286,9 @@
  cmdline.append('--uncompressed')   if self._opt_pull.get_active():   cmdline.append('--pull') + if not (self._opt_proxy.get_active() and + ui.ui().config('http_proxy', 'host', '')): + cmdline += ["--config", "http_proxy.host="]   if remotecmd:   cmdline.append('--remotecmd')   cmdline.append(remotecmd)
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
114
115
116
 
117
118
119
 
114
115
116
117
118
119
120
@@ -114,6 +114,7 @@
  msg = self.hgthread.getqueue().get(0)   msg = unicode(msg, 'iso-8859-1')   self.textbuffer.insert(enditer, msg) + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)   except Queue.Empty:   pass   self.update_progress()
Change 1 of 2 Show Entire File hggtk/​synch.py Stacked
 
19
20
21
22
 
23
24
25
 
452
453
454
 
455
456
457
 
19
20
21
 
22
23
24
25
 
452
453
454
455
456
457
458
@@ -19,7 +19,7 @@
 import threading  from mercurial import hg, ui, util, extensions  from mercurial.repo import RepoError -from dialog import error_dialog, question_dialog +from dialog import error_dialog, question_dialog, info_dialog  from hglib import HgThread  import shlib  import gtklib @@ -452,6 +452,7 @@
  if append:   enditer = self.textbuffer.get_end_iter()   self.textbuffer.insert(enditer, msg) + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)   else:   self.textbuffer.set_text(msg)