Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sun, 17 Jun 2007 20:08:06 +0200
changeset 4597 ec431334e4fc
parent 4593 2937d0dbfab0 (current diff)
parent 4596 8e37342cb05d (diff)
child 4598 b25ee3f8f714
Merge with crew-stable
hgext/patchbomb.py
tests/test-patchbomb
tests/test-patchbomb.out
--- a/hgext/patchbomb.py	Sun Jun 17 14:11:30 2007 +0200
+++ b/hgext/patchbomb.py	Sun Jun 17 20:08:06 2007 +0200
@@ -380,6 +380,7 @@
         if bcc: m['Bcc'] = ', '.join(bcc)
         if opts['test']:
             ui.status('Displaying ', m['Subject'], ' ...\n')
+            ui.flush()
             fp = os.popen(os.getenv('PAGER', 'more'), 'w')
             try:
                 fp.write(m.as_string(0))
--- a/tests/test-patchbomb.out	Sun Jun 17 14:11:30 2007 +0200
+++ b/tests/test-patchbomb.out	Sun Jun 17 20:08:06 2007 +0200
@@ -1,4 +1,8 @@
 adding a
+This patch series consists of 1 patches.
+
+
+Displaying [PATCH] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -23,11 +27,14 @@
 @@ -0,0 +1,1 @@
 +a
 
-This patch series consists of 1 patches.
+adding b
+This patch series consists of 2 patches.
 
 
-Displaying [PATCH] a ...
-adding b
+Write the introductory message for the patch series.
+
+
+Displaying [PATCH 0 of 2] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -39,6 +46,7 @@
 Cc: bar
 
 
+Displaying [PATCH 1 of 2] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -64,6 +72,7 @@
 @@ -0,0 +1,1 @@
 +a
 
+Displaying [PATCH 2 of 2] b ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -95,15 +104,6 @@
 Write the introductory message for the patch series.
 
 
-Displaying [PATCH 0 of 2] test ...
-Displaying [PATCH 1 of 2] a ...
-Displaying [PATCH 2 of 2] b ...
-This patch series consists of 2 patches.
-
-
-Write the introductory message for the patch series.
-
-
 Writing [PATCH 0 of 2] test ...
 Writing [PATCH 1 of 2] a ...
 Writing [PATCH 2 of 2] b ...