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

verify_heads() needs to be aware of the branch renaming map

Browse Source 
As all branches created on the git side are transformed by
sanitize_name(), this should be a safe backwards compatible change. If a
user is doing incremental imports and sanitize_name() now suddenly
modifies the branch name, verify_heads() would already have complained
on the first incremental run.

Thanks goes to Steve Tousignant<s.tousignant@gmail.com> for discovering
the problem.
This commit is contained in:
Frej Drejhammar
2016-04-02 15:01:45 +02:00
parent 6d8b4dbb11
commit b7cc6ab3bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hg-fast-export.py
View File

@@ -327,7 +327,7 @@ def branchtip(repo, heads):
break
return tip
def verify_heads(ui,repo,cache,force):
def verify_heads(ui,repo,cache,force,branchesmap):
branches={}
for bn, heads in repo.branchmap().iteritems():
branches[bn] = branchtip(repo, heads)
@@ -337,7 +337,7 @@ def verify_heads(ui,repo,cache,force):
# get list of hg's branches to verify, don't take all git has
for _,_,b in l:
b=get_branch(b)
sha1=get_git_sha1(b)
sha1=get_git_sha1(sanitize_name(b,"branch",branchesmap))
c=cache.get(b)
if sha1!=c:
sys.stderr.write('Error: Branch [%s] modified outside hg-fast-export:'
@@ -368,7 +368,7 @@ def hg2git(repourl,m,marksfile,mappingfile,headsfile,tipfile,
ui,repo=setup_repo(repourl)
if not verify_heads(ui,repo,heads_cache,force):
if not verify_heads(ui,repo,heads_cache,force,branchesmap):
return 1
try: