Rev 2327: Merge (hopefully the last time) mainline fixes for 0.15. in http://people.ubuntu.com/~robertc/baz2.0/0.15
Robert Collins
robertc at robertcollins.net
Wed Mar 21 04:14:40 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/0.15
------------------------------------------------------------
revno: 2327
revision-id: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
parent: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 15:14:35 +1100
message:
Merge (hopefully the last time) mainline fixes for 0.15.
added:
bzrlib/tests/per_lock/ bzrlibtestsper_lock-20070314195914-llb0phfp2laomqb3-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/per_lock/test_lock.py test_lock.py-20070313190612-mfpoa7t8kvrgrhj2-1
bzrlib/tests/per_lock/test_temporary_write_lock.py test_temporary_write-20070314233412-xp3ocbyvw3woa03w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
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_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2323.2.35.1.9
merged: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:39:38 +0000
message:
(John Arbash Meinel) allow win32 to grab a write lock after 'bzr status', so that we can record the updated stat values.
------------------------------------------------------------
revno: 2323.2.35.1.5.3.4
merged: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
parent: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Tue 2007-03-20 16:59:59 -0500
message:
NEWS
------------------------------------------------------------
revno: 2323.2.35.1.5.3.3
merged: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
parent: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 17:11:28 -0500
message:
make Write locks not block on Read locks, so that revert tests don't fail
Specifically:
test_revert.TestRevert.test_preserve_execute
test_revert.TestRevert.test_revert_executable
fail if we fail to take a Write lock if we have a Read lock.
------------------------------------------------------------
revno: 2323.2.35.1.5.3.2
merged: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
parent: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 16:45:03 -0500
message:
Disable read locks blocking on write locks.
This requires some small test updates to disable that sort of check.
But it should allow the rest of the test suite to pass on non-win32
------------------------------------------------------------
revno: 2323.2.35.1.5.3.1
merged: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 15:56:18 -0500
message:
[merge] locking changes into bzr.dev tip
------------------------------------------------------------
revno: 2323.2.30.3.8.1.11
merged: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
parent: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Mon 2007-03-19 15:45:46 -0500
message:
Remove the unused _ignore_write_lock parameter.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.10
merged: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
parent: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:39:05 -0500
message:
[merge] Alexander Belchenko: forgotten import of TestSkipped
------------------------------------------------------------
revno: 2323.2.30.3.8.1.8.1.1
merged: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: jam-locking-bialix
timestamp: Fri 2007-03-16 01:27:43 +0200
message:
forgotten import of TestSkipped
------------------------------------------------------------
revno: 2323.2.30.3.8.1.9
merged: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:24:59 -0500
message:
[merge] bzr.dev 2359
------------------------------------------------------------
revno: 2323.2.30.3.8.1.8
merged: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:15:20 -0600
message:
Use the right lock object.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.7
merged: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
parent: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:55:59 -0500
message:
Change the temporary_write_lock api, so that it always returns a lock object,
and a flag indicating whether it was able to grab a write lock.
This is because callers don't know whether it had to unlock the original lock, so it
should always return something that lets callers maintain proper state.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.6
merged: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
parent: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:14:45 -0500
message:
ctypes locks should return ctypes locks.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.5
merged: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
parent: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:02:16 -0500
message:
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.4
merged: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
parent: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 12:19:48 -0500
message:
Implement temporary_write_lock, and restore_read_lock for win32 locks.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.3
merged: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
parent: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 18:40:34 -0500
message:
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process.
Implement it for _fcntl.
This is the api that can be used when we want to update a dirty dirstate
even though we only have a read lock.
On win32, this will actually unlock and re-lock the file. Which is part of
the api description. But we don't have to limit ourselves to the lowest
common denominator on all platforms.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.2
merged: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
parent: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 17:31:38 -0500
message:
[merge] LockCleanup changes.
------------------------------------------------------------
revno: 2323.2.30.3.8.1.1
merged: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:39:14 -0600
message:
(broken) Change fcntl locks to be properly exclusive within the same process.
This exposes the location where we are opening the same WorkingTree in both read and write
mode, which breaks several tests.
------------------------------------------------------------
revno: 2323.2.35.1.8
merged: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:23:07 +0000
message:
(John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.
------------------------------------------------------------
revno: 2323.2.35.1.5.2.5
merged: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
parent: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Tue 2007-03-20 16:54:06 -0500
message:
[merge] bzr.dev 2365
------------------------------------------------------------
revno: 2323.2.35.1.5.2.4
merged: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 20:00:14 -0500
message:
NEWS for fixing bug #93681
------------------------------------------------------------
revno: 2323.2.35.1.5.2.3
merged: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
parent: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:55:43 -0500
message:
Just check if the entry is absent before calling _make_absent.
------------------------------------------------------------
revno: 2323.2.35.1.5.2.2
merged: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
parent: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:49:11 -0500
message:
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.
------------------------------------------------------------
revno: 2323.2.35.1.5.2.1
merged: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:41:04 -0500
message:
(broken) Add a simplified test which exposes the bug.
------------------------------------------------------------
revno: 2323.2.35.1.7
merged: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 20:21:00 +0000
message:
(John Arbash Meinel, Wouter van Heyst) Handle ERROR_DIRECTORY on win32 when doing 'bzr status filename'
------------------------------------------------------------
revno: 2323.2.35.1.5.1.4
merged: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
parent: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Tue 2007-03-20 14:19:16 -0500
message:
Handle ERROR_DIRECTORY for python 2.5
------------------------------------------------------------
revno: 2323.2.35.1.5.1.3
merged: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
parent: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:27:36 -0500
message:
NEWS entry for fixing bug #90819
------------------------------------------------------------
revno: 2323.2.35.1.5.1.2
merged: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
parent: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:24:56 -0500
message:
Clean up the error.
------------------------------------------------------------
revno: 2323.2.35.1.5.1.1
merged: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:10:30 -0500
message:
Catch Windows ERROR_DIRECTORY when doing os.listdir('file')
------------------------------------------------------------
revno: 2323.2.35.1.6
merged: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-19 07:26:06 +0000
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.3
merged: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-19 03:08:04 -0400
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 2323.2.35.1.5
merged: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-17 01:53:05 +0000
message:
(John Arbash Meinel) Update dirstate._iter_changes to return unicode for all paths (bug #92608)
------------------------------------------------------------
revno: 2323.2.35.1.2.1.8
merged: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
parent: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 20:34:14 -0500
message:
Update the tests to handle when fs is non-unicode.
------------------------------------------------------------
revno: 2323.2.35.1.2.1.7
merged: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
parent: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 16:00:04 -0600
message:
NEWS on fixing bug #92608
------------------------------------------------------------
revno: 2323.2.35.1.2.1.6
merged: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
parent: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 14:13:40 -0500
message:
Change utf8_decode_with_None to return what we care about.
Re-use utf8_decode_with_None in the outer loop to avoid decoding in the inner
process_entry
Change the name of the local variable, to make it clear what we are doing.
------------------------------------------------------------
revno: 2323.2.35.1.2.1.5
merged: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
parent: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 11:55:16 -0500
message:
Split out the unicode tests properly.
------------------------------------------------------------
revno: 2323.2.35.1.2.1.4
merged: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
parent: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:22:08 -0500
message:
Clean up of test_compare code.
Change helpers to return locked trees, so we have less copied code.
------------------------------------------------------------
revno: 2323.2.35.1.2.1.3
merged: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
parent: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:10:20 -0500
message:
Start splitting up the overzealous test into focused tests.
And find the bug in add (I was decoding the wrong parameter)
------------------------------------------------------------
revno: 2323.2.35.1.2.1.2
merged: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
parent: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 17:35:35 -0500
message:
Add an overzealous test, for Unicode support of _iter_changes.
For both knowns and unknowns.
And include a basic, if suboptimal, fix.
I would rather defer the decoding until we've determined that we are going to return the tuple.
There is still something broken with added files, but I'll get to that.
------------------------------------------------------------
revno: 2323.2.35.1.2.1.1
merged: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 15:51:12 -0500
message:
Basic implementation test that makes sure _iter_changes handles unknown files.
------------------------------------------------------------
revno: 2323.2.35.1.4
merged: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-16 04:17:59 +0000
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 2323.2.30.3.14
merged: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 18:25:18 -0500
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 2323.2.35.1.3
merged: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 23:19:15 +0000
message:
(John Arbash Meinel, Alexander Belchenko) some small cleanups for the new lock code.
------------------------------------------------------------
revno: 2323.2.30.3.13
merged: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 14:22:25 -0500
message:
Cleanup according to Alexander's review comments.
------------------------------------------------------------
revno: 2323.2.35.1.2
merged: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 15:12:45 +0000
message:
(John Arbash Meinel) Clean up OS locks, and implement per-lock implementation tests.
------------------------------------------------------------
revno: 2323.2.30.3.12
merged: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 18:13:41 -0500
message:
Don't create the alternative lock types unless we are on windows.
------------------------------------------------------------
revno: 2323.2.30.3.11
merged: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
parent: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:57:03 -0500
message:
Code cleanup
------------------------------------------------------------
revno: 2323.2.30.3.10
merged: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
parent: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:47:17 -0500
message:
Cleanup errors, and change ReadOnlyLockError to pass around more details.
------------------------------------------------------------
revno: 2323.2.30.3.9
merged: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:15:52 -0500
message:
Update the lock code and test code so that if more than one
lock implementation is available, they will both be tested.
It is quite a bit of overhead, for a case where we are likely to only have 1
real lock implementation per platform, but hey, for now we have 2.
------------------------------------------------------------
revno: 2323.2.30.3.8
merged: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
parent: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:18:12 -0500
message:
Fix Copyright in lock.py
------------------------------------------------------------
revno: 2323.2.30.3.7
merged: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
parent: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:17:37 -0500
message:
Remove the msvc lock type, since it can no longer be used.
------------------------------------------------------------
revno: 2323.2.30.3.6
merged: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
parent: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:11:51 -0500
message:
On Win32 if you have a file opened in read+write mode, you must call seek() when switching
------------------------------------------------------------
revno: 2323.2.30.3.5
merged: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
parent: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:35:38 -0500
message:
Fall back on ctypes to get LockFileEx, because msvcrt.locking()
------------------------------------------------------------
revno: 2323.2.30.3.4
merged: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
parent: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 15:28:27 -0500
message:
Clean up the lock.py code to use less indenting, and conform to better coding practise.
------------------------------------------------------------
revno: 2323.2.30.3.3
merged: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
parent: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:39:27 -0600
message:
Define an explicit error when trying to grab a write lock on a readonly file.
Add some future tests that ensure write and read locks exclude eachother.
Currently fcntl locks do not exclude.
------------------------------------------------------------
revno: 2323.2.30.3.2
merged: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
parent: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:15:57 -0600
message:
Add a tests that multiple write locks raise the right kind of error.
------------------------------------------------------------
revno: 2323.2.30.3.1
merged: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:11:05 -0600
message:
Add some basic locking tests which should currently pass on all platforms.
------------------------------------------------------------
revno: 2323.2.35.1.1
merged: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 15:50:44 +0000
message:
Fixes for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.58
merged: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
parent: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 11:22:51 -0400
message:
Clean up NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.57
merged: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
parent: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:54:34 -0400
message:
Ensure server default works, too
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.56
merged: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
parent: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:46:22 -0400
message:
Merge fix from Vincent
------------------------------------------------------------
revno: 2323.2.35.2.1
merged: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 92195
timestamp: Wed 2007-03-14 11:37:18 +0100
message:
Fix bug #92195.
* tests/blackbox/test_merge_directive.py:
(TestMergeDirective.prepare_merge_directive): Set smtp_server in
branch config.
(TestMergeDirective.test_mail): Check that the smtp_server is
taken into account.
* builtins.py:
(cmd_merge_directive.run): Provide config smtp_server to
SMTP.connect().
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.55
merged: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:42:57 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54
merged: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:59:44 -0400
message:
Decoded revision ids are utf-8
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.53
merged: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:18:51 -0400
message:
Fix deserialization of merge directives with no patch
Diff too large for email (2236 lines, the limit is 1000).
More information about the bazaar-commits
mailing list