[PATCH 1 of 9 V2] py3: rename pycompat.getcwd() to encoding.getcwd() (API)
Matt Harbison
mharbison72 at gmail.com
Tue Sep 25 02:25:34 UTC 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1537573703 14400
# Fri Sep 21 19:48:23 2018 -0400
# Node ID 1fcff747a558e32f9cb9d8411c256532455c10f8
# Parent d3d333ab167a5f0c23bd42a822732683d9afa221
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
We need to avoid os.getcwdb() on Windows to avoid DeprecationWarnings, and we
need encoding.strtolocal() to encode the result of os.getcwd().
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -503,7 +503,7 @@ py3pats = [
[
(r'os\.environ', "use encoding.environ instead (py3)", r'#.*re-exports'),
(r'os\.name', "use pycompat.osname instead (py3)"),
- (r'os\.getcwd', "use pycompat.getcwd instead (py3)"),
+ (r'os\.getcwd', "use encoding.getcwd instead (py3)", r'#.*re-exports'),
(r'os\.sep', "use pycompat.ossep instead (py3)"),
(r'os\.pathsep', "use pycompat.ospathsep instead (py3)"),
(r'os\.altsep', "use pycompat.osaltsep instead (py3)"),
diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -74,7 +74,7 @@ class convert_cvs(converter_source):
raise error.Abort(_('revision %s is not a patchset number')
% self.revs[0])
- d = pycompat.getcwd()
+ d = encoding.getcwd()
try:
os.chdir(self.path)
id = None
diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -1127,7 +1127,7 @@ class svn_sink(converter_sink, commandli
self.delexec = []
self.copies = []
self.wc = None
- self.cwd = pycompat.getcwd()
+ self.cwd = encoding.getcwd()
created = False
if os.path.isfile(os.path.join(path, '.svn', 'entries')):
@@ -1147,7 +1147,7 @@ class svn_sink(converter_sink, commandli
path = '/' + path
path = 'file://' + path
- wcpath = os.path.join(pycompat.getcwd(), os.path.basename(path) +
+ wcpath = os.path.join(encoding.getcwd(), os.path.basename(path) +
'-wc')
ui.status(_('initializing svn working copy %r\n')
% os.path.basename(wcpath))
diff --git a/hgext/fastannotate/commands.py b/hgext/fastannotate/commands.py
--- a/hgext/fastannotate/commands.py
+++ b/hgext/fastannotate/commands.py
@@ -12,6 +12,7 @@ import os
from mercurial.i18n import _
from mercurial import (
commands,
+ encoding,
error,
extensions,
patch,
@@ -41,7 +42,7 @@ def _matchpaths(repo, rev, pats, opts, a
if perfhack:
# cwd related to reporoot
reporoot = os.path.dirname(repo.path)
- reldir = os.path.relpath(pycompat.getcwd(), reporoot)
+ reldir = os.path.relpath(encoding.getcwd(), reporoot)
if reldir == '.':
reldir = ''
if any(opts.get(o[1]) for o in commands.walkopts): # a)
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -3585,7 +3585,7 @@ def mqinit(orig, ui, *args, **kwargs):
raise error.Abort(_('only a local queue repository '
'may be initialized'))
else:
- repopath = cmdutil.findrepo(pycompat.getcwd())
+ repopath = cmdutil.findrepo(encoding.getcwd())
if not repopath:
raise error.Abort(_('there is no Mercurial repository here '
'(.hg not found)'))
diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py
--- a/hgext/narrow/narrowcommands.py
+++ b/hgext/narrow/narrowcommands.py
@@ -69,7 +69,7 @@ def clonenarrowcmd(orig, ui, repo, *args
narrowspecfile = opts['narrowspec']
if narrowspecfile:
- filepath = os.path.join(pycompat.getcwd(), narrowspecfile)
+ filepath = os.path.join(encoding.getcwd(), narrowspecfile)
ui.status(_("reading narrowspec from '%s'\n") % filepath)
try:
fdata = util.readfile(filepath)
@@ -349,7 +349,7 @@ def trackedcmd(ui, repo, remotepath=None
newrules = opts.get('import_rules')
if newrules:
try:
- filepath = os.path.join(pycompat.getcwd(), newrules)
+ filepath = os.path.join(encoding.getcwd(), newrules)
fdata = util.readfile(filepath)
except IOError as inst:
raise error.Abort(_("cannot read narrowspecs from '%s': %s") %
diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -25,6 +25,7 @@ from . import (
changelog,
cmdutil,
discovery,
+ encoding,
error,
exchange,
filelog,
@@ -432,7 +433,7 @@ class bundlerepository(object):
return bundlepeer(self)
def getcwd(self):
- return pycompat.getcwd() # always outside the repo
+ return encoding.getcwd() # always outside the repo
# Check if parents exist in localrepo before setting
def setparents(self, p1, p2=nullid):
@@ -452,13 +453,13 @@ def instance(ui, path, create, intents=N
parentpath = ui.config("bundle", "mainreporoot")
if not parentpath:
# try to find the correct path to the working directory repo
- parentpath = cmdutil.findrepo(pycompat.getcwd())
+ parentpath = cmdutil.findrepo(encoding.getcwd())
if parentpath is None:
parentpath = ''
if parentpath:
# Try to make the full path relative so we get a nice, short URL.
# In particular, we don't want temp dir names in test outputs.
- cwd = pycompat.getcwd()
+ cwd = encoding.getcwd()
if parentpath == cwd:
parentpath = ''
else:
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -581,7 +581,7 @@ def _conflictsmsg(repo):
unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
if unresolvedlist:
mergeliststr = '\n'.join(
- [' %s' % util.pathto(repo.root, pycompat.getcwd(), path)
+ [' %s' % util.pathto(repo.root, encoding.getcwd(), path)
for path in unresolvedlist])
msg = _('''Unresolved merge conflicts:
@@ -1110,7 +1110,7 @@ def openstorage(repo, cmd, file_, opts,
raise error.CommandError(cmd, _('invalid arguments'))
if not os.path.isfile(file_):
raise error.Abort(_("revlog '%s' not found") % file_)
- r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
+ r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False),
file_[:-2] + ".i")
return r
@@ -2629,7 +2629,7 @@ def commitforceeditor(repo, ctx, subs, f
committext = buildcommittext(repo, ctx, subs, extramsg)
# run editor in the repository root
- olddir = pycompat.getcwd()
+ olddir = encoding.getcwd()
os.chdir(repo.root)
# make in-memory changes visible to external process
diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -161,7 +161,7 @@ class server(object):
based stream to fout.
"""
def __init__(self, ui, repo, fin, fout):
- self.cwd = pycompat.getcwd()
+ self.cwd = encoding.getcwd()
# developer config: cmdserver.log
logpath = ui.config("cmdserver", "log")
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -99,7 +99,7 @@ def debugancestor(ui, repo, *args):
"""find the ancestor revision of two revisions in a given index"""
if len(args) == 3:
index, rev1, rev2 = args
- r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False), index)
+ r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
lookup = r.lookup
elif len(args) == 2:
if not repo:
@@ -503,7 +503,7 @@ def debugdag(ui, repo, file_=None, *revs
spaces = opts.get(r'spaces')
dots = opts.get(r'dots')
if file_:
- rlog = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
+ rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False),
file_)
revs = set((int(r) for r in revs))
def events():
@@ -1754,7 +1754,7 @@ def debugpathcomplete(ui, repo, *specs,
def complete(path, acceptable):
dirstate = repo.dirstate
- spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
+ spec = os.path.normpath(os.path.join(encoding.getcwd(), path))
rootdir = repo.root + pycompat.ossep
if spec != repo.root and not spec.startswith(rootdir):
return [], []
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -210,7 +210,7 @@ class dirstate(object):
forcecwd = self._ui.config('ui', 'forcecwd')
if forcecwd:
return forcecwd
- return pycompat.getcwd()
+ return encoding.getcwd()
def getcwd(self):
'''Return the path from which a canonical path is calculated.
diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -748,7 +748,7 @@ def _getlocal(ui, rpath, wd=None):
"""
if wd is None:
try:
- wd = pycompat.getcwd()
+ wd = encoding.getcwd()
except OSError as e:
raise error.Abort(_("error getting current working directory: %s") %
encoding.strtolocal(e.strerror))
@@ -968,7 +968,7 @@ def _dispatch(req):
if not path:
raise error.RepoError(_("no repository found in"
" '%s' (.hg not found)")
- % pycompat.getcwd())
+ % encoding.getcwd())
raise
if repo:
ui = repo.ui
diff --git a/mercurial/encoding.py b/mercurial/encoding.py
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -233,6 +233,13 @@ if not _nativeenviron:
environ = dict((tolocal(k.encode(u'utf-8')), tolocal(v.encode(u'utf-8')))
for k, v in os.environ.items()) # re-exports
+if pycompat.ispy3:
+ # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which
+ # returns bytes.
+ getcwd = os.getcwdb # re-exports
+else:
+ getcwd = os.getcwd # re-exports
+
# How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
_wide = _sysstr(environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
and "WFA" or "WF")
diff --git a/mercurial/hook.py b/mercurial/hook.py
--- a/mercurial/hook.py
+++ b/mercurial/hook.py
@@ -150,7 +150,7 @@ def _exthook(ui, repo, htype, name, cmd,
if repo:
cwd = repo.root
else:
- cwd = pycompat.getcwd()
+ cwd = encoding.getcwd()
r = ui.system(cmd, environ=env, cwd=cwd, blockedtag='exthook-%s' % (name,))
duration = util.timer() - starttime
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -27,6 +27,7 @@ from .thirdparty import (
)
from . import (
copies,
+ encoding,
error,
filemerge,
match as matchmod,
@@ -1436,7 +1437,7 @@ def calculateupdates(repo, wctx, mctx, a
def _getcwd():
try:
- return pycompat.getcwd()
+ return encoding.getcwd()
except OSError as err:
if err.errno == errno.ENOENT:
return None
diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py
--- a/mercurial/pycompat.py
+++ b/mercurial/pycompat.py
@@ -97,9 +97,7 @@ if ispy3:
osaltsep = os.altsep
if osaltsep:
osaltsep = osaltsep.encode('ascii')
- # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which
- # returns bytes.
- getcwd = os.getcwdb
+
sysplatform = sys.platform.encode('ascii')
sysexecutable = sys.executable
if sysexecutable:
@@ -393,7 +391,6 @@ else:
if getattr(sys, 'argv', None) is not None:
sysargv = sys.argv
sysplatform = sys.platform
- getcwd = os.getcwd
sysexecutable = sys.executable
shlexsplit = shlex.split
bytesio = cStringIO.StringIO
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -447,7 +447,7 @@ class ui(object):
if section in (None, 'paths'):
# expand vars and ~
# translate paths relative to root (or home) into absolute paths
- root = root or pycompat.getcwd()
+ root = root or encoding.getcwd()
for c in self._tcfg, self._ucfg, self._ocfg:
for n, p in c.items('paths'):
# Ignore sub-options.
diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py
--- a/mercurial/unionrepo.py
+++ b/mercurial/unionrepo.py
@@ -19,6 +19,7 @@ from .node import nullid
from . import (
changelog,
cmdutil,
+ encoding,
error,
filelog,
localrepo,
@@ -240,7 +241,7 @@ class unionrepository(object):
return unionpeer(self)
def getcwd(self):
- return pycompat.getcwd() # always outside the repo
+ return encoding.getcwd() # always outside the repo
def instance(ui, path, create, intents=None, createopts=None):
if create:
@@ -248,13 +249,13 @@ def instance(ui, path, create, intents=N
parentpath = ui.config("bundle", "mainreporoot")
if not parentpath:
# try to find the correct path to the working directory repo
- parentpath = cmdutil.findrepo(pycompat.getcwd())
+ parentpath = cmdutil.findrepo(encoding.getcwd())
if parentpath is None:
parentpath = ''
if parentpath:
# Try to make the full path relative so we get a nice, short URL.
# In particular, we don't want temp dir names in test outputs.
- cwd = pycompat.getcwd()
+ cwd = encoding.getcwd()
if parentpath == cwd:
parentpath = ''
else:
diff --git a/mercurial/win32.py b/mercurial/win32.py
--- a/mercurial/win32.py
+++ b/mercurial/win32.py
@@ -584,7 +584,7 @@ def spawndetached(args):
# TODO: CreateProcessW on py3?
res = _kernel32.CreateProcessA(
None, encoding.strtolocal(args), None, None, False, _CREATE_NO_WINDOW,
- env, pycompat.getcwd(), ctypes.byref(si), ctypes.byref(pi))
+ env, encoding.getcwd(), ctypes.byref(si), ctypes.byref(pi))
if not res:
raise ctypes.WinError()
More information about the Mercurial-devel
mailing list