Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-01-30 09:59:02 +01:00
Code Issues Packages Projects Releases Activity

Fix failure to print error message in verify_heads

Browse Source 
On Python 3, `b'%s' % None` fails with a TypeError. In verify_heads,
an error message prints the sha1 of a git commit, but that sha1
can be None.

This commit instead prints `b'<None>'` if sha1 is None.
This commit is contained in:
chrisjbillington
2020-03-06 11:02:38 -05:00
parent 56da62847a
commit 48508ee299
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hg-fast-export.py
View File

@@ -483,7 +483,7 @@ def verify_heads(ui,repo,cache,force,branchesmap):
if sha1!=c:
stderr_buffer.write(
b'Error: Branch [%s] modified outside hg-fast-export:'
b'\n%s (repo) != %s (cache)\n' % (b, sha1, c)
b'\n%s (repo) != %s (cache)\n' % (b, b'<None>' if sha1 is None else sha1, c)
)
if not force: return False