comparison mercurial/hgweb.py @ 134:13d609f8d830

fix problem with non wrapping file list fix file list not appearing in checkin
author jake@edge2.net
date Sat, 21 May 2005 16:21:16 -0700
parents fb84d3e71042
children c0faf50822ea
comparison
equal deleted inserted replaced
133:fb84d3e71042 134:13d609f8d830
136 files.append('<a href="?cmd=file;cs=%s;fn=%s">%s</a>&nbsp;&nbsp;' \ 136 files.append('<a href="?cmd=file;cs=%s;fn=%s">%s</a>&nbsp;&nbsp;' \
137 % (hn, f, cgi.escape(f))) 137 % (hn, f, cgi.escape(f)))
138 print self.tmpl.do_page('change_table.tmpl', 138 print self.tmpl.do_page('change_table.tmpl',
139 author=obfuscate(changes[1]), 139 author=obfuscate(changes[1]),
140 desc=nl2br(cgi.escape(changes[4])), date=datestr, 140 desc=nl2br(cgi.escape(changes[4])), date=datestr,
141 files=''.join(files), revnum=i, revnode=hn) 141 files=' '.join(files), revnum=i, revnode=hn)
142 142
143 class checkin(page): 143 class checkin(page):
144 def __init__(self, repo, tmpl_dir, nodestr): 144 def __init__(self, repo, tmpl_dir, nodestr):
145 page.__init__(self, tmpl_dir) 145 page.__init__(self, tmpl_dir)
146 self.repo = repo 146 self.repo = repo
166 166
167 print self.tmpl.do_page('checkin.tmpl', revnum=i, revnode=self.nodestr, 167 print self.tmpl.do_page('checkin.tmpl', revnum=i, revnode=self.nodestr,
168 p1num=i1, p1node=h1, p2num=i2, p2node=h2, p2link=p2link, 168 p1num=i1, p1node=h1, p2num=i2, p2node=h2, p2link=p2link,
169 mfnum=self.repo.manifest.rev(changes[0]), 169 mfnum=self.repo.manifest.rev(changes[0]),
170 mfnode=hg.hex(changes[0]), author=obfuscate(changes[1]), 170 mfnode=hg.hex(changes[0]), author=obfuscate(changes[1]),
171 desc=nl2br(cgi.escape(changes[4])), date=datestr) 171 desc=nl2br(cgi.escape(changes[4])), date=datestr,
172 files=' '.join(files))
172 173
173 (c, a, d) = self.repo.diffrevs(parents[0], self.node) 174 (c, a, d) = self.repo.diffrevs(parents[0], self.node)
174 change = self.repo.changelog.read(parents[0]) 175 change = self.repo.changelog.read(parents[0])
175 mf2 = self.repo.manifest.read(change[0]) 176 mf2 = self.repo.manifest.read(change[0])
176 for f in c: 177 for f in c: