Rev 4806: (mbp) fix bug 513432 in 2.1 in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4806 [merge]
revision-id: pqm at pqm.ubuntu.com-20100130093410-xyutv8mobva3juuo
parent: pqm at pqm.ubuntu.com-20100129162018-0a1o6pjjpky5zwql
parent: mbp at sourcefrog.net-20100130090103-1kt0hoch3gjjgdnk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Sat 2010-01-30 09:34:10 +0000
message:
  (mbp) fix bug 513432 in 2.1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
=== modified file 'NEWS'
--- a/NEWS	2010-01-29 15:18:58 +0000
+++ b/NEWS	2010-01-30 09:01:03 +0000
@@ -14,6 +14,9 @@
 Bug Fixes
 *********
 
+* Fix "AttributeError in Inter1and2Helper" during fetch.
+  (Martin Pool, #513432)
+
 * Using the ``bzrlib.chk_map`` module from within multiple threads at the
   same time was broken due to race conditions with a module level page
   cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
@@ -23,6 +26,7 @@
   increase memory pressure on processes using threads.
   (Robert Collins, John Arbash Meinel, #514090)
 
+
 bzr 2.1.0rc2
 ############
 

=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py	2009-12-01 22:34:04 +0000
+++ b/bzrlib/fetch.py	2010-01-30 09:01:03 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -254,7 +254,9 @@
         root_id_order.sort(key=operator.itemgetter(0))
         # Create a record stream containing the roots to create.
         if len(revs) > 100:
-            graph = _get_rich_root_heads_graph(self.source_repo, revs)
+            # XXX: not covered by tests, should have a flag to always run
+            # this. -- mbp 20100129
+            graph = _get_rich_root_heads_graph(self.source, revs)
         new_roots_stream = _new_root_data_stream(
             root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
         return [('texts', new_roots_stream)]