/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2006-2010 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
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
254
    out += """\
255
\nBazaar supports all of the standard parts within the URL::
256
257
  <protocol>://[user[:password]@]host[:port]/[path]
258
259
allowing URLs such as::
260
261
  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk
262
4798.4.4 by Matt Nordhoff
urlspec help: sftp URLs support ~ too
263
For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin
264
with '~' as meaning that the rest of the path should be interpreted
265
relative to the remote user's home directory.  For example if the user
266
``remote`` has a  home directory of ``/home/remote`` on the server
267
shell.example.com, then::
4798.4.3 by Neil Martinsen-Burrell
Add discussion of ~ in URLs
268
269
  bzr+ssh://remote@shell.example.com/~/myproject/trunk
270
271
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).
272
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
273
Many commands that accept URLs also accept location aliases too.  See
4797.17.1 by Andrew Bennetts
Merge alias-loc-docs-337834 (which was against lp:bzr/2.0).
274
::doc:`location-alias-help`.
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
275
"""
276
2241.2.5 by ghigo
add the topics transport
277
    return out
278
2023.1.2 by ghigo
add help topics module
279
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
280
_basic_help = \
4634.132.3 by Parth Malwankar
added version number to help when 'bzr' cmd is run (bug #369501)
281
"""Bazaar %s -- a free distributed version-control tool
5050.47.1 by Martin Pool
Backport fix for bad url in bzr help
282
http://bazaar.canonical.com/
2023.1.2 by ghigo
add help topics module
283
284
Basic commands:
285
  bzr init           makes this directory a versioned branch
286
  bzr branch         make a copy of another branch
287
288
  bzr add            make files or directories versioned
289
  bzr ignore         ignore a file or pattern
290
  bzr mv             move or rename a versioned file
291
292
  bzr status         summarize changes in working copy
293
  bzr diff           show detailed diffs
294
295
  bzr merge          pull in changes from another branch
296
  bzr commit         save some or all changes
3696.7.2 by Jelmer Vernooij
Mention changes are sent via email.
297
  bzr send           send changes via email
2023.1.2 by ghigo
add help topics module
298
299
  bzr log            show history of changes
300
  bzr check          validate storage
301
302
  bzr help init      more help on e.g. init command
303
  bzr help commands  list all commands
304
  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)
305
""" % bzrlib.__version__
2023.1.2 by ghigo
add help topics module
306
307
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
308
_global_options = \
1551.9.32 by Aaron Bentley
Add global option help
309
"""Global Options
310
311
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
312
command.  (e.g. ``bzr --profile help``).
1551.9.32 by Aaron Bentley
Add global option help
313
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
314
--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
315
--no-aliases   Do not process command aliases when running this command.
1551.9.32 by Aaron Bentley
Add global option help
316
--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
317
               This does not suppress other plugin effects.
318
--no-plugins   Do not process any plugins.
5875.3.22 by INADA Naoki
s/i18n/l10n/
319
--no-l10n      Do not translate messages.
4766.3.9 by Vincent Ladeuil
Make it clear that --concurrency is for selftest only (so far).
320
--concurrency  Number of processes that can be run concurrently (selftest).
1551.9.32 by Aaron Bentley
Add global option help
321
2748.1.1 by Ian Clatworthy
(Daniel Watkins) help global-options now lists all debug flags
322
--profile      Profile execution using the hotshot profiler.
323
--lsprof       Profile execution using the lsprof profiler.
1551.9.32 by Aaron Bentley
Add global option help
324
--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
325
               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
326
               text format will be used.  If the filename either starts with
327
               "callgrind.out" or end with ".callgrind", the output will be
328
               formatted for use with KCacheGrind. Otherwise, the output
329
               will be a pickle.
3169.3.1 by Andrew Bennetts
Make --coverage a global option.
330
--coverage     Generate line coverage report in the specified directory.
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
331
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
332
See http://doc.bazaar.canonical.com/developers/profiling.html for more
333
information on profiling.
334
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
335
A number of debug flags are also available to assist troubleshooting and
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
336
development.  See :doc:`debug-flags-help`.
1551.9.32 by Aaron Bentley
Add global option help
337
"""
338
2768.1.1 by Ian Clatworthy
Document standard options
339
_standard_options = \
340
"""Standard Options
341
342
Standard options are legal for all commands.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
343
2768.1.1 by Ian Clatworthy
Document standard options
344
--help, -h     Show help message.
2768.1.13 by Ian Clatworthy
Minor fixes to help
345
--verbose, -v  Display more information.
346
--quiet, -q    Only display errors and warnings.
2768.1.1 by Ian Clatworthy
Document standard options
347
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
348
Unlike global options, standard options can be used in aliases.
2768.1.1 by Ian Clatworthy
Document standard options
349
"""
350
351
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
352
_checkouts = \
353
"""Checkouts
354
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
355
Checkouts are source trees that are connected to a branch, so that when
356
you commit in the source tree, the commit goes into that branch.  They
357
allow you to use a simpler, more centralized workflow, ignoring some of
358
Bazaar's decentralized features until you want them. Using checkouts
359
with shared repositories is very similar to working with SVN or CVS, but
360
doesn't have the same restrictions.  And using checkouts still allows
361
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.
362
363
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.
364
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.
365
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.
366
checkout from (the master branch). Then if you make any commits they will be
367
made on the other branch first. This creates an instant mirror of your work, or
368
facilitates lockstep development, where each developer is working together,
369
continuously integrating the changes of others.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
370
371
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.
372
you have the full history locally.  As you have a first class branch you can
373
also commit locally if you want, for instance due to the temporary loss af a
374
network connection. Use the --local option to commit to do this. All the local
375
commits will then be made on the master branch the next time you do a non-local
376
commit.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
377
378
If you are using a checkout from a shared branch you will periodically want to
379
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.
380
command. The changes need to be applied before any non-local commit, but
381
Bazaar will tell you if there are any changes and suggest that you use this
382
command when needed.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
383
384
It is also possible to create a "lightweight" checkout by passing the
385
--lightweight flag to checkout. A lightweight checkout is even closer to an
386
SVN checkout in that it is not a first class branch, it mainly consists of the
387
working tree. This means that any history operations must query the master
388
branch, which could be slow if a network connection is involved. Also, as you
389
don't have a local branch, then you cannot commit locally.
390
2374.1.1 by Ian Clatworthy
Help and man page fixes
391
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.
392
master branch. This means that if the master branch is on the same disk or LAN
393
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.
394
that modify the revision history (as only one copy of the branch needs to
395
be updated). Heavyweight checkouts will generally be faster for any command
396
that uses the history but does not change it, but if the master branch is on
397
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.
398
399
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
400
containing your branches, where you maintain only one working tree by
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
401
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.
402
work on a different branch.
403
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
404
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
405
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.
406
protocol , such as sftp://, and that you have write permissions at the other
407
end. Checkouts also work on the local file system, so that all that matters is
408
file permissions.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
409
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
410
You can change the master of a checkout by using the "switch" command (see
5031.2.2 by Matthew Fuller
Rewrap paragraph.
411
"help switch").  This will change the location that the commits are sent to.
412
The "bind" command can also be used to turn a normal branch into a heavy
413
checkout. If you would like to convert your heavy checkout into a normal
414
branch so that every commit is local, you can use the "unbind" command. To see
415
whether or not a branch is bound or not you can use the "info" command. If the
416
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.
417
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
418
Related commands::
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
419
420
  checkout    Create a checkout. Pass --lightweight to get a lightweight
421
              checkout
422
  update      Pull any changes in the master branch in to your checkout
423
  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
424
              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.
425
              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
426
  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.
427
              be sent to
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
428
  bind        Turn a standalone branch into a heavy checkout so that any
429
              commits will be sent to the master branch
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
430
  unbind      Turn a heavy checkout into a standalone branch so that any
431
              commits are only made locally
4871.2.1 by Patrick Regan
Added info to related commands in checkouts
432
  info        Displays whether a branch is bound or unbound. If the branch is
433
              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.
434
"""
435
2401.2.1 by James Westby
Add a help topic for repositories.
436
_repositories = \
437
"""Repositories
438
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
439
Repositories in Bazaar are where committed information is stored. There is
440
a repository associated with every branch.
441
442
Repositories are a form of database. Bzr will usually maintain this for
443
good performance automatically, but in some situations (e.g. when doing
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
444
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.
445
optimise the database indices. This can be done by the 'bzr pack' command.
446
447
By default just running 'bzr init' will create a repository within the new
448
branch but it is possible to create a shared repository which allows multiple
449
branches to share their information in the same location. When a new branch is
450
created it will first look to see if there is a containing shared repository it
451
can use.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
452
453
When two branches of the same project share a repository, there is
454
generally a large space saving. For some operations (e.g. branching
455
within the repository) this translates in to a large time saving.
2401.2.1 by James Westby
Add a help topic for repositories.
456
457
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.
458
init-repo). This command takes the location of the repository to create. This
459
means that 'bzr init-repository repo' will create a directory named 'repo',
460
which contains a shared repository. Any new branches that are created in this
461
directory will then use it for storage.
2401.2.1 by James Westby
Add a help topic for repositories.
462
463
It is a good idea to create a repository whenever you might create more
464
than one branch of a project. This is true for both working areas where you
465
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.
466
projects. In the latter case, it is common to want branches without working
467
trees. Since the files in the branch will not be edited directly there is no
468
need to use up disk space for a working tree. To create a repository in which
469
the branches will not have working trees pass the '--no-trees' option to
470
'init-repository'.
2401.2.1 by James Westby
Add a help topic for repositories.
471
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
472
Related commands::
2401.2.1 by James Westby
Add a help topic for repositories.
473
474
  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.
475
                    in which new branches won't get a working tree.
2401.2.1 by James Westby
Add a help topic for repositories.
476
"""
477
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
478
2401.2.2 by James Westby
Add a working-trees help topic.
479
_working_trees = \
480
"""Working Trees
481
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
482
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.
483
see the files and edit them. The working tree is where you make changes to a
484
branch, and when you commit the current state of the working tree is the
485
snapshot that is recorded in the commit.
486
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
487
When you push a branch to a remote system, a working tree will not be
488
created. If one is already present the files will not be updated. The
489
branch information will be updated and the working tree will be marked
490
as out-of-date. Updating a working tree remotely is difficult, as there
491
may be uncommitted changes or the update may cause content conflicts that are
492
difficult to deal with remotely.
2401.2.2 by James Westby
Add a working-trees help topic.
493
494
If you have a branch with no working tree you can use the 'checkout' command
495
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.
496
create the working tree. If the branch is updated remotely, you can update the
497
working tree by running 'bzr update' in that directory.
2401.2.2 by James Westby
Add a working-trees help topic.
498
499
If you have a branch with a working tree that you do not want the 'remove-tree'
500
command will remove the tree if it is safe. This can be done to avoid the
501
warning about the remote working tree not being updated when pushing to the
502
branch. It can also be useful when working with a '--no-trees' repository
503
(see 'bzr help repositories').
504
505
If you want to have a working tree on a remote machine that you push to you
506
can either run 'bzr update' in the remote branch after each push, or use some
507
other method to update the tree during the push. There is an 'rspush' plugin
508
that will update the working tree using rsync as well as doing a push. There
509
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
510
after each push.
511
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
512
Useful commands::
2401.2.2 by James Westby
Add a working-trees help topic.
513
514
  checkout     Create a working tree when a branch does not have one.
515
  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
516
  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.
517
               this will update the tree to match the branch.
518
"""
519
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
520
521
_branches = \
522
"""Branches
523
524
A branch consists of the state of a project, including all of its
525
history. All branches have a repository associated (which is where the
526
branch history is stored), but multiple branches may share the same
527
repository (a shared repository). Branches can be copied and merged.
528
4971.2.2 by Neil Martinsen-Burrell
address Vincents comments
529
In addition, one branch may be bound to another one.  Binding to another
530
branch indicates that commits which happen in this branch must also 
531
happen in the other branch.  Bazaar ensures consistency by not allowing 
532
commits when the two branches are out of date.  In order for a commit 
533
to succeed, it may be necessary to update the current branch using 
534
``bzr update``.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
535
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
536
Related commands::
537
3535.4.2 by Marius Kruger
Update branches help topic to avoid ambiguity.
538
  init    Change a directory into a versioned branch.
4431.2.1 by mernst at mit
branch documentation: clarify English word "copy"
539
  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
540
  merge   Perform a three-way merge.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
541
  bind    Bind a branch to another one.
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
542
"""
543
544
545
_standalone_trees = \
546
"""Standalone Trees
547
548
A standalone tree is a working tree with an associated repository. It
549
is an independently usable branch, with no dependencies on any other.
550
Creating a standalone tree (via bzr init) is the quickest way to put
551
an existing project under version control.
552
553
Related Commands::
554
555
  init    Make a directory into a versioned branch.
556
"""
557
558
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
559
_status_flags = \
560
"""Status Flags
561
562
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
563
manner.  They are in the form::
564
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
565
   xxx   <filename>
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
566
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
567
where the columns' meanings are as follows.
568
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
569
Column 1 - versioning/renames::
570
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
571
  + File versioned
572
  - File unversioned
573
  R File renamed
574
  ? File unknown
3930.2.10 by Karl Fogel
Two followup changes related to the fix for bug #306394:
575
  X File nonexistent (and unknown to bzr)
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
576
  C File has conflicts
577
  P Entry for a pending merge (not a file)
578
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
579
Column 2 - contents::
580
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
581
  N File created
582
  D File deleted
583
  K File kind changed
584
  M File modified
585
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
586
Column 3 - execute::
587
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
588
  * The execute bit was changed
589
"""
590
1551.9.32 by Aaron Bentley
Add global option help
591
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
592
_env_variables = \
593
"""Environment Variables
594
5452.2.1 by John C Barstow
Reformat the tale in env-variables to look better at 80 columns.
595
=================== ===========================================================
596
BZRPATH             Path where bzr is to look for shell plugin external
597
                    commands.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
598
BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.
599
EMAIL               E-Mail address of the user.
600
BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.
601
EDITOR              Editor for editing commit messages.
602
BZR_PLUGIN_PATH     Paths where bzr should look for plugins.
603
BZR_DISABLE_PLUGINS Plugins that bzr should not load.
604
BZR_PLUGINS_AT      Plugins to load from a directory not in BZR_PLUGIN_PATH.
605
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.
606
BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA and
607
                    HOME.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
608
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.
609
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)
610
                    plink or lsh.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
611
BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).
612
BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).
613
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.
614
BZR_CONCURRENCY     Number of processes that can be run concurrently (selftest)
615
BZR_PROGRESS_BAR    Override the progress display. Values are 'none', 'dots',
616
                    or 'tty'.
5185.3.1 by John C Barstow
Document additional evironment variables in bzr help env-variables.
617
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.
618
BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a
619
                    breakin debugger.
620
=================== ===========================================================
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
621
"""
622
623
624
_files = \
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
625
r"""Files
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
626
5278.1.2 by Martin Pool
Don't say 'Linux' except when specifically talking about the kernel
627
:On Unix:   ~/.bazaar/bazaar.conf
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
628
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
629
630
Contains the user's default configuration. The section ``[DEFAULT]`` is
631
used to define general configuration that will be applied everywhere.
632
The section ``[ALIASES]`` can be used to create command aliases for
633
commonly used options.
634
635
A typical config file might look something like::
636
637
  [DEFAULT]
638
  email=John Doe <jdoe@isp.com>
639
640
  [ALIASES]
641
  commit = commit --strict
642
  log10 = log --short -r -10..-1
643
"""
644
1551.19.11 by Aaron Bentley
Add criss-cross help topic
645
_criss_cross = \
3079.1.1 by Alexander Belchenko
topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
646
"""Criss-Cross
647
1551.19.11 by Aaron Bentley
Add criss-cross help topic
648
A criss-cross in the branch history can cause the default merge technique
649
to emit more conflicts than would normally be expected.
650
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
651
In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
652
better results.  You may wish to ``bzr revert`` the working tree and merge
653
again.  Alternatively, use ``bzr remerge`` on particular conflicted files.
1551.19.11 by Aaron Bentley
Add criss-cross help topic
654
655
Criss-crosses occur in a branch's history if two branches merge the same thing
656
and then merge one another, or if two branches merge one another at the same
657
time.  They can be avoided by having each branch only merge from or into a
658
designated central branch (a "star topology").
659
660
Criss-crosses cause problems because of the way merge works.  Bazaar's default
661
merge is a three-way merger; in order to merge OTHER into THIS, it must
662
find a basis for comparison, BASE.  Using BASE, it can determine whether
663
differences between THIS and OTHER are due to one side adding lines, or
664
from another side removing lines.
665
666
Criss-crosses mean there is no good choice for a base.  Selecting the recent
667
merge points could cause one side's changes to be silently discarded.
668
Selecting older merge points (which Bazaar does) mean that extra conflicts
669
are emitted.
670
671
The ``weave`` merge type is not affected by this problem because it uses
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
672
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
673
differences.
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
674
"""
1551.19.11 by Aaron Bentley
Add criss-cross help topic
675
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
676
_branches_out_of_sync = """Branches Out of Sync
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
677
678
When reconfiguring a checkout, tree or branch into a lightweight checkout,
679
a local branch must be destroyed.  (For checkouts, this is the local branch
680
that serves primarily as a cache.)  If the branch-to-be-destroyed does not
681
have the same last revision as the new reference branch for the lightweight
682
checkout, data could be lost, so Bazaar refuses.
683
684
How you deal with this depends on *why* the branches are out of sync.
685
686
If you have a checkout and have done local commits, you can get back in sync
687
by running "bzr update" (and possibly "bzr commit").
688
689
If you have a branch and the remote branch is out-of-date, you can push
690
the local changes using "bzr push".  If the local branch is out of date, you
691
can do "bzr pull".  If both branches have had changes, you can merge, commit
692
and then push your changes.  If you decide that some of the changes aren't
693
useful, you can "push --overwrite" or "pull --overwrite" instead.
694
"""
695
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
696
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
697
_storage_formats = \
698
"""Storage Formats
699
700
To ensure that older clients do not access data incorrectly,
701
Bazaar's policy is to introduce a new storage format whenever
702
new features requiring new metadata are added. New storage
703
formats may also be introduced to improve performance and
704
scalability.
705
4634.87.1 by Andrew Bennetts
Cherrypick lp:bzr r4743: (igc) Fix help on formats now that 2a is released (Jared Hance)
706
The newest format, 2a, is highly recommended. If your
707
project is not using 2a, then you should suggest to the
708
project owner to upgrade.
709
710
4927.2.3 by Ian Clatworthy
improve formatting: better linking, notes, etc.
711
.. note::
712
713
   Some of the older formats have two variants:
714
   a plain one and a rich-root one. The latter include an additional
715
   field about the root of the tree. There is no performance cost
716
   for using a rich-root format but you cannot easily merge changes
717
   from a rich-root format into a plain format. As a consequence,
718
   moving a project to a rich-root format takes some co-ordination
719
   in that all contributors need to upgrade their repositories
720
   around the same time. 2a and all future formats will be
721
   implicitly rich-root.
722
723
See :doc:`current-formats-help` for the complete list of
724
currently supported formats. See :doc:`other-formats-help` for
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
725
descriptions of any available experimental and deprecated formats.
726
"""
727
728
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
729
# Register help topics
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
730
topic_registry.register("revisionspec", _help_on_revisionspec,
731
                        "Explain how to use --revision")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
732
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
733
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
734
def get_current_formats_topic(topic):
735
    from bzrlib import bzrdir
736
    return "Current Storage Formats\n\n" + \
737
        bzrdir.format_registry.help_topic(topic)
738
def get_other_formats_topic(topic):
739
    from bzrlib import bzrdir
740
    return "Other Storage Formats\n\n" + \
741
        bzrdir.format_registry.help_topic(topic)
742
topic_registry.register('current-formats', get_current_formats_topic,
743
    'Current storage formats')
744
topic_registry.register('other-formats', get_other_formats_topic,
745
    'Experimental and deprecated storage formats')
2768.1.1 by Ian Clatworthy
Document standard options
746
topic_registry.register('standard-options', _standard_options,
747
                        'Options that can be used with any command')
1551.9.34 by Aaron Bentley
Fix NEWS and whitespace
748
topic_registry.register('global-options', _global_options,
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
749
                    'Options that control how Bazaar runs')
2241.2.8 by ghigo
- rename transport urlspec
750
topic_registry.register('urlspec', _help_on_transport,
2241.2.5 by ghigo
add the topics transport
751
                        "Supported transport protocols")
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
752
topic_registry.register('status-flags', _status_flags,
753
                        "Help on status flags")
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
754
def get_bugs_topic(topic):
755
    from bzrlib import bugtracker
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
756
    return ("Bug Tracker Settings\n\n" +
3154.1.1 by Ian Clatworthy
Minor tweaks to bug tracker integration documentation
757
        bugtracker.tracker_registry.help_topic(topic))
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
758
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
759
topic_registry.register('env-variables', _env_variables,
760
                        'Environment variable names and values')
761
topic_registry.register('files', _files,
762
                        'Information on configuration and log files')
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
763
topic_registry.register_lazy('hooks', 'bzrlib.hooks', 'hooks_help_text',
764
                        'Points at which custom processing can be added')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
765
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
766
# Load some of the help topics from files. Note that topics which reproduce API
767
# details will tend to skew (quickly usually!) so please seek other solutions
768
# for such things.
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
769
topic_registry.register('authentication', _load_from_file,
770
                        'Information on configuring authentication')
771
topic_registry.register('configuration', _load_from_file,
772
                        'Details on the configuration settings available')
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
773
topic_registry.register('conflict-types', _load_from_file,
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
774
                        'Types of conflicts and what to do about them')
4110.2.7 by Martin Pool
Split debug flags into their own help topic
775
topic_registry.register('debug-flags', _load_from_file,
776
                        'Options to show or record debug information')
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
777
topic_registry.register('location-alias', _load_from_file,
778
                        'Aliases for remembered locations')
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
779
topic_registry.register('log-formats', _load_from_file,
780
                        'Details on the logging formats available')
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
781
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
782
783
# Register concept topics.
784
# Note that we might choose to remove these from the online help in the
785
# future or implement them via loading content from files. In the meantime,
786
# please keep them concise.
787
topic_registry.register('branches', _branches,
788
                        'Information on what a branch is', SECT_CONCEPT)
789
topic_registry.register('checkouts', _checkouts,
790
                        'Information on what a checkout is', SECT_CONCEPT)
3368.2.17 by Ian Clatworthy
add content-filters help topic
791
topic_registry.register('content-filters', _load_from_file,
792
                        'Conversion of content into/from working trees',
793
                        SECT_CONCEPT)
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
794
topic_registry.register('diverged-branches', _load_from_file,
795
                        'How to fix diverged branches',
796
                        SECT_CONCEPT)
4208.4.1 by Ian Clatworthy
eol conversion support
797
topic_registry.register('eol', _load_from_file,
798
                        'Information on end-of-line handling',
799
                        SECT_CONCEPT)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
800
topic_registry.register('formats', _storage_formats,
801
                        'Information on choosing a storage format',
802
                        SECT_CONCEPT)
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
803
topic_registry.register('patterns', _load_from_file,
804
                        'Information on the pattern syntax',
805
                        SECT_CONCEPT)
2401.2.1 by James Westby
Add a help topic for repositories.
806
topic_registry.register('repositories', _repositories,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
807
                        'Basic information on shared repositories.',
808
                        SECT_CONCEPT)
3398.1.20 by Ian Clatworthy
add rules help topic
809
topic_registry.register('rules', _load_from_file,
810
                        'Information on defining rule-based preferences',
811
                        SECT_CONCEPT)
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
812
topic_registry.register('standalone-trees', _standalone_trees,
813
                        'Information on what a standalone tree is',
814
                        SECT_CONCEPT)
2401.2.2 by James Westby
Add a working-trees help topic.
815
topic_registry.register('working-trees', _working_trees,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
816
                        'Information on working trees', SECT_CONCEPT)
1551.19.11 by Aaron Bentley
Add criss-cross help topic
817
topic_registry.register('criss-cross', _criss_cross,
818
                        'Information on criss-cross merging', SECT_CONCEPT)
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
819
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'
820
                        'Steps to resolve "out-of-sync" when reconfiguring',
821
                        SECT_CONCEPT)
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
822
2432.1.1 by Robert Collins
Add a HelpTopicContext object.
823
2432.1.15 by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name.
824
class HelpTopicIndex(object):
825
    """A index for bzr help that returns topics."""
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
826
2432.1.17 by Robert Collins
Add prefixes to HelpIndexes.
827
    def __init__(self):
