Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset b3d899faedb1…

Parents 5a5c59cb5131…

Parents 25818ed50c94…

by Steve Borho

Changes to 3 files · Browse files at b3d899faedb1 Showing diff from parent 5a5c59cb5131 25818ed50c94 Diff from another changeset...

Change 1 of 1 Show Entire File MANIFEST.in Stacked
 
1
2
3
4
5
 
1
 
2
3
4
@@ -1,5 +1,4 @@
 recursive-include icons *.png *.ico *.svg *.txt -include contrib/_hgtk  include contrib/nautilus-thg.py  include contrib/mergetools.rc  include contrib/tortoisehg.desktop
Change 1 of 1 Show Entire File setup.py Stacked
 
79
80
81
82
83
84
85
86
 
79
80
81
 
 
82
83
84
@@ -79,8 +79,6 @@
  'contrib/win32',   'tortoisehg',   'tortoisehg/hgqt', - 'tortoisehg/hgtk', - 'tortoisehg/hgtk/logview',   'tortoisehg/util',   'tortoisehg/thgutil/iniparse',   ]
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
38
39
40
41
 
42
43
44
 
38
39
40
 
41
42
43
44
@@ -38,7 +38,7 @@
  p = path[len('ssh://'):]   user, passwd = None, None   if p.find('@') != -1: - user, p = tuple(p.split('@', 1)) + user, p = tuple(p.rsplit('@', 1))   if user.find(':') != -1:   user, passwd = tuple(user.rsplit(':', 1))   m = re.match(r'([^:/]+)(:(\d+))?(/(.*))?$', p)