Rev 4246: (ianc) test tweaks & _reconcile_pack from brisbane-core (Robert in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Apr 3 12:26:57 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4246
revision-id: pqm at pqm.ubuntu.com-20090403112653-xcbrm6c5zdlymd53
parent: pqm at pqm.ubuntu.com-20090403061342-e673pjdl9aly2fmp
parent: ian.clatworthy at canonical.com-20090403103526-cro9danip2k7bac0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-04-03 12:26:53 +0100
message:
(ianc) test tweaks & _reconcile_pack from brisbane-core (Robert
Collins)
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
------------------------------------------------------------
revno: 4245.2.1
revision-id: ian.clatworthy at canonical.com-20090403103526-cro9danip2k7bac0
parent: pqm at pqm.ubuntu.com-20090403061342-e673pjdl9aly2fmp
parent: ian.clatworthy at canonical.com-20090403071811-xx3iio2c0y6abvx5
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2009-04-03 20:35:26 +1000
message:
test tweaks & _reconcile_pack from brisbane-core
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
------------------------------------------------------------
revno: 4245.1.1
revision-id: ian.clatworthy at canonical.com-20090403071811-xx3iio2c0y6abvx5
parent: pqm at pqm.ubuntu.com-20090403061342-e673pjdl9aly2fmp
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.bris-test-tweaks-and-reconcile-pack
timestamp: Fri 2009-04-03 17:18:11 +1000
message:
minor test clean-ups & _reconcile_pack API
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
=== modified file 'bzrlib/reconcile.py'
--- a/bzrlib/reconcile.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/reconcile.py 2009-04-03 07:18:11 +0000
@@ -505,9 +505,8 @@
total_inventories = len(list(
collection.inventory_index.combined_index.iter_all_entries()))
if len(all_revisions):
- self._packer = repofmt.pack_repo.ReconcilePacker(
- collection, packs, ".reconcile", all_revisions)
- new_pack = self._packer.pack(pb=self.pb)
+ new_pack = self.repo._reconcile_pack(collection, packs,
+ ".reconcile", all_revisions, self.pb)
if new_pack is not None:
self._discard_and_save(packs)
else:
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2009-03-25 04:20:12 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2009-04-03 07:18:11 +0000
@@ -2223,6 +2223,10 @@
reconciler.reconcile()
return reconciler
+ def _reconcile_pack(self, collection, packs, extension, revs, pb):
+ packer = ReconcilePacker(collection, packs, extension, revs)
+ return packer.pack(pb)
+
def unlock(self):
if self._write_lock_count == 1 and self._write_group is not None:
self.abort_write_group()
=== modified file 'bzrlib/tests/per_repository/test_add_inventory_by_delta.py'
--- a/bzrlib/tests/per_repository/test_add_inventory_by_delta.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/per_repository/test_add_inventory_by_delta.py 2009-04-03 07:18:11 +0000
@@ -88,3 +88,4 @@
else:
repo_delta.commit_write_group()
self.assertEqual(add_validator, delta_validator)
+ self.assertEqual(new_inv, inv)
=== modified file 'bzrlib/tests/per_repository/test_check.py'
--- a/bzrlib/tests/per_repository/test_check.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/per_repository/test_check.py 2009-04-03 07:18:11 +0000
@@ -43,7 +43,7 @@
# XXX: check requires a non-empty revision IDs list, but it ignores the
# contents of it!
check_object = tree.branch.repository.check(['ignored'])
- check_object.report_results(verbose=False)
+ check_object.report_results(verbose=True)
log = self._get_log(keep_log_file=True)
self.assertContainsRe(
log,
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py 2009-03-30 04:59:50 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py 2009-04-03 07:18:11 +0000
@@ -185,7 +185,6 @@
except:
builder.abort()
raise
- builder.finish_inventory()
self.assertEqual(revision_id, builder.commit('foo bar'))
finally:
tree.unlock()
@@ -830,12 +829,13 @@
self.assertEqual(expected_delta, delta)
builder.finish_inventory()
rev2 = builder.commit('')
- tree.set_parent_ids([rev2])
except:
builder.abort()
tree.unlock()
raise
- else:
+ try:
+ tree.set_parent_ids([rev2])
+ finally:
tree.unlock()
return rev2
=== modified file 'bzrlib/tests/per_repository_reference/test_add_inventory.py'
--- a/bzrlib/tests/per_repository_reference/test_add_inventory.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/per_repository_reference/test_add_inventory.py 2009-04-03 07:18:11 +0000
@@ -30,6 +30,8 @@
tree = self.make_branch_and_tree('sample')
revid = tree.commit('one')
inv = tree.branch.repository.get_inventory(revid)
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
base = self.make_repository('base')
repo = self.make_referring('referring', 'base')
repo.lock_write()
@@ -44,6 +46,10 @@
repo.commit_write_group()
finally:
repo.unlock()
+ repo.lock_read()
+ self.addCleanup(repo.unlock)
inv2 = repo.get_inventory(revid)
- self.assertEqual(inv._byid, inv2._byid)
+ content1 = dict((file_id, inv[file_id]) for file_id in inv)
+ content2 = dict((file_id, inv[file_id]) for file_id in inv2)
+ self.assertEqual(content1, content2)
self.assertRaises(errors.NoSuchRevision, base.get_inventory, revid)
=== modified file 'bzrlib/tests/per_repository_reference/test_add_revision.py'
--- a/bzrlib/tests/per_repository_reference/test_add_revision.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/per_repository_reference/test_add_revision.py 2009-04-03 07:18:11 +0000
@@ -30,6 +30,8 @@
tree = self.make_branch_and_tree('sample')
revid = tree.commit('one')
inv = tree.branch.repository.get_inventory(revid)
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
rev = tree.branch.repository.get_revision(revid)
base = self.make_repository('base')
repo = self.make_referring('referring', 'base')
=== modified file 'bzrlib/tests/per_repository_reference/test_add_signature_text.py'
--- a/bzrlib/tests/per_repository_reference/test_add_signature_text.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/per_repository_reference/test_add_signature_text.py 2009-04-03 07:18:11 +0000
@@ -30,6 +30,8 @@
tree = self.make_branch_and_tree('sample')
revid = tree.commit('one')
inv = tree.branch.repository.get_inventory(revid)
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
base = self.make_repository('base')
repo = self.make_referring('referring', 'base')
repo.lock_write()
More information about the bazaar-commits
mailing list