undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/remote-hg-shared-setup'

Browse Source 
* fc/remote-hg-shared-setup:
  remote-hg: add shared repo upgrade
  remote-hg: ensure shared repo is initialized
This commit is contained in:
Junio C Hamano 2013-09-04 12:36:32 -07:00
commit 4f5e9726e1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/remote-helpers/git-remote-hg
View File

@ -391,11 +391,24 @@ 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: # check and upgrade old organization
hg.clone(myui, {}, url, shared_path, update=False, pull=True) hg_path = os.path.join(shared_path, '.hg')
except: if os.path.exists(shared_path) and not os.path.exists(hg_path):
die('Repository error') repos = os.listdir(shared_path)
for x in repos:
local_hg = os.path.join(shared_path, x, 'clone', '.hg')
if not os.path.exists(local_hg):
continue
if not os.path.exists(hg_path):
shutil.move(local_hg, hg_path)
shutil.rmtree(os.path.join(shared_path, x, 'clone'))
# setup shared repo (if not there)
try:
hg.peer(myui, {}, shared_path, create=True)
except error.RepoError:
pass
if not os.path.exists(dirname): if not os.path.exists(dirname):
os.makedirs(dirname) os.makedirs(dirname)