At http://bzr.arbash-meinel.com/branches/bzr/1.10-dev/revision_stream
------------------------------------------------------------
revno: 3852
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: revision_stream
timestamp: Tue 2008-11-25 21:36:37 -0600
message:
Sorting topologically is one possible fix.
=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py 2008-11-25 20:39:57 +0000
+++ b/bzrlib/fetch.py 2008-11-26 03:36:37 +0000
@@ -255,7 +255,7 @@
# A missing signature is just skipped.
to_sf.insert_record_stream(filter_absent(from_sf.get_record_stream(
[(rev_id,) for rev_id in revs],
- self.to_repository._fetch_order,
+ 'topological',
not self.to_repository._fetch_uses_deltas)))
self._fetch_just_revision_texts(revs)
@@ -267,7 +267,7 @@
# bug #261339
to_rf.insert_record_stream(from_rf.get_record_stream(
[(rev_id,) for rev_id in version_ids],
- self.to_repository._fetch_order,
+ 'topological',
not self.to_repository._fetch_uses_deltas))
def _generate_root_texts(self, revs):
=== modified file 'bzrlib/tests/test_fetch.py'
--- a/bzrlib/tests/test_fetch.py 2008-11-26 03:35:09 +0000
+++ b/bzrlib/tests/test_fetch.py 2008-11-26 03:36:37 +0000
@@ -454,6 +454,7 @@
if ordering == 'topological':
for record in orig_grs(keys, ordering, include_delta_closure):
yield record
+ return
self.assertEqual('unordered', ordering)
for key in sorted(keys, reverse=True):
yield orig_grs([key], ordering, include_delta_closure).next()
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
