Rev 1792: (mpe) show plugin name in help; ancestry takes branch argument in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1792
revision-id: pqm at pqm.ubuntu.com-20060619085442-78ad2b3effaba541
parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
parent: michael at ellerman.id.au-20060618232130-6723c407d86a957b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-06-19 09:54:42 +0100
message:
  (mpe) show plugin name in help; ancestry takes branch argument
added:
  bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060618232130-6723c407d86a957b
    parent: michael at ellerman.id.au-20060618231923-8a362933a83c8660
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Mon 2006-06-19 09:21:30 +1000
    message:
      Fix phase handling in fetch code.
      
      Add a missing "next_phase()" in the fetch code, and call it "Fetch phase"
      not "fetch phase" to match other phases such as Merge/Build etc.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060618231923-8a362933a83c8660
    parent: michael at ellerman.id.au-20060615044007-c2e43776834241a8
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Mon 2006-06-19 09:19:23 +1000
    message:
      Show which plugin (if any) provides a command.
      
      Changes 'bzr help <foo>' and 'bzr help commands', to show which plugin
      provides a command. If the command is a builtin the output is unchanged.
      Tests included. Based on an original patch by Robert Widhopf-Fenk.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060615044007-c2e43776834241a8
    parent: michael at ellerman.id.au-20060606141136-c4e0263d5662a197
    parent: pqm at pqm.ubuntu.com-20060615033738-b8eca7ad18b0dd9c
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Thu 2006-06-15 14:40:07 +1000
    message:
      Merge bzr.dev, fix minor conflict in cmd_revision_history().
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060606141136-c4e0263d5662a197
    parent: michael at ellerman.id.au-20060531084429-35e5429abda9f560
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Wed 2006-06-07 00:11:36 +1000
    message:
      Don't coallesce try blocks, it can lead to confusing exceptions.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060531084429-35e5429abda9f560
    parent: michael at ellerman.id.au-20060530150334-1729470bccee74ee
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Wed 2006-05-31 18:44:29 +1000
    message:
      Add optional location to ancestry and fix behaviour for checkouts.
      
      This adds an optional location parameter to the ancestry command. It also
      changes the behaviour of ancestry on checkouts such that if they have
      been created with a subset of the branch history, only the subset is
      shown by 'bzr ancestry'. Tests for all of that as well.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060530150334-1729470bccee74ee
    parent: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Wed 2006-05-31 01:03:34 +1000
    message:
      Add an optional location parameter to the 'revision-history' command.
      
      Add tests for revision history against regular and repository branches,
      as well as checkouts and lightweight checkouts for completeness.