Rev 6044: (jam) Merge 2.3 into 2.4 including the get_parent_map tweak. in file:///home/pqm/archives/thelove/bzr/2.4/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.4/

------------------------------------------------------------
revno: 6044 [merge]
revision-id: pqm at pqm.ubuntu.com-20110902231318-v03drk68w9663ce8
parent: pqm at pqm.ubuntu.com-20110902190356-klgmcwh1b2tqv7jv
parent: pqm at pqm.ubuntu.com-20110901210744-ac0spkg98x42y95k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Fri 2011-09-02 23:13:18 +0000
message:
  (jam) Merge 2.3 into 2.4 including the get_parent_map tweak.
modified:
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py	2010-11-26 06:31:54 +0000
+++ b/bzrlib/smart/repository.py	2011-09-02 23:13:18 +0000
@@ -238,7 +238,7 @@
                 next_revs = set()
                 break
             # don't query things we've already queried
-            next_revs.difference_update(queried_revs)
+            next_revs = next_revs.difference(queried_revs)
             first_loop_done = True
 
         # sorting trivially puts lexographically similar revision ids together.

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-08-20 18:29:34 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-09-02 23:13:18 +0000
@@ -87,6 +87,11 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* Tweak an RPC implementation for ``Repository.get_parent_map``, it was
+  doing an inefficient ``small_set.difference_update(large_set)`` when we
+  can do ``small_set = small_set.difference(large_set)``. This speeds up
+  discovery time by about 10%. (John Arbash Meinel)
+
 Bug Fixes
 *********