Rev 2524: Apply Colin Watson's patch fixing 120647 in http://bazaar.launchpad.net/~ian-clatworthy/bzr/bzr0.17

[Ian Clatworthy]

At http://bazaar.launchpad.net/~ian-clatworthy/bzr/bzr0.17

------------------------------------------------------------
revno: 2524
revision-id: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
parent: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 11:56:32 +1000
message:
  Apply Colin Watson's patch fixing 120647
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-06-12 06:36:54 +0000
+++ b/NEWS	2007-06-18 01:56:32 +0000
@@ -1,3 +1,11 @@
+bzr 0.17  2007-06-18
+
+  BUGFIXES:
+
+    * Fix crash of commit due to wrong lookup of filesystem encoding.
+      (Colin Watson, #120647)
+
+
 bzr 0.17rc1  2007-06-12
 
   NOTES WHEN UPGRADING:

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2007-05-15 22:40:39 +0000
+++ b/bzrlib/osutils.py	2007-06-18 01:56:32 +0000
@@ -1149,7 +1149,7 @@
         path-from-top might be unicode or utf8, but it is the correct path to
         pass to os functions to affect the file in question. (such as os.lstat)
     """
-    fs_encoding = sys.getfilesystemencoding().upper()
+    fs_encoding = _fs_enc.upper()
     if (sys.platform == 'win32' or
         fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968')): # ascii
         return _walkdirs_unicode_to_utf8(top, prefix=prefix)