Show More
@@ -2378,12 +2378,7 b' def undoname(fn):' | |||||
2378 |
|
2378 | |||
2379 | def instance(ui, path, create, intents=None, createopts=None): |
|
2379 | def instance(ui, path, create, intents=None, createopts=None): | |
2380 | if create: |
|
2380 | if create: | |
2381 | vfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
2381 | createrepository(ui, path, createopts=createopts) | |
2382 |
|
||||
2383 | if vfs.exists('.hg'): |
|
|||
2384 | raise error.RepoError(_('repository %s already exists') % path) |
|
|||
2385 |
|
||||
2386 | createrepository(ui, vfs, createopts=createopts) |
|
|||
2387 |
|
2382 | |||
2388 | return localrepository(ui, util.urllocalpath(path), intents=intents) |
|
2383 | return localrepository(ui, util.urllocalpath(path), intents=intents) | |
2389 |
|
2384 | |||
@@ -2459,10 +2454,10 b' def filterknowncreateopts(ui, createopts' | |||||
2459 |
|
2454 | |||
2460 | return {k: v for k, v in createopts.items() if k not in known} |
|
2455 | return {k: v for k, v in createopts.items() if k not in known} | |
2461 |
|
2456 | |||
2462 |
def createrepository(ui, |
|
2457 | def createrepository(ui, path, createopts=None): | |
2463 | """Create a new repository in a vfs. |
|
2458 | """Create a new repository in a vfs. | |
2464 |
|
2459 | |||
2465 | ``wdirvfs`` is a vfs instance pointing at the working directory. |
|
2460 | ``path`` path to the new repo's working directory. | |
2466 | ``createopts`` options for the new repository. |
|
2461 | ``createopts`` options for the new repository. | |
2467 | """ |
|
2462 | """ | |
2468 | createopts = createopts or {} |
|
2463 | createopts = createopts or {} | |
@@ -2481,10 +2476,14 b' def createrepository(ui, wdirvfs, create' | |||||
2481 |
|
2476 | |||
2482 | requirements = newreporequirements(ui, createopts=createopts) |
|
2477 | requirements = newreporequirements(ui, createopts=createopts) | |
2483 |
|
2478 | |||
|
2479 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |||
2484 | if not wdirvfs.exists(): |
|
2480 | if not wdirvfs.exists(): | |
2485 | wdirvfs.makedirs() |
|
2481 | wdirvfs.makedirs() | |
2486 |
|
2482 | |||
2487 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
2483 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) | |
|
2484 | if hgvfs.exists(): | |||
|
2485 | raise error.RepoError(_('repository %s already exists') % path) | |||
|
2486 | ||||
2488 | hgvfs.makedir(notindexed=True) |
|
2487 | hgvfs.makedir(notindexed=True) | |
2489 |
|
2488 | |||
2490 | if b'store' in requirements: |
|
2489 | if b'store' in requirements: |
General Comments 0
You need to be logged in to leave comments.
Login now