##// END OF EJS Templates
mercurial: fixed code against latest mercurial release....
marcink -
r310:4934d096 default
parent child Browse files
Show More
@@ -453,10 +453,9 b' class HgRemote(object):'
453 fctx = ctx.filectx(path)
453 fctx = ctx.filectx(path)
454
454
455 result = []
455 result = []
456 for i, annotate_data in enumerate(fctx.annotate()):
456 for i, (a_line, content) in enumerate(fctx.annotate()):
457 ln_no = i + 1
457 ln_no = i + 1
458 node_info, content = annotate_data
458 sha = hex(a_line.fctx.node())
459 sha = hex(node_info[0].node())
460 result.append((ln_no, sha, content))
459 result.append((ln_no, sha, content))
461 return result
460 return result
462
461
@@ -20,10 +20,10 b' Mercurial libs compatibility'
20 """
20 """
21
21
22 import mercurial
22 import mercurial
23 import mercurial.demandimport
23 from mercurial import demandimport
24 # patch demandimport, due to bug in mercurial when it always triggers
24 # patch demandimport, due to bug in mercurial when it always triggers
25 # demandimport.enable()
25 # demandimport.enable()
26 mercurial.demandimport.enable = lambda *args, **kwargs: 1
26 demandimport.enable = lambda *args, **kwargs: 1
27
27
28 from mercurial import ui
28 from mercurial import ui
29 from mercurial import patch
29 from mercurial import patch
General Comments 0
You need to be logged in to leave comments. Login now