# HG changeset patch # User Patrick Mezard # Date 1194106004 -3600 # Node ID 8ce2dd9faa71052b5a2a662b1ae6aa80cdbfd074 # Parent 8bc73135c4532490f619502b57e95fc19206c609# Parent 48c22c719f8c264d9f38738649a4610776430ddb Merge with crew-stable diff -r 8bc73135c453 -r 8ce2dd9faa71 mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Fri Nov 02 14:45:05 2007 -0700 +++ b/mercurial/hgweb/hgweb_mod.py Sat Nov 03 17:06:44 2007 +0100 @@ -196,17 +196,17 @@ for f in modified: to = c1.filectx(f).data() tn = c2.filectx(f).data() - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f, opts=diffopts), f, tn) for f in added: to = None tn = c2.filectx(f).data() - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f, opts=diffopts), f, tn) for f in removed: to = c1.filectx(f).data() tn = None - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f, opts=diffopts), f, tn) def changelog(self, ctx, shortlog=False):