Mercurial > hg-stable
changeset 14828:80112b87fc7f
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 01 Jul 2011 13:59:09 -0500 |
| parents | f5bfb27b64e3 (current diff) 24ecdbe7c5c8 (diff) |
| children | a2de9da4604d |
| files | |
| diffstat | 6 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Thu Jun 30 19:34:09 2011 -0500 +++ b/.hgsigs Fri Jul 01 13:59:09 2011 -0500 @@ -39,3 +39,4 @@ b032bec2c0a651ca0ddecb65714bfe6770f67d70 0 iD8DBQBNlg5kywK+sNU5EO8RAnGEAJ9gmEx6MfaR4XcG2m/93vwtfyzs3gCgltzx8/YdHPwqDwRX/WbpYgi33is= 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 0 iD8DBQBNvTy4ywK+sNU5EO8RAmp8AJ9QnxK4jTJ7G722MyeBxf0UXEdGwACgtlM7BKtNQfbEH/fOW5y+45W88VI= 733af5d9f6b22387913e1d11350fb8cb7c1487dd 0 iD8DBQBN5q/8ywK+sNU5EO8RArRGAKCNGT94GKIYtSuwZ57z1sQbcw6uLACfffpbMV4NAPMl8womAwg+7ZPKnIU= +de9eb6b1da4fc522b1cab16d86ca166204c24f25 0 iD8DBQBODhfhywK+sNU5EO8RAr2+AJ4ugbAj8ae8/K0bYZzx3sascIAg1QCeK3b+zbbVVqd3b7CDpwFnaX8kTd4=
--- a/.hgtags Thu Jun 30 19:34:09 2011 -0500 +++ b/.hgtags Fri Jul 01 13:59:09 2011 -0500 @@ -51,3 +51,4 @@ b032bec2c0a651ca0ddecb65714bfe6770f67d70 1.8.2 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 1.8.3 733af5d9f6b22387913e1d11350fb8cb7c1487dd 1.8.4 +de9eb6b1da4fc522b1cab16d86ca166204c24f25 1.9
--- a/mercurial/hg.py Thu Jun 30 19:34:09 2011 -0500 +++ b/mercurial/hg.py Fri Jul 01 13:59:09 2011 -0500 @@ -17,7 +17,7 @@ import errno, os, shutil def _local(path): - path = util.expandpath(util.localpath(path)) + path = util.expandpath(util.urllocalpath(path)) return (os.path.isfile(path) and bundlerepo or localrepo) def addbranchrevs(lrepo, repo, branches, revs): @@ -227,8 +227,8 @@ else: dest = ui.expandpath(dest) - dest = util.localpath(dest) - source = util.localpath(source) + dest = util.urllocalpath(dest) + source = util.urllocalpath(source) if os.path.exists(dest): if not os.path.isdir(dest): @@ -250,7 +250,7 @@ try: abspath = origsource if islocal(origsource): - abspath = os.path.abspath(util.localpath(origsource)) + abspath = os.path.abspath(util.urllocalpath(origsource)) if islocal(dest): dircleanup = DirCleanup(dest)
--- a/mercurial/localrepo.py Thu Jun 30 19:34:09 2011 -0500 +++ b/mercurial/localrepo.py Fri Jul 01 13:59:09 2011 -0500 @@ -1985,7 +1985,7 @@ return os.path.join(base, name.replace('journal', 'undo', 1)) def instance(ui, path, create): - return localrepository(ui, util.localpath(path), create) + return localrepository(ui, util.urllocalpath(path), create) def islocal(path): return True
--- a/mercurial/util.py Thu Jun 30 19:34:09 2011 -0500 +++ b/mercurial/util.py Fri Jul 01 13:59:09 2011 -0500 @@ -1589,7 +1589,7 @@ def hasdriveletter(path): return path[1:2] == ':' and path[0:1].isalpha() -def localpath(path): +def urllocalpath(path): return url(path, parsequery=False, parsefragment=False).localpath() def hidepassword(u):
--- a/tests/test-convert-cvs-detectmerge.t Thu Jun 30 19:34:09 2011 -0500 +++ b/tests/test-convert-cvs-detectmerge.t Fri Jul 01 13:59:09 2011 -0500 @@ -54,6 +54,7 @@ modify file1 on branch v1_0 $ cvscall -Q update -rv1_0 + $ sleep 1 $ echo "change" >> file1 $ cvsci -m"add text" cvs commit: Examining .