diff --git a/hg-fast-export.py b/hg-fast-export.py index c5f6f5d..bf8c310 100755 --- a/hg-fast-export.py +++ b/hg-fast-export.py @@ -488,7 +488,9 @@ def branchtip(repo, heads): def verify_heads(ui,repo,cache,force,ignore_unnamed_heads,branchesmap): branches={} - for bn, heads in repo.branchmap().iteritems(): + + for bn in repo.branchmap(): + heads = repo.branchmap().branchheads(bn) branches[bn] = branchtip(repo, heads) l=[(-repo.changelog.rev(n), n, t) for t, n in branches.items()] l.sort() diff --git a/hg2git.py b/hg2git.py index 73b475c..0bc74ff 100755 --- a/hg2git.py +++ b/hg2git.py @@ -30,6 +30,14 @@ def set_origin_name(name): origin_name = name.encode('utf8') def setup_repo(url): + try: + # Mercurial >= 7.2 requires explicit initialization for largefile + # support to work. + from mercurial import initialization + initialization.init() + except ImportError: + pass + try: myui=ui.ui(interactive=False) except TypeError: