# HG changeset patch # User Edouard Gomez # Date 1156285164 -7200 # Node ID abcd6ae3cf5a4f80f00fb26bdfb9fb599261e734 # Parent 6e49bb42620bb64d72d14c7e528f5a16ea842f5a Fix hgk extension due to 4ec58b157265 refactoring diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -46,18 +46,20 @@ def dodiff(fp, ui, repo, node1, node2, f if f in mmap: to = repo.file(f).read(mmap[f]) tn = read(f) + opts = mdiff.diffopts() + opts.text = text fp.write("diff --git a/%s b/%s\n" % (f, f)) - fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts)) for f in added: to = None tn = read(f) fp.write("diff --git /dev/null b/%s\n" % (f)) - fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts)) for f in removed: to = repo.file(f).read(mmap[f]) tn = None fp.write("diff --git a/%s /dev/null\n" % (f)) - fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts)) def difftree(ui, repo, node1=None, node2=None, **opts): """diff trees from two commits"""