Rev 2441: (robertc) Fix bugs 107656 and 50408 by creating multiple help indices and cross referencing between them when user help requests are ambiguous. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Apr 23 03:09:47 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2441
revision-id: 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)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  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/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  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_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
    ------------------------------------------------------------
    revno: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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: 2432.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.

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



More information about the bazaar-commits mailing list