Mercurial > hg > hg-git

changeset 336:d61881f463ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fix from Benoit Allard
author Augie Fackler <durin42@gmail.com>
date Sat, 12 Jun 2010 21:19:40 -0500
parents eb345bacc1da (current diff) 628829fb92f1 (diff)
children 6cea997ee302
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -364,7 +364,7 @@
                 if sha in self.git.object_store:
                     obj = self.git.get_object(sha)
                     while isinstance(obj, Tag):
-                        obj_type, sha = obj._get_object()
+                        obj_type, sha = obj.object
                         obj = self.git.get_object(sha)
                     if isinstance (obj, Commit) and sha not in seenheads:
                         seenheads.add(sha)
@@ -694,7 +694,7 @@
                         sha = self.map_hg_get(refs[k])
                         self.tags[ref_name] = sha
                     elif isinstance (obj, Tag): # annotated
-                        (obj_type, obj_sha) = obj._get_object()
+                        (obj_type, obj_sha) = obj.object
                         obj = self.git.get_object(obj_sha)
                         if isinstance (obj, Commit):
                             sha = self.map_hg_get(obj_sha)