Mercurial > public > mercurial-scm > hg
diff mercurial/debugcommands.py @ 39818:24e493ec2229
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().
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 21 Sep 2018 19:48:23 -0400 |
| parents | 7e99b02768ef |
| children | c31ce080eb75 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Mon Sep 24 22:46:22 2018 -0400 +++ b/mercurial/debugcommands.py Fri Sep 21 19:48:23 2018 -0400 @@ -99,7 +99,7 @@ """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 @@ 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 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 [], []