# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-08-02 15:55:51
# Node ID b43cfaf571d600a3b0699c4a077b3cf9d8c3975e
# Parent  7469ff87212258341e0fef5a4d5ead40456104ce
# Parent  386e56ecfb78a9bda4b2699dd1ac2dceea5e3945

Merge with stable

diff --git a/hgext/color.py b/hgext/color.py
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -154,7 +154,7 @@ class colorui(uimod.ui):
             self._buffers[-1].extend([(str(a), label) for a in args])
         elif self._colormode == 'win32':
             for a in args:
-                win32print(a, orig, **opts)
+                win32print(a, super(colorui, self).write, **opts)
         else:
             return super(colorui, self).write(
                 *[self.label(str(a), label) for a in args], **opts)
@@ -163,9 +163,9 @@ class colorui(uimod.ui):
         label = opts.get('label', '')
         if self._colormode == 'win32':
             for a in args:
-                win32print(a, orig, **opts)
+                win32print(a, super(colorui, self).write_err, **opts)
         else:
-            return super(colorui, self).write(
+            return super(colorui, self).write_err(
                 *[self.label(str(a), label) for a in args], **opts)
 
     def label(self, msg, label):
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -81,7 +81,7 @@ class progresssource(object):
 
     def getfile(self, file, rev):
         self.retrieved += 1
-        self.ui.progress(_('retrieving file'), self.retrieved,
+        self.ui.progress(_('getting files'), self.retrieved,
                          item=file, total=self.filecount)
         return self.source.getfile(file, rev)
 
@@ -89,7 +89,7 @@ class progresssource(object):
         return self.source.lookuprev(rev)
 
     def close(self):
-        self.ui.progress(_('retrieving file'), None)
+        self.ui.progress(_('getting files'), None)
 
 class converter(object):
     def __init__(self, ui, source, dest, revmapfile, opts):
diff --git a/tests/test-convert-svn-move.out b/tests/test-convert-svn-move.out
--- a/tests/test-convert-svn-move.out
+++ b/tests/test-convert-svn-move.out
@@ -88,30 +88,30 @@ scanning [   <=>                        
 scanning [    <=>                                                           ] 4
                                                                                 
 converting [                                                              ] 0/4
-retrieving file [==========>                                              ] 1/5
-retrieving file [=====================>                                   ] 2/5
-retrieving file [=================================>                       ] 3/5
-retrieving file [============================================>            ] 4/5
-retrieving file [========================================================>] 5/5
+getting files [==========>                                                ] 1/5
+getting files [======================>                                    ] 2/5
+getting files [==================================>                        ] 3/5
+getting files [==============================================>            ] 4/5
+getting files [==========================================================>] 5/5
                                                                                 
 converting [==============>                                               ] 1/4
 scanning paths [                                                          ] 0/1
                                                                                 
-retrieving file [========================================================>] 1/1
+getting files [==========================================================>] 1/1
                                                                                 
 converting [==============================>                               ] 2/4
 scanning paths [                                                          ] 0/2
 scanning paths [============================>                             ] 1/2
                                                                                 
-retrieving file [=============>                                           ] 1/4
-retrieving file [===========================>                             ] 2/4
-retrieving file [=========================================>               ] 3/4
-retrieving file [========================================================>] 4/4
+getting files [=============>                                             ] 1/4
+getting files [============================>                              ] 2/4
+getting files [===========================================>               ] 3/4
+getting files [==========================================================>] 4/4
                                                                                 
 converting [=============================================>                ] 3/4
 scanning paths [                                                          ] 0/1
                                                                                 
-retrieving file [========================================================>] 1/1
+getting files [==========================================================>] 1/1
                                                                                 
 initializing destination hg-progress repository
 scanning source...
diff --git a/tests/test-ui-color.py b/tests/test-ui-color.py
new file mode 100644
--- /dev/null
+++ b/tests/test-ui-color.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+from hgext import color
+
+# ensure errors aren't buffered
+testui = color.colorui()
+testui.pushbuffer()
+testui.write('buffered\n')
+testui.warn('warning\n')
+testui.write_err('error\n')
+print repr(testui.popbuffer())
diff --git a/tests/test-ui-color.py.out b/tests/test-ui-color.py.out
new file mode 100644
--- /dev/null
+++ b/tests/test-ui-color.py.out
@@ -0,0 +1,3 @@
+warning
+error
+'buffered\n'