Rev 1910: Represent root entries using InventoryDirectory, not RootEntry in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Aug 8 01:24:39 BST 2006
------------------------------------------------------------
revno: 1910
revision-id: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
parent: pqm at pqm.ubuntu.com-20060807223714-7e5db0e31c1ac094
parent: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-08 01:24:38 +0100
message:
Represent root entries using InventoryDirectory, not RootEntry
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
parent: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Mon 2006-08-07 20:11:35 -0400
message:
Avoid generating unnecessary list
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
parent: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Mon 2006-08-07 19:14:45 -0400
message:
Remove is_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
parent: aaron.bentley at utoronto.ca-20060806213918-ad66802350eed5d3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sun 2006-08-06 17:59:57 -0400
message:
Add unit tests for Inventory.is_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806213918-ad66802350eed5d3
parent: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sun 2006-08-06 17:39:18 -0400
message:
Fix RootEntry deprecation warning
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
parent: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sun 2006-08-06 17:24:22 -0400
message:
Remove include_root parameter from list_files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
parent: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sun 2006-08-06 17:21:32 -0400
message:
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
parent: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sun 2006-08-06 14:59:06 -0400
message:
Fixed unicode test cases
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
parent: aaron.bentley at utoronto.ca-20060805223336-2c1f46fa8f50a75d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sat 2006-08-05 18:59:38 -0400
message:
More removal of unique-root stuff
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060805223336-2c1f46fa8f50a75d
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
parent: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: no-special-root
timestamp: Sat 2006-08-05 18:33:36 -0400
message:
Unshelved all changes except those related to removing RootEntry
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
parent: abentley at panoramicfeedback.com-20060804135316-9ba39931ba9ee379
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Fri 2006-08-04 10:08:46 -0400
message:
Fix bug that caused children of TREE_ROOT to always go in the root
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060804135316-9ba39931ba9ee379
parent: abentley at panoramicfeedback.com-20060804134618-f5e93ad371936caa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Fri 2006-08-04 09:53:16 -0400
message:
Update test to use changes_from
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060804134618-f5e93ad371936caa
parent: abentley at panoramicfeedback.com-20060804124808-1bd917366bb0bad3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Fri 2006-08-04 09:46:18 -0400
message:
Got all tests passing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060804124808-1bd917366bb0bad3
parent: aaron.bentley at utoronto.ca-20060804044102-2dca52cbf410b099
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Fri 2006-08-04 08:48:08 -0400
message:
Fix bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060804044102-2dca52cbf410b099
parent: aaron.bentley at utoronto.ca-20060712044552-c2511c3b317c96c9
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-08-04 00:41:02 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060712044552-c2511c3b317c96c9
parent: abentley at panoramicfeedback.com-20060623191814-95376908aa15f899
parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-07-12 00:45:52 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060623191814-95376908aa15f899
parent: aaron.bentley at utoronto.ca-20060620120811-0ee4e4dbef0742f7
parent: pqm at pqm.ubuntu.com-20060623181520-082f8258c961b88f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Fri 2006-06-23 15:18:14 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060620120811-0ee4e4dbef0742f7
parent: aaron.bentley at utoronto.ca-20060617200829-35ae255ca291b8ed
parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-06-20 08:08:11 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060617200829-35ae255ca291b8ed
parent: aaron.bentley at utoronto.ca-20060616032755-f4cf1597d02f26f6
parent: pqm at pqm.ubuntu.com-20060617190945-49d8ba41828060f5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-06-17 16:08:29 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060616032755-f4cf1597d02f26f6
parent: jelmer at samba.org-20060615234159-848796e5ac79edca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-15 23:27:55 -0400
message:
Removed unused ROOT_ID
------------------------------------------------------------
merged: jelmer at samba.org-20060615234159-848796e5ac79edca
parent: jelmer at samba.org-20060615210642-85e2c9c9ee5d8d05
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nested-trees
timestamp: Fri 2006-06-16 01:41:59 +0200
message:
Make argument to CommitBuilder.set_root_id() optional and fix a couple
of minor issues pointed out by Aaron.
------------------------------------------------------------
merged: jelmer at samba.org-20060615210642-85e2c9c9ee5d8d05
parent: aaron.bentley at utoronto.ca-20060615053706-01a1166e6eb4041e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nested-trees
timestamp: Thu 2006-06-15 23:06:42 +0200
message:
Let CommitBuilder explicitly track root ids.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060615053706-01a1166e6eb4041e
parent: aaron.bentley at utoronto.ca-20060613121315-50f7f373ba0e0236
parent: pqm at pqm.ubuntu.com-20060615033738-b8eca7ad18b0dd9c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-15 01:37:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060613121315-50f7f373ba0e0236
parent: aaron.bentley at utoronto.ca-20060608112023-a6da4991165f7d52
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-06-13 08:13:15 -0400
message:
Test root ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608112023-a6da4991165f7d52
parent: aaron.bentley at utoronto.ca-20060608103756-6a854ecf75030d42
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-08 12:20:23 +0100
message:
Formatting tweaks from review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608103756-6a854ecf75030d42
parent: aaron.bentley at utoronto.ca-20060608100236-583eceb108cafe5f
parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-08 11:37:56 +0100
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608100236-583eceb108cafe5f
parent: aaron.bentley at utoronto.ca-20060608083409-3c48dc2600ec6c95
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-08 11:02:36 +0100
message:
Roundtrip tree roots in bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608083409-3c48dc2600ec6c95
parent: aaron.bentley at utoronto.ca-20060607154216-ee8dd02f17967692
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-06-08 09:34:09 +0100
message:
Allow compare_trees to list root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607154216-ee8dd02f17967692
parent: aaron.bentley at utoronto.ca-20060607150224-495b5f83666638e1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-06-07 16:42:16 +0100
message:
Make update set the tree root when needed
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607150224-495b5f83666638e1
parent: aaron.bentley at utoronto.ca-20060604235258-79d46bd3349baaaa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-06-07 16:02:24 +0100
message:
Refactored checkout creation
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604235258-79d46bd3349baaaa
parent: aaron.bentley at utoronto.ca-20060604114901-c7313df2dbb00a15
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-06-05 00:52:58 +0100
message:
Don't fail test cases involving only repositories if they have wrong roots
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604114901-c7313df2dbb00a15
parent: aaron.bentley at utoronto.ca-20060604114000-816f987b17ea602a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 12:49:01 +0100
message:
Get tree_transform tests using real tree root instead of TREE_ROOT
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604114000-816f987b17ea602a
parent: aaron.bentley at utoronto.ca-20060604113834-37e52552bc42f4a0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 12:40:00 +0100
message:
Use actual tree root in tests, not TREE_ROOT
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604113834-37e52552bc42f4a0
parent: aaron.bentley at utoronto.ca-20060604110405-8771494935bba146
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 12:38:34 +0100
message:
Make pull set root id when basis has no root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604110405-8771494935bba146
parent: aaron.bentley at utoronto.ca-20060604110213-482571f588ca4e81
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 12:04:05 +0100
message:
Better error handling for bad transforms
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604110213-482571f588ca4e81
parent: aaron.bentley at utoronto.ca-20060604093106-e2d4ad3004936593
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 12:02:13 +0100
message:
Fix up merge tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060604093106-e2d4ad3004936593
parent: aaron.bentley at utoronto.ca-20060603235439-2406f3e81e749565
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 10:31:06 +0100
message:
fix up reparent_children
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603235439-2406f3e81e749565
parent: aaron.bentley at utoronto.ca-20060603234129-92ac45a7022d8f3f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 00:54:39 +0100
message:
Restore test_patches_data
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603234129-92ac45a7022d8f3f
parent: aaron.bentley at utoronto.ca-20060603222800-f2dfc8582e93bd57
parent: pqm at pqm.ubuntu.com-20060603212040-9ec7af97aa11d4d7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-06-04 00:41:29 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603222800-f2dfc8582e93bd57
parent: aaron.bentley at utoronto.ca-20060526051412-5da56faa425b8fc8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-06-03 23:28:00 +0100
message:
I will block you
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060526051412-5da56faa425b8fc8
parent: aaron.bentley at utoronto.ca-20060526042516-52ecbf5490514a3d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-05-26 01:14:12 -0400
message:
Removed all remaining uses of root_directory
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060526042516-52ecbf5490514a3d
parent: pqm at pqm.ubuntu.com-20060525092836-8e8381f8f4d69909
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-05-26 00:25:16 -0400
message:
Make root entry an InventoryDirectory, make EmptyTree really empty
More information about the bazaar-commits
mailing list