Rev 4990: (mbp) fix variable name in fetch in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4990 [merge]
revision-id: pqm at pqm.ubuntu.com-20100129195034-tkymzp1houhuhq6f
parent: pqm at pqm.ubuntu.com-20100129114810-pizbq0hfw5wctdaq
parent: mbp at sourcefrog.net-20100129190158-7egomwxels0n9gms
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-01-29 19:50:34 +0000
message:
  (mbp) fix variable name in fetch
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
=== modified file 'NEWS'
--- a/NEWS	2010-01-29 11:09:30 +0000
+++ b/NEWS	2010-01-29 19:50:34 +0000
@@ -20,6 +20,9 @@
 Bug Fixes
 *********
 
+* Fix "AttributeError in Inter1and2Helper" during fetch.
+  (Martin Pool, #513432)
+
 Improvements
 ************
 

=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py	2009-12-01 22:34:04 +0000
+++ b/bzrlib/fetch.py	2010-01-29 19:01:58 +0000
@@ -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)]