Rev 2586: merge trunk and fix run_bzr call in merge_directive tests in http://sourcefrog.net/bzr/cleanup-runbzr
Martin Pool
mbp at sourcefrog.net
Thu Jul 5 01:12:28 BST 2007
At http://sourcefrog.net/bzr/cleanup-runbzr
------------------------------------------------------------
revno: 2586
revision-id: mbp at sourcefrog.net-20070705001225-sgr71qfxpj9ghc83
parent: mbp at sourcefrog.net-20070704092722-2y1awxvaoeyv1w0h
parent: pqm at pqm.ubuntu.com-20070704204059-a1x9jomep52m9arn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Thu 2007-07-05 10:12:25 +1000
message:
merge trunk and fix run_bzr call in merge_directive tests
added:
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2581.1.5
merged: pqm at pqm.ubuntu.com-20070704204059-a1x9jomep52m9arn
parent: pqm at pqm.ubuntu.com-20070704140209-ldl1njlpcclszadu
parent: abentley at panoramicfeedback.com-20070704182424-q55ffb9o09qxw787
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 21:40:59 +0100
message:
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
------------------------------------------------------------
revno: 2581.1.4.1.1
merged: abentley at panoramicfeedback.com-20070704182424-q55ffb9o09qxw787
parent: pqm at pqm.ubuntu.com-20070704140209-ldl1njlpcclszadu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: less-crack
timestamp: Wed 2007-07-04 14:24:24 -0400
message:
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
------------------------------------------------------------
revno: 2581.1.4
merged: pqm at pqm.ubuntu.com-20070704140209-ldl1njlpcclszadu
parent: pqm at pqm.ubuntu.com-20070704095320-41p0gvstimqqzvtx
parent: abentley at panoramicfeedback.com-20070704131450-b3158abbethvwvob
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 15:02:09 +0100
message:
Fix #102019 by not asking strace to follow children
------------------------------------------------------------
revno: 2581.1.3.1.1
merged: abentley at panoramicfeedback.com-20070704131450-b3158abbethvwvob
parent: pqm at pqm.ubuntu.com-20070704095320-41p0gvstimqqzvtx
parent: v.ladeuil+lp at free.fr-20070703092859-yl7j53209tfmhf7u
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2007-07-04 09:14:50 -0400
message:
Fix #102019 by not asking strace to follow children
------------------------------------------------------------
revno: 2566.3.4
merged: v.ladeuil+lp at free.fr-20070703092859-yl7j53209tfmhf7u
parent: v.ladeuil+lp at free.fr-20070702152123-hkfs15u2m87nxrcf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 102019
timestamp: Tue 2007-07-03 11:28:59 +0200
message:
Take Martin and Robert comments into account.
* bzrlib/strace.py:
(strace): is now a wrapper that calls strace_detailed.
(strace_detailed): like strace before but with an option to
disable following forked children without polluting the kwargs
param.
* bzrlib/tests/test_strace.py:
(TestStrace.test_strace_callable_is_called,
TestStrace.test_strace_callable_result,
TestStrace.test_strace_result_has_raw_log): use strace_detailed
while disabling following forked children, the syntax is a bit
uglier but non-test users should never use anyway..
------------------------------------------------------------
revno: 2566.3.3
merged: v.ladeuil+lp at free.fr-20070702152123-hkfs15u2m87nxrcf
parent: v.ladeuil+lp at free.fr-20070702140940-oz36hfh6hcihlgbj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 102019
timestamp: Mon 2007-07-02 17:21:23 +0200
message:
Don't use '_' for unused variable to ease future support pf i18n.
------------------------------------------------------------
revno: 2566.3.2
merged: v.ladeuil+lp at free.fr-20070702140940-oz36hfh6hcihlgbj
parent: v.ladeuil+lp at free.fr-20070702110710-jjzry7iv7hbqinrm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 102019
timestamp: Mon 2007-07-02 16:09:40 +0200
message:
Fix typo, add comment, following Martin's review.
------------------------------------------------------------
revno: 2566.3.1
merged: v.ladeuil+lp at free.fr-20070702110710-jjzry7iv7hbqinrm
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 102019
timestamp: Mon 2007-07-02 13:07:10 +0200
message:
Fix #102019 by not asking strace to follow children forks during tests.
* bzrlib/tests/test_strace.py:
(TestStrace.test_strace_callable_is_called,
TestStrace.test_strace_callable_result,
TestStrace.test_strace_result_has_raw_log): Don't follow childrens
when calling strace to avoid random hanging.
* bzrlib/strace.py:
(strace): Provides a way do disable the strace '-f' option.
------------------------------------------------------------
revno: 2581.1.3
merged: pqm at pqm.ubuntu.com-20070704095320-41p0gvstimqqzvtx
parent: pqm at pqm.ubuntu.com-20070704090428-7up5xgpxdtt234u3
parent: mbp at sourcefrog.net-20070704092414-oql4gkeief8aq5oh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 10:53:20 +0100
message:
(mbp,r=john,r=robertc) -Dlock and lockdir fixes
------------------------------------------------------------
revno: 2555.3.22
merged: mbp at sourcefrog.net-20070704092414-oql4gkeief8aq5oh
parent: mbp at sourcefrog.net-20070704092156-us6h516qevsps4dg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-07-04 19:24:14 +1000
message:
hook docs
------------------------------------------------------------
revno: 2555.3.21
merged: mbp at sourcefrog.net-20070704092156-us6h516qevsps4dg
parent: mbp at sourcefrog.net-20070704091023-7ngb0ux89dnxbppi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-07-04 19:21:56 +1000
message:
Remove LockDir.wait()
------------------------------------------------------------
revno: 2555.3.20
merged: mbp at sourcefrog.net-20070704091023-7ngb0ux89dnxbppi
parent: mbp at sourcefrog.net-20070704090420-xyi51gwbmcoxdbjr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-07-04 19:10:23 +1000
message:
rename _lock_core to _attempt_lock
------------------------------------------------------------
revno: 2555.3.19
merged: mbp at sourcefrog.net-20070704090420-xyi51gwbmcoxdbjr
parent: mbp at sourcefrog.net-20070703092445-lxrbtbwncyyolqgz
parent: pqm at pqm.ubuntu.com-20070704083613-v2o3pj6chp4hiqky
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-07-04 19:04:20 +1000
message:
merge news from trunk
------------------------------------------------------------
revno: 2555.3.18
merged: mbp at sourcefrog.net-20070703092445-lxrbtbwncyyolqgz
parent: mbp at sourcefrog.net-20070703092317-7uf5ftvnu268m4ls
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 19:24:45 +1000
message:
Don't fail hard when removing pending lockdir
------------------------------------------------------------
revno: 2555.3.17
merged: mbp at sourcefrog.net-20070703092317-7uf5ftvnu268m4ls
parent: mbp at sourcefrog.net-20070703091157-r98tvj1rwxorobog
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 19:23:17 +1000
message:
Remove outdated comments
------------------------------------------------------------
revno: 2555.3.16
merged: mbp at sourcefrog.net-20070703091157-r98tvj1rwxorobog
parent: mbp at sourcefrog.net-20070703090919-85qfphsxv3pp2czj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 19:11:57 +1000
message:
Clean up patch to make divergence from mainline smaller.
Separate out LockDir._remove_pending_dir.
Put some behaviour back that was depended upon by test cases that override
attempt_lock.
Typos.
------------------------------------------------------------
revno: 2555.3.15
merged: mbp at sourcefrog.net-20070703090919-85qfphsxv3pp2czj
parent: mbp at sourcefrog.net-20070703072442-y3pwex52rrtsa8gg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 19:09:19 +1000
message:
remove pdb
------------------------------------------------------------
revno: 2555.3.14
merged: mbp at sourcefrog.net-20070703072442-y3pwex52rrtsa8gg
parent: mbp at sourcefrog.net-20070703070030-vayxt8668a4nappy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 17:24:42 +1000
message:
Better handling in LockDir of rename that moves one directory within another
------------------------------------------------------------
revno: 2555.3.13
merged: mbp at sourcefrog.net-20070703070030-vayxt8668a4nappy
parent: mbp at sourcefrog.net-20070628080901-o0xsxrgsqodeqvcu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 17:00:30 +1000
message:
LockDir cleanups
------------------------------------------------------------
revno: 2555.3.12
merged: mbp at sourcefrog.net-20070628080901-o0xsxrgsqodeqvcu
parent: mbp at sourcefrog.net-20070628075315-ewq68yfptqwx7nj8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 18:09:01 +1000
message:
Add test for https://bugs.launchpad.net/bzr/+bug/109169 -- test_failed_lock_leaves_no_trash
------------------------------------------------------------
revno: 2555.3.11
merged: mbp at sourcefrog.net-20070628075315-ewq68yfptqwx7nj8
parent: mbp at sourcefrog.net-20070628074325-fewhyi24ittr3kyz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 17:53:15 +1000
message:
fix up doctest example for token being returned from wait_lock
------------------------------------------------------------
revno: 2555.3.10
merged: mbp at sourcefrog.net-20070628074325-fewhyi24ittr3kyz
parent: mbp at sourcefrog.net-20070628060630-n7ygr23xhjcnay9w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 17:43:25 +1000
message:
doc
------------------------------------------------------------
revno: 2555.3.9
merged: mbp at sourcefrog.net-20070628060630-n7ygr23xhjcnay9w
parent: mbp at sourcefrog.net-20070628060052-2st5avps6i86neat
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 16:06:30 +1000
message:
Add test and fix for locking robustly when rename of directories doesn't act as a mutex (thank John)
------------------------------------------------------------
revno: 2555.3.8
merged: mbp at sourcefrog.net-20070628060052-2st5avps6i86neat
parent: mbp at sourcefrog.net-20070627093945-36tc2vu397tk1k6a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Thu 2007-06-28 16:00:52 +1000
message:
Add new BrokenRenameTransportDecorator
------------------------------------------------------------
revno: 2555.3.7
merged: mbp at sourcefrog.net-20070627093945-36tc2vu397tk1k6a
parent: mbp at sourcefrog.net-20070627092240-c75i6lwuwnc5gf2l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 19:39:45 +1000
message:
Docs on -Dlock
------------------------------------------------------------
revno: 2555.3.6
merged: mbp at sourcefrog.net-20070627092240-c75i6lwuwnc5gf2l
parent: mbp at sourcefrog.net-20070627091722-ouf4om2ib0e4s7ft
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 19:22:40 +1000
message:
Restore disabled LockDir trace message
------------------------------------------------------------
revno: 2555.3.5
merged: mbp at sourcefrog.net-20070627091722-ouf4om2ib0e4s7ft
parent: mbp at sourcefrog.net-20070627081353-f3402usvh4zlcs7q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 19:17:22 +1000
message:
Return token directly from LockDir.acquire to avoid unnecessary peek()
------------------------------------------------------------
revno: 2555.3.4
merged: mbp at sourcefrog.net-20070627081353-f3402usvh4zlcs7q
parent: mbp at sourcefrog.net-20070627081010-k0j4wgcyjjfabbe9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 18:13:53 +1000
message:
Remove unnecessary confirmation after acquiring LockDir
------------------------------------------------------------
revno: 2555.3.3
merged: mbp at sourcefrog.net-20070627081010-k0j4wgcyjjfabbe9
parent: mbp at sourcefrog.net-20070627080625-3rtudtycgo3ud4ip
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 18:10:10 +1000
message:
Simple lock tracing in LockDir
------------------------------------------------------------
revno: 2555.3.2
merged: mbp at sourcefrog.net-20070627080625-3rtudtycgo3ud4ip
parent: mbp at sourcefrog.net-20070627063331-42nj4x28k15zmqan
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 18:06:25 +1000
message:
rename _base_Lock to _OSLock
------------------------------------------------------------
revno: 2555.3.1
merged: mbp at sourcefrog.net-20070627063331-42nj4x28k15zmqan
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 16:33:31 +1000
message:
Better messages from assertContainsRe
------------------------------------------------------------
revno: 2581.1.2
merged: pqm at pqm.ubuntu.com-20070704090428-7up5xgpxdtt234u3
parent: pqm at pqm.ubuntu.com-20070704083613-v2o3pj6chp4hiqky
parent: robertc at robertcollins.net-20070702071125-cfv9utb636hn3kg3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 10:04:28 +0100
message:
(robertc) status analysis documentation.
------------------------------------------------------------
revno: 2566.2.3
merged: robertc at robertcollins.net-20070702071125-cfv9utb636hn3kg3
parent: robertc at robertcollins.net-20070702051812-9ztlxv5nw1w3v10m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-02 17:11:25 +1000
message:
Clearer description of locality of reference tuning.
------------------------------------------------------------
revno: 2566.2.2
merged: robertc at robertcollins.net-20070702051812-9ztlxv5nw1w3v10m
parent: robertc at robertcollins.net-20070702023128-5j3rtf8bx5v49tbi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-02 15:18:12 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2566.2.1
merged: robertc at robertcollins.net-20070702023128-5j3rtf8bx5v49tbi
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-02 12:31:28 +1000
message:
Status analysis.
------------------------------------------------------------
revno: 2581.1.1
merged: pqm at pqm.ubuntu.com-20070704083613-v2o3pj6chp4hiqky
parent: pqm at pqm.ubuntu.com-20070704080808-0ptk5p5yiwxjgnt7
parent: bialix at ukr.net-20070703171653-y3kif40lk0hqfi7m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 09:36:13 +0100
message:
teach windows installers to build pyrex/C extensions
------------------------------------------------------------
revno: 2571.3.4
merged: bialix at ukr.net-20070703171653-y3kif40lk0hqfi7m
parent: bialix at ukr.net-20070703171310-r7bd4007xyjlzxv5
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-07-03 20:16:53 +0300
message:
teach windows installers to build pyrex/C extensions
------------------------------------------------------------
revno: 2571.3.3
merged: bialix at ukr.net-20070703171310-r7bd4007xyjlzxv5
parent: bialix at ukr.net-20070703171217-8vypfjd2uso3air0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-07-03 20:13:10 +0300
message:
branding
------------------------------------------------------------
revno: 2571.3.2
merged: bialix at ukr.net-20070703171217-8vypfjd2uso3air0
parent: bialix at ukr.net-20070703170729-kwz1skah3o0yp7nx
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-07-03 20:12:17 +0300
message:
Build pyrex/C extensions for bzr.exe
------------------------------------------------------------
revno: 2571.3.1
merged: bialix at ukr.net-20070703170729-kwz1skah3o0yp7nx
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-07-03 20:07:29 +0300
message:
Building Python-based installer for bot Python 2.4 and 2.5
(important for pyrex/C extensions)
Diff too large for email (1057 lines, the limit is 1000).
More information about the bazaar-commits
mailing list