# HG changeset patch # User Giorgos Keramidas # Date 1155560797 -10800 # Node ID 26c37ebda1bb1bf8670a4297c00a265247ec0939 # Parent bd29a3067b97ec4c28a46dc634ad6cbcb440e11b 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. diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -134,7 +134,7 @@ class hgweb(object): modified, added, removed = map(lambda x: filterfiles(files, x), (modified, added, removed)) - diffopts = ui.diffopts() + diffopts = self.repo.ui.diffopts() for f in modified: to = r.file(f).read(mmap1[f]) tn = r.file(f).read(mmap2[f])