Rev 2964: Merge .dev. in http://people.ubuntu.com/~robertc/baz2.0/reconcile

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/reconcile

------------------------------------------------------------
revno: 2964
revision-id:robertc at robertcollins.net-20071104225308-5hr23xw3jirl9mne
parent: robertc at robertcollins.net-20071104204820-8a8tz6g8kiu1in4h
parent: pqm at pqm.ubuntu.com-20071104224734-8l8km2gqk9n1pdla
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Mon 2007-11-05 09:53:08 +1100
message:
  Merge .dev.
modified:
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 2951.1.12
    revision-id:pqm at pqm.ubuntu.com-20071104224734-8l8km2gqk9n1pdla
    parent: pqm at pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
    parent: robertc at robertcollins.net-20071104215830-ezhmccg0a750kb0l
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-11-04 22:47:34 +0000
    message:
      (robertc) Stage one of reconcile for pack repositories - perform inventory gc. (Robert Collins)
    modified:
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 2961.1.1
    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:48:20 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-11-04 22:53:08 +0000
@@ -1549,6 +1549,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()
@@ -1574,9 +1575,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.