Rev 2569: Merge bzr.dev again to resolve NEWS conflicts. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Tue Jul 3 08:46:37 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 2569
revision-id: 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.
added:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
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_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
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
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
------------------------------------------------------------
revno: 2553.1.22
revision-id: 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: 2553.1.21.1.1
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2553.1.21
revision-id: 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: 2553.1.20.1.1
revision-id: 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: 2553.1.18.2.2
revision-id: 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: 2553.1.18.2.1
revision-id: 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: 2553.1.20
revision-id: 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: 2553.1.18.1.2
revision-id: 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: 2553.1.18.1.1
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2553.1.19
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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
revision-id: 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: 2553.1.18
revision-id: 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: 2553.1.17.1.1
revision-id: 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: 2553.1.17
revision-id: 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: 2553.1.15.1.2
revision-id: 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
revision-id: 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
revision-id: 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: 2553.1.16
revision-id: 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: 2553.1.15.1.1
revision-id: 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: 2553.1.15
revision-id: 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.
Diff too large for email (2333 lines, the limit is 1000).
More information about the bazaar-commits
mailing list