Browse Source

remote-hg: use a shared repository store

This way we don't have to have duplicated Mercurial objects.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
6796d49ed0
  1. 35
      contrib/remote-helpers/git-remote-hg

35
contrib/remote-helpers/git-remote-hg

@ -343,21 +343,29 @@ def get_repo(url, alias): @@ -343,21 +343,29 @@ def get_repo(url, alias):

if hg.islocal(url):
repo = hg.repository(myui, url)
if not os.path.exists(dirname):
os.makedirs(dirname)
else:
local_path = os.path.join(dirname, 'clone')
if not os.path.exists(local_path):
shared_path = os.path.join(gitdir, 'hg')
if not os.path.exists(shared_path):
try:
peer, dstpeer = hg.clone(myui, {}, url, local_path, update=True, pull=True)
hg.clone(myui, {}, url, shared_path, update=False, pull=True)
except:
die('Repository error')
repo = dstpeer.local()
else:
repo = hg.repository(myui, local_path)
try:
peer = hg.peer(myui, {}, url)
except:
die('Repository error')
repo.pull(peer, heads=None, force=True)

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

local_path = os.path.join(dirname, 'clone')
if not os.path.exists(local_path):
hg.share(myui, shared_path, local_path, update=False)

repo = hg.repository(myui, local_path)
try:
peer = hg.peer(myui, {}, url)
except:
die('Repository error')
repo.pull(peer, heads=None, force=True)

return repo

@ -898,7 +906,7 @@ def fix_path(alias, repo, orig_url): @@ -898,7 +906,7 @@ def fix_path(alias, repo, orig_url):
subprocess.call(cmd)

def main(args):
global prefix, dirname, branches, bmarks
global prefix, gitdir, dirname, branches, bmarks
global marks, blob_marks, parsed_refs
global peer, mode, bad_mail, bad_name
global track_branches, force_push, is_tmp
@ -944,9 +952,6 @@ def main(args): @@ -944,9 +952,6 @@ def main(args):
if not is_tmp:
fix_path(alias, peer or repo, url)

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

marks_path = os.path.join(dirname, 'marks-hg')
marks = Marks(marks_path)


Loading…
Cancel
Save