Mercurial > hg > hg-git
comparison hggit/git_handler.py @ 307:7dfe8be21135
handle apply_delta() return value correctly
dulwich recently changed apply_delta() [1] to return lists. Invoke
join() on the output with an empty string, as dulwich does in its
codebase.
[1] git reference: a2709f6 (Return chunks from apply_delta.)
| author | Tay Ray Chuan <rctay89@gmail.com> |
|---|---|
| date | Fri, 02 Apr 2010 19:56:50 +0800 |
| parents | 7ddb740ac7cc |
| children | 062dd311708d |
comparison
equal
deleted
inserted
replaced
| 303:126ce54030f5 | 307:7dfe8be21135 |
|---|---|
| 259 author = name + ' <' + email + '>' | 259 author = name + ' <' + email + '>' |
| 260 else: | 260 else: |
| 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 |
| 268 def get_git_parents(self, ctx): | 268 def get_git_parents(self, ctx): |
| 269 def is_octopus_part(ctx): | 269 def is_octopus_part(ctx): |
| 287 def get_git_message(self, ctx): | 287 def get_git_message(self, ctx): |
| 288 extra = ctx.extra() | 288 extra = ctx.extra() |
| 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 |
| 296 extra_message = '' | 296 extra_message = '' |
| 297 if not ctx.branch() == 'default': | 297 if not ctx.branch() == 'default': |