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 7d664d38d11a

Parents 7ad968593d74

Parents 2e4510e36632

by Simon Heimberg

Changes to 4 files · Browse files at 7d664d38d11a Showing diff from parent 7ad968593d74 2e4510e36632 Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
13
14
15
 
 
13
14
15
16
@@ -13,3 +13,4 @@
 491a94666fc3498827066b8aa65aab34d3a3e623 0.4.1  93df004457accaba3651c6534115aa4b98d94ce7 0.5  f22f5ce0a2f40ff9d814efd5314d85e426df632f 0.6 +b42ad74af55054c231fc2d1763c2e8e0f2c0f49e 0.7
Change 1 of 4 Show Entire File hggtk/​synch.py Stacked
 
19
20
21
22
 
23
24
25
 
433
434
435
436
 
437
438
439
 
451
452
453
454
 
455
456
457
 
500
501
502
503
 
504
505
506
 
19
20
21
 
22
23
24
25
 
433
434
435
 
436
437
438
439
 
451
452
453
 
454
455
456
457
 
500
501
502
 
503
504
505
506
@@ -19,7 +19,7 @@
 import threading  from mercurial import hg, ui, util, extensions  from dialog import error_dialog, question_dialog, info_dialog -from hglib import HgThread, toutf, rootpath, RepoError +from hglib import HgThread, fromutf, toutf, rootpath, RepoError  import shlib  import gtklib  import urllib @@ -433,7 +433,7 @@
  self._exec_cmd(cmd)     def _conf_clicked(self, toolbutton, data=None): - newpath = self._pathtext.get_text() + newpath = self._pathtext.get_text().strip()   for name, path in self.paths:   if path == newpath:   newpath = None @@ -451,7 +451,7 @@
  self.fill_path_combo()     def _email_clicked(self, toolbutton, data=None): - path = self._pathtext.get_text() + path = self._pathtext.get_text().strip()   if not path:   info_dialog(self, 'No repository selected',   'Select a peer repository to compare with') @@ -500,7 +500,7 @@
  proxy_host = ui.ui().config('http_proxy', 'host', '')   use_proxy = self._use_proxy.get_active()   text_entry = self._pathbox.get_child() - remote_path = str(text_entry.get_text()) + remote_path = fromutf(text_entry.get_text().strip())     cmdline = cmd[:]   cmdline += ['--verbose', '--repository', self.root]
 
186
187
188
 
189
 
190
191
192
 
186
187
188
189
190
191
192
193
194
@@ -186,7 +186,9 @@
  opts = {'addremove': None, 'include': [], 'force': None,   'append': None, 'exclude': [], 'inspect': None}   try: + self.ui.quiet = True   hgshelve.unshelve(self.ui, self.repo, **opts) + self.ui.quiet = False   self.reload_status()   except:   pass
icons/​tortoise/​detect_rename.ico Side by side
renamed from icons/tortoise/detect_rename-32.ico
Removed image
Added image
Subtracted image Added image