This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4706

localrepo: validate directories before creating any
ClosedPublic

Authored by indygreg on Sep 24 2018, 12:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb504ff813c4f: localrepo: validate directories before creating any
Summary

There is no meaningful change in behavior because wdir would
already exist in the case where we raised RepoError. But I think
the code is easier to read if we do all validation first then
take actions with side-effects.

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

indygreg created this revision.Sep 24 2018, 12:12 PM
Closed by commit rHGb504ff813c4f: localrepo: validate directories before creating any (authored by indygreg). · Explain WhySep 26 2018, 1:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (5 lines)

Diff 11378

mercurial/localrepo.py

raise error.Abort(_('unable to create repository because of unknown ' raise error.Abort(_('unable to create repository because of unknown '
'creation option: %s') % 'creation option: %s') %
', '.join(sorted(unknownopts)), ', '.join(sorted(unknownopts)),
hint=_('is a required extension not loaded?')) hint=_('is a required extension not loaded?'))
requirements = newreporequirements(ui, createopts=createopts) requirements = newreporequirements(ui, createopts=createopts)
wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
if not wdirvfs.exists():
wdirvfs.makedirs()
hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
if hgvfs.exists(): if hgvfs.exists():
raise error.RepoError(_('repository %s already exists') % path) raise error.RepoError(_('repository %s already exists') % path)
if not wdirvfs.exists():
wdirvfs.makedirs()
hgvfs.makedir(notindexed=True) hgvfs.makedir(notindexed=True)
if b'store' in requirements: if b'store' in requirements:
hgvfs.mkdir(b'store') hgvfs.mkdir(b'store')
# We create an invalid changelog outside the store so very old # We create an invalid changelog outside the store so very old
# Mercurial versions (which didn't know about the requirements # Mercurial versions (which didn't know about the requirements
# file) encounter an error on reading the changelog. This # file) encounter an error on reading the changelog. This