Mercurial > hg > hg-git

diff hggit/git_handler.py @ 307:7dfe8be21135

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -261,7 +261,7 @@
             author = author + ' <none@none>'
 
         if 'author' in ctx.extra():
-            author = apply_delta(author, ctx.extra()['author'])
+            author = "".join(apply_delta(author, ctx.extra()['author']))
 
         return author
 
@@ -289,7 +289,7 @@
 
         message = ctx.description() + "\n"
         if 'message' in extra:
-            message = apply_delta(message, extra['message'])
+            message = "".join(apply_delta(message, extra['message']))
 
         # HG EXTRA INFORMATION
         add_extras = False