Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 47759:d7515d29761d stable 5.9rc0
branching: merge default into stable
This mark the start of the 5.9 freeze.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Jul 2021 22:52:09 +0200 |
| parents | a125cbbc5782 |
| children | 23921bc857b5 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Fri Jul 09 00:25:14 2021 +0530 +++ b/mercurial/subrepo.py Wed Jul 21 22:52:09 2021 +0200 @@ -21,7 +21,6 @@ from .node import ( bin, hex, - nullid, short, ) from . import ( @@ -61,7 +60,7 @@ expandedpath = urlutil.urllocalpath(util.expandpath(path)) u = urlutil.url(expandedpath) if not u.scheme: - path = util.normpath(os.path.abspath(u.path)) + path = util.normpath(util.abspath(u.path)) return path @@ -686,7 +685,7 @@ # we can't fully delete the repository as it may contain # local-only history self.ui.note(_(b'removing subrepo %s\n') % subrelpath(self)) - hg.clean(self._repo, nullid, False) + hg.clean(self._repo, self._repo.nullid, False) def _get(self, state): source, revision, kind = state