Rev 2535: Merge the 0.17 fixes back into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2535
revision-id: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 03:45:33 +0100
message:
  Merge the 0.17 fixes back into bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
    ------------------------------------------------------------
    revno: 2531.1.1
    merged: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
    parent: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
    parent: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.dev
    timestamp: Tue 2007-06-19 10:26:28 +1000
    message:
      Merge the 0.17 fixes back into bzr.dev
    ------------------------------------------------------------
    revno: 2522.2.4
    merged: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
    parent: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.0.17
    timestamp: Mon 2007-06-18 14:17:06 +1000
    message:
      (Ian Clatworthy) Release 0.17
    ------------------------------------------------------------
    revno: 2522.2.3
    merged: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
    parent: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.0.17
    timestamp: Mon 2007-06-18 12:25:13 +1000
    message:
      Revert logging just to stderr in commit as broke unicode filenames (#120930)
    ------------------------------------------------------------
    revno: 2522.2.2
    merged: 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
    ------------------------------------------------------------
    revno: 2522.2.1
    merged: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
    parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
    parent: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.17
    timestamp: Tue 2007-06-12 07:36:54 +0100
    message:
      (Ian Clatworthy) Release 0.17rc1
    ------------------------------------------------------------
    revno: 2521.2.1
    merged: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
    parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.0.17
    timestamp: Tue 2007-06-12 12:48:29 +1000
    message:
      (Ian Clatworthy) Release 0.17rc1
=== modified file 'NEWS'
--- a/NEWS	2007-06-18 20:10:35 +0000
+++ b/NEWS	2007-06-19 02:45:33 +0000
@@ -29,6 +29,18 @@
       running the test suite and cuts the time by about half.
       (Andrew Bennetts, Martin Pool)
 
+
+bzr 0.17  2007-06-18
+
+  BUGFIXES:
+
+    * Fix crash of commit due to wrong lookup of filesystem encoding.
+      (Colin Watson, #120647)
+
+    * Revert logging just to stderr in commit as broke unicode filenames.
+      (Aaron Bentley, Ian Clatworthy, #120930)
+
+
 bzr 0.17rc1  2007-06-12
 
   NOTES WHEN UPGRADING:

=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2007-06-06 05:56:03 +0000
+++ b/bzrlib/commit.py	2007-06-18 02:25:13 +0000
@@ -109,15 +109,9 @@
     def _note(self, format, *args):
         """Output a message.
 
-        Messages are output by writing directly to stderr instead of
-        using bzrlib.trace.note(). The latter constantly updates the
-        log file as we go causing an unnecessary performance hit.
-
-        Subclasses may choose to override this method but need to be aware
-        of its potential impact on performance.
+        Subclasses may choose to override this method.
         """
-        bzrlib.ui.ui_factory.clear_term()
-        sys.stderr.write((format + "\n") % args)
+        note(format, *args)
 
     def snapshot_change(self, change, path):
         if change == 'unchanged':

=== 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)