Show More
@@ -10,6 +10,7 b' from __future__ import absolute_import' | |||
|
10 | 10 | |
|
11 | 11 | import errno |
|
12 | 12 | import os |
|
13 | import posixpath | |
|
13 | 14 | import shutil |
|
14 | 15 | import stat |
|
15 | 16 | import weakref |
@@ -1292,7 +1293,11 b' def _incoming(' | |||
|
1292 | 1293 | source = bytes(subpath) |
|
1293 | 1294 | else: |
|
1294 | 1295 | p = urlutil.url(source) |
|
1295 | p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | |
|
1296 | if p.islocal(): | |
|
1297 | normpath = os.path.normpath | |
|
1298 | else: | |
|
1299 | normpath = posixpath.normpath | |
|
1300 | p.path = normpath(b'%s/%s' % (p.path, subpath)) | |
|
1296 | 1301 | source = bytes(p) |
|
1297 | 1302 | other = peer(repo, opts, source) |
|
1298 | 1303 | cleanupfn = other.close |
@@ -1363,7 +1368,11 b' def _outgoing(ui, repo, dests, opts, sub' | |||
|
1363 | 1368 | dest = bytes(subpath) |
|
1364 | 1369 | else: |
|
1365 | 1370 | p = urlutil.url(dest) |
|
1366 | p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | |
|
1371 | if p.islocal(): | |
|
1372 | normpath = os.path.normpath | |
|
1373 | else: | |
|
1374 | normpath = posixpath.normpath | |
|
1375 | p.path = normpath(b'%s/%s' % (p.path, subpath)) | |
|
1367 | 1376 | dest = bytes(p) |
|
1368 | 1377 | branches = path.branch, opts.get(b'branch') or [] |
|
1369 | 1378 |
General Comments 0
You need to be logged in to leave comments.
Login now