~bzr-pqm/bzr/bzr.dev

6059.3.1 by Vincent Ladeuil
Provide per-config option help
1
# Copyright (C) 2006-2011 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
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
36
from __future__ import absolute_import
37
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).
38
import bzrlib
39
from bzrlib import (
6059.3.1 by Vincent Ladeuil
Provide per-config option help
40
    config,
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).
41
    osutils,
42
    registry,
6110.7.1 by Jonathan Riddell
add topic help to translations
43
    i18n,
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).
44
    )
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
45
6110.7.4 by Jonathan Riddell
fix spacing
46
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
47
# Section identifiers (map topics to the right place in the manual)
48
SECT_COMMAND = "command"
49
SECT_CONCEPT = "concept"
50
SECT_HIDDEN =  "hidden"
51
SECT_LIST    = "list"
52
SECT_PLUGIN  = "plugin"
53
54
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
55
class HelpTopicRegistry(registry.Registry):
2070.4.15 by John Arbash Meinel
Fixes from Martin
56
    """A Registry customized for handling help topics."""
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
57
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
58
    def register(self, topic, detail, summary, section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
59
        """Register a new help topic.
60
61
        :param topic: Name of documentation entry
62
        :param detail: Function or string object providing detailed
63
            documentation for topic.  Function interface is detail(topic).
64
            This should return a text string of the detailed information.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
65
            See the module documentation for details on help text formatting.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
66
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
67
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
68
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
69
        # The detail is stored as the 'object' and the metadata as the info
6059.3.1 by Vincent Ladeuil
Provide per-config option help
70
        info = (summary, section)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
71
        super(HelpTopicRegistry, self).register(topic, detail, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
72
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
73
    def register_lazy(self, topic, module_name, member_name, summary,
74
                      section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
75
        """Register a new help topic, and import the details on demand.
76
77
        :param topic: Name of documentation entry
78
        :param module_name: The module to find the detailed help.
79
        :param member_name: The member of the module to use for detailed help.
80
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
81
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
82
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
83
        # The detail is stored as the 'object' and the metadata as the info
6059.3.1 by Vincent Ladeuil
Provide per-config option help
84
        info = (summary, section)
2070.4.15 by John Arbash Meinel
Fixes from Martin
85
        super(HelpTopicRegistry, self).register_lazy(topic, module_name,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
86
                                                     member_name, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
87
88
    def get_detail(self, topic):
89
        """Get the detailed help on a given topic."""
90
        obj = self.get(topic)
91
        if callable(obj):
92
            return obj(topic)
93
        else:
94
            return obj
95
96
    def get_summary(self, topic):
97
        """Get the single line summary for the topic."""
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
98
        info = self.get_info(topic)
99
        if info is None:
100
            return None
101
        else:
102
            return info[0]
103
104
    def get_section(self, topic):
105
        """Get the section for the topic."""
106
        info = self.get_info(topic)
107
        if info is None:
108
            return None
109
        else:
110
            return info[1]
111
112
    def get_topics_for_section(self, section):
113
        """Get the set of topics in a section."""
114
        result = set()
115
        for topic in self.keys():
116
            if section == self.get_section(topic):
117
                result.add(topic)
118
        return result
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
119
120
121
topic_registry = HelpTopicRegistry()
2023.1.2 by ghigo
add help topics module
122
123
124
#----------------------------------------------------
125
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
126
def _help_on_topics(dummy):
2023.1.2 by ghigo
add help topics module
127
    """Write out the help for topics to outfile"""
128
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
129
    topics = topic_registry.keys()
2070.4.2 by John Arbash Meinel
cleanup help_topics.py
130
    lmax = max(len(topic) for topic in topics)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
131
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
132
    out = []
2023.1.2 by ghigo
add help topics module
133
    for topic in topics:
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
134
        summary = topic_registry.get_summary(topic)
135
        out.append("%-*s %s\n" % (lmax, topic, summary))
136
    return ''.join(out)
137
138
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
139
def _load_from_file(topic_name):
140
    """Load help from a file.
141
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
142
    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
143
    """
3089.3.10 by Ian Clatworthy
more feedback from Alex - make help_topics a real package
144
    resource_name = osutils.pathjoin("en", "%s.txt" % (topic_name,))
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
145
    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
146
147
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
148
def _help_on_revisionspec(name):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
149
    """Generate the help for revision specs."""
150
    import re
2023.1.2 by ghigo
add help topics module
151
    import bzrlib.revisionspec
152
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
153
    out = []
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
154
    out.append(
155
"""Revision Identifiers
156
4569.2.5 by Matthew Fuller
Update online documentation to match new DWIM behavior.
157
A revision identifier refers to a specific state of a branch's history.  It
158
can be expressed in several ways.  It can begin with a keyword to
159
unambiguously specify a given lookup type; some examples are 'last:1',
160
'before:yesterday' and 'submit:'.
161
162
Alternately, it can be given without a keyword, in which case it will be
163
checked as a revision number, a tag, a revision id, a date specification, or a
164
branch specification, in that order.  For example, 'date:today' could be
165
written as simply 'today', though if you have a tag called 'today' that will
166
be found first.
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
167
168
If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a
169
revision range. Examples: '3647..3649', 'date:yesterday..-1' and
170
'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
171
spaces around the '..').
172
173
Ranges are interpreted differently by different commands. To the "log" command,
174
a range is a sequence of log messages, but to the "diff" command, the range
175
denotes a change between revisions (and not a sequence of changes).  In
176
addition, "log" considers a closed range whereas "diff" and "merge" consider it
177
to be open-ended, that is, they include one end but not the other.  For example:
178
"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)
179
while "bzr diff -r 3647..3649" includes the changes done in revisions 3648 and
180
3649, but not 3647.
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
181
182
The keywords used as revision selection methods are the following:
183
""")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
184
    details = []
3651.2.2 by Daniel Clemente
Explained the syntax for revision and range identifiers
185
    details.append("\nIn addition, plugins can provide other keywords.")
186
    details.append("\nA detailed description of each keyword is given below.\n")
2023.1.2 by ghigo
add help topics module
187
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
188
    # The help text is indented 4 spaces - this re cleans that up below
189
    indent_re = re.compile(r'^    ', re.MULTILINE)
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
190
    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
191
        doc = i.help_txt
192
        if doc == bzrlib.revisionspec.RevisionSpec.help_txt:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
193
            summary = "N/A"
194
            doc = summary + "\n"
195
        else:
196
            # Extract out the top line summary from the body and
197
            # clean-up the unwanted whitespace
198
            summary,doc = doc.split("\n", 1)
199
            #doc = indent_re.sub('', doc)
200
            while (doc[-2:] == '\n\n' or doc[-1:] == ' '):
201
                doc = doc[:-1]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
202
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
203
        # Note: The leading : here are HACKs to get reStructuredText
204
        # 'field' formatting - we know that the prefix ends in a ':'.
205
        out.append(":%s\n\t%s" % (i.prefix, summary))
206
        details.append(":%s\n%s" % (i.prefix, doc))
207
208
    return '\n'.join(out + details)
2023.1.2 by ghigo
add help topics module
209
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
210
2241.2.5 by ghigo
add the topics transport
211
def _help_on_transport(name):
212
    from bzrlib.transport import (
213
        transport_list_registry,
214
    )
215
    import textwrap
216
217
    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
218
       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
219
            break_long_words=False)
2241.2.5 by ghigo
add the topics transport
220
       line_with_indent = '\n' + ' ' * prefix_width
221
       help_text = line_with_indent.join(help_lines)
222
       return "%-20s%s\n" % (proto, help_text)
223
2241.2.8 by ghigo
- rename transport urlspec
224
    def sort_func(a,b):
225
        a1 = a[:a.rfind("://")]
226
        b1 = b[:b.rfind("://")]
227
        if a1>b1:
228
            return +1
229
        elif a1<b1:
230
            return -1
231
        else:
232
            return 0
233
2241.2.5 by ghigo
add the topics transport
234
    protl = []
235
    decl = []
236
    protos = transport_list_registry.keys( )
2241.2.8 by ghigo
- rename transport urlspec
237
    protos.sort(sort_func)
2241.2.5 by ghigo
add the topics transport
238
    for proto in protos:
239
        shorthelp = transport_list_registry.get_help(proto)
240
        if not shorthelp:
241
            continue
242
        if proto.endswith("://"):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
243
            protl.append(add_string(proto, shorthelp, 79))
2241.2.5 by ghigo
add the topics transport
244
        else:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
245
            decl.append(add_string(proto, shorthelp, 79))
246
247
248
    out = "URL Identifiers\n\n" + \
249
            "Supported URL prefixes::\n\n  " + \
250
            '  '.join(protl)
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
251
252
    if len(decl):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
253
        out += "\nSupported modifiers::\n\n  " + \
254
            '  '.join(decl)
2241.2.5 by ghigo
add the topics transport
255
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
256
    out += """\
257
\nBazaar supports all of the standard parts within the URL::
258
259
  <protocol>://[user[:password]@]host[:port]/[path]
260
261
allowing URLs such as::
262
263
  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk
264
4798.4.4 by Matt Nordhoff
urlspec help: sftp URLs support ~ too
265
For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin
266
with '~' as meaning that the rest of the path should be interpreted
267
relative to the remote user's home directory.  For example if the user
268
``remote`` has a  home directory of ``/home/remote`` on the server
269
shell.example.com, then::
4798.4.3 by Neil Martinsen-Burrell
Add discussion of ~ in URLs
270
271
  bzr+ssh://remote@shell.example.com/~/myproject/trunk
272
273
would refer to ``/home/remote/myproject/trunk``.
4797.17.1 by Andrew Bennetts
Merge alias-loc-docs-337834 (which was against lp:bzr/2.0).
274
6002.1.1 by John Arbash Meinel, Jelmer Vernooij
Add documentation on handling of special characters in URLs.
275
Many commands that accept URLs also accept location aliases too.
276
See :doc:`location-alias-help` and :doc:`url-special-chars-help`.
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
277
"""
278
2241.2.5 by ghigo
add the topics transport
279
    return out
280
2023.1.2 by ghigo
add help topics module
281
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
282
_basic_help = \
4634.132.3 by Parth Malwankar
added version number to help when 'bzr' cmd is run (bug #369501)
283
"""Bazaar %s -- a free distributed version-control tool
5050.47.1 by Martin Pool
Backport fix for bad url in bzr help
284
http://bazaar.canonical.com/
2023.1.2 by ghigo
add help topics module
285
286
Basic commands:
287
  bzr init           makes this directory a versioned branch
288
  bzr branch         make a copy of another branch
289
290
  bzr add            make files or directories versioned
291
  bzr ignore         ignore a file or pattern
292
  bzr mv             move or rename a versioned file
293
294
  bzr status         summarize changes in working copy
295
  bzr diff           show detailed diffs
296
297
  bzr merge          pull in changes from another branch
298
  bzr commit         save some or all changes
3696.7.2 by Jelmer Vernooij
Mention changes are sent via email.
299
  bzr send           send changes via email
2023.1.2 by ghigo
add help topics module
300
301
  bzr log            show history of changes
302
  bzr check          validate storage
303
304
  bzr help init      more help on e.g. init command
305
  bzr help commands  list all commands
306
  bzr help topics    list all help topics
4634.132.3 by Parth Malwankar
added version number to help when 'bzr' cmd is run (bug #369501)
307
""" % bzrlib.__version__
2023.1.2 by ghigo
add help topics module
308
309
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
310
_global_options = \
1551.9.32 by Aaron Bentley
Add global option help
311
"""Global Options
312
313
These options may be used with any command, and may appear in front of any
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
314
command.  (e.g. ``bzr --profile help``).
6161.1.5 by Vincent Ladeuil
Get rid of the --override-config long name, ensures the overrides are resest when the command has run.
315
316
--version      Print the version number. Must be supplied before the command.
317
--no-aliases   Do not process command aliases when running this command.
318
--builtin      Use the built-in version of a command, not the plugin version.
319
               This does not suppress other plugin effects.
320
--no-plugins   Do not process any plugins.
321
--no-l10n      Do not translate messages.
322
--concurrency  Number of processes that can be run concurrently (selftest).
323
324
--profile      Profile execution using the hotshot profiler.
325
--lsprof       Profile execution using the lsprof profiler.
326
--lsprof-file  Profile execution using the lsprof profiler, and write the
327
               results to a specified file.  If the filename ends with ".txt",
328
               text format will be used.  If the filename either starts with
329
               "callgrind.out" or end with ".callgrind", the output will be
330
               formatted for use with KCacheGrind. Otherwise, the output
331
               will be a pickle.
332
--coverage     Generate line coverage report in the specified directory.
333
334
-Oname=value   Override the ``name`` config option setting it to ``value`` for
335
               the duration of the command.  This can be used multiple times if
336
               several options need to be overridden.
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
337
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
338
See http://doc.bazaar.canonical.com/developers/profiling.html for more
339
information on profiling.
340
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
341
A number of debug flags are also available to assist troubleshooting and
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
342
development.  See :doc:`debug-flags-help`.
1551.9.32 by Aaron Bentley
Add global option help
343
"""
344
2768.1.1 by Ian Clatworthy
Document standard options
345
_standard_options = \
346
"""Standard Options
347
348
Standard options are legal for all commands.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
349
2768.1.1 by Ian Clatworthy
Document standard options
350
--help, -h     Show help message.
2768.1.13 by Ian Clatworthy
Minor fixes to help
351
--verbose, -v  Display more information.
352
--quiet, -q    Only display errors and warnings.
2768.1.1 by Ian Clatworthy
Document standard options
353
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
354
Unlike global options, standard options can be used in aliases.
2768.1.1 by Ian Clatworthy
Document standard options
355
"""
356
357
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
358
_checkouts = \
359
"""Checkouts
360
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
361
Checkouts are source trees that are connected to a branch, so that when
362
you commit in the source tree, the commit goes into that branch.  They
363
allow you to use a simpler, more centralized workflow, ignoring some of
364
Bazaar's decentralized features until you want them. Using checkouts
365
with shared repositories is very similar to working with SVN or CVS, but
366
doesn't have the same restrictions.  And using checkouts still allows
367
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.
368
369
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.
370
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.
371
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.
372
checkout from (the master branch). Then if you make any commits they will be
373
made on the other branch first. This creates an instant mirror of your work, or
374
facilitates lockstep development, where each developer is working together,
375
continuously integrating the changes of others.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
376
377
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.
378
you have the full history locally.  As you have a first class branch you can
379
also commit locally if you want, for instance due to the temporary loss af a
380
network connection. Use the --local option to commit to do this. All the local
381
commits will then be made on the master branch the next time you do a non-local
382
commit.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
383
384
If you are using a checkout from a shared branch you will periodically want to
385
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.
386
command. The changes need to be applied before any non-local commit, but
387
Bazaar will tell you if there are any changes and suggest that you use this
388
command when needed.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
389
390
It is also possible to create a "lightweight" checkout by passing the
391
--lightweight flag to checkout. A lightweight checkout is even closer to an
392
SVN checkout in that it is not a first class branch, it mainly consists of the
393
working tree. This means that any history operations must query the master
394
branch, which could be slow if a network connection is involved. Also, as you
395
don't have a local branch, then you cannot commit locally.
396
2374.1.1 by Ian Clatworthy
Help and man page fixes
397
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.
398
master branch. This means that if the master branch is on the same disk or LAN
399
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.
400
that modify the revision history (as only one copy of the branch needs to
401
be updated). Heavyweight checkouts will generally be faster for any command
402
that uses the history but does not change it, but if the master branch is on
403
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.
404
405
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
406
containing your branches, where you maintain only one working tree by
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
407
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.
408
work on a different branch.
409
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
410
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
411
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.
412
protocol , such as sftp://, and that you have write permissions at the other
413
end. Checkouts also work on the local file system, so that all that matters is
414
file permissions.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
415
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
416
You can change the master of a checkout by using the "switch" command (see
5031.2.2 by Matthew Fuller
Rewrap paragraph.
417
"help switch").  This will change the location that the commits are sent to.
418
The "bind" command can also be used to turn a normal branch into a heavy
419
checkout. If you would like to convert your heavy checkout into a normal
420
branch so that every commit is local, you can use the "unbind" command. To see
421
whether or not a branch is bound or not you can use the "info" command. If the
422
branch is bound it will tell you the location of the bound branch.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
423
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
424
Related commands::
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
425
426
  checkout    Create a checkout. Pass --lightweight to get a lightweight
427
              checkout
428
  update      Pull any changes in the master branch in to your checkout
429
  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
430
              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.
431
              checkout without sending the commit to the master
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
432
  switch      Change the master branch that the commits in the checkout will
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
433
              be sent to
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
434
  bind        Turn a standalone branch into a heavy checkout so that any
435
              commits will be sent to the master branch
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
436
  unbind      Turn a heavy checkout into a standalone branch so that any
437
              commits are only made locally
4871.2.1 by Patrick Regan
Added info to related commands in checkouts
438
  info        Displays whether a branch is bound or unbound. If the branch is
439
              bound, then it will also display the location of the bound branch
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
440
"""
441
2401.2.1 by James Westby
Add a help topic for repositories.
442
_repositories = \
443
"""Repositories
444
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
445
Repositories in Bazaar are where committed information is stored. There is
446
a repository associated with every branch.
447
448
Repositories are a form of database. Bzr will usually maintain this for
449
good performance automatically, but in some situations (e.g. when doing
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
450
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.
451
optimise the database indices. This can be done by the 'bzr pack' command.
452
453
By default just running 'bzr init' will create a repository within the new
454
branch but it is possible to create a shared repository which allows multiple
455
branches to share their information in the same location. When a new branch is
456
created it will first look to see if there is a containing shared repository it
457
can use.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
458
459
When two branches of the same project share a repository, there is
460
generally a large space saving. For some operations (e.g. branching
461
within the repository) this translates in to a large time saving.
2401.2.1 by James Westby
Add a help topic for repositories.
462
463
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.
464
init-repo). This command takes the location of the repository to create. This
465
means that 'bzr init-repository repo' will create a directory named 'repo',
466
which contains a shared repository. Any new branches that are created in this
467
directory will then use it for storage.
2401.2.1 by James Westby
Add a help topic for repositories.
468
469
It is a good idea to create a repository whenever you might create more
470
than one branch of a project. This is true for both working areas where you
471
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.
472
projects. In the latter case, it is common to want branches without working
473
trees. Since the files in the branch will not be edited directly there is no
474
need to use up disk space for a working tree. To create a repository in which
475
the branches will not have working trees pass the '--no-trees' option to
476
'init-repository'.
2401.2.1 by James Westby
Add a help topic for repositories.
477
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
478
Related commands::
2401.2.1 by James Westby
Add a help topic for repositories.
479
480
  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.
481
                    in which new branches won't get a working tree.
2401.2.1 by James Westby
Add a help topic for repositories.
482
"""
483
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
484
2401.2.2 by James Westby
Add a working-trees help topic.
485
_working_trees = \
486
"""Working Trees
487
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
488
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.
489
see the files and edit them. The working tree is where you make changes to a
490
branch, and when you commit the current state of the working tree is the
491
snapshot that is recorded in the commit.
492
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
493
When you push a branch to a remote system, a working tree will not be
494
created. If one is already present the files will not be updated. The
495
branch information will be updated and the working tree will be marked
496
as out-of-date. Updating a working tree remotely is difficult, as there
497
may be uncommitted changes or the update may cause content conflicts that are
498
difficult to deal with remotely.
2401.2.2 by James Westby
Add a working-trees help topic.
499
500
If you have a branch with no working tree you can use the 'checkout' command
501
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.
502
create the working tree. If the branch is updated remotely, you can update the
503
working tree by running 'bzr update' in that directory.
2401.2.2 by James Westby
Add a working-trees help topic.
504
505
If you have a branch with a working tree that you do not want the 'remove-tree'
506
command will remove the tree if it is safe. This can be done to avoid the
507
warning about the remote working tree not being updated when pushing to the
508
branch. It can also be useful when working with a '--no-trees' repository
509
(see 'bzr help repositories').
510
511
If you want to have a working tree on a remote machine that you push to you
512
can either run 'bzr update' in the remote branch after each push, or use some
513
other method to update the tree during the push. There is an 'rspush' plugin
514
that will update the working tree using rsync as well as doing a push. There
515
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
516
after each push.
517
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
518
Useful commands::
2401.2.2 by James Westby
Add a working-trees help topic.
519
520
  checkout     Create a working tree when a branch does not have one.
521
  remove-tree  Removes the working tree from a branch when it is safe to do so.
5448.2.1 by Martin
Fix some "its" vs. "it's" spelling confusion in bzrlib code... also, ahem, a name in the NEWS file
522
  update       When a working tree is out of sync with its associated branch
2401.2.2 by James Westby
Add a working-trees help topic.
523
               this will update the tree to match the branch.
524
"""
525
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
526
527
_branches = \
528
"""Branches
529
530
A branch consists of the state of a project, including all of its
531
history. All branches have a repository associated (which is where the
532
branch history is stored), but multiple branches may share the same
533
repository (a shared repository). Branches can be copied and merged.
534
4971.2.2 by Neil Martinsen-Burrell
address Vincents comments
535
In addition, one branch may be bound to another one.  Binding to another
536
branch indicates that commits which happen in this branch must also 
537
happen in the other branch.  Bazaar ensures consistency by not allowing 
538
commits when the two branches are out of date.  In order for a commit 
539
to succeed, it may be necessary to update the current branch using 
540
``bzr update``.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
541
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
542
Related commands::
543
3535.4.2 by Marius Kruger
Update branches help topic to avoid ambiguity.
544
  init    Change a directory into a versioned branch.
4431.2.1 by mernst at mit
branch documentation: clarify English word "copy"
545
  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
546
  merge   Perform a three-way merge.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
547
  bind    Bind a branch to another one.
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
548
"""
549
550
551
_standalone_trees = \
552
"""Standalone Trees
553
554
A standalone tree is a working tree with an associated repository. It
555
is an independently usable branch, with no dependencies on any other.
556
Creating a standalone tree (via bzr init) is the quickest way to put
557
an existing project under version control.
558
559
Related Commands::
560
561
  init    Make a directory into a versioned branch.
562
"""
563
564
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
565
_status_flags = \
566
"""Status Flags
567
568
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
569
manner.  They are in the form::
570
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
571
   xxx   <filename>
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
572
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
573
where the columns' meanings are as follows.
574
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
575
Column 1 - versioning/renames::
576
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
577
  + File versioned
578
  - File unversioned
579
  R File renamed
580
  ? File unknown
3930.2.10 by Karl Fogel
Two followup changes related to the fix for bug #306394:
581
  X File nonexistent (and unknown to bzr)
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
582
  C File has conflicts
583
  P Entry for a pending merge (not a file)
584
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
585
Column 2 - contents::
586
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
587
  N File created
588
  D File deleted
589
  K File kind changed
590
  M File modified
591
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
592
Column 3 - execute::
593
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
594
  * The execute bit was changed
595
"""
596
1551.9.32 by Aaron Bentley
Add global option help
597
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
598
_env_variables = \
599
"""Environment Variables
600
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
601
=================== ===========================================================
602
BZRPATH             Path where bzr is to look for shell plugin external
603
                    commands.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
604
BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.
605
EMAIL               E-Mail address of the user.
606
BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.
607
EDITOR              Editor for editing commit messages.
608
BZR_PLUGIN_PATH     Paths where bzr should look for plugins.
609
BZR_DISABLE_PLUGINS Plugins that bzr should not load.
610
BZR_PLUGINS_AT      Plugins to load from a directory not in BZR_PLUGIN_PATH.
611
BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
612
BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA and
613
                    HOME.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
614
BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// URLs).
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
615
BZR_SSH             Path to SSH client, or one of paramiko, openssh, sshcorp,
5448.3.4 by Matthew Gordon
Updated command-line help message. (help env-variables)
616
                    plink or lsh.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
617
BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).
618
BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).
619
BZR_COLUMNS         Override implicit terminal width.
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
620
BZR_CONCURRENCY     Number of processes that can be run concurrently (selftest)
6015.19.1 by Dennis Benzinger
Fixed description of BZR_PROGRESS_BAR in "bzr help env-variables".
621
BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or 'text'.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
622
BZR_PDB             Control whether to launch a debugger on error.
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
623
BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a
624
                    breakin debugger.
6182.2.26 by Benoît Pierre
Add an entry for BZR_TEXTUI_INPUT in the 'env-variables' help section.
625
BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based (instead
626
                    of char-based).
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
627
=================== ===========================================================
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
628
"""
629
630
631
_files = \
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
632
r"""Files
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
633
5278.1.2 by Martin Pool
Don't say 'Linux' except when specifically talking about the kernel
634
:On Unix:   ~/.bazaar/bazaar.conf
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
635
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
636
637
Contains the user's default configuration. The section ``[DEFAULT]`` is
638
used to define general configuration that will be applied everywhere.
639
The section ``[ALIASES]`` can be used to create command aliases for
640
commonly used options.
641
642
A typical config file might look something like::
643
644
  [DEFAULT]
645
  email=John Doe <jdoe@isp.com>
646
647
  [ALIASES]
648
  commit = commit --strict
649
  log10 = log --short -r -10..-1
650
"""
651
1551.19.11 by Aaron Bentley
Add criss-cross help topic
652
_criss_cross = \
3079.1.1 by Alexander Belchenko
topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
653
"""Criss-Cross
654
1551.19.11 by Aaron Bentley
Add criss-cross help topic
655
A criss-cross in the branch history can cause the default merge technique
656
to emit more conflicts than would normally be expected.
657
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
658
In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
659
better results.  You may wish to ``bzr revert`` the working tree and merge
660
again.  Alternatively, use ``bzr remerge`` on particular conflicted files.
1551.19.11 by Aaron Bentley
Add criss-cross help topic
661
662
Criss-crosses occur in a branch's history if two branches merge the same thing
663
and then merge one another, or if two branches merge one another at the same
664
time.  They can be avoided by having each branch only merge from or into a
665
designated central branch (a "star topology").
666
667
Criss-crosses cause problems because of the way merge works.  Bazaar's default
668
merge is a three-way merger; in order to merge OTHER into THIS, it must
669
find a basis for comparison, BASE.  Using BASE, it can determine whether
670
differences between THIS and OTHER are due to one side adding lines, or
671
from another side removing lines.
672
673
Criss-crosses mean there is no good choice for a base.  Selecting the recent
674
merge points could cause one side's changes to be silently discarded.
675
Selecting older merge points (which Bazaar does) mean that extra conflicts
676
are emitted.
677
678
The ``weave`` merge type is not affected by this problem because it uses
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
679
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
680
differences.
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
681
"""
1551.19.11 by Aaron Bentley
Add criss-cross help topic
682
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
683
_branches_out_of_sync = """Branches Out of Sync
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
684
685
When reconfiguring a checkout, tree or branch into a lightweight checkout,
686
a local branch must be destroyed.  (For checkouts, this is the local branch
687
that serves primarily as a cache.)  If the branch-to-be-destroyed does not
688
have the same last revision as the new reference branch for the lightweight
689
checkout, data could be lost, so Bazaar refuses.
690
691
How you deal with this depends on *why* the branches are out of sync.
692
693
If you have a checkout and have done local commits, you can get back in sync
694
by running "bzr update" (and possibly "bzr commit").
695
696
If you have a branch and the remote branch is out-of-date, you can push
697
the local changes using "bzr push".  If the local branch is out of date, you
698
can do "bzr pull".  If both branches have had changes, you can merge, commit
699
and then push your changes.  If you decide that some of the changes aren't
700
useful, you can "push --overwrite" or "pull --overwrite" instead.
701
"""
702
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
703
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
704
_storage_formats = \
705
"""Storage Formats
706
707
To ensure that older clients do not access data incorrectly,
708
Bazaar's policy is to introduce a new storage format whenever
709
new features requiring new metadata are added. New storage
710
formats may also be introduced to improve performance and
711
scalability.
712
4634.87.1 by Andrew Bennetts
Cherrypick lp:bzr r4743: (igc) Fix help on formats now that 2a is released (Jared Hance)
713
The newest format, 2a, is highly recommended. If your
714
project is not using 2a, then you should suggest to the
715
project owner to upgrade.
716
717
4927.2.3 by Ian Clatworthy
improve formatting: better linking, notes, etc.
718
.. note::
719
720
   Some of the older formats have two variants:
721
   a plain one and a rich-root one. The latter include an additional
722
   field about the root of the tree. There is no performance cost
723
   for using a rich-root format but you cannot easily merge changes
724
   from a rich-root format into a plain format. As a consequence,
725
   moving a project to a rich-root format takes some co-ordination
726
   in that all contributors need to upgrade their repositories
727
   around the same time. 2a and all future formats will be
728
   implicitly rich-root.
729
730
See :doc:`current-formats-help` for the complete list of
731
currently supported formats. See :doc:`other-formats-help` for
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
732
descriptions of any available experimental and deprecated formats.
733
"""
734
735
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
736
# Register help topics
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
737
topic_registry.register("revisionspec", _help_on_revisionspec,
738
                        "Explain how to use --revision")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
739
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
740
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
741
def get_current_formats_topic(topic):
742
    from bzrlib import bzrdir
743
    return "Current Storage Formats\n\n" + \
744
        bzrdir.format_registry.help_topic(topic)
745
def get_other_formats_topic(topic):
746
    from bzrlib import bzrdir
747
    return "Other Storage Formats\n\n" + \
748
        bzrdir.format_registry.help_topic(topic)
749
topic_registry.register('current-formats', get_current_formats_topic,
750
    'Current storage formats')
751
topic_registry.register('other-formats', get_other_formats_topic,
752
    'Experimental and deprecated storage formats')
2768.1.1 by Ian Clatworthy
Document standard options
753
topic_registry.register('standard-options', _standard_options,
754
                        'Options that can be used with any command')
1551.9.34 by Aaron Bentley
Fix NEWS and whitespace
755
topic_registry.register('global-options', _global_options,
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
756
                    'Options that control how Bazaar runs')
2241.2.8 by ghigo
- rename transport urlspec
757
topic_registry.register('urlspec', _help_on_transport,
2241.2.5 by ghigo
add the topics transport
758
                        "Supported transport protocols")
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
759
topic_registry.register('status-flags', _status_flags,
760
                        "Help on status flags")
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
761
def get_bugs_topic(topic):
762
    from bzrlib import bugtracker
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
763
    return ("Bug Tracker Settings\n\n" +
3154.1.1 by Ian Clatworthy
Minor tweaks to bug tracker integration documentation
764
        bugtracker.tracker_registry.help_topic(topic))
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
765
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
766
topic_registry.register('env-variables', _env_variables,
767
                        'Environment variable names and values')
768
topic_registry.register('files', _files,
769
                        'Information on configuration and log files')
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
770
topic_registry.register_lazy('hooks', 'bzrlib.hooks', 'hooks_help_text',
771
                        'Points at which custom processing can be added')
6319.2.1 by Jelmer Vernooij
Allow registering custom location aliases.
772
topic_registry.register_lazy('location-alias', 'bzrlib.directory_service',
773
                        'AliasDirectory.help_text',
774
                        'Aliases for remembered locations')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
775
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
776
# Load some of the help topics from files. Note that topics which reproduce API
777
# details will tend to skew (quickly usually!) so please seek other solutions
778
# for such things.
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
779
topic_registry.register('authentication', _load_from_file,
780
                        'Information on configuring authentication')
781
topic_registry.register('configuration', _load_from_file,
782
                        'Details on the configuration settings available')
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
783
topic_registry.register('conflict-types', _load_from_file,
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
784
                        'Types of conflicts and what to do about them')
4110.2.7 by Martin Pool
Split debug flags into their own help topic
785
topic_registry.register('debug-flags', _load_from_file,
786
                        'Options to show or record debug information')
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
787
topic_registry.register('log-formats', _load_from_file,
788
                        'Details on the logging formats available')
6002.1.1 by John Arbash Meinel, Jelmer Vernooij
Add documentation on handling of special characters in URLs.
789
topic_registry.register('url-special-chars', _load_from_file,
790
                        'Special character handling in URLs')
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
791
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
792
793
# Register concept topics.
794
# Note that we might choose to remove these from the online help in the
795
# future or implement them via loading content from files. In the meantime,
796
# please keep them concise.
797
topic_registry.register('branches', _branches,
798
                        'Information on what a branch is', SECT_CONCEPT)
799
topic_registry.register('checkouts', _checkouts,
800
                        'Information on what a checkout is', SECT_CONCEPT)
3368.2.17 by Ian Clatworthy
add content-filters help topic
801
topic_registry.register('content-filters', _load_from_file,
802
                        'Conversion of content into/from working trees',
803
                        SECT_CONCEPT)
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
804
topic_registry.register('diverged-branches', _load_from_file,
805
                        'How to fix diverged branches',
806
                        SECT_CONCEPT)
4208.4.1 by Ian Clatworthy
eol conversion support
807
topic_registry.register('eol', _load_from_file,
808
                        'Information on end-of-line handling',
809
                        SECT_CONCEPT)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
810
topic_registry.register('formats', _storage_formats,
811
                        'Information on choosing a storage format',
812
                        SECT_CONCEPT)
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
813
topic_registry.register('patterns', _load_from_file,
814
                        'Information on the pattern syntax',
815
                        SECT_CONCEPT)
2401.2.1 by James Westby
Add a help topic for repositories.
816
topic_registry.register('repositories', _repositories,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
817
                        'Basic information on shared repositories.',
818
                        SECT_CONCEPT)
3398.1.20 by Ian Clatworthy
add rules help topic
819
topic_registry.register('rules', _load_from_file,
820
                        'Information on defining rule-based preferences',
821
                        SECT_CONCEPT)
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
822
topic_registry.register('standalone-trees', _standalone_trees,
823
                        'Information on what a standalone tree is',
824
                        SECT_CONCEPT)
2401.2.2 by James Westby
Add a working-trees help topic.
825
topic_registry.register('working-trees', _working_trees,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
826
                        'Information on working trees', SECT_CONCEPT)
1551.19.11 by Aaron Bentley
Add criss-cross help topic
827
topic_registry.register('criss-cross', _criss_cross,
828
                        'Information on criss-cross merging', SECT_CONCEPT)
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
829
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'
830
                        'Steps to resolve "out-of-sync" when reconfiguring',
831
                        SECT_CONCEPT)
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
832
2432.1.1 by Robert Collins
Add a HelpTopicContext object.
833
2432.1.15 by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name.
834
class HelpTopicIndex(object):
835
    """A index for bzr help that returns topics."""
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
836
2432.1.17 by Robert Collins
Add prefixes to HelpIndexes.
837
    def __init__(self):
838
        self.prefix = ''
839
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
840
    def get_topics(self, topic):
841
        """Search for topic in the HelpTopicRegistry.
842
843
        :param topic: A topic to search for. None is treated as 'basic'.
844
        :return: A list which is either empty or contains a single
845
            RegisteredTopic entry.
846
        """
847
        if topic is None:
848
            topic = 'basic'
849
        if topic in topic_registry:
850
            return [RegisteredTopic(topic)]
851
        else:
852
            return []
853
854
6059.3.1 by Vincent Ladeuil
Provide per-config option help
855
def _format_see_also(see_also):
856
    result = ''
857
    if see_also:
858
        result += '\n:See also: '
859
        result += ', '.join(sorted(set(see_also)))
860
        result += '\n'
861
    return result
862
863
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
864
class RegisteredTopic(object):
865
    """A help topic which has been registered in the HelpTopicRegistry.
866
867
    These topics consist of nothing more than the name of the topic - all
868
    data is retrieved on demand from the registry.
869
    """
870
871
    def __init__(self, topic):
872
        """Constructor.
873
874
        :param topic: The name of the topic that this represents.
875
        """
876
        self.topic = topic
2432.1.10 by Robert Collins
Add get_help_text() to RegisteredTopic to get the help as a string.
877
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
878
    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.
879
        """Return a string with the help for this topic.
880
881
        :param additional_see_also: Additional help topics to be
882
            cross-referenced.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
883
        :param plain: if False, raw help (reStructuredText) is
884
            returned instead of plain text.
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
885
        """
886
        result = topic_registry.get_detail(self.topic)
6059.3.2 by Vincent Ladeuil
Cough, with tests.
887
        result += _format_see_also(additional_see_also)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
888
        if plain:
889
            result = help_as_plain_text(result)
6110.7.1 by Jonathan Riddell
add topic help to translations
890
        i18n.install()
891
        result = i18n.gettext_per_paragraph(result)
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
892
        return result
2432.1.27 by Robert Collins
Add a get_help_topic method to RegisteredTopic.
893
894
    def get_help_topic(self):
895
        """Return the help topic this can be found under."""
896
        return self.topic
2485.1.1 by James Westby
Update the help topics to the latest bzr.dev.
897
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
898
899
def help_as_plain_text(text):
900
    """Minimal converter of reStructuredText to plain text."""
4927.2.10 by Ian Clatworthy
fix test failures
901
    import re
5215.2.1 by John Szakmeister
Fix standalone code blocks in help text.
902
    # Remove the standalone code block marker
5215.2.2 by John Szakmeister
Make standlone code blocks work correctly in indented sections.
903
    text = re.sub(r"(?m)^\s*::\n\s*$", "", text)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
904
    lines = text.splitlines()
905
    result = []
906
    for line in lines:
907
        if line.startswith(':'):
908
            line = line[1:]
909
        elif line.endswith('::'):
910
            line = line[:-1]
4927.2.10 by Ian Clatworthy
fix test failures
911
        # Map :doc:`xxx-help` to ``bzr help xxx``
6002.1.1 by John Arbash Meinel, Jelmer Vernooij
Add documentation on handling of special characters in URLs.
912
        line = re.sub(":doc:`(.+?)-help`", r'``bzr help \1``', line)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
913
        result.append(line)
914
    return "\n".join(result) + "\n"
6059.3.1 by Vincent Ladeuil
Provide per-config option help
915
916
917
class ConfigOptionHelpIndex(object):
918
    """A help index that returns help topics for config options."""
919
920
    def __init__(self):
921
        self.prefix = 'configuration/'
922
923
    def get_topics(self, topic):
924
        """Search for topic in the registered config options.
925
926
        :param topic: A topic to search for.
927
        :return: A list which is either empty or contains a single
928
            config.Option entry.
929
        """
930
        if topic is None:
931
            return []
932
        elif topic.startswith(self.prefix):
933
            topic = topic[len(self.prefix):]
934
        if topic in config.option_registry:
935
            return [config.option_registry.get(topic)]
936
        else:
937
            return []
938
939