Rev 2256: Update a clean branch with the dirstate improvements. in http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate
John Arbash Meinel
john at arbash-meinel.com
Fri Feb 2 05:00:59 GMT 2007
At http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate
------------------------------------------------------------
revno: 2256
revision-id: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-01 23:00:35 -0600
message:
Update a clean branch with the dirstate improvements.
added:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/tree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/workingtree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-2
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 1852.4.26
merged: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
parent: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
parent: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: WorkingTreeFormat4 as the default tree format.
timestamp: Thu 2007-02-01 22:56:09 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.4.24.1.1
merged: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
parent: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: WorkingTree Format 4
timestamp: Thu 2007-02-01 22:55:26 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.8
merged: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
parent: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status-benchmarks
timestamp: Thu 2007-02-01 22:53:48 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.19
merged: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
parent: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_write_inventory
timestamp: Thu 2007-02-01 22:51:48 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.5
merged: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
parent: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: Tree.walkdirs
timestamp: Thu 2007-02-01 22:49:38 -0600
message:
[merge] bzr.dev 2255, resolve conflicts, update copyrights
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.7
merged: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
parent: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-02-01 22:23:24 -0600
message:
[merge] bzr.dev 2255
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.6
merged: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
parent: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-01-18 18:01:12 -0600
message:
Fix an invalid access to bzrlib.xml6 in workingtree.py
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.5
merged: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tree-revision-tree.
timestamp: Thu 2007-01-18 17:45:24 -0600
message:
[merge] bzr.dev 2240
------------------------------------------------------------
revno: 1852.4.25
merged: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTreeFormat4 as the default tree format.
timestamp: Fri 2006-12-08 14:19:36 +1100
message:
Snapshot state
------------------------------------------------------------
revno: 1852.4.24
merged: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
parent: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-10-16 12:20:12 +1000
message:
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
------------------------------------------------------------
revno: 1852.4.23
merged: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
parent: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-10-06 10:41:27 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.7
merged: robertc at robertcollins.net-20061006003850-31476149984a1a02
parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Fri 2006-10-06 10:38:50 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.18
merged: robertc at robertcollins.net-20061006003734-c1f35733490cb427
parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Fri 2006-10-06 10:37:34 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.4
merged: robertc at robertcollins.net-20061006003453-c840b2008705450b
parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-10-06 10:34:53 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.4
merged: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-10-06 10:33:41 +1000
message:
Merge up.
------------------------------------------------------------
revno: 1852.4.22
merged: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
parent: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-10-04 13:37:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.6
merged: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Wed 2006-10-04 13:33:44 +1000
message:
merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.17
merged: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Wed 2006-10-04 12:12:35 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.3
merged: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Wed 2006-10-04 11:56:39 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.3
merged: robertc at robertcollins.net-20061004014835-764aa46abec8451b
parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Wed 2006-10-04 11:48:35 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1852.4.21
merged: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
parent: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-10-04 11:38:38 +1000
message:
(Robert Collins, John Meinel) Update WorkingTree Format 4 format string to be nicer to read.
------------------------------------------------------------
revno: 1852.4.20
merged: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
parent: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-09-13 13:43:46 +1000
message:
Steps toward an object model.
------------------------------------------------------------
revno: 1852.4.19
merged: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
parent: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-09-11 15:36:48 +1000
message:
Get DirState objects roundtripping an add of a ghost tree.
------------------------------------------------------------
revno: 1852.4.18
merged: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
parent: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-09-08 15:57:25 +1000
message:
Write top level acceptance test for dirstate.
------------------------------------------------------------
revno: 1852.4.17
merged: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
parent: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-09-08 14:33:01 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.5
merged: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Fri 2006-09-08 14:30:58 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.16
merged: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Fri 2006-09-08 14:30:20 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.2
merged: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-09-08 14:28:01 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.2
merged: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
parent: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-09-08 14:20:58 +1000
message:
Implement WorkingTree interface conformance tests for
WorkingTree.revision_tree. As part of this, refactor the basis_tree method
to use revision_tree to access the cached basis inventory.
(Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 1908.4.2.1.4.1.10.1.1
merged: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-revision-tree.
timestamp: Fri 2006-09-08 11:58:47 +1000
message:
Add a new method ``Tree.revision_tree`` which allows access to cached
trees for arbitrary revisions. This allows the in development dirstate
tree format to provide access to the callers to cached copies of
inventory data which are cheaper to access than inventories from the
repository. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 1852.4.16
merged: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
parent: robertc at robertcollins.net-20060802081150-6041cc7808a58320
parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-08-07 17:19:28 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.4
merged: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-08-07 17:19:19 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.15
merged: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Mon 2006-08-07 17:19:10 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13.1.1
merged: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
parent: pqm at pqm.ubuntu.com-20060806235730-876748deb30a3d2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-08-07 17:18:55 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.4.15
merged: robertc at robertcollins.net-20060802081150-6041cc7808a58320
parent: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-08-02 18:11:50 +1000
message:
Ensure Format4 working trees start with a dirstate.
------------------------------------------------------------
revno: 1852.4.14
merged: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
parent: robertc at robertcollins.net-20060801024856-8d077236a204de35
parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-08-02 15:55:06 +1000
message:
Merge _write_inventory test.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.14
merged: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_write_inventory
timestamp: Wed 2006-08-02 15:44:51 +1000
message:
test that WorkingTree._write_inventory works as expected by the current code.
------------------------------------------------------------
revno: 1852.4.13
merged: robertc at robertcollins.net-20060801024856-8d077236a204de35
parent: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:48:56 +1000
message:
2-parent case working.
------------------------------------------------------------
revno: 1852.4.12
merged: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
parent: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:34:25 +1000
message:
get actual parent info for the first parent.
------------------------------------------------------------
revno: 1852.4.11
merged: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
parent: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:17:03 +1000
message:
Get one content containing test passing.
------------------------------------------------------------
revno: 1852.4.10
merged: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
parent: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Tue 2006-08-01 12:10:24 +1000
message:
Use just the tree api to generate dirstate information.
------------------------------------------------------------
revno: 1852.4.9
merged: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
parent: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:47:19 +1000
message:
Merge Tree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.3
merged: robertc at robertcollins.net-20060731134709-61df962ef27379f6
parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-07-31 23:47:09 +1000
message:
Merge Tree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.13
merged: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 23:46:52 +1000
message:
Add WorkingTree.walkdirs benchmarks.
------------------------------------------------------------
revno: 1852.4.8
merged: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
parent: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:05:17 +1000
message:
get current dirstat tests all passing.
------------------------------------------------------------
revno: 1852.4.7
merged: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
parent: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-31 23:00:32 +1000
message:
Merge in bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.2
merged: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Mon 2006-07-31 23:00:10 +1000
message:
Merge in bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.12
merged: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
parent: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 22:57:18 +1000
message:
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.11
merged: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
parent: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 21:19:48 +1000
message:
Tree.walkdirs handles missing contents in workingtrees.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.10
merged: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
parent: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 17:18:54 +1000
message:
Tweak the Tree.walkdirs interface more to be more useful.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.9
merged: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
parent: robertc at robertcollins.net-20060731045034-092027e3f462f644
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:50:51 +1000
message:
Add missing test script.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.8
merged: robertc at robertcollins.net-20060731045034-092027e3f462f644
parent: robertc at robertcollins.net-20060731041731-5e25624f04900907
parent: robertc at robertcollins.net-20060731043747-26893f2e873e7816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:50:34 +1000
message:
Merge walkdirs tidyup.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.7
merged: robertc at robertcollins.net-20060731041731-5e25624f04900907
parent: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 14:17:31 +1000
message:
Start testing behaviour of unknowns in WorkingTree.walkdirs.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.6
merged: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
parent: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
parent: robertc at robertcollins.net-20060730140221-19d4964ea23f4406
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Mon 2006-07-31 00:09:17 +1000
message:
Merge osutils.walkdirs improvements.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.5
merged: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
parent: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sun 2006-07-30 02:04:35 +1000
message:
Add missing test_walkdirs test file.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.4
merged: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
parent: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
parent: pqm at pqm.ubuntu.com-20060729144556-473b3c46dfa061a7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sun 2006-07-30 02:04:16 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.3
merged: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
parent: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sat 2006-07-29 13:57:49 +1000
message:
Add a first-cut Tree.walkdirs method.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.2
merged: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
parent: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
parent: pqm at pqm.ubuntu.com-20060728165219-3a441adb0af54ef8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Sat 2006-07-29 11:49:10 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.3.1.1.4.2.4.1.4.1.1
merged: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
parent: robertc at robertcollins.net-20060725062142-a8ba77276b76c8cf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Tree.walkdirs
timestamp: Fri 2006-07-28 19:00:47 +1000
message:
Add a complex test tree for use with Tree.walkdirs.
------------------------------------------------------------
revno: 1852.4.6
merged: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
parent: robertc at robertcollins.net-20060727010824-1574387ff896add8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-28 11:21:52 +1000
message:
start hooking in the prototype dirstate serialiser.
------------------------------------------------------------
revno: 1852.4.5
merged: robertc at robertcollins.net-20060727010824-1574387ff896add8
parent: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Thu 2006-07-27 11:08:24 +1000
message:
merge single file status benchmark.
------------------------------------------------------------
revno: 1852.3.1.1.2.1.3.1.1
merged: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status-benchmarks
timestamp: Thu 2006-07-27 11:08:05 +1000
message:
Add single file status benchmark.
------------------------------------------------------------
revno: 1852.4.4
merged: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
parent: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Wed 2006-07-26 17:49:58 +1000
message:
Merge Tree.changes_from work.
------------------------------------------------------------
revno: 1852.4.3
merged: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
parent: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
parent: robertc at robertcollins.net-20060717072302-c398045e6dcc577d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Mon 2006-07-17 17:23:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 1852.4.2
merged: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
parent: robertc at robertcollins.net-20060714054631-831827119939d138
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-14 16:01:10 +1000
message:
Introduce a WorkingTree Format 4, which is the new dirstate format.
------------------------------------------------------------
revno: 1852.4.1
merged: robertc at robertcollins.net-20060714054631-831827119939d138
parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
parent: robertc at robertcollins.net-20060714052817-76f18c3e784ed1ef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: WorkingTree Format 4
timestamp: Fri 2006-07-14 15:46:31 +1000
message:
Merge in prepatory work for adding WorkingTreeFormat4.
-------------- next part --------------
Diff too large for email (2522 lines, the limit is 1000).
More information about the bazaar-commits
mailing list