Mercurial > hg
changeset 5505:8ce2dd9faa71
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 03 Nov 2007 17:06:44 +0100 |
parents | 8bc73135c453 (current diff) 48c22c719f8c (diff) |
children | be20a42f27a1 |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):