diff --git a/hggit/git_handler.py b/hggit/git_handler.py index 6866ae460ee75f5da13c639d66f117a748bdcea9_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..f6f84d51a15442ec60b50bb0b7d9c1de45744381_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -7,6 +7,7 @@ from dulwich.repo import Repo, check_ref_format from dulwich import client from dulwich import config as dul_config +from dulwich import diff_tree try: from mercurial import bookmarks @@ -1296,6 +1297,6 @@ if commit.parents: btree = self.git[commit.parents[0]].tree - changes = self.git.object_store.tree_changes(btree, tree) + changes = diff_tree.tree_changes(self.git.object_store, btree, tree) files = {} gitlinks = {} @@ -1300,6 +1301,8 @@ files = {} gitlinks = {} - for (oldfile, newfile), (oldmode, newmode), (oldsha, newsha) in changes: + for change in changes: + oldfile, oldmode, oldsha = change.old + newfile, newmode, newsha = change.new # actions are described by the following table ('no' means 'does not # exist'): # old new | action