Mercurial > hg > gitserve

diff mercurial/hgweb/hgweb_mod.py @ 2894:3848488244fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move ui.diffopts to patch.diffopts where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 11:34:08 -0500
parents cf86bbb8ed68
children ef8ee4477019 ee6ed2b29e1a
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py	Mon Aug 14 15:07:00 2006 -0500
+++ b/mercurial/hgweb/hgweb_mod.py	Tue Aug 15 11:34:08 2006 -0500
@@ -11,7 +11,7 @@
 import mimetypes
 from mercurial.demandload import demandload
 demandload(globals(), "re zlib ConfigParser mimetools cStringIO sys tempfile")
-demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,streamclone")
+demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,streamclone,patch")
 demandload(globals(), "mercurial:templater")
 demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile")
 from mercurial.node import *
@@ -134,7 +134,7 @@
             modified, added, removed = map(lambda x: filterfiles(files, x),
                                            (modified, added, removed))
 
-        diffopts = ui.diffopts()
+        diffopts = patch.diffopts(ui)
         for f in modified:
             to = r.file(f).read(mmap1[f])
             tn = r.file(f).read(mmap2[f])