remote-hg: ensure shared repo is initialized

6796d49 (remote-hg: use a shared repository store) introduced a bug by
making the shared repository '.git/hg', which is already used before
that patch, so clones that happened before that patch, fail after that
patch, because there's no shared Mercurial repo.

So, instead of simply checking if the directory exists, let's always try
to create an empty shared repository to ensure it's there. This works
because we don't need the initial clone, if the repository is shared,
pulling from the child updates the parent's storage; it's exactly the
same as cloning, so we can simplify the shared repo setup this way while
at the same time fixing the problem.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 2013-08-09 17:38:03 -05:00 committed by Junio C Hamano
parent b48493e937
commit 52f0856a7b
1 changed files with 6 additions and 5 deletions

View File

@ -391,11 +391,12 @@ def get_repo(url, alias):
os.makedirs(dirname) os.makedirs(dirname)
else: else:
shared_path = os.path.join(gitdir, 'hg') shared_path = os.path.join(gitdir, 'hg')
if not os.path.exists(shared_path):
try: # setup shared repo (if not there)
hg.clone(myui, {}, url, shared_path, update=False, pull=True) try:
except: hg.peer(myui, {}, shared_path, create=True)
die('Repository error') except error.RepoError:
pass


if not os.path.exists(dirname): if not os.path.exists(dirname):
os.makedirs(dirname) os.makedirs(dirname)