[PATCH 2 of 2] util: rename the util.localpath that uses url to urllocalpath (issue2875)

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1309534629 -7200
# Branch stable
# Node ID d8f7fdeaab2383c8a62cdb2391fbf070b887aec2
# Parent  63845b717148ed9534c895bb1703ba87c3a8bc6d
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).

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -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)
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -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
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -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):