Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 14825:de9eb6b1da4f stable 1.9
util: rename the util.localpath that uses url to urllocalpath (issue2875)
util is never imported by any other name than util, so this is mostly just a
simple search and replace from util.localpath to util.urllocalpath (assuming
other uses of util.localpath already has been renamed).
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 01 Jul 2011 17:37:09 +0200 |
| parents | b39ed8c8e5e5 |
| children | 510c893a726f |
line wrap: on
line diff
--- a/mercurial/hg.py Fri Jul 01 18:13:48 2011 +0200 +++ b/mercurial/hg.py Fri Jul 01 17:37:09 2011 +0200 @@ -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)