Rev 1973: Use the new WorkingTree parent-management apis throughout the codebase. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 30 05:38:45 BST 2006
------------------------------------------------------------
revno: 1973
revision-id: pqm at pqm.ubuntu.com-20060830043844-d570350402a5ad15
parent: pqm at pqm.ubuntu.com-20060830034022-6efbdf5f2a2977f9
parent: robertc at robertcollins.net-20060830041458-c0b772f8932bf454
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-30 05:38:44 +0100
message:
Use the new WorkingTree parent-management apis throughout the codebase.
modified:
bzrlib/benchmarks/tree_creator/heavily_merged.py heavily_merged.py-20060815024128-b16a7pn542u6b13k-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830041458-c0b772f8932bf454
parent: robertc at robertcollins.net-20060825065618-75b5d54af758e21b
parent: robertc at robertcollins.net-20060830032604-ea756bf3749f449e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Wed 2006-08-30 14:14:58 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065618-75b5d54af758e21b
parent: robertc at robertcollins.net-20060825052134-a34a069997758e5c
parent: robertc at robertcollins.net-20060825065602-f106e544c3de1f74
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 16:56:18 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825052134-a34a069997758e5c
parent: robertc at robertcollins.net-20060825050317-54d67521a8bee0b1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 15:21:34 +1000
message:
Teach status to handle the base revision being a ghost.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825050317-54d67521a8bee0b1
parent: robertc at robertcollins.net-20060825023048-3d55ad8c315b24aa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 15:03:17 +1000
message:
Remove usage of tree.pending_merges().
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825023048-3d55ad8c315b24aa
parent: robertc at robertcollins.net-20060825022255-43913791a8b23630
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 12:30:48 +1000
message:
forward to get_parent_ids in pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825022255-43913791a8b23630
parent: robertc at robertcollins.net-20060825011012-de08c40767252e6a
parent: robertc at robertcollins.net-20060825022146-6e344ca329c52a6e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 12:22:55 +1000
message:
Fix status to not use pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825011012-de08c40767252e6a
parent: robertc at robertcollins.net-20060823103007-d8daab903560f58e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-25 11:10:12 +1000
message:
Remove remerges dependence on pending_merges, also makes it simpler.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060823103007-d8daab903560f58e
parent: robertc at robertcollins.net-20060822105058-6cd6d48f6d97af76
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Wed 2006-08-23 20:30:07 +1000
message:
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060822105058-6cd6d48f6d97af76
parent: robertc at robertcollins.net-20060817141646-5d6640b193c7f4d9
parent: robertc at robertcollins.net-20060822055251-90587a0c3a067e09
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Tue 2006-08-22 20:50:58 +1000
message:
Merge updated set_parents api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060817141646-5d6640b193c7f4d9
parent: robertc at robertcollins.net-20060811120610-ae75892349d3f2e4
parent: robertc at robertcollins.net-20060817042931-5e09ab5a6bb04fe2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-18 00:16:46 +1000
message:
Update with new parent-ids patch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060811120610-ae75892349d3f2e4
parent: robertc at robertcollins.net-20060811052234-d46a7278ea8474d0
parent: robertc at robertcollins.net-20060811052855-d3622775878f20db
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-11 22:06:10 +1000
message:
Update to replaced parent checking api bzrlib/merge.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20060811052234-d46a7278ea8474d0
parent: robertc at robertcollins.net-20060810070653-1ea05fe6c62ef720
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Fri 2006-08-11 15:22:34 +1000
message:
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060810070653-1ea05fe6c62ef720
parent: robertc at robertcollins.net-20060809075225-403b319ef88ba9f4
parent: robertc at robertcollins.net-20060809112339-2fb0af74cc1495b7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Thu 2006-08-10 17:06:53 +1000
message:
Revamped set_parent* api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060809075225-403b319ef88ba9f4
parent: robertc at robertcollins.net-20060807231825-39ebde642c2fc61a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use set_parent_trees.
timestamp: Wed 2006-08-09 17:52:25 +1000
message:
Change all callers of set_last_revision to use set_parent_trees.
More information about the bazaar-commits
mailing list