diff --git a/hggit/git_handler.py b/hggit/git_handler.py index 64fa5ea18b89f823339fe002a75d78edf5d235af_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..5fa9649c4ef6abf2d877b0a52e8432ae580eb6f2_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -376,9 +376,10 @@ ## CHANGESET CONVERSION METHODS def export_git_objects(self): - clnode = self.repo.changelog.node - nodes = [clnode(n) for n in self.repo] - export = [node for node in nodes if not hex(node) in self._map_hg] + repo = self.repo + clnode = repo.changelog.node + nodes = [clnode(n) for n in repo] + export = [repo[node] for node in nodes if not hex(node) in self._map_hg] total = len(export) if not total: return @@ -391,7 +392,7 @@ # and therefore export, is in topological order. By definition, # export[0]'s parents must be present in Git, so we start the # incremental exporter from there. - pctx = self.repo[export[0]].p1() + pctx = export[0].p1() pnode = pctx.node() if pnode == nullid: gitcommit = None @@ -406,5 +407,5 @@ exporter = hg2git.IncrementalChangesetExporter( self.repo, pctx, self.git.object_store, gitcommit) - for i, rev in enumerate(export): + for i, ctx in enumerate(export): self.ui.progress('exporting', i, total=total) @@ -410,7 +411,6 @@ self.ui.progress('exporting', i, total=total) - ctx = self.repo.changectx(rev) state = ctx.extra().get('hg-git', None) if state == 'octopus': self.ui.debug("revision %d is a part " "of octopus explosion\n" % ctx.rev()) continue @@ -412,9 +412,9 @@ state = ctx.extra().get('hg-git', None) if state == 'octopus': self.ui.debug("revision %d is a part " "of octopus explosion\n" % ctx.rev()) continue - self.export_hg_commit(rev, exporter) + self.export_hg_commit(ctx.node(), exporter) self.ui.progress('exporting', None, total=total)