Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 15381:c519cd8f0169 stable
backout dbdb777502dc (issue3077) (issue3071)
Using util.realpath turns out to create complex issues on both Mac and
Windows. Back this change out for the release.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 29 Oct 2011 11:02:23 -0500 |
| parents | dbdb777502dc |
| children | e27561eb4a76 b8d8599410da |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Oct 28 15:00:21 2011 +0200 +++ b/mercurial/localrepo.py Sat Oct 29 11:02:23 2011 -0500 @@ -28,7 +28,7 @@ def __init__(self, baseui, path=None, create=False): repo.repository.__init__(self) - self.root = util.realpath(util.expandpath(path)) + self.root = os.path.realpath(util.expandpath(path)) self.path = os.path.join(self.root, ".hg") self.origroot = path self.auditor = scmutil.pathauditor(self.root, self._checknested) @@ -79,7 +79,7 @@ self.sharedpath = self.path try: - s = util.realpath(self.opener.read("sharedpath").rstrip('\n')) + s = os.path.realpath(self.opener.read("sharedpath").rstrip('\n')) if not os.path.exists(s): raise error.RepoError( _('.hg/sharedpath points to nonexistent directory %s') % s)