comparison mercurial/hgweb/hgweb_mod.py @ 2900:26c37ebda1bb

hgweb: partially revert 4ec58b157265 The change from self.repo.ui.diffopts() to ui.diffopts() causes a traceback when the diff of a changeset should be displayed in the web interface. Revert to self.repo.ui.diffopts() for now.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Mon, 14 Aug 2006 16:06:37 +0300
parents cf86bbb8ed68
children ef8ee4477019
comparison
equal deleted inserted replaced
2885:bd29a3067b97 2900:26c37ebda1bb
132 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5] 132 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5]
133 if files: 133 if files:
134 modified, added, removed = map(lambda x: filterfiles(files, x), 134 modified, added, removed = map(lambda x: filterfiles(files, x),
135 (modified, added, removed)) 135 (modified, added, removed))
136 136
137 diffopts = ui.diffopts() 137 diffopts = self.repo.ui.diffopts()
138 for f in modified: 138 for f in modified:
139 to = r.file(f).read(mmap1[f]) 139 to = r.file(f).read(mmap1[f])
140 tn = r.file(f).read(mmap2[f]) 140 tn = r.file(f).read(mmap2[f])
141 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, 141 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
142 opts=diffopts), f, tn) 142 opts=diffopts), f, tn)