Linefeed symbols appear in notepad

[Matthew Steeples]

On Win32 0.16rc1:
In a branch, make some changes and then run bzr --commit
In the notepad window that pops up, the entire file is on one line and the squares appear where CR+LF would usually be. I don't know if this is an actual problem for checking in (I'm guessing not) but it doesn't look too pretty.

Windows XP SP2

This used to work in 0.14 and before (didn't get chance to try 0.15)

[Alexander Belchenko (bialix)]

Confirmed. This is regression.

Actually bug in the code that write commit template to the file. Now it use unix line-endings (LF-only), but notepad don't understand this. It requires CRLF.

To fix problem need to change code that open file before write: mode should be 'w' not 'wb'.

[Alexander Belchenko (bialix)]

Actually this bug exists an in 0.15 too. And I believe it caused by this statement:

msgfile = os.fdopen(tmp_fileno, 'w')

[Alexander Belchenko (bialix)]

Bug caused by the code:

        tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
        msgfile = os.fdopen(tmp_fileno, 'w')

By default mkstemp open file in binary mode. In 0.14 and before we explicitly re-open file in text mode. Now should be used such fix:

=== modified file 'bzrlib/msgeditor.py'
--- bzrlib/msgeditor.py 2007-02-26 21:48:05 +0000
+++ bzrlib/msgeditor.py 2007-04-29 07:28:14 +0000
@@ -103,7 +103,9 @@

     msgfilename = None
     try:
- tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
+ tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
+ dir=u'.',
+ text=True)
         msgfile = os.fdopen(tmp_fileno, 'w')
         try:
             if start_message is not None:

[Alexander Belchenko (bialix)]

fix and test to prevent regression in the future in associated branch

[Matthew Steeples (matthew.steeples)]

Thanks very much for the rapid turnaround. Works perfectly now.

[Alexander Belchenko (bialix)]

Fix already in 0.16rc2 and corresponding tests in bzr.dev