Unified · Split
| @@ -261,7 +261,7 @@ class GitHandler(object): · 260 unmodified lines | |||
| 261 | author = author + ' <none@none>' | 261 | author = author + ' <none@none>' |
| 262 | 262 | ||
| 263 | if 'author' in ctx.extra(): | 263 | if 'author' in ctx.extra(): |
| 264 | author = apply_delta(author, ctx.extra()['author']) | 264 | author = "".join(apply_delta(author, ctx.extra()['author'])) |
| 265 | 265 | ||
| 266 | return author | 266 | return author |
| 267 | 267 | ||
| @@ -289,7 +289,7 @@ class GitHandler(object): · 21 unmodified lines | |||
| 289 | 289 | ||
| 290 | message = ctx.description() + "\n" | 290 | message = ctx.description() + "\n" |
| 291 | if 'message' in extra: | 291 | if 'message' in extra: |
| 292 | message = apply_delta(message, extra['message']) | 292 | message = "".join(apply_delta(message, extra['message'])) |
| 293 | 293 | ||
| 294 | # HG EXTRA INFORMATION | 294 | # HG EXTRA INFORMATION |
| 295 | add_extras = False | 295 | add_extras = False |
| @@ -363,7 +363,7 @@ class GitHandler(object): · 67 unmodified lines | |||
| 363 | if sha in self.git.object_store: | 363 | if sha in self.git.object_store: |
| 364 | obj = self.git.get_object(sha) | 364 | obj = self.git.get_object(sha) |
| 365 | while isinstance(obj, Tag): | 365 | while isinstance(obj, Tag): |
| 366 | obj_type, sha = obj.get_object() | 366 | obj_type, sha = obj._get_object() |
| 367 | obj = self.git.get_object(sha) | 367 | obj = self.git.get_object(sha) |
| 368 | if isinstance (obj, Commit) and sha not in seenheads: | 368 | if isinstance (obj, Commit) and sha not in seenheads: |
| 369 | seenheads.add(sha) | 369 | seenheads.add(sha) |
| @@ -666,7 +666,7 @@ class GitHandler(object): · 296 unmodified lines | |||
| 666 | sha = self.map_hg_get(refs[k]) | 666 | sha = self.map_hg_get(refs[k]) |
| 667 | self.tags[ref_name] = sha | 667 | self.tags[ref_name] = sha |
| 668 | elif isinstance (obj, Tag): # annotated | 668 | elif isinstance (obj, Tag): # annotated |
| 669 | (obj_type, obj_sha) = obj.get_object() | 669 | (obj_type, obj_sha) = obj._get_object() |
| 670 | obj = self.git.get_object(obj_sha) | 670 | obj = self.git.get_object(obj_sha) |
| 671 | if isinstance (obj, Commit): | 671 | if isinstance (obj, Commit): |
| 672 | sha = self.map_hg_get(obj_sha) | 672 | sha = self.map_hg_get(obj_sha) |