--- a/mercurial/unionrepo.py Wed Aug 17 20:57:15 2016 -0700
+++ b/mercurial/unionrepo.py Wed Nov 23 00:03:11 2016 +0530
@@ -13,8 +13,6 @@
from __future__ import absolute_import
-import os
-
from .i18n import _
from .node import nullid
@@ -27,6 +25,7 @@
manifest,
mdiff,
pathutil,
+ pycompat,
revlog,
scmutil,
util,
@@ -229,7 +228,7 @@
return unionpeer(self)
def getcwd(self):
- return os.getcwd() # always outside the repo
+ return pycompat.getcwd() # always outside the repo
def instance(ui, path, create):
if create:
@@ -237,13 +236,13 @@
parentpath = ui.config("bundle", "mainreporoot", "")
if not parentpath:
# try to find the correct path to the working directory repo
- parentpath = cmdutil.findrepo(os.getcwd())
+ parentpath = cmdutil.findrepo(pycompat.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 = os.getcwd()
+ cwd = pycompat.getcwd()
if parentpath == cwd:
parentpath = ''
else: