This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4549

localrepo: move check for existing repo into createrepository()
ClosedPublic

Authored by martinvonz on Sep 12 2018, 3:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe471cb2852ea: localrepo: move check for existing repo into createrepository()
Summary

For symmetry with the check for existence of a repo in
localrepository.init, we should check for the non-existence in
createrepository(). We could alternatively move both checks into
instance().

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

martinvonz created this revision.Sep 12 2018, 3:23 PM
pulkit added a subscriber: pulkit.Sep 12 2018, 4:22 PM

test-init.t and test-mq.t says hi!

--- /storage/pulkit/repo/hgpush/tests/test-init.t
+++ /storage/pulkit/repo/hgpush/tests/test-init.t.err
@@ -99,7 +99,7 @@
 test failure
 
   $ hg init local
-  abort: repository local already exists!
+  abort: File exists: '$TESTTMP/local/.hg'
   [255]
 
 init+push to remote2
@@ -144,14 +144,14 @@
 init to existing repo
 
   $ hg init -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1
-  abort: repository remote1 already exists!
+  abort: File exists: '$TESTTMP/remote1/.hg'
   abort: could not create remote repo!
   [255]
 
 clone to existing repo
 
   $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1
-  abort: repository remote1 already exists!
+  abort: File exists: '$TESTTMP/remote1/.hg'
   abort: could not create remote repo!
   [255]
 

ERROR: test-init.t output changed
!
--- /storage/pulkit/repo/hgpush/tests/test-mq.t
+++ /storage/pulkit/repo/hgpush/tests/test-mq.t.err
@@ -154,7 +154,7 @@
   guards
   $ cat .hg/patches/series
   $ hg qinit -c
-  abort: repository $TESTTMP/d/.hg/patches already exists!
+  abort: File exists: '$TESTTMP/d/.hg/patches/.hg'
   [255]
   $ cd ..
 

ERROR: test-mq.t output changed
martinvonz added a comment.Sep 12 2018, 5:15 PM
In D4549#69559, @pulkit wrote:

test-init.t and test-mq.t says hi!

Sorry! :( Looks like I forgot to drop the .hg argument when I switched from wdirvfs to hgvfs. I'll fix right away.

martinvonz updated this revision to Diff 10977.Sep 12 2018, 5:50 PM
Closed by commit rHGe471cb2852ea: localrepo: move check for existing repo into createrepository() (authored by martinvonz). · Explain WhySep 12 2018, 9:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (15 lines)

Diff 10981

mercurial/localrepo.py

def undoname(fn): def undoname(fn):
base, name = os.path.split(fn) base, name = os.path.split(fn)
assert name.startswith('journal') assert name.startswith('journal')
return os.path.join(base, name.replace('journal', 'undo', 1)) return os.path.join(base, name.replace('journal', 'undo', 1))
def instance(ui, path, create, intents=None, createopts=None): def instance(ui, path, create, intents=None, createopts=None):
if create: if create:
vfs = vfsmod.vfs(path, expandpath=True, realpath=True) createrepository(ui, path, createopts=createopts)
if vfs.exists('.hg'):
raise error.RepoError(_('repository %s already exists') % path)
createrepository(ui, vfs, createopts=createopts)
return localrepository(ui, util.urllocalpath(path), intents=intents) return localrepository(ui, util.urllocalpath(path), intents=intents)
def islocal(path): def islocal(path):
return True return True
def newreporequirements(ui, createopts=None): def newreporequirements(ui, createopts=None):
"""Determine the set of requirements for a new local repository. """Determine the set of requirements for a new local repository.
Extensions can wrap this function to filter out creation options Extensions can wrap this function to filter out creation options
they know how to handle. they know how to handle.
""" """
known = {'narrowfiles'} known = {'narrowfiles'}
return {k: v for k, v in createopts.items() if k not in known} return {k: v for k, v in createopts.items() if k not in known}
def createrepository(ui, wdirvfs, createopts=None): def createrepository(ui, path, createopts=None):
"""Create a new repository in a vfs. """Create a new repository in a vfs.
``wdirvfs`` is a vfs instance pointing at the working directory. ``path`` path to the new repo's working directory.
``createopts`` options for the new repository. ``createopts`` options for the new repository.
""" """
createopts = createopts or {} createopts = createopts or {}
unknownopts = filterknowncreateopts(ui, createopts) unknownopts = filterknowncreateopts(ui, createopts)
if not isinstance(unknownopts, dict): if not isinstance(unknownopts, dict):
raise error.ProgrammingError('filterknowncreateopts() did not return ' raise error.ProgrammingError('filterknowncreateopts() did not return '
'a dict') 'a dict')
if unknownopts: if unknownopts:
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') %
', '.sorted(unknownopts), ', '.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)
if not wdirvfs.exists(): if not wdirvfs.exists():
wdirvfs.makedirs() wdirvfs.makedirs()
hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
if hgvfs.exists():
raise error.RepoError(_('repository %s already exists') % path)
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