History

Merge fix from Benoit Allard

Augie Fackler committed 16 years ago

Commit cb60dde2 parents 1bb87cf 4314f631 file · +2 −2Browse files

Unified · Split

hggit/git_handler.py+2−2
@@ -364,7 +364,7 @@ class GitHandler(object): · 363 unmodified lines
364 if sha in self.git.object_store:364 if sha in self.git.object_store:
365 obj = self.git.get_object(sha)365 obj = self.git.get_object(sha)
366 while isinstance(obj, Tag):366 while isinstance(obj, Tag):
367 obj_type, sha = obj._get_object()367 obj_type, sha = obj.object
368 obj = self.git.get_object(sha)368 obj = self.git.get_object(sha)
369 if isinstance (obj, Commit) and sha not in seenheads:369 if isinstance (obj, Commit) and sha not in seenheads:
370 seenheads.add(sha)370 seenheads.add(sha)
@@ -694,7 +694,7 @@ class GitHandler(object): · 323 unmodified lines
694 sha = self.map_hg_get(refs[k])694 sha = self.map_hg_get(refs[k])
695 self.tags[ref_name] = sha695 self.tags[ref_name] = sha
696 elif isinstance (obj, Tag): # annotated696 elif isinstance (obj, Tag): # annotated
697 (obj_type, obj_sha) = obj._get_object()697 (obj_type, obj_sha) = obj.object
698 obj = self.git.get_object(obj_sha)698 obj = self.git.get_object(obj_sha)
699 if isinstance (obj, Commit):699 if isinstance (obj, Commit):
700 sha = self.map_hg_get(obj_sha)700 sha = self.map_hg_get(obj_sha)