Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2025-11-01 00:45:47 +01:00
Code Issues Packages Projects Releases Activity

Allow converting a repository with git and hg subrepos

Browse Source 
In the verification phase, fast-export falsely expects that both hg
and git subrepositories should have the appropriate line in the
subrepo-map file. The case is, that only hg subrepos need a line in
subrepo-map that references a converted subrepo, while git
subrepositories do not.
This commit is contained in:
Ondrej Stanek
2020-04-29 15:56:36 +02:00
committed by Frej Drejhammar
parent 595587b245
commit cf0e5837b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hg-fast-export.py
View File

@@ -525,14 +525,14 @@ def hg2git(repourl,m,marksfile,mappingfile,headsfile,tipfile,
mapping_cache[revnode.encode('hex_codec')] = str(rev)
if submodule_mappings:
# Make sure that all submodules are registered in the submodule-mappings file
# Make sure that all mercurial submodules are registered in the submodule-mappings file
for rev in range(0,max):
ctx=revsymbol(repo,str(rev))
if ctx.hidden():
continue
if ctx.substate:
for key in ctx.substate:
if key not in submodule_mappings:
if ctx.substate[key][2]=='hg' and key not in submodule_mappings:
sys.stderr.write("Error: %s not found in submodule-mappings\n" % (key))
return 1