Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 10962:8d5f5122a732
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 19 Apr 2010 17:00:02 -0500 |
parents | ca739acf1a98 61cd6653f846 |
children | 9e314c5e6890 |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Apr 16 23:59:43 2010 +0200 +++ b/mercurial/commands.py Mon Apr 19 17:00:02 2010 -0500 @@ -1178,7 +1178,9 @@ m = cmdutil.match(repo, pats, opts) if stat: it = patch.diff(repo, node1, node2, match=m, opts=diffopts) - width = ui.interactive() and util.termwidth() or 80 + width = 80 + if not ui.plain(): + width = util.termwidth() for chunk, label in patch.diffstatui(util.iterlines(it), width=width, git=diffopts.git): ui.write(chunk, label=label)