Rev 2055: Merge bzr.dev. in sftp://rookery/~/public_html/baz2.0/transport
Robert Collins
robertc at robertcollins.net
Wed Jul 4 09:09:17 BST 2007
At sftp://rookery/~/public_html/baz2.0/transport
------------------------------------------------------------
revno: 2055
revision-id: robertc at robertcollins.net-20070704080912-h81ahk975cf52kg0
parent: robertc at robertcollins.net-20070704080813-wzebx0r88fvwj5rq
parent: pqm at pqm.ubuntu.com-20070704041011-o8aw2m812hzhz8yr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transport-get-file
timestamp: Wed 2007-07-04 18:09:12 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
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/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
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/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2052.1.528
revision-id: 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: 2052.1.526.2.1
revision-id: 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: 2052.1.414.8.1.3.1
revision-id: 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: 2052.1.527
revision-id: 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: 2052.1.526.1.1
revision-id: 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: 2052.1.452.2.4
revision-id: 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: 2052.1.452.2.3
revision-id: 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: 2052.1.452.2.2
revision-id: 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: 2052.1.452.2.1
revision-id: 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: 2052.1.526
revision-id: 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: 2052.1.488.2.4
revision-id: 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: 2052.1.488.2.3
revision-id: 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: 2052.1.488.2.2
revision-id: 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: 2052.1.488.2.1
revision-id: 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: 2052.1.525
revision-id: 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: 2052.1.501.2.16
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.
------------------------------------------------------------
revno: 2052.1.501.2.15
revision-id: 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: 2052.1.508.1.4
revision-id: 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: 2052.1.524
revision-id: 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: 2052.1.522.1.2
revision-id: 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: 2052.1.468.3.1
revision-id: 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: 2052.1.523
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: 2052.1.522.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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: 2052.1.522
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: 2052.1.521.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: 2052.1.519.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: 2052.1.519.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: 2052.1.521
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: 2052.1.519.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: 2052.1.519.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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: 2052.1.468.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'.
Diff too large for email (1876 lines, the limit is 1000).
More information about the bazaar-commits
mailing list