comparison mercurial/hgweb/webutil.py @ 6437:101526031d06

hgweb: fix merge breakage
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Mar 2008 23:14:25 -0500
parents 62e0bb41e682
children f6c00b17387c
comparison
equal deleted inserted replaced
6436:856ae126f48c 6437:101526031d06
69 d['file'] = s.path() 69 d['file'] = s.path()
70 d.update(args) 70 d.update(args)
71 yield d 71 yield d
72 72
73 def renamelink(fctx): 73 def renamelink(fctx):
74 r = fctx.renamed(node) 74 r = fctx.renamed()
75 if r: 75 if r:
76 return [dict(file=r[0], node=hex(r[1]))] 76 return [dict(file=r[0], node=hex(r[1]))]
77 return [] 77 return []
78 78
79 def nodetagsdict(repo, node): 79 def nodetagsdict(repo, node):