Rev 2438: merge bzr.dev at 2450 in http://bazaar.launchpad.net/~bzr/bzr/bzr.http.auth

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Apr 24 10:52:03 BST 2007


At http://bazaar.launchpad.net/~bzr/bzr/bzr.http.auth

------------------------------------------------------------
revno: 2438
revision-id: v.ladeuil+lp at free.fr-20070424095159-pnxwqfn1og3bqg5e
parent: v.ladeuil+lp at free.fr-20070424094954-k60h58nkwrf09l94
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Tue 2007-04-24 11:51:59 +0200
message:
  merge bzr.dev at 2450
added:
  bzrlib/breakin.py              breakin.py-20070417043829-so46nevf978u713k-1
  bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
  bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
  bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/server.txt                 server.txt-20060913044801-h939fvbwzz39gf7g-1
  setup.py*                      setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
    ------------------------------------------------------------
    revno: 2420.1.30
    merged: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
    parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
    parent: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-24 06:42:49 +0100
    message:
      Press C-\ to break into pdb
        ------------------------------------------------------------
        revno: 2420.1.3.3.8
        merged: mbp at sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
        parent: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
        parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-24 15:02:04 +1000
        message:
          Merge trunk & fix NEWS conflict
        ------------------------------------------------------------
        revno: 2420.1.3.3.7
        merged: mbp at sourcefrog.net-20070424045131-gyjo7l8oa99ndyrv
        parent: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-24 14:51:31 +1000
        message:
          Add BZR_SIGQUIT_PDB=0 option to disable breakin.
          
          Split tests for this into test_breakin, and make them a bit more robust.
        ------------------------------------------------------------
        revno: 2420.1.3.3.6
        merged: mbp at sourcefrog.net-20070417092535-n711rw7qtt6irrye
        parent: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 19:25:35 +1000
        message:
          Correct the mention of C-\ in NEWS (Daniel Silverstone)
        ------------------------------------------------------------
        revno: 2420.1.3.3.5
        merged: mbp at sourcefrog.net-20070417073222-l20nvpvkfr8ak12d
        parent: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 17:32:22 +1000
        message:
          Second sigquit goes through to the default handler
        ------------------------------------------------------------
        revno: 2420.1.3.3.4
        merged: mbp at sourcefrog.net-20070417065755-lgvnd360eqfs8cfz
        parent: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 16:57:55 +1000
        message:
          Late load pdb for breakin; fix copyright
        ------------------------------------------------------------
        revno: 2420.1.3.3.3
        merged: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
        parent: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
        parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 16:53:14 +1000
        message:
          merge benchmark fix
        ------------------------------------------------------------
        revno: 2420.1.3.3.2
        merged: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
        parent: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 15:24:19 +1000
        message:
          doc BZR_PDB and sigquit
        ------------------------------------------------------------
        revno: 2420.1.3.3.1
        merged: mbp at sourcefrog.net-20070417043912-2mwgd3htam3a5uq2
        parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: breakin
        timestamp: Tue 2007-04-17 14:39:12 +1000
        message:
          C-\ drops bzr into the debugger
    ------------------------------------------------------------
    revno: 2420.1.29
    merged: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
    parent: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
    parent: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-24 04:37:35 +0100
    message:
      (John Arbash Meinel) Small updates for 'bzr info' tests and win32
        ------------------------------------------------------------
        revno: 2420.1.5.3.3
        merged: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
        parent: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_locking_fixes
        timestamp: Mon 2007-04-23 21:55:10 -0500
        message:
          Update comment according to Martin
        ------------------------------------------------------------
        revno: 2420.1.5.3.2
        merged: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
        parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate_locking_fixes
        timestamp: Thu 2007-04-19 17:26:04 -0500
        message:
          Make "test_info_locking" an expected failure on win32 for now.
    ------------------------------------------------------------
    revno: 2420.1.28
    merged: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
    parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
    parent: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-24 04:12:08 +0100
    message:
      (Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
        ------------------------------------------------------------
        revno: 2418.4.2
        merged: john at arbash-meinel.com-20070424024356-nffcxmkfaigudmrp
        parent: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
        parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2007-04-23 21:43:56 -0500
        message:
          [merge] bzr.dev 2447
        ------------------------------------------------------------
        revno: 2418.4.1
        merged: john at arbash-meinel.com-20070413201949-ay6r5nh3bgsxfogw
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        parent: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2007-04-13 15:19:49 -0500
        message:
          (Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest'
        ------------------------------------------------------------
        revno: 2394.2.10
        merged: ian.clatworthy at internode.on.net-20070413004631-nkdsnpcuy8xb0x62
        parent: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Fri 2007-04-13 10:46:31 +1000
        message:
          another doc fix and whitespace fixes
        ------------------------------------------------------------
        revno: 2394.2.9
        merged: ian.clatworthy at internode.on.net-20070413004053-y5wr76o3512rjawk
        parent: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Fri 2007-04-13 10:40:53 +1000
        message:
          update NEWS and help to reflect removal of comma support
        ------------------------------------------------------------
        revno: 2394.2.8
        merged: ian.clatworthy at internode.on.net-20070413003033-k3nc1zq02qlkb8cj
        parent: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Fri 2007-04-13 10:30:33 +1000
        message:
          incorporate feedback from jam
        ------------------------------------------------------------
        revno: 2394.2.7
        merged: ian.clatworthy at internode.on.net-20070411021409-im2b7jkohfnb5boq
        parent: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-11 12:14:09 +1000
        message:
          Added whitebox tests - filter_suite_by_re and sort_suite_by_re
        ------------------------------------------------------------
        revno: 2394.2.6
        merged: ian.clatworthy at internode.on.net-20070410142343-6bfz9k67b8tvrz6x
        parent: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-11 00:23:43 +1000
        message:
          completed blackbox tests
        ------------------------------------------------------------
        revno: 2394.2.5
        merged: ian.clatworthy at internode.on.net-20070410090806-d9pkgwomcpbkizj2
        parent: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Tue 2007-04-10 19:08:06 +1000
        message:
          list-only working, include test not
        ------------------------------------------------------------
        revno: 2394.2.4
        merged: ian.clatworthy at internode.on.net-20070404131351-xqdiyfvwohs96ecs
        parent: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-04 23:13:51 +1000
        message:
          Clean up whitespace
        ------------------------------------------------------------
        revno: 2394.2.3
        merged: ian.clatworthy at internode.on.net-20070404131147-r9dp5hu8166xhb8u
        parent: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-04 23:11:47 +1000
        message:
          Backed out test junk
        ------------------------------------------------------------
        revno: 2394.2.2
        merged: ian.clatworthy at internode.on.net-20070404125915-w0m76xc9tjxhbo42
        parent: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-04 22:59:15 +1000
        message:
          Add --randomize and update help
        ------------------------------------------------------------
        revno: 2394.2.1
        merged: ian.clatworthy at internode.on.net-20070404091010-1j1sdngh8t77ef9v
        parent: pqm at pqm.ubuntu.com-20070404005411-46c388fbf2acf940
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.selftest-not
        timestamp: Wed 2007-04-04 19:10:10 +1000
        message:
          --list and --exclude first cut
    ------------------------------------------------------------
    revno: 2420.1.27
    merged: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
    parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
    parent: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 18:07:58 +0100
    message:
      (Andrew Bennetts) Make RemoteBzrDir.open_workingtree raise NoWorkingTree instead of NotLocalUrl when appropriate.
        ------------------------------------------------------------
        revno: 2420.1.25.1.1
        merged: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
        parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: workingtree-msg
        timestamp: Mon 2007-04-23 18:30:30 +1000
        message:
          Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
          when there is no remote working tree, avoiding spurious "This transport does not
          update the working tree" warnings from cmd_push.
    ------------------------------------------------------------
    revno: 2420.1.26
    merged: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
    parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
    parent: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 08:50:15 +0100
    message:
      (robertc) bzr --fixes support to allow recording of bugs that are fixed by commits. (Jonathan Lange, James Henstridge, Robert Collins)
        ------------------------------------------------------------
        revno: 2376.4.43
        merged: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
        parent: jml at canonical.com-20070423055929-chgdr92da63lhcri
        parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: bug-support
        timestamp: Mon 2007-04-23 16:55:58 +1000
        message:
          Merge from mainline, resolving conflict in help_topics
        ------------------------------------------------------------
        revno: 2376.4.42
        merged: jml at canonical.com-20070423055929-chgdr92da63lhcri
        parent: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:59:29 +1000
        message:
          Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
          subclass.
        ------------------------------------------------------------
        revno: 2376.4.41
        merged: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
        parent: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:24:47 +1000
        message:
          Update UniqueIntegerBugTracker docstring for new API
        ------------------------------------------------------------
        revno: 2376.4.40
        merged: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
        parent: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:22:17 +1000
        message:
          Redo the hierarchy of bug trackers to reduce duplication.
        ------------------------------------------------------------
        revno: 2376.4.39
        merged: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
        parent: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 11:30:35 +1000
        message:
          Can also set the bug config options in branch.conf
        ------------------------------------------------------------
        revno: 2376.4.38
        merged: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
        parent: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
        parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 09:00:56 +1000
        message:
          Merge bzr.dev, resolving conflicts in error code.
        ------------------------------------------------------------
        revno: 2376.4.37
        merged: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
        parent: jml at canonical.com-20070422224519-wixpd8wnwxw70641
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:48:48 +1000
        message:
          Mention API additions in NEWS.
        ------------------------------------------------------------
        revno: 2376.4.36
        merged: jml at canonical.com-20070422224519-wixpd8wnwxw70641
        parent: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:45:19 +1000
        message:
          Provide really basic help topic for our bug tracker support.
        ------------------------------------------------------------
        revno: 2376.4.35
        merged: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
        parent: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:23:00 +1000
        message:
          Include configuration documentation for tracker config options.
        ------------------------------------------------------------
        revno: 2376.4.34
        merged: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
        parent: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:22:26 +1000
        message:
          Remove spurious quote mark in docstring.
        ------------------------------------------------------------
        revno: 2376.4.33
        merged: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
        parent: jml at canonical.com-20070420041143-td2407zcd2xygk70
        parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 14:13:08 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2376.4.32
        merged: jml at canonical.com-20070420041143-td2407zcd2xygk70
        parent: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 14:11:43 +1000
        message:
          Basic documentation for --fixes option
        ------------------------------------------------------------
        revno: 2376.4.31
        merged: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
        parent: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:53:28 +1000
        message:
          Whitespace normalization and use squid as an example rather than apache.
        ------------------------------------------------------------
        revno: 2376.4.30
        merged: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
        parent: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:40:09 +1000
        message:
          Support for Bugzilla bug trackers.
        ------------------------------------------------------------
        revno: 2376.4.29
        merged: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
        parent: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:19:43 +1000
        message:
          Tests for builtin trackers.
        ------------------------------------------------------------
        revno: 2376.4.28
        merged: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
        parent: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:10:49 +1000
        message:
          Focus the tests better and clean up some dodgy bits in UnknownBugTrackerAbbreviation
        ------------------------------------------------------------
        revno: 2376.4.27
        merged: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
        parent: jml at canonical.com-20070420022157-ampptjzryc2fju7t
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:27:38 +1000
        message:
          Include branch information in UnknownBugTrackerAbbreviation
        ------------------------------------------------------------
        revno: 2376.4.26
        merged: jml at canonical.com-20070420022157-ampptjzryc2fju7t
        parent: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:21:57 +1000
        message:
          Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
        ------------------------------------------------------------
        revno: 2376.4.25
        merged: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
        parent: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:10:08 +1000
        message:
          Make singleton bug tracker thing work via instances. 
        ------------------------------------------------------------
        revno: 2376.4.24
        merged: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
        parent: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 11:52:14 +1000
        message:
          Make the Tracker class attribute 'abbrevation', not 'abbreviated_bugtracker_name'
        ------------------------------------------------------------
        revno: 2376.4.23
        merged: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
        parent: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 10:56:27 +1000
        message:
          Change 'tag' to 'abbreviated_tracker_name'
        ------------------------------------------------------------
        revno: 2376.4.22
        merged: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
        parent: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Tue 2007-04-17 17:59:42 +1000
        message:
          Variety of whitespace cleanups, tightening of tests and docstring changes in
          response to review of bug support.
        ------------------------------------------------------------
        revno: 2376.4.21
        merged: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
        parent: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Tue 2007-04-17 17:38:19 +1000
        message:
          Change the bugs separator to \n from ,
        ------------------------------------------------------------
        revno: 2376.4.20
        merged: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
        parent: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 17:29:37 +1000
        message:
          Direct tests for UniqueBugTracker and UniqueIntegerBugTracker
        ------------------------------------------------------------
        revno: 2376.4.19
        merged: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
        parent: jml at canonical.com-20070413065621-hv9tv4ws25remckj
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 17:19:12 +1000
        message:
          Rename SimpleBugTracker to UniqueBugTracker
        ------------------------------------------------------------
        revno: 2376.4.18
        merged: jml at canonical.com-20070413065621-hv9tv4ws25remckj
        parent: jml at canonical.com-20070413064225-cmuz00itroirlro4
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:56:21 +1000
        message:
          Store all bug fix URLs in a single property.
        ------------------------------------------------------------
        revno: 2376.4.17
        merged: jml at canonical.com-20070413064225-cmuz00itroirlro4
        parent: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:42:25 +1000
        message:
          Use urlutils.join instead of ugly, buggy, string mashing
        ------------------------------------------------------------
        revno: 2376.4.16
        merged: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
        parent: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:24:39 +1000
        message:
          "bug tracker" is two words, so use BugTracker in class names, not 'Bugtracker'
        ------------------------------------------------------------
        revno: 2376.4.15
        merged: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
        parent: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:12:33 +1000
        message:
          Whitespace cleanup
        ------------------------------------------------------------
        revno: 2376.4.14
        merged: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
        parent: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
        parent: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:11:23 +1000
        message:
          Merge James Westby's refactoring
            ------------------------------------------------------------
            revno: 2376.4.8.1.1
            merged: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
            parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.bug
            timestamp: Thu 2007-04-12 21:58:30 +0100
            message:
              Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
        ------------------------------------------------------------
        revno: 2376.4.13
        merged: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
        parent: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 15:10:07 +1000
        message:
          Some stylistic cleanups
        ------------------------------------------------------------
        revno: 2376.4.12
        merged: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
        parent: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 14:58:08 +1000
        message:
          Update NEWS file.
          Use non-lazy import
          Use run_bzr for running bzr in fixes tests.
        ------------------------------------------------------------
        revno: 2376.4.11
        merged: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
        parent: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:52:48 +1000
        message:
          Provide a way of resetting list options (specifying '-' as the argument)
        ------------------------------------------------------------
        revno: 2376.4.10
        merged: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
        parent: jml at canonical.com-20070413034711-pn129rtch4usvmdk
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:50:20 +1000
        message:
          Oops. Update tests to account for changed options to commit.
        ------------------------------------------------------------
        revno: 2376.4.9
        merged: jml at canonical.com-20070413034711-pn129rtch4usvmdk
        parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:47:11 +1000
        message:
          Merge from mainline.
        ------------------------------------------------------------
        revno: 2376.4.8
        merged: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
        parent: jml at canonical.com-20070411035653-himmtk357n8d3fbv
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 14:23:18 +1000
        message:
          Import sub-module, not member, following advice in HACKING
        ------------------------------------------------------------
        revno: 2376.4.7
        merged: jml at canonical.com-20070411035653-himmtk357n8d3fbv
        parent: jml at canonical.com-20070411002703-2jbq0152stafryqg
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 13:56:53 +1000
        message:
          - Add docstrings to tests.
          - Make the 'commit' command use the bugtracker infrastructure.
          - Update the blackbox tests
          - Move the 'is this a valid bug id' logic to the tracker
        ------------------------------------------------------------
        revno: 2376.4.6
        merged: jml at canonical.com-20070411002703-2jbq0152stafryqg
        parent: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 10:27:03 +1000
        message:
          Basic docstrings for bugtracker.py
        ------------------------------------------------------------
        revno: 2376.4.5
        merged: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
        parent: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 09:29:58 +1000
        message:
          Rename get_by_tag to get_tracker, to be more accurate.
        ------------------------------------------------------------
        revno: 2376.4.4
        merged: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
        parent: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Tue 2007-04-10 17:33:07 +1000
        message:
          Beginnings of generic bug-tracker plugin system.
        ------------------------------------------------------------
        revno: 2376.4.3
        merged: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
        parent: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Tue 2007-04-10 11:22:27 +1000
        message:
          Merge RF
        ------------------------------------------------------------
        revno: 2376.4.2
        merged: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
        parent: jml at canonical.com-20070328065202-1r825jxnabsy31ak
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Mon 2007-04-02 17:26:30 +1000
        message:
          More sophisticated error handling for --fixes option
        ------------------------------------------------------------
        revno: 2376.4.1
        merged: jml at canonical.com-20070328065202-1r825jxnabsy31ak
        parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-03-28 16:52:02 +1000
        message:
          Blackbox-driven --fixes option to commit.
    ------------------------------------------------------------
    revno: 2420.1.25
    merged: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
    parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
    parent: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 08:08:09 +0100
    message:
      (robertc) Update doc/server.txt and the port the smart server listens on. (Robert Collins, #107125, #98918)
        ------------------------------------------------------------
        revno: 2420.1.23.1.3
        merged: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
        parent: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 16:36:16 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 2420.1.23.1.2
        merged: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
        parent: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 14:38:50 +1000
        message:
          ``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve
          out to the local LAN and fixing bug 98918. (Robert Collins)
        ------------------------------------------------------------
        revno: 2420.1.23.1.1
        merged: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
        parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 14:28:56 +1000
        message:
          Document the default bzr:// port (fixes #107125).
    ------------------------------------------------------------
    revno: 2420.1.24
    merged: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
    parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
    parent: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 05:16:29 +0100
    message:
      (robertc) Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
        ------------------------------------------------------------
        revno: 1739.1.8
        merged: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
        parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
        parent: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 13:41:48 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 2387.2.1
        merged: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
        parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: cleanassertions
        timestamp: Fri 2007-03-30 16:32:16 +1000
        message:
          Mark bzrlib.tests as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
    ------------------------------------------------------------
    revno: 2420.1.23
    merged: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
    parent: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
    parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 04:32:45 +0100
    message:
      (robertc) 'bzr help urlspec' - new topic giving help on http://, sftp:// etc. (Goffredo Baroncelli)
        ------------------------------------------------------------
        revno: 1739.1.7
        merged: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
        parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
        parent: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 12:58:30 +1000
        message:
          Merge Goffredo's urlspec help patch and tweak the NEWS entries.
        ------------------------------------------------------------
        revno: 2241.2.13
        merged: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
        parent: ghigo at venice-20070421122215-glii923x3cfwo02j
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-04-21 14:43:08 +0200
        message:
          NEWS file updated
        ------------------------------------------------------------
        revno: 2241.2.12
        merged: ghigo at venice-20070421122215-glii923x3cfwo02j
        parent: ghigo at venice-20070207210804-r551d0lozrp20uex
        parent: ghigo at venice-20070421110123-cc9axlewjexbmn63
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-04-21 14:22:15 +0200
        message:
          update to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.6
            merged: ghigo at venice-20070421110123-cc9axlewjexbmn63
            parent: ghigo at venice-20070329204446-2j3uumjq9faxsigz
            parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-04-21 13:01:23 +0200
            message:
              Upgraded to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.5
            merged: ghigo at venice-20070329204446-2j3uumjq9faxsigz
            parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
            parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Thu 2007-03-29 22:44:46 +0200
            message:
              update to the latest bzr.dev
        ------------------------------------------------------------
        revno: 2241.2.11
        merged: ghigo at venice-20070207210804-r551d0lozrp20uex
        parent: ghigo at venice-20070207205220-5tnjou7hz9722njy
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Wed 2007-02-07 22:08:04 +0100
        message:
          On the basis of Robert Collins and John Arbash Meinel
          - removed some protocol ( http[s]+pycurl:// and http[s]+urllib://, 
          bzr+http:// and readonly+ )
          - _help_on_trasport( ) now supports the missing of the modifiers
          - add a blackbox test case
          - little PEP8 cleanup
        ------------------------------------------------------------
        revno: 2241.2.10
        merged: ghigo at venice-20070207205220-5tnjou7hz9722njy
        parent: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
        parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Wed 2007-02-07 21:52:20 +0100
        message:
          Update to the latest bzr-transport-registry
            ------------------------------------------------------------
            revno: 2241.2.4.1.4
            merged: ghigo at venice-20070207205057-hveyr0yfn35dhhea
            parent: ghigo at venice-20070207203349-gc7actj3vso0haf2
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Wed 2007-02-07 21:50:57 +0100
            message:
              Updates on the basis of John Arbash Meinel comments
            ------------------------------------------------------------
            revno: 2241.2.4.1.3
            merged: ghigo at venice-20070207203349-gc7actj3vso0haf2
            parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
            parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Wed 2007-02-07 21:33:49 +0100
            message:
              update to the latest bzr.dev
        ------------------------------------------------------------
        revno: 2241.2.9
        merged: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
        parent: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:56:20 +0100
        message:
          add the 'file://' prefix to the urlspec topic
        ------------------------------------------------------------
        revno: 2241.2.8
        merged: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
        parent: ghigo at venice-20070127172631-etl6aa78zxak9t0e
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:50:44 +0100
        message:
          - rename transport urlspec
          - sort the transport without '://'
        ------------------------------------------------------------
        revno: 2241.2.7
        merged: ghigo at venice-20070127172631-etl6aa78zxak9t0e
        parent: ghigo at venice-20070126211058-rekclacctmf9tes8
        parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:26:31 +0100
        message:
          update to the latest bzr-transport-registry branch
            ------------------------------------------------------------
            revno: 2241.2.4.1.2
            merged: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
            parent: ghigo at venice-20070127172441-cdb1cz664f9jqent
            parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-01-27 18:25:42 +0100
            message:
              update to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.1
            merged: ghigo at venice-20070127172441-cdb1cz664f9jqent
            parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-01-27 18:24:41 +0100
            message:
              uncomment test test__get_set_protocol_handlers
        ------------------------------------------------------------
        revno: 2241.2.6
        merged: ghigo at venice-20070126211058-rekclacctmf9tes8
        parent: ghigo at venice-20070126210953-2meopm4tu1x728wx
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Fri 2007-01-26 22:10:58 +0100
        message:
          removed unused code
        ------------------------------------------------------------
        revno: 2241.2.5
        merged: ghigo at venice-20070126210953-2meopm4tu1x728wx
        parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Fri 2007-01-26 22:09:53 +0100
        message:
          add the topics transport
        ------------------------------------------------------------
        revno: 2241.2.4
        merged: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
        parent: ghigo at venice-20070126204127-lnwfza86czjj5t9u
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:44:17 +0100
        message:
          removed commented line
        ------------------------------------------------------------
        revno: 2241.2.3
        merged: ghigo at venice-20070126204127-lnwfza86czjj5t9u
        parent: ghigo at venice-20070126203011-lhslhnwj1avh0jee
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:41:27 +0100
        message:
          removed the the registration of the 'None' transport, instead we use the set_default_transport function
          rename transport_registry in transport_list_registry
          remove unused function
        ------------------------------------------------------------
        revno: 2241.2.2
        merged: ghigo at venice-20070126203011-lhslhnwj1avh0jee
        parent: ghigo at venice-20070124203508-4tg2vz734s5j40y7
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:30:11 +0100
        message:
          Create the TransportList class
        ------------------------------------------------------------
        revno: 2241.2.1
        merged: ghigo at venice-20070124203508-4tg2vz734s5j40y7
        parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Wed 2007-01-24 21:35:08 +0100
        message:
          Add the TransportRegistry class
    ------------------------------------------------------------
    revno: 2420.1.22
    merged: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
    parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
    parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 04:01:58 +0100
    message:
      (robertc) Add the infrastructure for having C extension modules based on pyrex in bzrlib. (Robert Collins).
        ------------------------------------------------------------
        revno: 1739.1.6
        merged: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
        parent: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
        parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-04-23 12:29:35 +1000
        message:
          Resolve conflicts with bzr.dev.
        ------------------------------------------------------------
        revno: 1739.1.5
        merged: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
        parent: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-04-23 12:21:12 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 1739.1.4
        merged: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
        parent: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-03-12 10:34:27 +1100
        message:
          Fix building of C modules without pyrex installed.
        ------------------------------------------------------------
        revno: 1739.1.3
        merged: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
        parent: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
        parent: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Thu 2007-03-08 15:06:06 +1100
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1739.1.2
        merged: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
        parent: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Sat 2006-06-10 00:13:37 +1000
        message:
          More pyrex finesse, documentation.
        ------------------------------------------------------------
        revno: 1739.1.1
        merged: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
        parent: pqm at pqm.ubuntu.com-20060603212040-9ec7af97aa11d4d7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2006-06-05 03:34:18 +1000
        message:
          First cut at adding pyrex facilities.
    ------------------------------------------------------------
    revno: 2420.1.21
    merged: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
    parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
    parent: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 03:09:44 +0100
    message:
      (robertc) Fix bugs 107656 and 50408 by creating multiple help indices and cross referencing between them when user help requests are ambiguous. (Robert Collins)
    ------------------------------------------------------------
    revno: 2420.1.12.1.33
    merged: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
    parent: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2007-04-23 11:41:05 +1000
    message:
      Fix tests broken by deprecation of help.command_usage.
    ------------------------------------------------------------
    revno: 2420.1.12.1.32
    merged: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
    parent: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
    parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2007-04-23 10:28:58 +1000
    message:
      Merge up with bzr.dev.
    ------------------------------------------------------------
    revno: 2420.1.12.1.31
    merged: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
    parent: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Mon 2007-04-23 10:24:53 +1000
    message:
      Review feedback and put help.command_usage back in as a deprecated function.
    ------------------------------------------------------------
    revno: 2420.1.12.1.30
    merged: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
    parent: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:44:37 +1000
    message:
      Fix the ModuleHelpTopic get_help_topic to be tested with closer to real world data and strip the bzrlib.plugins. prefix from the name.
    ------------------------------------------------------------
    revno: 2420.1.12.1.29
    merged: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
    parent: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:41:57 +1000
    message:
      Add get_help_topic to ModuleHelpTopic.
    ------------------------------------------------------------
    revno: 2420.1.12.1.28
    merged: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
    parent: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:39:19 +1000
    message:
      Add a get_help_topic method to commands.Command.
    ------------------------------------------------------------
    revno: 2420.1.12.1.27
    merged: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
    parent: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:36:58 +1000
    message:
      Add a get_help_topic method to RegisteredTopic.
    ------------------------------------------------------------
    revno: 2420.1.12.1.26
    merged: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
    parent: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:32:28 +1000
    message:
      NEWS entry for bzr help PLUGINNAME.
    ------------------------------------------------------------
    revno: 2420.1.12.1.25
    merged: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
    parent: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 15:30:47 +1000
    message:
      Return plugin module docstrings for 'bzr help plugin'.
    ------------------------------------------------------------
    revno: 2420.1.12.1.24
    merged: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
    parent: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 14:36:09 +1000
    message:
      Add plugins as a help index.
    ------------------------------------------------------------
    revno: 2420.1.12.1.23
    merged: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
    parent: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 14:35:44 +1000
    message:
      Add a list of shadowed terms to "bzr help term".
    ------------------------------------------------------------
    revno: 2420.1.12.1.22
    merged: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
    parent: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 14:08:31 +1000
    message:
      Teach RegisteredTopic to support the additional_see_also list of related help terms.
    ------------------------------------------------------------
    revno: 2420.1.12.1.21
    merged: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
    parent: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 13:54:06 +1000
    message:
      Teach Command.get_help_text to show additional help cross references when supplied.
    ------------------------------------------------------------
    revno: 2420.1.12.1.20
    merged: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
    parent: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 13:39:54 +1000
    message:
      Modify the result of HelpIndices.search to include the index each result was found in.
    ------------------------------------------------------------
    revno: 2420.1.12.1.19
    merged: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
    parent: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 13:32:20 +1000
    message:
      Ensure each HelpIndex has a unique prefix.
    ------------------------------------------------------------
    revno: 2420.1.12.1.18
    merged: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
    parent: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 13:19:49 +1000
    message:
      Add support for doing bzr help commands/COMMANDNAME.
    ------------------------------------------------------------
    revno: 2420.1.12.1.17
    merged: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
    parent: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 13:07:01 +1000
    message:
      Add prefixes to HelpIndexes.
    ------------------------------------------------------------
    revno: 2420.1.12.1.16
    merged: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
    parent: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 12:56:44 +1000
    message:
      Correct spelling of Indexs to Indices.
    ------------------------------------------------------------
    revno: 2420.1.12.1.15
    merged: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
    parent: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 12:48:34 +1000
    message:
      Rename Context (in bzrlib.help) to Index, for a clearer name.
    ------------------------------------------------------------
    revno: 2420.1.12.1.14
    merged: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
    parent: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 12:32:10 +1000
    message:
      Switch help.help to using HelpContexts completely, fixing bug 107656.
    ------------------------------------------------------------
    revno: 2420.1.12.1.13
    merged: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
    parent: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 12:20:05 +1000
    message:
      HelpCommandContext now implementes get_topics.
    ------------------------------------------------------------
    revno: 2420.1.12.1.12
    merged: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
    parent: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 11:57:10 +1000
    message:
      Relocate command help onto Command.
    ------------------------------------------------------------
    revno: 2420.1.12.1.11
    merged: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
    parent: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 11:15:12 +1000
    message:
      Remove duplication by using the new help infrastructure for topic output.
    ------------------------------------------------------------
    revno: 2420.1.12.1.10
    merged: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
    parent: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 11:07:51 +1000
    message:
      Add get_help_text() to RegisteredTopic to get the help as a string.
    ------------------------------------------------------------
    revno: 2420.1.12.1.9
    merged: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
    parent: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:50:34 +1000
    message:
      Expand HelpContexts documentation.
    ------------------------------------------------------------
    revno: 2420.1.12.1.8
    merged: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
    parent: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:45:17 +1000
    message:
      HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
    ------------------------------------------------------------
    revno: 2420.1.12.1.7
    merged: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
    parent: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:34:03 +1000
    message:
      HelpContexts.search now returns the found topics.
    ------------------------------------------------------------
    revno: 2420.1.12.1.6
    merged: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
    parent: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:30:40 +1000
    message:
      HelpContexts.search now invokes get_topics on each context.
    ------------------------------------------------------------
    revno: 2420.1.12.1.5
    merged: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
    parent: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:18:30 +1000
    message:
      Initial stub for topic searching.
    ------------------------------------------------------------
    revno: 2420.1.12.1.4
    merged: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
    parent: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:14:15 +1000
    message:
      Add an explicit error for missing help topics.
    ------------------------------------------------------------
    revno: 2420.1.12.1.3
    merged: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
    parent: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 10:06:46 +1000
    message:
      Create a HelpContexts object to do help lookups.
    ------------------------------------------------------------
    revno: 2420.1.12.1.2
    merged: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
    parent: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 09:57:17 +1000
    message:
      Add a HelpCommandContext class for help from commands.
    ------------------------------------------------------------
    revno: 2420.1.12.1.1
    merged: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
    parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: help-contexts
    timestamp: Fri 2007-04-20 09:54:43 +1000
    message:
      Add a HelpTopicContext object.
-------------- next part --------------

Diff too large for email (3426 lines, the limit is 1000).


More information about the bazaar-commits mailing list