Rev 1586: Merge bzr.dev in /home/robertc/source/baz/integration/

Robert Collins robertc at robertcollins.net
Wed Mar 15 12:27:10 GMT 2006


------------------------------------------------------------
revno: 1586
revision-id: robertc at robertcollins.net-20060315122642-05693b82bcd6c9f5
parent: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-15 23:26:42 +1100
message:
  Merge bzr.dev
removed:
  bzrlib/tests/test_reweave.py.moved test_reweave.py-20060302012326-a582932ad7879ccd
added:
  bzrlib/transport/http/         http-20060113083522-fa806bfc2aca663c
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
renamed:
  bzrlib/transport/http.py => bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
    parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
    parent: mbp at sourcefrog.net-20060312160001-f6b3fd167b668e7e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-03-13 11:15:48 +0000
    message:
      PyCurl range-request integration
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312160001-f6b3fd167b668e7e
    parent: mbp at sourcefrog.net-20060312155822-94e98ec4d9c0c09a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 16:00:01 +0000
    message:
      Fix http tests that were failing to run tearDown when setup got a missing dependency
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312155822-94e98ec4d9c0c09a
    parent: mbp at sourcefrog.net-20060312152226-444c3f03d72f9c8e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 15:58:22 +0000
    message:
      Clean up test_setup code; avoid possible pipe jam
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312152226-444c3f03d72f9c8e
    parent: mbp at sourcefrog.net-20060312151819-7e3b4d709bc6fc61
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 15:22:26 +0000
    message:
      Fix up TestSetup.tearDown - shouldn't try to remove nonexistent directory
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312151819-7e3b4d709bc6fc61
    parent: mbp at sourcefrog.net-20060312150248-328c8ca89743c29d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 15:18:19 +0000
    message:
      Fix up bogus-url tests for broken dns servers, and error imports
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312150248-328c8ca89743c29d
    parent: mbp at sourcefrog.net-20060312145613-c315fd6e73f6c294
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 15:02:48 +0000
    message:
      Prevent selftest failure when pycurl is not installed
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060312145613-c315fd6e73f6c294
    parent: mbp at sourcefrog.net-20060310073752-03c7a792c3301e0e
    parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Sun 2006-03-12 14:56:13 +0000
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
    parent: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
    parent: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-03-12 00:19:04 +0000
    message:
      Make pull update the progress bar more nicely
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
    parent: aaron.bentley at utoronto.ca-20060310045903-c8ca6fd89dfb3ac4
    parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2006-03-11 14:49:50 -0500
    message:
      Merge from bzr.ab.integration
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
    parent: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
    parent: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Fri 2006-03-10 15:51:55 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
    parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
    parent: mbp at sourcefrog.net-20060310084726-11b359658759d929
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-03-10 14:30:59 +0000
    message:
      LocalTransport quoting fix from ddaa
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060310084726-11b359658759d929
    parent: mbp at sourcefrog.net-20060310060925-7b26b6236c7cd6e5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-03-10 19:47:26 +1100
    message:
      Remove pointless file bzrlib/tests/test_reweave.py.moved that was still hanging around for some reason.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060310060925-7b26b6236c7cd6e5
    parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-03-10 17:09:25 +1100
    message:
      [patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
      
      When trying to convert a Launchpad branch into metadir format, I hit a
      bug caused by incorrect url quoting in LocalTransport (one of weaves has
      a '/' in its id).
      
      The attached patch fix LocalTransport.list_dir to allow converting
      Launchpad to metadir. It should probably be augmented by a number of
      test cases, and probably overlaps wildly with John's local transport
      quoting branch. But I'm posting it here for the record.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
    parent: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
    parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-03-10 02:19:35 +0000
    message:
      Merge in knit-using-revision-versioned-file-graph tuning work.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
    parent: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
    parent: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 20:22:47 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060310045903-c8ca6fd89dfb3ac4
    parent: abentley at panoramicfeedback.com-20060309230946-17940a3d767d17b8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-03-09 23:59:03 -0500
    message:
      Make pull update the progress bar more nicely
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060310073752-03c7a792c3301e0e
    parent: mbp at sourcefrog.net-20060310062953-bc1c7ade75c89a7a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-03-10 18:37:52 +1100
    message:
      Integrate http range support for pycurl
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060310062953-bc1c7ade75c89a7a
    parent: mbp at sourcefrog.net-20060309091102-dd5ab6eca97d4c08
    parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-03-10 17:29:53 +1100
    message:
      [merge] bzr.dev; pycurl not updated for readv yet
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060309091102-dd5ab6eca97d4c08
    parent: mbp at sourcefrog.net-20060309080151-ad1d845b9aeae633
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-09 20:11:02 +1100
    message:
      New 'http+urllib' scheme
      
      Move _real_abspath up to HttpTransportBase -- this just removes the
      implementation qualifier from the scheme.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060309080151-ad1d845b9aeae633
    parent: mbp at sourcefrog.net-20060308035552-a3b872720630721e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-09 19:01:51 +1100
    message:
      Add new protocol 'http+pycurl' that always uses PyCurl.
      
      A special http server is provided for testing that asks clients to connect
      this way.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060308035552-a3b872720630721e
    parent: mbp at sourcefrog.net-20060308011040-356245d526340960
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Wed 2006-03-08 14:55:52 +1100
    message:
      Allow urls like http+pycurl://host/ to use a particular impl
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060308011040-356245d526340960
    parent: mbp at sourcefrog.net-20060307082313-6ed75701c8fff2b4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Wed 2006-03-08 12:10:40 +1100
    message:
      [patch] Add TestCase.assertIsInstance
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060307082313-6ed75701c8fff2b4
    parent: mbp at sourcefrog.net-20060307082237-3e46d850858aec37
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2006-03-07 19:23:13 +1100
    message:
      Trim test for TestTransportProviderAdapter to be less dependent on 
      builtin transports
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060307082237-3e46d850858aec37
    parent: mbp at sourcefrog.net-20060307082208-2e9f964ee73d5eb3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2006-03-07 19:22:37 +1100
    message:
      Construct unique test directory names even when test ids recurr
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060307082208-2e9f964ee73d5eb3
    parent: mbp at sourcefrog.net-20060307071940-7cb4e06a66645fec
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2006-03-07 19:22:08 +1100
    message:
      Transport tests should always construct the precise transport to be tested
      even if there are others that would serve the same protocol
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060307071940-7cb4e06a66645fec
    parent: mbp at sourcefrog.net-20060306112949-4f5ff861d863b8b3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2006-03-07 18:19:40 +1100
    message:
      Style review fixes (thanks robertc)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306112949-4f5ff861d863b8b3
    parent: mbp at sourcefrog.net-20060306112625-5f01ec1a7dd2c645
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 22:29:49 +1100
    message:
      Reenable urllib transport
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306112625-5f01ec1a7dd2c645
    parent: mbp at sourcefrog.net-20060306112010-17c0170dde5d1eea
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 22:26:25 +1100
    message:
      todo
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306112010-17c0170dde5d1eea
    parent: mbp at sourcefrog.net-20060306094922-6a0ccdd7d6637cda
    parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 22:20:10 +1100
    message:
      [merge] large merge to sync with bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306094922-6a0ccdd7d6637cda
    parent: mbp at sourcefrog.net-20060306094405-12f57849f4e01cb4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 20:49:22 +1100
    message:
      [pycurl] Make Curl instance a local variable not a long-lived object.
      
      There seems no value in keeping it around and in fact it was not retained for
      any time.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306094405-12f57849f4e01cb4
    parent: mbp at sourcefrog.net-20060306091132-22232ddbf954a312
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 20:44:05 +1100
    message:
      Curl should follow http redirects, the same as urllib
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306091132-22232ddbf954a312
    parent: mbp at sourcefrog.net-20060306085529-95ddffee6a7afc17
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 20:11:32 +1100
    message:
      Multiple transports can be registered for any protocol, and they are 
      tried in order.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306085529-95ddffee6a7afc17
    parent: mbp at sourcefrog.net-20060306072148-d7a8823cc828da7f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 19:55:29 +1100
    message:
      doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060306072148-d7a8823cc828da7f
    parent: mbp at sourcefrog.net-20060220040856-e58605288737ad5c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-06 18:21:48 +1100
    message:
      [broken] keep hooking pycurl into test framework
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060220040856-e58605288737ad5c
    parent: mbp at sourcefrog.net-20060210090435-a53447137885cb1f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-02-20 15:08:56 +1100
    message:
      Make sure bzrlib.transport.http gets installed
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210090435-a53447137885cb1f
    parent: mbp at sourcefrog.net-20060210062523-ab69c1d5f17253bc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 20:04:35 +1100
    message:
      Some support for falling back between transport implementations.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210062523-ab69c1d5f17253bc
    parent: mbp at sourcefrog.net-20060210060722-89e4007ffbceba04
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 17:25:23 +1100
    message:
      Prepare to select a transport depending on what dependencies can be satisfied.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210060722-89e4007ffbceba04
    parent: mbp at sourcefrog.net-20060210043957-26d6fac8bab3f654
    parent: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 17:07:22 +1100
    message:
      [merge] update from bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210043957-26d6fac8bab3f654
    parent: mbp at sourcefrog.net-20060210043835-158a13008b991b1c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 15:39:57 +1100
    message:
      Raise exception if unicode is passed to transport; formatting fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060210043835-158a13008b991b1c
    parent: mbp at sourcefrog.net-20060113095713-1fa5912229a3898e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-02-10 15:38:35 +1100
    message:
      Update BRANCH.TODO
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060113095713-1fa5912229a3898e
    parent: mbp at sourcefrog.net-20060112053545-c408cfdd98427725
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-13 20:57:13 +1100
    message:
      Review updates of pycurl transport
      
      Split them out into 
      
        bzrlib.transport.http             common base
        bzrlib.transport.http._urllib     pure python
        bzrlib.transport.http._pycurl     calls pycurl
      
      Update to work with robert's nice transport test multiplexer.
      
      Add PyCurlTransport.has() which does just a HEAD request; should be faster.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060112053545-c408cfdd98427725
    parent: mbp at sourcefrog.net-20060110061150-77fa0e14e45ffacf
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-12 16:35:45 +1100
    message:
      Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060110061150-77fa0e14e45ffacf
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2006-01-10 17:11:50 +1100
    message:
      First-cut implementation of pycurl.  Substantially faster than using urllib.
      
      This always overrides urllib and so will fail on machines that don't have it.



More information about the bazaar-commits mailing list