828
        self.prefix = ''
829
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
830
    def get_topics(self, topic):
831
        """Search for topic in the HelpTopicRegistry.
832
833
        :param topic: A topic to search for. None is treated as 'basic'.
834
        :return: A list which is either empty or contains a single
835
            RegisteredTopic entry.
836
        """
837
        if topic is None:
838
            topic = 'basic'
839
        if topic in topic_registry:
840
            return [RegisteredTopic(topic)]
841
        else:
842
            return []
843
844
845
class RegisteredTopic(object):
846
    """A help topic which has been registered in the HelpTopicRegistry.
847
848
    These topics consist of nothing more than the name of the topic - all
849
    data is retrieved on demand from the registry.
850
    """
851
852
    def __init__(self, topic):
853
        """Constructor.
854
855
        :param topic: The name of the topic that this represents.
856
        """
857
        self.topic = topic
2432.1.10 by Robert Collins
Add get_help_text() to RegisteredTopic to get the help as a string.
858
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
859
    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.
860
        """Return a string with the help for this topic.
861
862
        :param additional_see_also: Additional help topics to be
863
            cross-referenced.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
864
        :param plain: if False, raw help (reStructuredText) is
865
            returned instead of plain text.
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
866
        """
867
        result = topic_registry.get_detail(self.topic)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
