Rev 2425: merge dirstate in http://sourcefrog.net/bzr/dirstate-plus-subtree
Martin Pool
mbp at sourcefrog.net
Fri Mar 2 08:55:18 GMT 2007
At http://sourcefrog.net/bzr/dirstate-plus-subtree
------------------------------------------------------------
revno: 2425
revision-id: mbp at sourcefrog.net-20070302085516-0yyuvauummgcycsm
parent: mbp at sourcefrog.net-20070301122840-6exf6ilcew2mcn1g
parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 19:55:16 +1100
message:
merge dirstate
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_readonly.py test_readonly.py-20061219164256-7imbl63m4j15n0es-1
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
------------------------------------------------------------
revno: 2406.1.92
merged: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
parent: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Fri 2007-03-02 18:57:54 +1100
message:
Test for smart_add(save=false) should be run against all WorkingTrees; adjust the test to more precisely cover the contract.
------------------------------------------------------------
revno: 2406.1.91
merged: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
parent: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 15:40:12 +1100
message:
Move unknown detection in long status into the delta creation, saving a tree-scan.
------------------------------------------------------------
revno: 2406.1.90
merged: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
parent: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 14:47:56 +1100
message:
Add unversioned path reporting to TreeDelta.
------------------------------------------------------------
revno: 2406.1.89
merged: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
parent: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 21:19:49 -0600
message:
Revert back to base64.encodestring() It seems codes.encoder() is actually a wrapper around encodestring() not the other way around.
------------------------------------------------------------
revno: 2406.1.88
merged: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
parent: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 13:58:30 +1100
message:
Enable InterTree._iter_changes symlink tests.
------------------------------------------------------------
revno: 2406.1.87
merged: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
parent: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 13:49:53 +1100
message:
Dont walk unversioned directories in _iter_changes.
------------------------------------------------------------
revno: 2406.1.86
merged: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
parent: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
parent: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 20:33:27 -0600
message:
Fix tests broken by dirstate caching sha1 and stat values.
Change _iter_changes so that it call update_entry() at the beginning.
this gives us a chance to have files change kind, and still get
the sha1 value from the cache rather than re-reading the file.
Some small updates for executable bits on win32.
------------------------------------------------------------
revno: 2406.1.83.1.9
merged: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
parent: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:30:56 -0600
message:
one more test that needs to ignore dirstate
------------------------------------------------------------
revno: 2406.1.83.1.8
merged: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
parent: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:22:58 -0600
message:
Fix another tests that was assuming dirstate was identical
between branches.
------------------------------------------------------------
revno: 2406.1.83.1.7
merged: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
parent: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 20:11:59 -0600
message:
Some updates to how we handle the executable bit. In preparation for supporting Win32
------------------------------------------------------------
revno: 2406.1.83.1.6
merged: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
parent: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 19:38:06 -0600
message:
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
------------------------------------------------------------
revno: 2406.1.83.1.5
merged: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
parent: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 19:27:53 -0600
message:
Fix a small bug when we have a symlink that does not need to be re-read.
------------------------------------------------------------
revno: 2406.1.83.1.4
merged: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
parent: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 18:27:06 -0600
message:
do not update_entry from disk if it is supposed to be absent or renamed
and make sure to use the current target_details afterwards
in case something has changed.
------------------------------------------------------------
revno: 2406.1.83.1.3
merged: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 18:07:29 -0600
message:
(broken) Change get_sha1_for_entry into update_entry
which reads off of the disk, and updates dirblocks.
This includes handling when files change into directories, and other
such content changes.
For some reason it breaks higher level tests, so for now, I'm
leaving this as a local commit until I can sort out the rest.
------------------------------------------------------------
revno: 2406.1.85
merged: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
parent: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Fri 2007-03-02 12:06:12 +1100
message:
Teach _iter_changes to gather unversioned path details upon request.
------------------------------------------------------------
revno: 2406.1.84
merged: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:59:30 -0600
message:
[merge] WorkingTree4 no longer uses the HashCache.
This saves 1-2s on a 'bzr status' in a 55k entry tree.
Locks are also updated to be non-blocking, and DirState will try to
write out its contents if it has been changed even if currently
read-locked, by trying to grab a write lock for the write.
------------------------------------------------------------
revno: 2406.1.83.1.2
merged: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
parent: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 15:56:19 -0600
message:
Update to dirstate locking.
Move all of WT4.lock_* functions locally, so that they can
properly interact and cleanup around when we lock/unlock the
dirstate file.
Change all Lock objects to be non-blocking. So that if someone
grabs a lock on the DirState we find out immediately, rather
than blocking.
Change WT4.unlock() so that if the dirstate is dirty, it will
save the contents even if it only has a read lock.
It does this by trying to take a write lock, if it fails
we just ignore it. If it succeeds, then we can flush to disk.
This is more important now that DirState tracks file changes.
It allows 'bzr status' to update the cached stat and sha values.
------------------------------------------------------------
revno: 2406.1.83.1.1
merged: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-nohc
timestamp: Thu 2007-03-01 13:58:38 -0600
message:
Update WorkingTree4 so that it doesn't use a HashCache,
instead caching the sha values and stat fingerprint in the 'current'
section.
------------------------------------------------------------
revno: 2406.1.83
merged: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
parent: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:48:50 -0600
message:
Update some obvious copyright headers to include 2007.
------------------------------------------------------------
revno: 2406.1.82
merged: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
parent: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:06:38 -0600
message:
Fix a small typo that causes _iter_changes to break.
------------------------------------------------------------
revno: 2406.1.81
merged: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
parent: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:01:33 -0600
message:
Be optimistic about .bzr/branch/revision-history already being in utf8.
Decoding all 178k revisions for a mozilla tree takes about 3s / 15s for a 'bzr status'.
Branch6 will do better by caching last_revision rather than the complete history.
But for now, it looks a lot better if we just assume the revisions are utf8.
------------------------------------------------------------
revno: 2406.1.80
merged: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
parent: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 09:54:18 -0600
message:
Don't decode the path entry until we've actually decided to return the tuple.
This saves somewhere between 500 - 1000ms on the Moz tree.
It will be more noticable when we don't do the extra directory walking
(where we have to decode all of the path names again).
------------------------------------------------------------
revno: 2406.1.79
merged: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
parent: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 23:20:44 +1100
message:
Some BRANCH.TODO updates.
Diff too large for email (2414 lines, the limit is 1000).
More information about the bazaar-commits
mailing list