This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10840

clone: cleanup the "cleanup dir" logic used during local clone
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:36 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1c7f3d911d0f: clone: cleanup the "cleanup dir" logic used during local clone
Summary

With the previous code, there was a small windows were we could delete too much
data. This should no longer be the case.

(This is an opportunity improvement while looking at something next to that.)

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (10 lines)

Diff 28588

mercurial/hg.py

srcrepo = srcpeer.local() srcrepo = srcpeer.local()
abspath = origsource abspath = origsource
if islocal(origsource): if islocal(origsource):
abspath = os.path.abspath(urlutil.urllocalpath(origsource)) abspath = os.path.abspath(urlutil.urllocalpath(origsource))
if islocal(dest): if islocal(dest):
if os.path.exists(dest):
# only clean up directories we create ourselves
hgdir = os.path.realpath(os.path.join(dest, b".hg"))
cleandir = hgdir
else:
cleandir = dest cleandir = dest
copy = False copy = False
if ( if (
srcrepo srcrepo
and srcrepo.cancopy() and srcrepo.cancopy()
and islocal(dest) and islocal(dest)
and not phases.hassecret(srcrepo) and not phases.hassecret(srcrepo)
): ):
except error.LockError: except error.LockError:
copy = False copy = False
if copy: if copy:
srcrepo.hook(b'preoutgoing', throw=True, source=b'clone') srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
hgdir = os.path.realpath(os.path.join(dest, b".hg")) hgdir = os.path.realpath(os.path.join(dest, b".hg"))
if not os.path.exists(dest): if not os.path.exists(dest):
util.makedirs(dest) util.makedirs(dest)
else:
# only clean up directories we create ourselves
cleandir = hgdir
try: try:
destpath = hgdir destpath = hgdir
util.makedir(destpath, notindexed=True) util.makedir(destpath, notindexed=True)
except OSError as inst: except OSError as inst:
if inst.errno == errno.EEXIST: if inst.errno == errno.EEXIST:
cleandir = None cleandir = None
raise error.Abort( raise error.Abort(
_(b"destination '%s' already exists") % dest _(b"destination '%s' already exists") % dest