Mercurial > hg
changeset 11958:60bfb876dc45
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 17 Aug 2010 17:44:19 -0500 |
| parents | 8439a7a2d613 (current diff) 03b5ad552b42 (diff) |
| children | be33381882ad |
| files | mercurial/cmdutil.py |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Tue Aug 17 17:41:20 2010 -0500 +++ b/i18n/pt_BR.po Tue Aug 17 17:44:19 2010 -0500 @@ -7835,7 +7835,7 @@ " :hg:`push` for a way to actively distribute your changes." msgstr "" " Consolida no repositório local mudanças nos arquivos dados. Ao\n" -" contrário do que ocorre um sistema de controle de versão\n" +" contrário do que ocorre em um sistema de controle de versão\n" " centralizado, esta operação é local. Veja :hg:`push` para um modo\n" " de distribuir ativamente suas mudanças."
--- 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):