Rev 2415: (merge) updates from dirstate branch in http://sourcefrog.net/bzr/dirstate-plus-subtree
Martin Pool
mbp at sourcefrog.net
Tue Feb 27 05:51:39 GMT 2007
At http://sourcefrog.net/bzr/dirstate-plus-subtree
------------------------------------------------------------
revno: 2415
revision-id: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
parent: mbp at sourcefrog.net-20070226144759-5xfdve14d83esg7u
parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Tue 2007-02-27 16:51:36 +1100
message:
(merge) updates from dirstate branch
added:
bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2406.1.20
merged: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
parent: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 21:09:28 -0600
message:
update test for format 3, and enable caching of path split while lock is held.
------------------------------------------------------------
revno: 2406.1.19
merged: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
parent: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 20:48:45 -0600
message:
disable the new test for now, since it triggers a pdb trace and hangs the test suite.
------------------------------------------------------------
revno: 2406.1.18
merged: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
parent: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 20:44:58 -0600
message:
Change the sort order to match walkdirs() and iter_entries_by_dir()
------------------------------------------------------------
revno: 2406.1.17.1.6
merged: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
parent: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:58:06 -0600
message:
Because the disk format (sorting) has now changed
bump the format number. Converting between them is trivial, and
could actually be done on the fly if desired.
------------------------------------------------------------
revno: 2406.1.17.1.5
merged: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
parent: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:30:27 -0600
message:
Add a test that dirstate adds records in the right order.
------------------------------------------------------------
revno: 2406.1.17.1.4
merged: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
parent: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 19:08:04 -0600
message:
Rather than using split hunks, implement a bisect_dirblocks
which knows that it is bisecting dirblocks and only compares the first
hunk, and does the comparison in split mode.
------------------------------------------------------------
revno: 2406.1.17.1.3
merged: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
parent: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 18:41:09 -0600
message:
Add the ability to cache the split output
rather than having to always split paths.
------------------------------------------------------------
revno: 2406.1.17.1.2
merged: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
parent: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 18:34:12 -0600
message:
Add a helper function, which allows us to store keys as plain paths,
but bisect across them as split paths.
------------------------------------------------------------
revno: 2406.1.17.1.1
merged: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 17:05:06 -0600
message:
(broken) Update the test to actually expose the iter_changes bug.
------------------------------------------------------------
revno: 2406.1.17
merged: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
parent: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:11:07 -0600
message:
Add another test that makes sure we can add as long as the file_id isn't current.
------------------------------------------------------------
revno: 2406.1.16
merged: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
parent: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:08:14 -0600
message:
Make sure adding a duplicate file_id raises DuplicateFileId.
This adds an explicit test for it, updates Inventory to raise the right error,
and updates Dirstate.add() to also check for a duplicated file_id.
------------------------------------------------------------
revno: 2406.1.15
merged: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
parent: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:51:04 -0600
message:
Try to create an intertree test that exposes the walkdir vs dirstate mismatch. No luck yet.
------------------------------------------------------------
revno: 2406.1.14
merged: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
parent: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:17:03 -0600
message:
Make set_root_id() a no-op if the id doesn't change,
and change the test_merge_core tests to flush the state to disk, since
they are hanging onto a write lock.
------------------------------------------------------------
revno: 2406.1.13
merged: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
parent: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:18:58 -0600
message:
find an edge case in our _get_entry logic and fix it.
Also, id2path doesn't need to grab the index, just use _get_entry.
------------------------------------------------------------
revno: 2406.1.12
merged: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
parent: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 11:09:38 -0600
message:
Some comments on merge code, fix merge tests that
assume basis_tree() is valid after the tree has been modified.
------------------------------------------------------------
revno: 2406.1.11
merged: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
parent: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:59:24 -0600
message:
Avoid directly accessing tree.inventory in merge.py
------------------------------------------------------------
revno: 2406.1.10
merged: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
parent: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:53:16 -0600
message:
Handle the case when we are adding a file to an empty directory.
Add a suite of tests for WorkingTree.add()
------------------------------------------------------------
revno: 2406.1.9
merged: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
parent: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:19:02 -0600
message:
Add more tests for WorkingTree.move() and a similar suite
for WorkingTree.rename_one().
------------------------------------------------------------
revno: 2406.1.8
merged: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
parent: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 09:27:17 -0600
message:
Lock the tree when using a commit builder.
------------------------------------------------------------
revno: 2406.1.7
merged: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
parent: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:54:44 +1100
message:
continue iteration at the right point for InterDirStateTree._iter_changes.
------------------------------------------------------------
revno: 2406.1.6
merged: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
parent: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 16:14:05 +1100
message:
Test for iterating changes past empty directories.
------------------------------------------------------------
revno: 2406.1.5
merged: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
parent: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:54:23 +1100
message:
Back out changing default format: its not ready yet.
------------------------------------------------------------
revno: 2406.1.4
merged: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
parent: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 15:27:55 +1100
message:
Test InterTree._iter_changes with missing (absent but versioned) files.
------------------------------------------------------------
revno: 2406.1.3
merged: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
parent: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:53:30 +1100
message:
Add tests for _iter_changes with symlinks, disabled until unversioned file support is added, as that affects the test expected value.
------------------------------------------------------------
revno: 2406.1.2
merged: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
parent: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:19:29 +1100
message:
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
------------------------------------------------------------
revno: 2406.1.1
merged: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 20:11:26 -0600
message:
_iter_changes should return Unicode paths.
Also, support NULL_REVISION by special casing the source_index
and just stating that all entries are absent.
Diff too large for email (1788 lines, the limit is 1000).
More information about the bazaar-commits
mailing list