/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4110.2.24 by Martin Pool
merge trunk
1
# Copyright (C) 2006, 2009 Canonical Ltd
2023.1.2 by ghigo
add help topics module
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2023.1.2 by ghigo
add help topics module
16
17
"""A collection of extra help information for using bzr.
18
19
Help topics are meant to be help for items that aren't commands, but will
20
help bzr become fully learnable without referring to a tutorial.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
21
22
Limited formatting of help text is permitted to make the text useful
23
both within the reference manual (reStructuredText) and on the screen.
24
The help text should be reStructuredText with formatting kept to a
25
minimum and, in particular, no headings. The onscreen renderer applies
26
the following simple rules before rendering the text:
27
28
    1. A '::' appearing on the end of a line is replaced with ':'.
29
    2. Lines starting with a ':' have it stripped.
30
31
These rules mean that literal blocks and field lists respectively can
32
be used in the help text, producing sensible input to a manual while
33
rendering on the screen naturally.
2023.1.2 by ghigo
add help topics module
34
"""
35
3087.2.4 by Alexander Belchenko
Help topics can now be loaded from files (based on Ian's patch, adapted to proper support various windows installers).
36
import sys
37
38
import bzrlib
39
from bzrlib import (
40
    osutils,
41
    registry,
42
    )
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
43
44
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
45
# Section identifiers (map topics to the right place in the manual)
46
SECT_COMMAND = "command"
47
SECT_CONCEPT = "concept"
48
SECT_HIDDEN =  "hidden"
49
SECT_LIST    = "list"
50
SECT_PLUGIN  = "plugin"
51
52
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
53
class HelpTopicRegistry(registry.Registry):
2070.4.15 by John Arbash Meinel
Fixes from Martin
54
    """A Registry customized for handling help topics."""
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
55
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
56
    def register(self, topic, detail, summary, section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
57
        """Register a new help topic.
58
59
        :param topic: Name of documentation entry
60
        :param detail: Function or string object providing detailed
61
            documentation for topic.  Function interface is detail(topic).
62
            This should return a text string of the detailed information.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
63
            See the module documentation for details on help text formatting.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
64
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
65
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
66
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
67
        # The detail is stored as the 'object' and the metadata as the info
68
        info=(summary,section)
69
        super(HelpTopicRegistry, self).register(topic, detail, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
70
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
71
    def register_lazy(self, topic, module_name, member_name, summary,
72
                      section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
73
        """Register a new help topic, and import the details on demand.
74
75
        :param topic: Name of documentation entry
76
        :param module_name: The module to find the detailed help.
77
        :param member_name: The member of the module to use for detailed help.
78
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
79
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
80
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
81
        # The detail is stored as the 'object' and the metadata as the info
82
        info=(summary,section)
2070.4.15 by John Arbash Meinel
Fixes from Martin
83
        super(HelpTopicRegistry, self).register_lazy(topic, module_name,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
84
                                                     member_name, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
85
86
    def get_detail(self, topic):
87
        """Get the detailed help on a given topic."""
88
        obj = self.get(topic)
89
        if callable(obj):
90
            return obj(topic)
91
        else:
92
            return obj
93
94
    def get_summary(self, topic):
95
        """Get the single line summary for the topic."""
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
96
        info = self.get_info(topic)
97
        if info is None:
98
            return None
99
        else:
100
            return info[0]
101
102
    def get_section(self, topic):
103
        """Get the section for the topic."""
104
        info = self.get_info(topic)
105
        if info is None:
106
            return None
107
        else:
108
            return info[1]
109
110
    def get_topics_for_section(self, section):
111
        """Get the set of topics in a section."""
112
        result = set()
113
        for topic in self.keys():
114
            if section == self.get_section(topic):
115
                result.add(topic)
116
        return result
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
117
118
119
topic_registry = HelpTopicRegistry()
2023.1.2 by ghigo
add help topics module
120
121
122
#----------------------------------------------------
123
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
124
def _help_on_topics(dummy):
2023.1.2 by ghigo
add help topics module
125
    """Write out the help for topics to outfile"""
126
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
127
    topics = topic_registry.keys()
2070.4.2 by John Arbash Meinel
cleanup help_topics.py
128
    lmax = max(len(topic) for topic in topics)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
129
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
130
    out = []
2023.1.2 by ghigo
add help topics module
131
    for topic in topics:
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
132
        summary = topic_registry.get_summary(topic)
133
        out.append("%-*s %s\n" % (lmax, topic, summary))
134
    return ''.join(out)
135
136
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
137
def _load_from_file(topic_name):
138
    """Load help from a file.
139
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
140
    Topics are expected to be txt files in bzrlib.help_topics.
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
141
    """
3089.3.10 by Ian Clatworthy
more feedback from Alex - make help_topics a real package
142
    resource_name = osutils.pathjoin("en", "%s.txt" % (topic_name,))
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
143
    return osutils.resource_string('bzrlib.help_topics', resource_name)
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
144
145
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
146
def _help_on_revisionspec(name):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
147
    """Generate the help for revision specs."""
148
    import re
2023.1.2 by ghigo
add help topics module
149
    import bzrlib.revisionspec
150
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
151
    out = []
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
152
    out.append(
153
"""Revision Identifiers
154
4569.2.5 by Matthew Fuller
Update online documentation to match new DWIM behavior.
155
A revision identifier refers to a specific state of a branch's history.  It
156
can be expressed in several ways.  It can begin with a keyword to
157
unambiguously specify a given lookup type; some examples are 'last:1',
158
'before:yesterday' and 'submit:'.
159
160
Alternately, it can be given without a keyword, in which case it will be
161
checked as a revision number, a tag, a revision id, a date specification, or a
162
branch specification, in that order.  For example, 'date:today' could be
163
written as simply 'today', though if you have a tag called 'today' that will
164
be found first.
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
165
166
If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a
167
revision range. Examples: '3647..3649', 'date:yesterday..-1' and
168
'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes or
3651.2.3 by Daniel Clemente
Explained more about range interpretations. Removed sentence about REV1..REV2..REV3 because it's unimplemented
169
spaces around the '..').
170
171
Ranges are interpreted differently by different commands. To the "log" command,
172
a range is a sequence of log messages, but to the "diff" command, the range
173
denotes a change between revisions (and not a sequence of changes).  In
174
addition, "log" considers a closed range whereas "diff" and "merge" consider it
175
to be open-ended, that is, they include one end but not the other.  For example:
176
"bzr log -r 3647..3649" shows the messages of revisions 3647, 3648 and 3649,
3946.1.2 by Ian Clatworthy
Correct incorrect wording in revisionspec help (Matthew Fuller)
177
while "bzr diff -r 3647..3649" includes the changes done in revisions 3648 and
178
3649, but not 3647.
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
179
180
The keywords used as revision selection methods are the following:
181
""")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
182
    details = []
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
183
    details.append("\nIn addition, plugins can provide other keywords.")
184
    details.append("\nA detailed description of each keyword is given below.\n")
2023.1.2 by ghigo
add help topics module
185
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
186
    # The help text is indented 4 spaces - this re cleans that up below
187
    indent_re = re.compile(r'^    ', re.MULTILINE)
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
188
    for prefix, i in bzrlib.revisionspec.revspec_registry.iteritems():
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
189
        doc = i.help_txt
190
        if doc == bzrlib.revisionspec.RevisionSpec.help_txt:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
191
            summary = "N/A"
192
            doc = summary + "\n"
193
        else:
194
            # Extract out the top line summary from the body and
195
            # clean-up the unwanted whitespace
196
            summary,doc = doc.split("\n", 1)
197
            #doc = indent_re.sub('', doc)
198
            while (doc[-2:] == '\n\n' or doc[-1:] == ' '):
199
                doc = doc[:-1]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
200
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
201
        # Note: The leading : here are HACKs to get reStructuredText
202
        # 'field' formatting - we know that the prefix ends in a ':'.
203
        out.append(":%s\n\t%s" % (i.prefix, summary))
204
        details.append(":%s\n%s" % (i.prefix, doc))
205
206
    return '\n'.join(out + details)
2023.1.2 by ghigo
add help topics module
207
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
208
2241.2.5 by ghigo
add the topics transport
209
def _help_on_transport(name):
210
    from bzrlib.transport import (
211
        transport_list_registry,
212
    )
213
    import textwrap
214
215
    def add_string(proto, help, maxl, prefix_width=20):
4070.11.2 by Martin Pool
Ask textwrap not to break long words or on hyphens
216
       help_lines = textwrap.wrap(help, maxl - prefix_width,
4070.11.5 by Martin Pool
textwrap break_on_hyphens option is not available in python2.5
217
            break_long_words=False)
2241.2.5 by ghigo
add the topics transport
218
       line_with_indent = '\n' + ' ' * prefix_width
219
       help_text = line_with_indent.join(help_lines)
220
       return "%-20s%s\n" % (proto, help_text)
221
2241.2.8 by ghigo
- rename transport urlspec
222
    def sort_func(a,b):
223
        a1 = a[:a.rfind("://")]
224
        b1 = b[:b.rfind("://")]
225
        if a1>b1:
226
            return +1
227
        elif a1<b1:
228
            return -1
229
        else:
230
            return 0
231
2241.2.5 by ghigo
add the topics transport
232
    protl = []
233
    decl = []
234
    protos = transport_list_registry.keys( )
2241.2.8 by ghigo
- rename transport urlspec
235
    protos.sort(sort_func)
2241.2.5 by ghigo
add the topics transport
236
    for proto in protos:
237
        shorthelp = transport_list_registry.get_help(proto)
238
        if not shorthelp:
239
            continue
240
        if proto.endswith("://"):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
241
            protl.append(add_string(proto, shorthelp, 79))
2241.2.5 by ghigo
add the topics transport
242
        else:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
243
            decl.append(add_string(proto, shorthelp, 79))
244
245
246
    out = "URL Identifiers\n\n" + \
247
            "Supported URL prefixes::\n\n  " + \
248
            '  '.join(protl)
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
249
250
    if len(decl):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
251
        out += "\nSupported modifiers::\n\n  " + \
252
            '  '.join(decl)
2241.2.5 by ghigo
add the topics transport
253
254
    return out
255
2023.1.2 by ghigo
add help topics module
256
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
257
_basic_help = \
2023.1.2 by ghigo
add help topics module
258
"""Bazaar -- a free distributed version-control tool
259
http://bazaar-vcs.org/
260
261
Basic commands:
262
  bzr init           makes this directory a versioned branch
263
  bzr branch         make a copy of another branch
264
265
  bzr add            make files or directories versioned
266
  bzr ignore         ignore a file or pattern
267
  bzr mv             move or rename a versioned file
268
269
  bzr status         summarize changes in working copy
270
  bzr diff           show detailed diffs
271
272
  bzr merge          pull in changes from another branch
273
  bzr commit         save some or all changes
3696.7.2 by Jelmer Vernooij
Mention changes are sent via email.
274
  bzr send           send changes via email
2023.1.2 by ghigo
add help topics module
275
276
  bzr log            show history of changes
277
  bzr check          validate storage
278
279
  bzr help init      more help on e.g. init command
280
  bzr help commands  list all commands
281
  bzr help topics    list all help topics
282
"""
283
284
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
285
_global_options = \
1551.9.32 by Aaron Bentley
Add global option help
286
"""Global Options
287
288
These options may be used with any command, and may appear in front of any
2768.1.1 by Ian Clatworthy
Document standard options
289
command.  (e.g. "bzr --profile help").
1551.9.32 by Aaron Bentley
Add global option help
290
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
291
--version      Print the version number. Must be supplied before the command.
2748.1.1 by Ian Clatworthy
(Daniel Watkins) help global-options now lists all debug flags
292
--no-aliases   Do not process command aliases when running this command.
1551.9.32 by Aaron Bentley
Add global option help
293
--builtin      Use the built-in version of a command, not the plugin version.
2748.1.1 by Ian Clatworthy
(Daniel Watkins) help global-options now lists all debug flags
294
               This does not suppress other plugin effects.
295
--no-plugins   Do not process any plugins.
1551.9.32 by Aaron Bentley
Add global option help
296
2748.1.1 by Ian Clatworthy
(Daniel Watkins) help global-options now lists all debug flags
297
--profile      Profile execution using the hotshot profiler.
298
--lsprof       Profile execution using the lsprof profiler.
1551.9.32 by Aaron Bentley
Add global option help
299
--lsprof-file  Profile execution using the lsprof profiler, and write the
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
300
               results to a specified file.  If the filename ends with ".txt",
2654.2.1 by Ian Clatworthy
Dump profiling data for KCacheGrind if the filename starts with callgrind.out
301
               text format will be used.  If the filename either starts with
302
               "callgrind.out" or end with ".callgrind", the output will be
303
               formatted for use with KCacheGrind. Otherwise, the output
304
               will be a pickle.
3169.3.1 by Andrew Bennetts
Make --coverage a global option.
305
--coverage     Generate line coverage report in the specified directory.
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
306
307
See doc/developers/profiling.txt for more information on profiling.
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
308
A number of debug flags are also available to assist troubleshooting and
4110.2.7 by Martin Pool
Split debug flags into their own help topic
309
development.  See `bzr help debug-flags`.
1551.9.32 by Aaron Bentley
Add global option help
310
"""
311
2768.1.1 by Ian Clatworthy
Document standard options
312
_standard_options = \
313
"""Standard Options
314
315
Standard options are legal for all commands.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
316
2768.1.1 by Ian Clatworthy
Document standard options
317
--help, -h     Show help message.
2768.1.13 by Ian Clatworthy
Minor fixes to help
318
--verbose, -v  Display more information.
319
--quiet, -q    Only display errors and warnings.
2768.1.1 by Ian Clatworthy
Document standard options
320
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
321
Unlike global options, standard options can be used in aliases.
2768.1.1 by Ian Clatworthy
Document standard options
322
"""
323
324
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
325
_checkouts = \
326
"""Checkouts
327
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
328
Checkouts are source trees that are connected to a branch, so that when
329
you commit in the source tree, the commit goes into that branch.  They
330
allow you to use a simpler, more centralized workflow, ignoring some of
331
Bazaar's decentralized features until you want them. Using checkouts
332
with shared repositories is very similar to working with SVN or CVS, but
333
doesn't have the same restrictions.  And using checkouts still allows
334
others working on the project to use whatever workflow they like.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
335
336
A checkout is created with the bzr checkout command (see "help checkout").
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
337
You pass it a reference to another branch, and it will create a local copy
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
338
for you that still contains a reference to the branch you created the
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
339
checkout from (the master branch). Then if you make any commits they will be
340
made on the other branch first. This creates an instant mirror of your work, or
341
facilitates lockstep development, where each developer is working together,
342
continuously integrating the changes of others.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
343
344
However the checkout is still a first class branch in Bazaar terms, so that
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
345
you have the full history locally.  As you have a first class branch you can
346
also commit locally if you want, for instance due to the temporary loss af a
347
network connection. Use the --local option to commit to do this. All the local
348
commits will then be made on the master branch the next time you do a non-local
349
commit.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
350
351
If you are using a checkout from a shared branch you will periodically want to
352
pull in all the changes made by others. This is done using the "update"
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
353
command. The changes need to be applied before any non-local commit, but
354
Bazaar will tell you if there are any changes and suggest that you use this
355
command when needed.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
356
357
It is also possible to create a "lightweight" checkout by passing the
358
--lightweight flag to checkout. A lightweight checkout is even closer to an
359
SVN checkout in that it is not a first class branch, it mainly consists of the
360
working tree. This means that any history operations must query the master
361
branch, which could be slow if a network connection is involved. Also, as you
362
don't have a local branch, then you cannot commit locally.
363
2374.1.1 by Ian Clatworthy
Help and man page fixes
364
Lightweight checkouts work best when you have fast reliable access to the
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
365
master branch. This means that if the master branch is on the same disk or LAN
366
a lightweight checkout will be faster than a heavyweight one for any commands
3310.2.1 by James Westby
Fix wording in the checkouts help topic.
367
that modify the revision history (as only one copy of the branch needs to
368
be updated). Heavyweight checkouts will generally be faster for any command
369
that uses the history but does not change it, but if the master branch is on
370
the same disk then there won't be a noticeable difference.
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
371
372
Another possible use for a checkout is to use it with a treeless repository
2370.1.2 by Ian Clatworthy
Minor fixes to help on checkouts
373
containing your branches, where you maintain only one working tree by
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
374
switching the master branch that the checkout points to when you want to
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
375
work on a different branch.
376
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
377
Obviously to commit on a checkout you need to be able to write to the master
2370.1.2 by Ian Clatworthy
Minor fixes to help on checkouts
378
branch. This means that the master branch must be accessible over a writeable
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
379
protocol , such as sftp://, and that you have write permissions at the other
380
end. Checkouts also work on the local file system, so that all that matters is
381
file permissions.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
382
383
You can change the master of a checkout by using the "bind" command (see "help
384
bind"). This will change the location that the commits are sent to. The bind
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
385
command can also be used to turn a branch into a heavy checkout. If you
386
would like to convert your heavy checkout into a normal branch so that every
387
commit is local, you can use the "unbind" command.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
388
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
389
Related commands::
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
390
391
  checkout    Create a checkout. Pass --lightweight to get a lightweight
392
              checkout
393
  update      Pull any changes in the master branch in to your checkout
394
  commit      Make a commit that is sent to the master branch. If you have
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
395
              a heavy checkout then the --local option will commit to the
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
396
              checkout without sending the commit to the master
397
  bind        Change the master branch that the commits in the checkout will
398
              be sent to
399
  unbind      Turn a heavy checkout into a standalone branch so that any
400
              commits are only made locally
401
"""
402
2401.2.1 by James Westby
Add a help topic for repositories.
403
_repositories = \
404
"""Repositories
405
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
406
Repositories in Bazaar are where committed information is stored. There is
407
a repository associated with every branch.
408
409
Repositories are a form of database. Bzr will usually maintain this for
410
good performance automatically, but in some situations (e.g. when doing
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
411
very many commits in a short time period) you may want to ask bzr to
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
412
optimise the database indices. This can be done by the 'bzr pack' command.
413
414
By default just running 'bzr init' will create a repository within the new
415
branch but it is possible to create a shared repository which allows multiple
416
branches to share their information in the same location. When a new branch is
417
created it will first look to see if there is a containing shared repository it
418
can use.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
419
420
When two branches of the same project share a repository, there is
421
generally a large space saving. For some operations (e.g. branching
422
within the repository) this translates in to a large time saving.
2401.2.1 by James Westby
Add a help topic for repositories.
423
424
To create a shared repository use the init-repository command (or the alias
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
425
init-repo). This command takes the location of the repository to create. This
426
means that 'bzr init-repository repo' will create a directory named 'repo',
427
which contains a shared repository. Any new branches that are created in this
428
directory will then use it for storage.
2401.2.1 by James Westby
Add a help topic for repositories.
429
430
It is a good idea to create a repository whenever you might create more
431
than one branch of a project. This is true for both working areas where you
432
are doing the development, and any server areas that you use for hosting
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
433
projects. In the latter case, it is common to want branches without working
434
trees. Since the files in the branch will not be edited directly there is no
435
need to use up disk space for a working tree. To create a repository in which
436
the branches will not have working trees pass the '--no-trees' option to
437
'init-repository'.
2401.2.1 by James Westby
Add a help topic for repositories.
438
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
439
Related commands::
2401.2.1 by James Westby
Add a help topic for repositories.
440
441
  init-repository   Create a shared repository. Use --no-trees to create one
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
442
                    in which new branches won't get a working tree.
2401.2.1 by James Westby
Add a help topic for repositories.
443
"""
444
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
445
2401.2.2 by James Westby
Add a working-trees help topic.
446
_working_trees = \
447
"""Working Trees
448
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
449
A working tree is the contents of a branch placed on disk so that you can
2401.2.2 by James Westby
Add a working-trees help topic.
450
see the files and edit them. The working tree is where you make changes to a
451
branch, and when you commit the current state of the working tree is the
452
snapshot that is recorded in the commit.
453
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
454
When you push a branch to a remote system, a working tree will not be
455
created. If one is already present the files will not be updated. The
456
branch information will be updated and the working tree will be marked
457
as out-of-date. Updating a working tree remotely is difficult, as there
458
may be uncommitted changes or the update may cause content conflicts that are
459
difficult to deal with remotely.
2401.2.2 by James Westby
Add a working-trees help topic.
460
461
If you have a branch with no working tree you can use the 'checkout' command
462
to create a working tree. If you run 'bzr checkout .' from the branch it will
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
463
create the working tree. If the branch is updated remotely, you can update the
464
working tree by running 'bzr update' in that directory.
2401.2.2 by James Westby
Add a working-trees help topic.
465
466
If you have a branch with a working tree that you do not want the 'remove-tree'
467
command will remove the tree if it is safe. This can be done to avoid the
468
warning about the remote working tree not being updated when pushing to the
469
branch. It can also be useful when working with a '--no-trees' repository
470
(see 'bzr help repositories').
471
472
If you want to have a working tree on a remote machine that you push to you
473
can either run 'bzr update' in the remote branch after each push, or use some
474
other method to update the tree during the push. There is an 'rspush' plugin
475
that will update the working tree using rsync as well as doing a push. There
476
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
477
after each push.
478
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
479
Useful commands::
2401.2.2 by James Westby
Add a working-trees help topic.
480
481
  checkout     Create a working tree when a branch does not have one.
482
  remove-tree  Removes the working tree from a branch when it is safe to do so.
483
  update       When a working tree is out of sync with it's associated branch
484
               this will update the tree to match the branch.
485
"""
486
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
487
488
_branches = \
489
"""Branches
490
491
A branch consists of the state of a project, including all of its
492
history. All branches have a repository associated (which is where the
493
branch history is stored), but multiple branches may share the same
494
repository (a shared repository). Branches can be copied and merged.
495
496
Related commands::
497
3535.4.2 by Marius Kruger
Update branches help topic to avoid ambiguity.
498
  init    Change a directory into a versioned branch.
4431.2.1 by mernst at mit
branch documentation: clarify English word "copy"
499
  branch  Create a new branch that is a copy of an existing branch.
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
500
  merge   Perform a three-way merge.
501
"""
502
503
504
_standalone_trees = \
505
"""Standalone Trees
506
507
A standalone tree is a working tree with an associated repository. It
508
is an independently usable branch, with no dependencies on any other.
509
Creating a standalone tree (via bzr init) is the quickest way to put
510
an existing project under version control.
511
512
Related Commands::
513
514
  init    Make a directory into a versioned branch.
515
"""
516
517
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
518
_status_flags = \
519
"""Status Flags
520
521
Status flags are used to summarise changes to the working tree in a concise
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
522
manner.  They are in the form::
523
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
524
   xxx   <filename>
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
525
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
526
where the columns' meanings are as follows.
527
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
528
Column 1 - versioning/renames::
529
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
530
  + File versioned
531
  - File unversioned
532
  R File renamed
533
  ? File unknown
3930.2.10 by Karl Fogel
Two followup changes related to the fix for bug #306394:
534
  X File nonexistent (and unknown to bzr)
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
535
  C File has conflicts
536
  P Entry for a pending merge (not a file)
537
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
538
Column 2 - contents::
539
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
540
  N File created
541
  D File deleted
542
  K File kind changed
543
  M File modified
544
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
545
Column 3 - execute::
546
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
547
  * The execute bit was changed
548
"""
549
1551.9.32 by Aaron Bentley
Add global option help
550
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
551
_env_variables = \
552
"""Environment Variables
553
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
554
================ =================================================================
555
BZRPATH          Path where bzr is to look for shell plugin external commands.
556
BZR_EMAIL        E-Mail address of the user. Overrides EMAIL.
557
EMAIL            E-Mail address of the user.
558
BZR_EDITOR       Editor for editing commit messages. Overrides EDITOR.
559
EDITOR           Editor for editing commit messages.
560
BZR_PLUGIN_PATH  Paths where bzr should look for plugins.
561
BZR_HOME         Directory holding .bazaar config dir. Overrides HOME.
562
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
2967.2.1 by Rob Weir
Document BZR_REMOTE_PATH in 'bzr help env-variables'
563
BZR_REMOTE_PATH  Full name of remote 'bzr' command (for bzr+ssh:// URLs).
3193.4.1 by Alexander Belchenko
List possible values for BZR_SSH environment variable in env-variables help topic. (#181842)
564
BZR_SSH          SSH client: paramiko (default), openssh, ssh, plink.
3193.6.5 by Alexander Belchenko
help topic on $BZR_LOG differentiate between *nix and Win32
565
BZR_LOG          Location of .bzr.log (use '/dev/null' to suppress log).
566
BZR_LOG (Win32)  Location of .bzr.log (use 'NUL' to suppress log).
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
567
================ =================================================================
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
568
"""
569
570
571
_files = \
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
572
r"""Files
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
573
574
:On Linux:   ~/.bazaar/bazaar.conf
575
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
576
577
Contains the user's default configuration. The section ``[DEFAULT]`` is
578
used to define general configuration that will be applied everywhere.
579
The section ``[ALIASES]`` can be used to create command aliases for
580
commonly used options.
581
582
A typical config file might look something like::
583
584
  [DEFAULT]
585
  email=John Doe <jdoe@isp.com>
586
587
  [ALIASES]
588
  commit = commit --strict
589
  log10 = log --short -r -10..-1
590
"""
591
1551.19.11 by Aaron Bentley
Add criss-cross help topic
592
_criss_cross = \
3079.1.1 by Alexander Belchenko
topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
593
"""Criss-Cross
594
1551.19.11 by Aaron Bentley
Add criss-cross help topic
595
A criss-cross in the branch history can cause the default merge technique
596
to emit more conflicts than would normally be expected.
597
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
598
In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
599
better results.  You may wish to ``bzr revert`` the working tree and merge
600
again.  Alternatively, use ``bzr remerge`` on particular conflicted files.
1551.19.11 by Aaron Bentley
Add criss-cross help topic
601
602
Criss-crosses occur in a branch's history if two branches merge the same thing
603
and then merge one another, or if two branches merge one another at the same
604
time.  They can be avoided by having each branch only merge from or into a
605
designated central branch (a "star topology").
606
607
Criss-crosses cause problems because of the way merge works.  Bazaar's default
608
merge is a three-way merger; in order to merge OTHER into THIS, it must
609
find a basis for comparison, BASE.  Using BASE, it can determine whether
610
differences between THIS and OTHER are due to one side adding lines, or
611
from another side removing lines.
612
613
Criss-crosses mean there is no good choice for a base.  Selecting the recent
614
merge points could cause one side's changes to be silently discarded.
615
Selecting older merge points (which Bazaar does) mean that extra conflicts
616
are emitted.
617
618
The ``weave`` merge type is not affected by this problem because it uses
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
619
line-origin detection instead of a basis revision to determine the cause of
3324.3.1 by Martin Pool
help criss-cross should suggest using remerge
620
differences.
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
621
"""
1551.19.11 by Aaron Bentley
Add criss-cross help topic
622
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
623
_branches_out_of_sync = """Branches out of sync
624
625
When reconfiguring a checkout, tree or branch into a lightweight checkout,
626
a local branch must be destroyed.  (For checkouts, this is the local branch
627
that serves primarily as a cache.)  If the branch-to-be-destroyed does not
628
have the same last revision as the new reference branch for the lightweight
629
checkout, data could be lost, so Bazaar refuses.
630
631
How you deal with this depends on *why* the branches are out of sync.
632
633
If you have a checkout and have done local commits, you can get back in sync
634
by running "bzr update" (and possibly "bzr commit").
635
636
If you have a branch and the remote branch is out-of-date, you can push
637
the local changes using "bzr push".  If the local branch is out of date, you
638
can do "bzr pull".  If both branches have had changes, you can merge, commit
639
and then push your changes.  If you decide that some of the changes aren't
640
useful, you can "push --overwrite" or "pull --overwrite" instead.
641
"""
642
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
643
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
644
_storage_formats = \
645
"""Storage Formats
646
647
To ensure that older clients do not access data incorrectly,
648
Bazaar's policy is to introduce a new storage format whenever
649
new features requiring new metadata are added. New storage
650
formats may also be introduced to improve performance and
651
scalability.
652
4737.2.4 by Jared Hance
- More modifications/corrections.
653
The newest format, 2a, is highly recommended. If your
4737.2.7 by Jared Hance
Deleted typo.
654
project is not using 2a, then you should suggest to the
4737.2.4 by Jared Hance
- More modifications/corrections.
655
project owner to upgrade.
656
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
657
4737.2.1 by Jared Hance
Changed "bzr help formats" to no longer give information on extremely outdated formats.
658
Note: Some of the older formats have two variants:
3892.1.4 by Ian Clatworthy
rich-root explanation and improved help for 1.6 and 1.9 formats
659
a plain one and a rich-root one. The latter include an additional
660
field about the root of the tree. There is no performance cost
661
for using a rich-root format but you cannot easily merge changes
662
from a rich-root format into a plain format. As a consequence,
663
moving a project to a rich-root format takes some co-ordination
664
in that all contributors need to upgrade their repositories
4737.2.5 by Jared Hance
Changed "version" to "format" (see diff)
665
around the same time. 2a and all future formats will be
4737.2.4 by Jared Hance
- More modifications/corrections.
666
implicitly rich-root.
3892.1.4 by Ian Clatworthy
rich-root explanation and improved help for 1.6 and 1.9 formats
667
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
668
See ``bzr help current-formats`` for the complete list of
669
currently supported formats. See ``bzr help other-formats`` for
670
descriptions of any available experimental and deprecated formats.
671
"""
672
673
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
674
# Register help topics
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
675
topic_registry.register("revisionspec", _help_on_revisionspec,
676
                        "Explain how to use --revision")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
677
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
678
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
679
def get_current_formats_topic(topic):
680
    from bzrlib import bzrdir
681
    return "Current Storage Formats\n\n" + \
682
        bzrdir.format_registry.help_topic(topic)
683
def get_other_formats_topic(topic):
684
    from bzrlib import bzrdir
685
    return "Other Storage Formats\n\n" + \
686
        bzrdir.format_registry.help_topic(topic)
687
topic_registry.register('current-formats', get_current_formats_topic,
688
    'Current storage formats')
689
topic_registry.register('other-formats', get_other_formats_topic,
690
    'Experimental and deprecated storage formats')
2768.1.1 by Ian Clatworthy
Document standard options
691
topic_registry.register('standard-options', _standard_options,
692
                        'Options that can be used with any command')
1551.9.34 by Aaron Bentley
Fix NEWS and whitespace
693
topic_registry.register('global-options', _global_options,
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
694
                    'Options that control how Bazaar runs')
2241.2.8 by ghigo
- rename transport urlspec
695
topic_registry.register('urlspec', _help_on_transport,
2241.2.5 by ghigo
add the topics transport
696
                        "Supported transport protocols")
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
697
topic_registry.register('status-flags', _status_flags,
698
                        "Help on status flags")
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
699
def get_bugs_topic(topic):
700
    from bzrlib import bugtracker
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
701
    return ("Bug Tracker Settings\n\n" +
3154.1.1 by Ian Clatworthy
Minor tweaks to bug tracker integration documentation
702
        bugtracker.tracker_registry.help_topic(topic))
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
703
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
704
topic_registry.register('env-variables', _env_variables,
705
                        'Environment variable names and values')
706
topic_registry.register('files', _files,
707
                        'Information on configuration and log files')
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
708
topic_registry.register_lazy('hooks', 'bzrlib.hooks', 'hooks_help_text',
709
                        'Points at which custom processing can be added')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
710
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
711
# Load some of the help topics from files. Note that topics which reproduce API
712
# details will tend to skew (quickly usually!) so please seek other solutions
713
# for such things.
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
714
topic_registry.register('authentication', _load_from_file,
715
                        'Information on configuring authentication')
716
topic_registry.register('configuration', _load_from_file,
717
                        'Details on the configuration settings available')
718
topic_registry.register('conflicts', _load_from_file,
719
                        'Types of conflicts and what to do about them')
4110.2.7 by Martin Pool
Split debug flags into their own help topic
720
topic_registry.register('debug-flags', _load_from_file,
721
                        'Options to show or record debug information')
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
722
topic_registry.register('log-formats', _load_from_file,
723
                        'Details on the logging formats available')
4416.4.1 by Neil Martinsen-Burrell
Fix 269477 Add documentation about diverged branches and refer to it when pushing fails
724
topic_registry.register('diverged-branches', _load_from_file,
725
                        'How to fix diverged branches')
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
726
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
727
728
# Register concept topics.
729
# Note that we might choose to remove these from the online help in the
730
# future or implement them via loading content from files. In the meantime,
731
# please keep them concise.
732
topic_registry.register('branches', _branches,
733
                        'Information on what a branch is', SECT_CONCEPT)
734
topic_registry.register('checkouts', _checkouts,
735
                        'Information on what a checkout is', SECT_CONCEPT)
3368.2.17 by Ian Clatworthy
add content-filters help topic
736
topic_registry.register('content-filters', _load_from_file,
737
                        'Conversion of content into/from working trees',
738
                        SECT_CONCEPT)
4208.4.1 by Ian Clatworthy
eol conversion support
739
topic_registry.register('eol', _load_from_file,
740
                        'Information on end-of-line handling',
741
                        SECT_CONCEPT)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
742
topic_registry.register('formats', _storage_formats,
743
                        'Information on choosing a storage format',
744
                        SECT_CONCEPT)
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
745
topic_registry.register('patterns', _load_from_file,
746
                        'Information on the pattern syntax',
747
                        SECT_CONCEPT)
2401.2.1 by James Westby
Add a help topic for repositories.
748
topic_registry.register('repositories', _repositories,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
749
                        'Basic information on shared repositories.',
750
                        SECT_CONCEPT)
3398.1.20 by Ian Clatworthy
add rules help topic
751
topic_registry.register('rules', _load_from_file,
752
                        'Information on defining rule-based preferences',
753
                        SECT_CONCEPT)
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
754
topic_registry.register('standalone-trees', _standalone_trees,
755
                        'Information on what a standalone tree is',
756
                        SECT_CONCEPT)
2401.2.2 by James Westby
Add a working-trees help topic.
757
topic_registry.register('working-trees', _working_trees,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
758
                        'Information on working trees', SECT_CONCEPT)
1551.19.11 by Aaron Bentley
Add criss-cross help topic
759
topic_registry.register('criss-cross', _criss_cross,
760
                        'Information on criss-cross merging', SECT_CONCEPT)
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
761
topic_registry.register('sync-for-reconfigure', _branches_out_of_sync,
3723.2.1 by John Arbash Meinel
Fix bug #270471 by updating the topic string for 'sync-for-reconfigure'
762
                        'Steps to resolve "out-of-sync" when reconfiguring',
763
                        SECT_CONCEPT)
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
764
2432.1.1 by Robert Collins
Add a HelpTopicContext object.
765
2432.1.15 by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name.
766
class HelpTopicIndex(object):
767
    """A index for bzr help that returns topics."""
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
768
2432.1.17 by Robert Collins
Add prefixes to HelpIndexes.
769
    def __init__(self):
770
        self.prefix = ''
771
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
772
    def get_topics(self, topic):
773
        """Search for topic in the HelpTopicRegistry.
774
775
        :param topic: A topic to search for. None is treated as 'basic'.
776
        :return: A list which is either empty or contains a single
777
            RegisteredTopic entry.
778
        """
779
        if topic is None:
780
            topic = 'basic'
781
        if topic in topic_registry:
782
            return [RegisteredTopic(topic)]
783
        else:
784
            return []
785
786
787
class RegisteredTopic(object):
788
    """A help topic which has been registered in the HelpTopicRegistry.
789
790
    These topics consist of nothing more than the name of the topic - all
791
    data is retrieved on demand from the registry.
792
    """
793
794
    def __init__(self, topic):
795
        """Constructor.
796
797
        :param topic: The name of the topic that this represents.
798
        """
799
        self.topic = topic
2432.1.10 by Robert Collins
Add get_help_text() to RegisteredTopic to get the help as a string.
800
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
801
    def get_help_text(self, additional_see_also=None, plain=True):
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
802
        """Return a string with the help for this topic.
803
804
        :param additional_see_also: Additional help topics to be
805
            cross-referenced.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
806
        :param plain: if False, raw help (reStructuredText) is
807
            returned instead of plain text.
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
808
        """
809
        result = topic_registry.get_detail(self.topic)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
810
        # there is code duplicated here and in bzrlib/plugin.py's
2432.1.25 by Robert Collins
Return plugin module docstrings for 'bzr help plugin'.
811
        # matching Topic code. This should probably be factored in
812
        # to a helper function and a common base class.
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
813
        if additional_see_also is not None:
814
            see_also = sorted(set(additional_see_also))
815
        else:
816
            see_also = None
817
        if see_also:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
818
            result += '\n:See also: '
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
819
            result += ', '.join(see_also)
820
            result += '\n'
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
821
        if plain:
822
            result = help_as_plain_text(result)
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
823
        return result
2432.1.27 by Robert Collins
Add a get_help_topic method to RegisteredTopic.
824
825
    def get_help_topic(self):
826
        """Return the help topic this can be found under."""
827
        return self.topic
2485.1.1 by James Westby
Update the help topics to the latest bzr.dev.
828
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
829
830
def help_as_plain_text(text):
831
    """Minimal converter of reStructuredText to plain text."""
832
    lines = text.splitlines()
833
    result = []
834
    for line in lines:
835
        if line.startswith(':'):
836
            line = line[1:]
837
        elif line.endswith('::'):
838
            line = line[:-1]
839
        result.append(line)
840
    return "\n".join(result) + "\n"