This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11063

windows: use abspath in mercurial/hg.py
ClosedPublic

Authored by marmoute on Jul 10 2021, 1:45 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1fdf315eff66: windows: use abspath in mercurial/hg.py
Summary

We replace os.path.abspath with util.abspath. This should solve more "drive
capitalization" issue on Windows.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 10 2021, 1:45 PM
Alphare accepted this revision.Jul 13 2021, 11:39 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:39 AM
marmoute added a commit: rHG1fdf315eff66: windows: use abspath in mercurial/hg.py.Jul 16 2021, 5:21 AM
Closed by commit rHG1fdf315eff66: windows: use abspath in mercurial/hg.py (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (4 lines)

Diff 29309

mercurial/hg.py

pull=True, pull=True,
revs=rev, revs=rev,
update=False, update=False,
stream=stream, stream=stream,
) )
# Resolve the value to put in [paths] section for the source. # Resolve the value to put in [paths] section for the source.
if islocal(source): if islocal(source):
defaultpath = os.path.abspath(urlutil.urllocalpath(source)) defaultpath = util.abspath(urlutil.urllocalpath(source))
else: else:
defaultpath = source defaultpath = source
sharerepo = repository(ui, path=sharepath) sharerepo = repository(ui, path=sharepath)
destrepo = share( destrepo = share(
ui, ui,
sharerepo, sharerepo,
dest=dest, dest=dest,
update=update, update=update,
stream=stream, stream=stream,
) )
srcrepo = srcpeer.local() srcrepo = srcpeer.local()
abspath = origsource abspath = origsource
if islocal(origsource): if islocal(origsource):
abspath = os.path.abspath(urlutil.urllocalpath(origsource)) abspath = util.abspath(urlutil.urllocalpath(origsource))
if islocal(dest): if islocal(dest):
if os.path.exists(dest): if os.path.exists(dest):
# only clean up directories we create ourselves # only clean up directories we create ourselves
hgdir = os.path.realpath(os.path.join(dest, b".hg")) hgdir = os.path.realpath(os.path.join(dest, b".hg"))
cleandir = hgdir cleandir = hgdir
else: else:
cleandir = dest cleandir = dest