Merge with crew-stable

contrib/win32/win32-build.txt

@@ -21,6 +21,9 b' It has the following prerequisites, at l'
   The py2exe distutils extension
       http://sourceforge.net/projects/py2exe/
 
+  GnuWin32 gettext utility
+      http://gnuwin32.sourceforge.net/packages/gettext.htm
+
   Inno Setup
       http://www.jrsoftware.org/isinfo.php
 

mercurial/windows.py

@@ -41,6 +41,7 b' class winstdout(object):'
             limit = 16000
             l = len(s)
             start = 0
+            self.softspace = 0;
             while start < l:
                 end = start + limit
                 self.fp.write(s[start:end])

tests/test-demandimport.py

@@ -36,5 +36,5 b' print "fred.sub =", f(fred.sub)'
 print "fred =", f(fred)
 
 print "re =", f(re)
-print "re.stdout =", f(re.stdout)
+print "re.stderr =", f(re.stderr)
 print "re =", f(re)

tests/test-demandimport.py.out

@@ -11,5 +11,5 b" fred = <unloaded module 're'>"
 fred.sub = <function sub at 0x?>
 fred = <proxied module 're'>
 re = <unloaded module 'sys'>
-re.stdout = <open file '<stdout>', mode 'w' at 0x?>
+re.stderr = <open file '<stderr>', mode 'w' at 0x?>
 re = <proxied module 'sys'>