868
        # 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'.
869
        # matching Topic code. This should probably be factored in
870
        # 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.
871
        if additional_see_also is not None:
872
            see_also = sorted(set(additional_see_also))
873
        else:
874
            see_also = None
875
        if see_also:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
876
            result += '\n:See also: '
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
877
            result += ', '.join(see_also)
878
            result += '\n'
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
879
        if plain:
880
            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.
881
        return result
2432.1.27 by Robert Collins
Add a get_help_topic method to RegisteredTopic.
882
883
    def get_help_topic(self):
884
        """Return the help topic this can be found under."""
885
        return self.topic
2485.1.1 by James Westby
Update the help topics to the latest bzr.dev.
886
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
887
888
def help_as_plain_text(text):
889
    """Minimal converter of reStructuredText to plain text."""
4927.2.10 by Ian Clatworthy
fix test failures
890
    import re
5215.2.1 by John Szakmeister
Fix standalone code blocks in help text.
891
    # Remove the standalone code block marker
5215.2.2 by John Szakmeister
Make standlone code blocks work correctly in indented sections.
892
    text = re.sub(r"(?m)^\s*::\n\s*$", "", text)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
893
    lines = text.splitlines()
894
    result = []
895
    for line in lines:
896
        if line.startswith(':'):
897
            line = line[1:]
898
        elif line.endswith('::'):
899
            line = line[:-1]
4927.2.10 by Ian Clatworthy
fix test failures
900
        # Map :doc:`xxx-help` to ``bzr help xxx``
901
        line = re.sub(":doc:`(.+)-help`", r'``bzr help \1``', line)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
902
        result.append(line)
903
    return "\n".join(result) + "\n"