branch | stable |
changeset 10948 | 61cd6653f846 |
parent 10933 | e3396b218e10 |
child 10962 | 8d5f5122a732 |
child 11007 | a0102da324ab |
--- a/mercurial/commands.py Sat Apr 17 15:35:34 2010 +0200 +++ b/mercurial/commands.py Thu Apr 15 18:52:59 2010 +0200 @@ -1158,7 +1158,9 @@ m = cmdutil.match(repo, pats, opts) it = patch.diff(repo, node1, node2, match=m, opts=diffopts) if stat: - width = ui.interactive() and util.termwidth() or 80 + width = 80 + if not ui.plain(): + width = util.termwidth() ui.write(patch.diffstat(util.iterlines(it), width=width, git=diffopts.git)) else: