Skip to content
Snippets Groups Projects
Commit 6eded2e4 authored by Augie Fackler's avatar Augie Fackler
Browse files

Un-break hg 1.3 by adding a compat layer for progress.

parent 3ab3765d
No related branches found
No related tags found
No related merge requests found
......@@ -17,7 +17,7 @@
import os
from mercurial import commands, extensions, hg, util
from mercurial import commands, extensions, hg, util as hgutil
from mercurial.i18n import _
import gitrepo, hgrepo
......@@ -32,7 +32,7 @@
_oldlocal = hg.schemes['file']
def _local(path):
p = util.drop_scheme('file', path)
p = hgutil.drop_scheme('file', path)
if (os.path.exists(os.path.join(p, '.git')) and
not os.path.exists(os.path.join(p, '.hg'))):
return gitrepo
......
......@@ -13,6 +13,7 @@
from mercurial import context, util as hgutil
from mercurial import error
import util
class GitHandler(object):
mapfile = 'git-mapfile'
......@@ -176,7 +177,7 @@
export = [node for node in nodes if not hex(node) in self._map_hg]
total = len(export)
for i, rev in enumerate(export):
self.ui.progress('import', i, total=total)
util.progress(self.ui, 'import', i, total=total)
ctx = self.repo.changectx(rev)
state = ctx.extra().get('hg-git', None)
if state == 'octopus':
......@@ -184,7 +185,7 @@
"of octopus explosion\n" % ctx.rev())
continue
self.export_hg_commit(rev)
self.ui.progress('import', None, total=total)
util.progress(self.ui, 'import', None, total=total)
# convert this commit into git objects
......@@ -401,6 +402,6 @@
# import each of the commits, oldest first
total = len(commits)
for i, csha in enumerate(commits):
self.ui.progress('import', i, total=total, unit='commits')
util.progress(self.ui, 'import', i, total=total, unit='commits')
commit = convert_list[csha]
self.import_git_commit(commit)
......@@ -405,6 +406,6 @@
commit = convert_list[csha]
self.import_git_commit(commit)
self.ui.progress('import', None, total=total, unit='commits')
util.progress(self.ui, 'import', None, total=total, unit='commits')
def import_git_commit(self, commit):
self.ui.debug(_("importing: %s\n") % commit.id)
......
"""Compatability functions for old Mercurial versions."""
def progress(ui, *args, **kwargs):
"""Shim for progress on hg < 1.4. Remove when 1.3 is dropped."""
getattr(ui, 'progress', lambda *x, **kw: None)(*args, **kwargs)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment