Rev 4088: (jam, bialix) A few small updates, progress bar fix, setup.py fix in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4088
revision-id: pqm at pqm.ubuntu.com-20090306214205-sa9k572tezp8s0a1
parent: pqm at pqm.ubuntu.com-20090306193539-h0q6dlyayhgcehta
parent: john at arbash-meinel.com-20090306204902-c3ttkto3tzqrs9li
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-06 21:42:05 +0000
message:
  (jam, bialix) A few small updates, progress bar fix, setup.py fix
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 4086.2.4
    revision-id: john at arbash-meinel.com-20090306204902-c3ttkto3tzqrs9li
    parent: john at arbash-meinel.com-20090306204556-rvxi33g6nhvfhqob
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2009-03-06 14:49:02 -0600
    message:
      Updates to NEWS for the various tweaks.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4086.2.3
    revision-id: john at arbash-meinel.com-20090306204556-rvxi33g6nhvfhqob
    parent: john at arbash-meinel.com-20090306204358-p5lful9jcxatzrhw
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2009-03-06 14:45:56 -0600
    message:
      Remove the check for no $TERM setting, as win32 doesn't have $TERM
    modified:
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
    ------------------------------------------------------------
    revno: 4086.2.2
    revision-id: john at arbash-meinel.com-20090306204358-p5lful9jcxatzrhw
    parent: john at arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2009-03-06 14:43:58 -0600
    message:
      Change how we intern strings when processing xml entries.
      Use intern() itself, rather than a cache that never expires.
    modified:
      bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
    ------------------------------------------------------------
    revno: 4086.2.1
    revision-id: john at arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
    parent: pqm at pqm.ubuntu.com-20090306064825-kbpwggw21dygeix6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2009-03-06 14:42:40 -0600
    message:
      Fix a small bug in setup.py when an extension fails to build
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS	2009-03-06 12:01:51 +0000
+++ b/NEWS	2009-03-06 21:42:05 +0000
@@ -111,6 +111,12 @@
       for branches. This is now fixed and a test added to prevent it
       reoccuring. (Robert Collins, Andrew Bennetts)
 
+    * Restore the progress bar on Windows. We were disabling it when TERM
+      wasn't set, but Windows doesn't set TERM. (Alexander Belchenko)
+
+    * ``setup.py build_ext`` now gives a proper error when an extension
+      fails to build. (John Arbash Meinel)
+
     * Under rare circumstances (aka nobody reported a bug about it), the ftp
       transport could revert to ascii mode. It now stays in binary mode except
       when needed.
@@ -201,6 +207,12 @@
     * ``bzrlib.tests.run_suite`` accepts a runner_class parameter
       supporting the use of different runners. (Robert Collins)
 
+    * Change how file_ids and revision_ids are interned as part of
+      inventory deserialization. Now we use the real ``intern()``, rather
+      than our own workaround that would also cache a Unicode copy of the
+      string, and never emptied the cache. This should slightly reduce
+      memory consumption. (John Arbash Meinel)
+
     * New branch method ``create_clone_on_transport`` that returns a
       branch object. (Robert Collins)
 

=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py	2009-02-23 15:42:47 +0000
+++ b/bzrlib/ui/__init__.py	2009-03-06 20:45:56 +0000
@@ -240,7 +240,7 @@
         cls = CLIUIFactory
     elif not isatty():
         cls = CLIUIFactory
-    elif os.environ.get('TERM') in (None, 'dumb', ''):
+    elif os.environ.get('TERM') in ('dumb', ''):
         # e.g. emacs compile window
         cls = CLIUIFactory
     # User may know better, otherwise default to TextUIFactory

=== modified file 'bzrlib/xml8.py'
--- a/bzrlib/xml8.py	2009-01-17 01:30:58 +0000
+++ b/bzrlib/xml8.py	2009-03-06 20:43:58 +0000
@@ -131,7 +131,7 @@
     if a_str.__class__ == unicode:
         return _encode_utf8(a_str)
     else:
-        return _get_cached_ascii(a_str)
+        return intern(a_str)
 
 
 def _clear_cache():

=== modified file 'setup.py'
--- a/setup.py	2009-02-24 19:07:29 +0000
+++ b/setup.py	2009-03-06 20:42:40 +0000
@@ -209,7 +209,7 @@
             build_ext.build_extension(self, ext)
         except CCompilerError:
             if not self.allow_python_fallback:
-                log.warn('\n  Cannot build extensions.\n'
+                log.warn('\n  Cannot build extension "%s".\n'
                          '  Use "build_ext --allow-python-fallback" to use'
                          ' slower python implementations instead.\n'
                          % (ext.name,))