mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/remote-hg-fixup-url'

Browse Source 
Update to the Hg remote helper (in contrib/).

* fc/remote-hg-fixup-url:
  remote-hg: store converted URL
This commit is contained in:
Junio C Hamano
2013-01-21 20:15:32 -08:00
parent aa0ae51048 e6bc8a3328
commit 9a69ef1e70
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,6 +720,14 @@ def do_export(parser):
if peer: if peer:
parser.repo.push(peer, force=False) parser.repo.push(peer, force=False)
def fix_path(alias, repo, orig_url):
repo_url = util.url(repo.url())
url = util.url(orig_url)
if str(url) == str(repo_url):
return
cmd = ['git', 'config', 'remote.%s.url' % alias, "hg::%s" % repo_url]
subprocess.call(cmd)
def main(args): def main(args):
global prefix, dirname, branches, bmarks global prefix, dirname, branches, bmarks
global marks, blob_marks, parsed_refs global marks, blob_marks, parsed_refs
@ -766,6 +774,9 @@ def main(args):
repo = get_repo(url, alias) repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias prefix = 'refs/hg/%s' % alias
if not is_tmp:
fix_path(alias, peer or repo, url)
if not os.path.exists(dirname): if not os.path.exists(dirname):
os.makedirs(dirname) os.makedirs(dirname)