Rev 1590: Integrate latest bzr.dev. in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1590
revision-id: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: robertc at robertcollins.net-20060317130304-6c5ff2ac3f6f24f7
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:26:04 +1100
message:
  Integrate latest bzr.dev.
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
    parent: pqm at pqm.ubuntu.com-20060316193744-3fcf853ba6d5b713
    parent: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-03-16 20:53:42 +0000
    message:
      Fix pycurl error reporting
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
    parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-16 20:02:36 +0000
    message:
      Raise errors correctly on pycurl connection failure
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060316193744-3fcf853ba6d5b713
    parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
    parent: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-03-16 19:37:44 +0000
    message:
      Several small fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
    parent: mbp at sourcefrog.net-20060316145824-550a15b8ba1491df
    parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-03-16 19:14:29 +0000
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060316145824-550a15b8ba1491df
    parent: mbp at sourcefrog.net-20060316145545-124f96fa0c9e9461
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-16 14:58:24 +0000
    message:
      Show a message while deleting the test directories
      It can take quite a while
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060316145545-124f96fa0c9e9461
    parent: mbp at sourcefrog.net-20060316125316-f152367d62a87f6f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-16 14:55:45 +0000
    message:
      Stop selftest failing when run outside of bzr source directory
      
      It was trying to import tools.doc_generate, which is used to generate the man
      page but is not installed by setup.py.  Skip the test if it can't be run.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060316125316-f152367d62a87f6f
    parent: mbp at sourcefrog.net-20060313164851-620b667bf518c996
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-03-16 12:53:16 +0000
    message:
      Doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060313164851-620b667bf518c996
    parent: mbp at sourcefrog.net-20060313164557-8c0dfeef44fc7c0a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-13 16:48:51 +0000
    message:
      Better error message for Command.run() not implemented
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060313164557-8c0dfeef44fc7c0a
    parent: mbp at sourcefrog.net-20060313163840-f8c21cf25dcba892
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-13 16:45:57 +0000
    message:
      Move rarely-used import into Command.help()
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060313163840-f8c21cf25dcba892
    parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-03-13 16:38:40 +0000
    message:
      Remove factored-out get_weave methods that were never called