--- a/mercurial/hgweb/hgweb_mod.py Sat Aug 12 16:05:09 2006 -0700
+++ b/mercurial/hgweb/hgweb_mod.py Sat Aug 12 16:13:27 2006 -0700
@@ -134,32 +134,22 @@
modified, added, removed = map(lambda x: filterfiles(files, x),
(modified, added, removed))
- diffopts = self.repo.ui.diffopts()
- showfunc = diffopts['showfunc']
- ignorews = diffopts['ignorews']
- ignorewsamount = diffopts['ignorewsamount']
- ignoreblanklines = diffopts['ignoreblanklines']
+ diffopts = ui.diffopts()
for f in modified:
to = r.file(f).read(mmap1[f])
tn = r.file(f).read(mmap2[f])
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
- showfunc=showfunc, ignorews=ignorews,
- ignorewsamount=ignorewsamount,
- ignoreblanklines=ignoreblanklines), f, tn)
+ opts=diffopts), f, tn)
for f in added:
to = None
tn = r.file(f).read(mmap2[f])
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
- showfunc=showfunc, ignorews=ignorews,
- ignorewsamount=ignorewsamount,
- ignoreblanklines=ignoreblanklines), f, tn)
+ opts=diffopts), f, tn)
for f in removed:
to = r.file(f).read(mmap1[f])
tn = None
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
- showfunc=showfunc, ignorews=ignorews,
- ignorewsamount=ignorewsamount,
- ignoreblanklines=ignoreblanklines), f, tn)
+ opts=diffopts), f, tn)
def changelog(self, pos, shortlog=False):
def changenav(**map):