Rev 2962: Do not try to use try:finally: around a yield for python 2.4. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Sun Nov 4 21:58:46 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 2962
revision-id:robertc at robertcollins.net-20071104215830-ezhmccg0a750kb0l
parent: robertc at robertcollins.net-20071104203532-6vndyb5pv82em6n7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-11-05 08:58:30 +1100
message:
Do not try to use try:finally: around a yield for python 2.4.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2007-11-04 20:35:32 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2007-11-04 21:58:30 +0000
@@ -1523,6 +1523,7 @@
"""
assert self.is_locked()
pb = ui.ui_factory.nested_progress_bar()
+ result = []
try:
revision_nodes = self._pack_collection.revision_index \
.combined_index.iter_all_entries()
@@ -1548,9 +1549,10 @@
index_parents = item[3]
rev_parents = tuple(revision.parent_ids)
if index_parents != rev_parents:
- yield (revision.revision_id, index_parents, rev_parents)
+ result.append((revision.revision_id, index_parents, rev_parents))
finally:
pb.finished()
+ return result
def get_parents(self, revision_ids):
"""See StackedParentsProvider.get_parents.
More information about the bazaar-commits
mailing list