[patch] 2 win32 bugs

[Alexey Shamrin]

Hello!

I have noticed that (simple) fixes for 2 serious windows bugs are not
yet included in official bzr.dev. So I decided to put a branch on a
server:

http://nicecode.org/bzr/branches/win32.essential

I have also changed NEWS :-)

Here is a diff:

=== modified file 'NEWS'
--- NEWS
+++ NEWS
@@ -68,6 +68,10 @@

     * Fix representation of tab characters in commit messages.  (Harald
       Meland)
+
+    * Fix for bzr pull failing sometimes under windows
+
+    * Fix for sftp transport under windows when using interactive auth

   TESTING:


=== modified file 'bzrlib/merge.py'
--- bzrlib/merge.py
+++ bzrlib/merge.py
@@ -559,7 +559,7 @@
                 if path == '.':
                     path = ''
                 else:
-                    assert path.startswith('.' + os.sep), "path is %s" % path
+                    assert path.startswith('.' + '/') or
path.startswith('.' + '\\'), "path is %s" % path
                 path = path[2:]
             adjust_ids.append((path, id))
         if len(adjust_ids) > 0:

=== modified file 'bzrlib/transport/sftp.py'
--- bzrlib/transport/sftp.py
+++ bzrlib/transport/sftp.py
@@ -446,7 +446,8 @@
                 pass

         # give up and ask for a password
-        password = getpass.getpass('SSH %s@%s password: ' %
(self._username, self._host))
+        enc = sys.stdout.encoding
+        password = getpass.getpass('SSH %s@%s password: ' %
(self._username.encode(enc,'replace'), self._host.encode(enc)))
         try:
             transport.auth_password(self._username, password)
         except paramiko.SSHException:

ash at nicecode:~/win32 $


--
Alexey