Bazaar

Merge lp:~mbp/bzr/513432-fetch into lp:bzr

  1. 513432-fetch
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/513432-fetch
Merge into: lp:bzr
Diff against target: 28 lines (+6/-1)
2 files modified
NEWS (+3/-0)
bzrlib/fetch.py (+3/-1)
To merge this branch: bzr merge lp:~mbp/bzr/513432-fetch
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+18277@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

silly old jam :-)

indicates a hole in test coverage but trivial enough to land now imo.

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/513432-fetch into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #513432 AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo'
> https://bugs.launchpad.net/bugs/513432
>
>
> silly old jam :-)
>
> indicates a hole in test coverage but trivial enough to land now imo.
>

I absolutely remember running into this, and I would have sworn that I
sent in a fix after the original patch landed. But, the bug is obviously
there and this is correct...

 merge: approve

Approved for the 2.1.0 branch.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktjNGAACgkQJdeBCYSNAAO0GwCdGcm+HjzmUuz8DRnYiy6Rj0yf
UnkAoNMRKNVWYOnXesRWAziJXl1rkuJC
=h4MX
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-01-29 11:09:30 +0000
+++ NEWS 2010-01-29 19:04:15 +0000
@@ -20,6 +20,9 @@
20Bug Fixes20Bug Fixes
21*********21*********
2222
23* Fix "AttributeError in Inter1and2Helper" during fetch.
24 (Martin Pool, #513432)
25
23Improvements26Improvements
24************27************
2528
2629
=== modified file 'bzrlib/fetch.py'
--- bzrlib/fetch.py 2009-12-01 22:34:04 +0000
+++ bzrlib/fetch.py 2010-01-29 19:04:15 +0000
@@ -254,7 +254,9 @@
254 root_id_order.sort(key=operator.itemgetter(0))254 root_id_order.sort(key=operator.itemgetter(0))
255 # Create a record stream containing the roots to create.255 # Create a record stream containing the roots to create.
256 if len(revs) > 100:256 if len(revs) > 100:
257 graph = _get_rich_root_heads_graph(self.source_repo, revs)257 # XXX: not covered by tests, should have a flag to always run
258 # this. -- mbp 20100129
259 graph = _get_rich_root_heads_graph(self.source, revs)
258 new_roots_stream = _new_root_data_stream(260 new_roots_stream = _new_root_data_stream(
259 root_id_order, rev_id_to_root_id, parent_map, self.source, graph)261 root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
260 return [('texts', new_roots_stream)]262 return [('texts', new_roots_stream)]