diff --git a/hggit/git_handler.py b/hggit/git_handler.py
index e41773ad35842f3c6dbda7e6650f21ba8d28d1cc_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..108d9303ef7152f14385c8982cf93457c954b766_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -550,7 +550,7 @@
 
         oldenc = self.swap_out_encoding()
 
-        ctx = self.repo.changectx(rev)
+        ctx = self.repo[rev]
         extra = ctx.extra()
 
         commit = Commit()
@@ -874,7 +874,7 @@
             self.git_file_readlines(git_commit_tree, '.hgsubstate'))
         parentsubdata = ''
         if gparents:
-            p1ctx = self.repo.changectx(gparents[0])
+            p1ctx = self.repo[gparents[0]]
             if '.hgsubstate' in p1ctx:
                 parentsubdata = p1ctx.filectx('.hgsubstate').data()
                 parentsubdata = parentsubdata.splitlines()
@@ -958,8 +958,8 @@
             # begin with).
             if p2 == nullid:
                 return []
-            manifest1 = self.repo.changectx(p1).manifest()
-            manifest2 = self.repo.changectx(p2).manifest()
+            manifest1 = self.repo[p1].manifest()
+            manifest2 = self.repo[p2].manifest()
             return [path for path, node1 in manifest1.iteritems() if path not
                     in files and manifest2.get(path, node1) != node1]