Rev 2574: merge news from trunk in http://sourcefrog.net/bzr/dlock
Martin Pool
mbp at sourcefrog.net
Wed Jul 4 10:04:23 BST 2007
At http://sourcefrog.net/bzr/dlock
------------------------------------------------------------
revno: 2574
revision-id: 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
added:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2555.1.27
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: 2555.1.16.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: 2555.1.16.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: 2555.1.16.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: 2555.1.16.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)
------------------------------------------------------------
revno: 2555.1.26
merged: pqm at pqm.ubuntu.com-20070704080808-0ptk5p5yiwxjgnt7
parent: pqm at pqm.ubuntu.com-20070704041011-o8aw2m812hzhz8yr
parent: robertc at robertcollins.net-20070704062503-qmwfp3ocv0yug593
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 09:08:08 +0100
message:
(robertc) Overhaul smart_add to be an api on MutableTree allowing specialisation and reducing some cruft. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2555.1.13.2.10
merged: robertc at robertcollins.net-20070704062503-qmwfp3ocv0yug593
parent: robertc at robertcollins.net-20070704055005-vo5vt7jytsazi0ei
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Wed 2007-07-04 16:25:03 +1000
message:
And a missing import.
------------------------------------------------------------
revno: 2555.1.13.2.9
merged: robertc at robertcollins.net-20070704055005-vo5vt7jytsazi0ei
parent: robertc at robertcollins.net-20070704042857-w5472bxutvhxrl2y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Wed 2007-07-04 15:50:05 +1000
message:
Really honestly finally fix tests.
------------------------------------------------------------
revno: 2555.1.13.2.8
merged: robertc at robertcollins.net-20070704042857-w5472bxutvhxrl2y
parent: robertc at robertcollins.net-20070704024326-czaqy9flaooda2jj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Wed 2007-07-04 14:28:57 +1000
message:
Really really change the command to use the new API.
------------------------------------------------------------
revno: 2555.1.13.2.7
merged: robertc at robertcollins.net-20070704024326-czaqy9flaooda2jj
parent: robertc at robertcollins.net-20070704013950-7pp23plwyqjvgkxg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Wed 2007-07-04 12:43:26 +1000
message:
Fix missed tests.
------------------------------------------------------------
revno: 2555.1.13.2.6
merged: robertc at robertcollins.net-20070704013950-7pp23plwyqjvgkxg
parent: robertc at robertcollins.net-20070703023836-etkrpxm2rmbhqgaj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Wed 2007-07-04 11:39:50 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2555.1.13.2.5
merged: robertc at robertcollins.net-20070703023836-etkrpxm2rmbhqgaj
parent: robertc at robertcollins.net-20070703023332-jz0qdt2dwhzjuhlc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Tue 2007-07-03 12:38:36 +1000
message:
* ``bzrlib.add.FastPath`` is now private and moved to
``bzrlib.mutabletree._FastPath``. (Robert Collins, Martin Pool)
------------------------------------------------------------
revno: 2555.1.13.2.4
merged: robertc at robertcollins.net-20070703023332-jz0qdt2dwhzjuhlc
parent: robertc at robertcollins.net-20070702224620-rptec516zwv3opwn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Tue 2007-07-03 12:33:32 +1000
message:
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
deprecated in favour of ``MutableTree.smart_add``. (Robert Collins,
Martin Pool)
------------------------------------------------------------
revno: 2555.1.13.2.3
merged: robertc at robertcollins.net-20070702224620-rptec516zwv3opwn
parent: robertc at robertcollins.net-20070702223611-50tnzmbeoryqid75
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Tue 2007-07-03 08:46:20 +1000
message:
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
------------------------------------------------------------
revno: 2555.1.13.2.2
merged: robertc at robertcollins.net-20070702223611-50tnzmbeoryqid75
parent: robertc at robertcollins.net-20070702220543-bbal5fjb73rsl1s5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Tue 2007-07-03 08:36:11 +1000
message:
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
for dealing with unexpanded glob lists - e.g. on the win32 platform. This
was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)
* ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on
win32. Callers of the function should do this. (Robert Collins)
* ``bzrlib.add.glob_expand_for_win32`` is now
``bzrlib.win32utils.glob_expand``. (Robert Collins)
* ``bzrlib.smart_add`` is deprecated. (Robert Collins)
------------------------------------------------------------
revno: 2555.1.13.2.1
merged: robertc at robertcollins.net-20070702220543-bbal5fjb73rsl1s5
parent: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Tue 2007-07-03 08:05:43 +1000
message:
Remove unused references to smart_add.
------------------------------------------------------------
revno: 2555.1.25
merged: pqm at pqm.ubuntu.com-20070704041011-o8aw2m812hzhz8yr
parent: pqm at pqm.ubuntu.com-20070704024013-cwx0ld720nvdfb8q
parent: andrew.bennetts at canonical.com-20070704031237-faouhtp7ckc4m69t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 05:10:11 +0100
message:
(Kent Gibson) Fix bug #4663: bzr log -r to support selecting merge revisions.
------------------------------------------------------------
revno: 2555.1.23.2.1
merged: andrew.bennetts at canonical.com-20070704031237-faouhtp7ckc4m69t
parent: pqm at pqm.ubuntu.com-20070703184919-6iz3vo2rx42smf25
parent: warthog618 at gmail.com-20070504104926-dmz6x2gw7ydb8i7p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: kent-bug-4663
timestamp: Wed 2007-07-04 13:12:37 +1000
message:
Merge Kent Gibson's fix for bug #4663, resolving conflicts.
------------------------------------------------------------
revno: 2466.8.1.3.1
merged: warthog618 at gmail.com-20070504104926-dmz6x2gw7ydb8i7p
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: log_range
timestamp: Fri 2007-05-04 18:49:26 +0800
message:
Fix ``bzr log -r`` to support selecting merge revisions.
------------------------------------------------------------
revno: 2555.1.24
merged: pqm at pqm.ubuntu.com-20070704024013-cwx0ld720nvdfb8q
parent: pqm at pqm.ubuntu.com-20070703184919-6iz3vo2rx42smf25
parent: ian.clatworthy at internode.on.net-20070704015326-c9vt1dxbxh7mmy26
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 03:40:13 +0100
message:
(Daniel Watkins) Bug #113990 - update should print summary of changes (like pull does)
------------------------------------------------------------
revno: 2555.1.23.1.1
merged: ian.clatworthy at internode.on.net-20070704015326-c9vt1dxbxh7mmy26
parent: pqm at pqm.ubuntu.com-20070703184919-6iz3vo2rx42smf25
parent: d.m.watkins at warwick.ac.uk-20070605001422-j0je4kv0k53l5y3z
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2007-07-04 11:53:26 +1000
message:
(Daniel Watkins) Bug #113990 - update should print summary of changes (like pull does)
------------------------------------------------------------
revno: 2504.2.4
merged: d.m.watkins at warwick.ac.uk-20070605001422-j0je4kv0k53l5y3z
parent: d.m.watkins at warwick.ac.uk-20070604020326-xytfikeijqusd5v5
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113990
timestamp: Tue 2007-06-05 01:14:22 +0100
message:
Reformatted code to fit in 79 columns.
------------------------------------------------------------
revno: 2504.2.3
merged: d.m.watkins at warwick.ac.uk-20070604020326-xytfikeijqusd5v5
parent: d.m.watkins at warwick.ac.uk-20070604002011-6xz29dbsc1z53n5t
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113990
timestamp: Mon 2007-06-04 03:03:26 +0100
message:
Further modified existing tests to cover the new output.
------------------------------------------------------------
revno: 2504.2.2
merged: d.m.watkins at warwick.ac.uk-20070604002011-6xz29dbsc1z53n5t
parent: d.m.watkins at warwick.ac.uk-20070604001930-ixh34lrwhcw340wq
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113990
timestamp: Mon 2007-06-04 01:20:11 +0100
message:
Modified existing tests to reflect changes to output.
------------------------------------------------------------
revno: 2504.2.1
merged: d.m.watkins at warwick.ac.uk-20070604001930-ixh34lrwhcw340wq
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113990
timestamp: Mon 2007-06-04 01:19:30 +0100
message:
builtins.py now passes a delta._ChangeReporter down the line when update is called, causing the changes the update makes to be displayed.
------------------------------------------------------------
revno: 2555.1.23
merged: pqm at pqm.ubuntu.com-20070703184919-6iz3vo2rx42smf25
parent: pqm at pqm.ubuntu.com-20070703083649-cbfyk0jt0itbktgb
parent: abentley at panoramicfeedback.com-20070703180034-zuiuqbo5mx0tsa1n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 19:49:19 +0100
message:
Fix #120678 by issuing a CONNECT request when https is used via a proxy
------------------------------------------------------------
revno: 2540.2.4
merged: abentley at panoramicfeedback.com-20070703180034-zuiuqbo5mx0tsa1n
parent: v.ladeuil+lp at free.fr-20070703152901-o25i9ntsv1jj1m4h
parent: pqm at pqm.ubuntu.com-20070703083649-cbfyk0jt0itbktgb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-07-03 14:00:34 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2540.2.3
merged: v.ladeuil+lp at free.fr-20070703152901-o25i9ntsv1jj1m4h
parent: v.ladeuil+lp at free.fr-20070626091244-nou3usgr34947wz9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 120678
timestamp: Tue 2007-07-03 17:29:01 +0200
message:
Take Aaron's comments into account.
------------------------------------------------------------
revno: 2540.2.2
merged: v.ladeuil+lp at free.fr-20070626091244-nou3usgr34947wz9
parent: v.ladeuil+lp at free.fr-20070622075602-1kk9gdry92v2usq3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 120678
timestamp: Tue 2007-06-26 11:12:44 +0200
message:
Fix #120678 by issuing a CONNECT request when https is used via a proxy.
* bzrlib/transport/http/_urllib2_wrappers.py:
(_ConectRequest): Make the class private and better document its
purpose.
(AbstractAuthHandler): Limit the attempts to
authenticate. Otherwise, in the very special case of CONNECT, if
the credentials are wrong we loop recursively until the stack
explodes.
------------------------------------------------------------
revno: 2540.2.1
merged: v.ladeuil+lp at free.fr-20070622075602-1kk9gdry92v2usq3
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 120678
timestamp: Fri 2007-06-22 09:56:02 +0200
message:
Rough, working, tested against squid+apache in basic auth fix for #120678
* bzrlib/transport/http/_urllib2_wrappers.py:
(Response.begin): Don't close the connection after a successful
CONNECT (grr).
(HTTPConnection.__init__, HTTPSConnection.__init__): Add a
proxied_host parameter. This is ugly and should be refactored.
(HTTPSConnection.connect, HTTPSConnection.connect_to_origin):
Split the httplib.HTTPSConnection so that we can issue a CONNECT
request *before* swithing the socket to ssl mode.
(Request.set_proxy): Trap the proxy setting to preserve the
original host.
(ConnectRequest): New specific request.
(ConnectRequest.set_proxy): Trap the proxy setting again to avoid
losing the original host (ugly).
(HTTPSHandler.https_request): Wow, we really need https tests,
https requests common headers were never set :-/
(HTTPSHandler.https_open): When connecting through a proxy, the
first request should be a CONNECT to establish the encrypted link.
------------------------------------------------------------
revno: 2555.1.22
merged: pqm at pqm.ubuntu.com-20070703083649-cbfyk0jt0itbktgb
parent: pqm at pqm.ubuntu.com-20070703080840-vjh1sot1a5nwix4h
parent: robertc at robertcollins.net-20070703074630-6c5jph1rtpcjbw46
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 09:36:49 +0100
message:
(robertc) Allow -Dhooks to get the hooks invoked during commit logged.
------------------------------------------------------------
revno: 2553.2.16
merged: robertc at robertcollins.net-20070703074630-6c5jph1rtpcjbw46
parent: robertc at robertcollins.net-20070703072155-vodf62irxoa7nthy
parent: pqm at pqm.ubuntu.com-20070703073546-9dv8bocak8u3ou6m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-07-03 17:46:30 +1000
message:
Merge bzr.dev again to resolve NEWS conflicts.
------------------------------------------------------------
revno: 2553.2.15
merged: robertc at robertcollins.net-20070703072155-vodf62irxoa7nthy
parent: robertc at robertcollins.net-20070702061147-rmouxo51qwz7rkns
parent: robertc at robertcollins.net-20070628082944-g033tsq16abxue3h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-07-03 17:21:55 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2555.1.5.1.4
merged: robertc at robertcollins.net-20070628082944-g033tsq16abxue3h
parent: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 18:29:44 +1000
message:
Allow -Dhooks to get the hooks invoked during commit logged.
------------------------------------------------------------
revno: 2555.1.21
merged: pqm at pqm.ubuntu.com-20070703080840-vjh1sot1a5nwix4h
parent: pqm at pqm.ubuntu.com-20070703073546-9dv8bocak8u3ou6m
parent: ian.clatworthy at internode.on.net-20070703073711-grb8q45os61y904x
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 09:08:40 +0100
message:
(Vincent Ladeuil) Merge fix for #110448
------------------------------------------------------------
revno: 2555.1.19.1.2
merged: ian.clatworthy at internode.on.net-20070703073711-grb8q45os61y904x
parent: ian.clatworthy at internode.on.net-20070703070332-45j7qw8z03fnulav
parent: v.ladeuil+lp at free.fr-20070609153407-c5jx52cfk47jydq5
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 17:37:11 +1000
message:
(Vincent Ladeuil) Merge fix for #110448
------------------------------------------------------------
revno: 2520.3.1
merged: v.ladeuil+lp at free.fr-20070609153407-c5jx52cfk47jydq5
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 110448
timestamp: Sat 2007-06-09 17:34:07 +0200
message:
Fix 110448 by adding a relpath parameter to get_transport.
* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport.get_transport,
get_readonly_transport): Add a relpath parameter.
* bzrlib/tests/test_transport.py:
(TestTransportImplementation.get_transport): Add a relpath
parameter.
* bzrlib/tests/test_sftp_transport.py:
(TestCaseWithSFTPServer.get_tranport): Deleted.
* bzrlib/tests/test_dirstate.py:
(TestCaseWithDirState.create_basic_dirstate): Use the new shiny
get_transport !
------------------------------------------------------------
revno: 2555.1.20
merged: pqm at pqm.ubuntu.com-20070703073546-9dv8bocak8u3ou6m
parent: pqm at pqm.ubuntu.com-20070703064804-tphz64uvb1bhdj78
parent: ian.clatworthy at internode.on.net-20070703070332-45j7qw8z03fnulav
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 08:35:46 +0100
message:
(Vincent Ladeuil) Fix #115209 - Unable to handle http code 400: Bad Request When issuing too many ranges
------------------------------------------------------------
revno: 2555.1.19.1.1
merged: ian.clatworthy at internode.on.net-20070703070332-45j7qw8z03fnulav
parent: pqm at pqm.ubuntu.com-20070703064804-tphz64uvb1bhdj78
parent: v.ladeuil+lp at free.fr-20070621081747-xj6dft70oigy1s8l
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 17:03:32 +1000
message:
(Vincent Ladeuil) Fix #115209 - Unable to handle http code 400: Bad Request When issuing too many ranges
------------------------------------------------------------
revno: 2520.2.3
merged: v.ladeuil+lp at free.fr-20070621081747-xj6dft70oigy1s8l
parent: v.ladeuil+lp at free.fr-20070620135621-x43c0hnmzu0iuo6m
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 115209
timestamp: Thu 2007-06-21 10:17:47 +0200
message:
Take aaron's remark into account.
* bzrlib/tests/HTTPTestUtil.py:
(LimitedRangeRequestHandler.get_multiple_ranges): Oops, remove
commented-out pdb usage.
------------------------------------------------------------
revno: 2520.2.2
merged: v.ladeuil+lp at free.fr-20070620135621-x43c0hnmzu0iuo6m
parent: v.ladeuil+lp at free.fr-20070612144857-1swhz5c3qo8n76l8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 115209
timestamp: Wed 2007-06-20 15:56:21 +0200
message:
Fix #115209 by issuing a single range request on 400: Bad Request
* bzrlib/transport/http/response.py:
(handle_response): Consider 400 as an indication that too much
ranges were specified.
* bzrlib/transport/http/_urllib2_wrappers.py:
(Request): Add an 'accpeted_errors' parameters describing what
error codes the caller will handle.
(HTTPErrorProcessor): Mention that Request specific accepted error
codes takes precedence.
(HTTPDefaultErrorHandler.http_error_default): Remove dead code.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): Add 400 as an accepted error iff
ranges are specified.
(HttpTransport_urllib._head): Restrict accepted errors.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._degrade_range_hint,
HttpTransportBase._get_ranges_hinted): Replace _retry_get.
(HttpTransportBase.readv): Simplified and avoid the spurious _get()
issued when _get was successful.
* bzrlib/tests/test_http.py:
(TestLimitedRangeRequestServer,
TestLimitedRangeRequestServer_urllib,
TestLimitedRangeRequestServer_pycurl): Bug #115209 specific tests.
* bzrlib/tests/HTTPTestUtil.py:
(LimitedRangeRequestHandler, LimitedRangeHTTPServer): New test
classes to emulate apache throwing 400: Bad Request when too much
ranges are specified.
(AuthRequestHandler.do_GET): Remove dead code. Yeah, I know,
not related to the bug :-/
------------------------------------------------------------
revno: 2520.2.1
merged: v.ladeuil+lp at free.fr-20070612144857-1swhz5c3qo8n76l8
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 115209
timestamp: Tue 2007-06-12 16:48:57 +0200
message:
First step to fix #115209 use _coalesce_offsets like other transports.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._bytes_to_read_before_seek): Setting it to 512
to minimize additional bytes transferred but still reducing number
of ranges.
(HttpTransportBase.readv): _coalesce_offsets does a better job
than offset_to_ranges/ Reduce code duplication too.
(HttpTransportBase.offsets_to_ranges): Deprecated.
(HttpTransportBase._attempted_range_header): Made private. Adapted
to offsets.
(HttpTransportBase._range_header): Made private. Adapted to
offsets.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._get): s/ranges/offsets/
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get, PyCurlTransport._get_ranged): s/ranges/offsets/
* bzrlib/tests/__init__.py:
(Transport._coalesce_offsets): Fix minor typo.
* bzrlib/tests/test_http.py:
(TestOffsets): Deleted. We rely on Transport._coalesce_offsets
only now.
(TestRangeHeader.check_header): Convert ranges to offets and use
Transport._coalesce_offsets.
(TestRangeHeader.test_range_header_single): Use tuples not lists !
(TestRanges._file_contents): Convert ranges to offets and use
Transport._coalesce_offsets. And fix indentation too.
(TestRanges._file_tail): Fix indentation.
(TestRanges.test_range_header): Use _file_contents so that we can
still use ranges.
------------------------------------------------------------
revno: 2555.1.19
merged: pqm at pqm.ubuntu.com-20070703064804-tphz64uvb1bhdj78
parent: pqm at pqm.ubuntu.com-20070703055715-ij91yrkomctki31m
parent: ian.clatworthy at internode.on.net-20070703060731-vq1d8o0hwu2otkzm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 07:48:04 +0100
message:
fix #123485 - selftest broken under Python 2.5.1 because of tafile API change
------------------------------------------------------------
revno: 2555.1.18.1.1
merged: ian.clatworthy at internode.on.net-20070703060731-vq1d8o0hwu2otkzm
parent: pqm at pqm.ubuntu.com-20070703055715-ij91yrkomctki31m
parent: ian.clatworthy at internode.on.net-20070703045545-1cxkxzh24wpo04uk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 16:07:31 +1000
message:
fix #123485 - selftest broken under Python 2.5.1 because of tafile API change
------------------------------------------------------------
revno: 2555.1.16.2.2
merged: ian.clatworthy at internode.on.net-20070703045545-1cxkxzh24wpo04uk
parent: ian.clatworthy at internode.on.net-20070703042914-ag3unoftav0en4tp
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.tar-on-py251
timestamp: Tue 2007-07-03 14:55:45 +1000
message:
use basename as poolie recommended
------------------------------------------------------------
revno: 2555.1.16.2.1
merged: ian.clatworthy at internode.on.net-20070703042914-ag3unoftav0en4tp
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.tar-on-py251
timestamp: Tue 2007-07-03 14:29:14 +1000
message:
fix #123485 - selftest broken under Python 2.5.1 because of tafile API change
------------------------------------------------------------
revno: 2555.1.18
merged: pqm at pqm.ubuntu.com-20070703055715-ij91yrkomctki31m
parent: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
parent: ian.clatworthy at internode.on.net-20070703013005-6t3szn696zlxppzu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 06:57:15 +0100
message:
Merge Daniel Watkin's fix for #113436 (including use of new test API)
------------------------------------------------------------
revno: 2555.1.16.1.2
merged: ian.clatworthy at internode.on.net-20070703013005-6t3szn696zlxppzu
parent: ian.clatworthy at internode.on.net-20070703004004-qilp1re0a7q9rag3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 11:30:05 +1000
message:
Fix PQM failure - use new test API
------------------------------------------------------------
revno: 2555.1.16.1.1
merged: ian.clatworthy at internode.on.net-20070703004004-qilp1re0a7q9rag3
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: d.m.watkins at warwick.ac.uk-20070612021457-q0p6f7ezdldxigwb
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 10:40:04 +1000
message:
Merge Daniel Watkin's fix for #113436
------------------------------------------------------------
revno: 2520.1.7
merged: d.m.watkins at warwick.ac.uk-20070612021457-q0p6f7ezdldxigwb
parent: d.m.watkins at warwick.ac.uk-20070612021242-johprm857jsmbpzc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Tue 2007-06-12 03:14:57 +0100
message:
Commands that use status flags now have a reference to 'help status-flags', fixing bug #113436.
------------------------------------------------------------
revno: 2520.1.6
merged: d.m.watkins at warwick.ac.uk-20070612021242-johprm857jsmbpzc
parent: d.m.watkins at warwick.ac.uk-20070608195438-gu45k2p8gnhdqude
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Tue 2007-06-12 03:12:42 +0100
message:
Fixed 'pull' help.
------------------------------------------------------------
revno: 2520.1.5
merged: d.m.watkins at warwick.ac.uk-20070608195438-gu45k2p8gnhdqude
parent: d.m.watkins at warwick.ac.uk-20070608195413-bq1iro4mrqfx8e89
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:54:38 +0100
message:
'help merge' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.4
merged: d.m.watkins at warwick.ac.uk-20070608195413-bq1iro4mrqfx8e89
parent: d.m.watkins at warwick.ac.uk-20070608195330-5mbalaf9uzut17b1
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:54:13 +0100
message:
'help pull' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.3
merged: d.m.watkins at warwick.ac.uk-20070608195330-5mbalaf9uzut17b1
parent: d.m.watkins at warwick.ac.uk-20070608195302-r9304tm0yazwov8o
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:53:30 +0100
message:
'help status' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.2
merged: d.m.watkins at warwick.ac.uk-20070608195302-r9304tm0yazwov8o
parent: d.m.watkins at warwick.ac.uk-20070608194605-odbz8k4k40dg54c7
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:53:02 +0100
message:
Added test for 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.1
merged: d.m.watkins at warwick.ac.uk-20070608194605-odbz8k4k40dg54c7
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:46:05 +0100
message:
Added 'help status-flags'.
------------------------------------------------------------
revno: 2555.1.17
merged: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: andrew.bennetts at canonical.com-20070703041219-4zsjgrup4k6sdlzk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 06:24:58 +0100
message:
(Andrew Bennetts, Aaron Bentley) Add container format as described in doc/developers/container-format.txt
------------------------------------------------------------
revno: 2506.2.12
merged: andrew.bennetts at canonical.com-20070703041219-4zsjgrup4k6sdlzk
parent: andrew.bennetts at canonical.com-20070703040601-62bbp6gt9ivf3vja
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:12:19 +1000
message:
Update docstring for Aaron's changes.
------------------------------------------------------------
revno: 2506.2.11
merged: andrew.bennetts at canonical.com-20070703040601-62bbp6gt9ivf3vja
parent: andrew.bennetts at canonical.com-20070703040508-11q9cdef4og1qry8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:06:01 +1000
message:
Keep container-format.txt up to date with changes to the code.
------------------------------------------------------------
revno: 2506.2.10
merged: andrew.bennetts at canonical.com-20070703040508-11q9cdef4og1qry8
parent: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abentley-container-format
timestamp: Tue 2007-07-03 14:05:08 +1000
message:
Add '(introduced in 0.18)' to pack format string.
------------------------------------------------------------
revno: 2506.2.9
merged: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
parent: abentley at panoramicfeedback.com-20070628165006-m7bd56ngqs26rd91
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: container-format
timestamp: Thu 2007-06-28 13:13:06 -0400
message:
Use file-like objects as container input, not callables
------------------------------------------------------------
revno: 2506.2.8
merged: abentley at panoramicfeedback.com-20070628165006-m7bd56ngqs26rd91
parent: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: container-format
timestamp: Thu 2007-06-28 12:50:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2506.2.7
merged: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
parent: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
parent: andrew.bennetts at canonical.com-20070614125513-nua0p6bw9cw3jeaq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 23:28:02 +1000
message:
Change read/iter_records to return a callable, add more validation, and
improve docstrings.
------------------------------------------------------------
revno: 2506.2.6.1.2
merged: andrew.bennetts at canonical.com-20070614125513-nua0p6bw9cw3jeaq
parent: andrew.bennetts at canonical.com-20070614112338-6u3900u6nkag66u8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 22:55:13 +1000
message:
Docstring improvements.
------------------------------------------------------------
revno: 2506.2.6.1.1
merged: andrew.bennetts at canonical.com-20070614112338-6u3900u6nkag66u8
parent: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 21:23:38 +1000
message:
Return a callable instead of a str from read, and add more validation.
------------------------------------------------------------
revno: 2506.2.6
merged: andrew.bennetts at canonical.com-20070614055245-rtwk0vgz74fyyimo
parent: andrew.bennetts at canonical.com-20070614022816-ne4h4qk0j50x6n26
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 15:52:45 +1000
message:
Add validate method to ContainerReader and BytesRecordReader.
------------------------------------------------------------
revno: 2506.2.5
merged: andrew.bennetts at canonical.com-20070614022816-ne4h4qk0j50x6n26
parent: andrew.bennetts at canonical.com-20070614015707-hncvkzg0mn4w0w31
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 12:28:16 +1000
message:
Update format marker in container-format.txt to be in sync with the code.
------------------------------------------------------------
revno: 2506.2.4
merged: andrew.bennetts at canonical.com-20070614015707-hncvkzg0mn4w0w31
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
parent: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 11:57:07 +1000
message:
Some small improvements to the pack format, and also merge in bzr.dev.
------------------------------------------------------------
revno: 2506.2.3.1.4
merged: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
parent: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:56:02 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2506.2.3.1.3
merged: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:54:46 +1000
message:
Change format marker to use the word 'Bazaar' rather than 'bzr'.
------------------------------------------------------------
revno: 2506.2.3.1.2
merged: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
parent: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:53:12 +1000
message:
Raise InvalidRecordError on invalid names.
------------------------------------------------------------
revno: 2506.2.3.1.1
merged: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 17:58:35 +1000
message:
Remove duplicate definition of ContainerWriter.
------------------------------------------------------------
revno: 2506.2.3
merged: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
parent: andrew.bennetts at canonical.com-20070611072208-9p73cf5vcu7zh0ys
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Tue 2007-06-12 11:56:39 +1000
message:
Fix docstring markup, remove obsolete comment.
------------------------------------------------------------
revno: 2506.2.2.1.1
merged: andrew.bennetts at canonical.com-20070611072208-9p73cf5vcu7zh0ys
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Mon 2007-06-11 17:22:08 +1000
message:
Fix docstring markup, remove obsolete comment.
------------------------------------------------------------
revno: 2506.2.2
merged: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
parent: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
parent: andrew.bennetts at canonical.com-20070609034525-j9d7i5dlk6ou97eb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Sat 2007-06-09 13:48:20 +1000
message:
More improvements, especially in error handling.
------------------------------------------------------------
revno: 2506.2.1.1.3
merged: andrew.bennetts at canonical.com-20070609034525-j9d7i5dlk6ou97eb
parent: andrew.bennetts at canonical.com-20070608064547-vzhyegqx2vl6pni3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Sat 2007-06-09 13:45:25 +1000
message:
Deal with EOF in the middle of a bytes record.
------------------------------------------------------------
revno: 2506.2.1.1.2
merged: andrew.bennetts at canonical.com-20070608064547-vzhyegqx2vl6pni3
parent: andrew.bennetts at canonical.com-20070608063359-s5ps81a8i85w7by0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 16:45:47 +1000
message:
Test docstring tweaks, inspired by looking over the output of jml's testdoc tool.
------------------------------------------------------------
revno: 2506.2.1.1.1
merged: andrew.bennetts at canonical.com-20070608063359-s5ps81a8i85w7by0
parent: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 16:33:59 +1000
message:
More progress:
* Rename container.py to pack.py
* Refactor bytes record reading into a separate class for ease of unit testing.
* Start handling error conditions such as invalid content lengths in byte
records.
------------------------------------------------------------
revno: 2506.2.1
merged: andrew.bennetts at canonical.com-20070607160934-jfs1wrxxtulso9nw
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Fri 2007-06-08 02:09:34 +1000
message:
Start implementing container format reading and writing.
------------------------------------------------------------
revno: 2555.1.16
merged: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
parent: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 19:36:15 +0100
message:
(John Arbash Meinel) A couple small updates for pushing over ftp.
------------------------------------------------------------
revno: 2555.1.15.1.1
merged: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 12:35:53 -0500
message:
(John Arbash Meinel) A couple small updates for pushing over ftp.
------------------------------------------------------------
revno: 2555.1.15
merged: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
parent: pqm at pqm.ubuntu.com-20070702153926-23pkgktuxy6sahxr
parent: john at arbash-meinel.com-20070702150118-ypa1als5c0dx61ll
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 17:27:43 +0100
message:
(Kent Gibson) 'bzr log --verbose' shows deltas for merged revisions.
------------------------------------------------------------
revno: 2555.1.13.1.2
merged: john at arbash-meinel.com-20070702150118-ypa1als5c0dx61ll
parent: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
parent: warthog618 at gmail.com-20070619134630-c72ge100z6nmy21l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 10:01:18 -0500
message:
(Kent Gibson) 'bzr log --verbose' shows deltas for merged revisions.
------------------------------------------------------------
revno: 2466.8.1.2.2
merged: warthog618 at gmail.com-20070619134630-c72ge100z6nmy21l
parent: warthog618 at gmail.com-20070502110246-05zkgmrv5vm807ms
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: merge_deltas
timestamp: Tue 2007-06-19 21:46:30 +0800
message:
Add tests for deltas in merge revisions
------------------------------------------------------------
revno: 2466.8.1.2.1
merged: warthog618 at gmail.com-20070502110246-05zkgmrv5vm807ms
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: merge_deltas
timestamp: Wed 2007-05-02 19:02:46 +0800
message:
Long log format reports deltas on merge revisions.
------------------------------------------------------------
revno: 2555.1.14
merged: pqm at pqm.ubuntu.com-20070702153926-23pkgktuxy6sahxr
parent: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
parent: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 16:39:26 +0100
message:
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
------------------------------------------------------------
revno: 2555.1.13.1.1
merged: john at arbash-meinel.com-20070702142427-egq5thf8lj6fh9ls
parent: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-02 09:24:27 -0500
message:
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
------------------------------------------------------------
revno: 2555.1.13
merged: pqm at pqm.ubuntu.com-20070702070639-um9oyfoc2i6g8umv
parent: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
parent: robertc at robertcollins.net-20070702061147-rmouxo51qwz7rkns
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 08:06:39 +0100
message:
(robertc) Reduce duplication in interface based testing by extracting a new class TestScenarioApplier.
------------------------------------------------------------
revno: 2553.2.14
merged: robertc at robertcollins.net-20070702061147-rmouxo51qwz7rkns
parent: robertc at robertcollins.net-20070702055355-82gailz4yex9gpw4
parent: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 16:11:47 +1000
message:
Merge with bzr.dev.
------------------------------------------------------------
revno: 2553.2.13
merged: robertc at robertcollins.net-20070702055355-82gailz4yex9gpw4
parent: robertc at robertcollins.net-20070702052625-motr7ljwhmqvw9rg
parent: robertc at robertcollins.net-20070702055259-eoyl4u4nfml4kdez
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:53:55 +1000
message:
Remove unneeded inner function in adapt_test_to_scenario.
------------------------------------------------------------
revno: 2553.2.11.1.1
merged: robertc at robertcollins.net-20070702055259-eoyl4u4nfml4kdez
parent: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Mon 2007-07-02 15:52:59 +1000
message:
Remove unneeded inner function in adapt_test_to_scenario.
------------------------------------------------------------
revno: 2553.2.12
merged: robertc at robertcollins.net-20070702052625-motr7ljwhmqvw9rg
parent: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:26:25 +1000
message:
Merge with bzr.dev.
------------------------------------------------------------
revno: 2553.2.11
merged: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
parent: robertc at robertcollins.net-20070628071528-muyk19rxv7z8dhiy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Mon 2007-07-02 15:24:25 +1000
message:
Document repository_to_test_repository for testing.
------------------------------------------------------------
revno: 2553.2.10
merged: robertc at robertcollins.net-20070628071528-muyk19rxv7z8dhiy
parent: robertc at robertcollins.net-20070628064436-lyl4ygrlwe7xup2h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 17:15:28 +1000
message:
And overhaul WorkingTreeTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.9
merged: robertc at robertcollins.net-20070628064436-lyl4ygrlwe7xup2h
parent: robertc at robertcollins.net-20070628061619-mds81zx3hw1dpeqm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:44:36 +1000
message:
And overhaul RevisionStoreTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.8
merged: robertc at robertcollins.net-20070628061619-mds81zx3hw1dpeqm
parent: robertc at robertcollins.net-20070628060118-wpuciqx1xrjesces
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:16:19 +1000
message:
And overhaul InterVersionedFileTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.7
merged: robertc at robertcollins.net-20070628060118-wpuciqx1xrjesces
parent: robertc at robertcollins.net-20070628051904-mjbhgq3n8dw3m8jg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 16:01:18 +1000
message:
And overhaul BzrDirTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.6
merged: robertc at robertcollins.net-20070628051904-mjbhgq3n8dw3m8jg
parent: robertc at robertcollins.net-20070628045744-v8b44ng9lmh5azyj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 15:19:04 +1000
message:
And overhaul BranchTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.5
merged: robertc at robertcollins.net-20070628045744-v8b44ng9lmh5azyj
parent: robertc at robertcollins.net-20070628042515-7uktaa31hsky2nw8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 14:57:44 +1000
message:
And overhaul TransportTestProviderAdapter too.
------------------------------------------------------------
revno: 2553.2.4
merged: robertc at robertcollins.net-20070628042515-7uktaa31hsky2nw8
parent: robertc at robertcollins.net-20070628011643-ns42kcef2ymfxu28
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 14:25:15 +1000
message:
Treat InterRepositoryTestProviderAdapter like RepositoryTestProviderAdapter
------------------------------------------------------------
revno: 2553.2.3
merged: robertc at robertcollins.net-20070628011643-ns42kcef2ymfxu28
parent: robertc at robertcollins.net-20070627222709-tqtod0gjk3xj5p6w
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 11:16:43 +1000
message:
Split out the common test scenario support from the repository implementation specific code.
------------------------------------------------------------
revno: 2553.2.2
merged: robertc at robertcollins.net-20070627222709-tqtod0gjk3xj5p6w
parent: robertc at robertcollins.net-20070627074138-2as9koyepbawsm8n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: adapter-cleanup
timestamp: Thu 2007-06-28 08:27:09 +1000
message:
Move RepositoryTestProviderAdapter into the tests part of the code base.
------------------------------------------------------------
revno: 2553.2.1
merged: robertc at robertcollins.net-20070627074138-2as9koyepbawsm8n
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Wed 2007-06-27 17:41:38 +1000
message:
Overhaul RepositoryTestAdapter to be cleaner and more modular.
------------------------------------------------------------
revno: 2555.1.12
merged: pqm at pqm.ubuntu.com-20070702060812-93jk0h4ue2ttalwi
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
parent: mbp at sourcefrog.net-20070702052407-z66ymyo539uuvp1k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 07:08:12 +0100
message:
Improved phrasing in version output
------------------------------------------------------------
revno: 2555.1.11.1.2
merged: mbp at sourcefrog.net-20070702052407-z66ymyo539uuvp1k
parent: mbp at sourcefrog.net-20070702044841-bhqv1470tepruga0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-07-02 15:24:07 +1000
message:
Improved phrasing in version output
------------------------------------------------------------
revno: 2555.1.11.1.1
merged: mbp at sourcefrog.net-20070702044841-bhqv1470tepruga0
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-07-02 14:48:41 +1000
message:
Show bzr.log location in bzr --version output.
------------------------------------------------------------
revno: 2555.1.11
merged: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
parent: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 16:01:44 +0100
message:
(John Arbash Meinel) Improve 'make api-docs' output.
------------------------------------------------------------
revno: 2399.1.17
merged: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
parent: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-06-28 18:18:09 -0500
message:
[merge] bzr.dev 2562
------------------------------------------------------------
revno: 2399.1.16
merged: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Sat 2007-04-28 10:04:17 -0500
message:
[merge] bzr.dev 2466
------------------------------------------------------------
revno: 2399.1.15
merged: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 16:33:07 -0500
message:
[merge] api-doc-builder and remove the pydoctor build code for now.
------------------------------------------------------------
revno: 2399.1.14
merged: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 15:36:40 -0500
message:
[merge] bzr.dev 2413
------------------------------------------------------------
revno: 2399.1.13
merged: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:45:51 -0500
message:
Remove BRANCH.TODO info, now that we have make check-api-doc
------------------------------------------------------------
revno: 2399.1.12
merged: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
parent: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:32:10 -0500
message:
Add make check-api-docs, which runs epydoc --check, rather than generating output
------------------------------------------------------------
revno: 2399.1.11
merged: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
parent: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:02:36 -0500
message:
Update lazy_import with tests for the new '_should_proxy' variable.
------------------------------------------------------------
revno: 2399.1.10
merged: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
parent: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 13:45:51 -0500
message:
fix assertRaises to use the right parameter...
------------------------------------------------------------
revno: 2399.1.9
merged: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
parent: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 12:49:10 -0500
message:
Since I have epydoc working with lazy imports, make it the default api doc generator.
Also, update Makefile to make it easier to just document one file.
------------------------------------------------------------
revno: 2399.1.8
merged: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
parent: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 18:19:39 -0500
message:
Change lazy_import to allow proxying when necessary.
Write a monkey-patch for epydoc.uid.ObjectUID so that it can understand
a lazy_import object.
With the monkey-patch in place, epydoc seems to be able to process bzrlib.
Now we still need to fix the errors. :)
------------------------------------------------------------
revno: 2399.1.7
merged: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
parent: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 17:11:22 -0500
message:
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string.
------------------------------------------------------------
revno: 2399.1.6
merged: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
parent: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:21:32 -0500
message:
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain.
------------------------------------------------------------
revno: 2399.1.5
merged: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
parent: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:06:31 -0500
message:
Clean up add.py documentation.
Add doc strings for undocumented functions.
Move documentation to the right location for 'smart_add_tree'
Fix rst documentation (the lines need to be indented for each parameter)
------------------------------------------------------------
revno: 2399.1.4
merged: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
parent: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:04:37 -0500
message:
Add command line invocations for epydoc and pydoctor to generate docs
for a single file.
------------------------------------------------------------
revno: 2399.1.3
merged: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
parent: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:36:09 -0500
message:
Add a list of documentation failures
------------------------------------------------------------
revno: 2399.1.2
merged: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
parent: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:35:46 -0500
message:
Add url to bazaar project page in docs
------------------------------------------------------------
revno: 2399.1.1
merged: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
parent: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:25:47 -0500
message:
Update Makefile to add 'make api-docs' using pydoctor
------------------------------------------------------------
revno: 2555.1.10
merged: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 07:07:00 +0100
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2555.1.9.1.1
merged: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-06-29 15:34:31 +1000
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2555.1.9
merged: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 01:00:00 +0100
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2555.1.8.1.1
merged: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 18:31:34 -0500
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2555.1.6.2.2
merged: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
parent: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 21:50:14 +0100
message:
Fix up with comments from Aaron.
------------------------------------------------------------
revno: 2555.1.6.2.1
merged: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 20:11:00 +0100
message:
Display a useful error message when annotating a non-existant file (#122656)
------------------------------------------------------------
revno: 2555.1.8
merged: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 23:53:35 +0100
message:
(James Westby) Fix TreeConfig to correctly return options from a section
------------------------------------------------------------
revno: 2555.1.7.1.2
merged: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
parent: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:22:53 -0500
message:
Clean up whitespace
------------------------------------------------------------
revno: 2555.1.7.1.1
merged: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:18:41 -0500
message:
[merge] James Westby's Fix for TreeConfig returning values from subsections.
------------------------------------------------------------
revno: 2533.1.1
merged: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-18 21:39:06 +0100
message:
Fix TreeConfig to return values from sections.
* TreeConfig would mistakenly search the top level when asked for options
from a section. This patch makes it respect the section argument and only
search the specified section.
* It also adds some more tests, explicity testing the behavior for
both keys that are present and absent in both sections and the top level,
keys that are present in both, default values, and missing sections.
------------------------------------------------------------
revno: 2555.1.7
merged: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 20:44:10 +0100
message:
Add a test for check_inventory_shape and fix tests (James Westby)
------------------------------------------------------------
revno: 2555.1.6.1.2
merged: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
parent: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:53:24 -0400
message:
Fix indenting in TestCheckInventoryShape
------------------------------------------------------------
revno: 2555.1.6.1.1
merged: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:52:13 -0400
message:
Merge check_shape fixes
------------------------------------------------------------
revno: 2545.3.2
merged: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
parent: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-25 21:05:06 +0100
message:
Add a test for check_inventory_shape.
Also fix up the tests that relied on the buggy behaviour.
------------------------------------------------------------
revno: 2545.3.1
merged: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Sun 2007-06-24 22:13:07 +0100
message:
Fix detection of directory entries in the inventory.
check_inventory_shape allows you to check that an inventory entry is a
directory by ending it in a '/'. However the code to add the '/' to the
entries for comparison uses the kind == 'dir' to detect directories, when
the key is 'directory'.
------------------------------------------------------------
revno: 2555.1.6
merged: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 09:29:03 +0100
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2555.1.5.1.3
merged: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
parent: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 18:00:25 +1000
message:
Allow 'from debug import debug_flags'
------------------------------------------------------------
revno: 2555.1.5.1.2
merged: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
parent: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:50:53 +1000
message:
Remember NEWS
------------------------------------------------------------
revno: 2555.1.5.1.1
merged: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:48:23 +1000
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2555.1.5
merged: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 08:08:27 +0100
message:
(robertc) Show the names of commit hooks during commit.
------------------------------------------------------------
revno: 2553.1.3
merged: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
parent: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-06-28 16:32:03 +1000
message:
Increase docs in response to review feedback.
------------------------------------------------------------
revno: 2553.1.2
merged: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
parent: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:21:59 +1000
message:
Show hook names during commit.
------------------------------------------------------------
revno: 2553.1.1
merged: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:08:53 +1000
message:
Give Hooks names.
------------------------------------------------------------
revno: 2555.1.4
merged: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 06:18:30 +0100
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2555.1.2.1.1
merged: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-06-28 14:39:55 +1000
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2555.1.3
merged: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 05:44:59 +0100
message:
(robertc) Document contributing to the performance effort and improve the roadmap dependency .png. (Robert Collins, Vincent Ladeuil)
------------------------------------------------------------
revno: 2541.2.6
merged: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
parent: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:51 +1000
message:
Fix gc graph linkage.
------------------------------------------------------------
revno: 2541.2.5
merged: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
parent: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:03 +1000
message:
Merge Vila's performance.dot tweaks.
------------------------------------------------------------
revno: 2555.1.1.1.1
merged: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: perfs
timestamp: Wed 2007-06-27 09:47:36 +0200
message:
Minor cleanup.
* doc/developers/performance.dot:
Use LR rankdir makes the graph easier to read.
* Makefile:
(doc/developers/performance.png): Add echo.
------------------------------------------------------------
revno: 2541.2.4
merged: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:51:22 +1000
message:
Merge more of bzr.dev.
------------------------------------------------------------
revno: 2541.2.3
merged: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:48:12 +1000
message:
Add GC to the performance.dot file and correct a bug in the performance-roadmap doc file.
------------------------------------------------------------
revno: 2541.2.2
merged: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
parent: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:43:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2541.2.1
merged: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-21 16:41:07 +1000
message:
Document contributing to the performance drive somewhat.
------------------------------------------------------------
revno: 2555.1.2
merged: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 09:07:23 +0100
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2555.3.1
merged: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: knit-index-reader
timestamp: Wed 2007-06-27 17:37:53 +1000
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2555.1.1
merged: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
parent: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 06:12:57 +0100
message:
Remove use of 'assert False' to raise an exception unconditionally
------------------------------------------------------------
revno: 2555.2.1
merged: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-06-27 14:33:04 +1000
message:
Remove use of 'assert False' to raise an exception unconditionally
Diff too large for email (7818 lines, the limit is 1000).
More information about the bazaar-commits
mailing list