Mercurial > public > mercurial-scm > hg
diff mercurial/cmdutil.py @ 11958:60bfb876dc45
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 17 Aug 2010 17:44:19 -0500 |
| parents | a80577bfea29 d157e040ac4c |
| children | ad787252fed6 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Aug 17 17:41:20 2010 -0500 +++ b/mercurial/cmdutil.py Tue Aug 17 17:44:19 2010 -0500 @@ -663,7 +663,7 @@ fp.write(s) if stat: - diffopts.context = 0 + diffopts = diffopts.copy(context=0) width = 80 if not ui.plain(): width = util.termwidth() @@ -803,10 +803,17 @@ matchfn = self.patch if matchfn: stat = self.diffopts.get('stat') + diff = self.diffopts.get('patch') diffopts = patch.diffopts(self.ui, self.diffopts) prev = self.repo.changelog.parents(node)[0] - diffordiffstat(self.ui, self.repo, diffopts, prev, node, - match=matchfn, stat=stat) + if stat: + diffordiffstat(self.ui, self.repo, diffopts, prev, node, + match=matchfn, stat=True) + if diff: + if stat: + self.ui.write("\n") + diffordiffstat(self.ui, self.repo, diffopts, prev, node, + match=matchfn, stat=False) self.ui.write("\n") def _meaningful_parentrevs(self, log, rev):