# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1282085059 18000
# Node ID 60bfb876dc4545d5e1742e401d376c4f7f2e2d4b
# Parent  8439a7a2d61392df519d29490cc5aec72390df57# Parent  03b5ad552b425ee9c21bfc1e56a62e5a3efdb74e
merge with stable

diff -r 8439a7a2d613 -r 60bfb876dc45 i18n/pt_BR.po
--- 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."
 
diff -r 8439a7a2d613 -r 60bfb876dc45 mercurial/cmdutil.py
--- 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):