/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
6622.1.30 by Jelmer Vernooij
Some more test fixes.
17
"""A collection of extra help information for using brz.
2023.1.2 by ghigo
add help topics module
18
19
Help topics are meant to be help for items that aren't commands, but will
6622.1.30 by Jelmer Vernooij
Some more test fixes.
20
help brz 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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
38
import breezy
39
from breezy 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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
142
    Topics are expected to be txt files in breezy.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,))
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
145
    return osutils.resource_string('breezy.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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
151
    import breezy.revisionspec
2023.1.2 by ghigo
add help topics module
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:
6622.1.30 by Jelmer Vernooij
Some more test fixes.
178
"brz log -r 3647..3649" shows the messages of revisions 3647, 3648 and 3649,
179
while "brz diff -r 3647..3649" includes the changes done in revisions 3648 and
3946.1.2 by Ian Clatworthy
Correct incorrect wording in revisionspec help (Matthew Fuller)
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)
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
190
    for prefix, i in breezy.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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
192
        if doc == breezy.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
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
198
            summary, doc = doc.split("\n", 1)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
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):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
212
    from breezy.transport import (
2241.2.5 by ghigo
add the topics transport
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
6973.12.3 by Jelmer Vernooij
Fixes.
224
    def key_func(a):
225
        return a[:a.rfind("://")]
2241.2.8 by ghigo
- rename transport urlspec
226
2241.2.5 by ghigo
add the topics transport
227
    protl = []
228
    decl = []
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
229
    protos = transport_list_registry.keys()
6973.12.3 by Jelmer Vernooij
Fixes.
230
    protos.sort(key=key_func)
2241.2.5 by ghigo
add the topics transport
231
    for proto in protos:
232
        shorthelp = transport_list_registry.get_help(proto)
233
        if not shorthelp:
234
            continue
235
        if proto.endswith("://"):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
236
            protl.append(add_string(proto, shorthelp, 79))
2241.2.5 by ghigo
add the topics transport
237
        else:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
238
            decl.append(add_string(proto, shorthelp, 79))
239
240
241
    out = "URL Identifiers\n\n" + \
242
            "Supported URL prefixes::\n\n  " + \
243
            '  '.join(protl)
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
244
245
    if len(decl):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
246
        out += "\nSupported modifiers::\n\n  " + \
247
            '  '.join(decl)
2241.2.5 by ghigo
add the topics transport
248
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
249
    out += """\
6622.1.31 by Jelmer Vernooij
Fix more tests.
250
\nBreezy supports all of the standard parts within the URL::
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
251
252
  <protocol>://[user[:password]@]host[:port]/[path]
253
254
allowing URLs such as::
255
6622.1.30 by Jelmer Vernooij
Some more test fixes.
256
  http://brzuser:BadPass@brz.example.com:8080/brz/trunk
4634.130.2 by Andrew Bennetts
Add help topic for location aliases like :parent.
257
6622.1.31 by Jelmer Vernooij
Fix more tests.
258
For brz+ssh:// and sftp:// URLs, Breezy also supports paths that begin
4798.4.4 by Matt Nordhoff
urlspec help: sftp URLs support ~ too
259
with '~' as meaning that the rest of the path should be interpreted
260
relative to the remote user's home directory.  For example if the user
261
``remote`` has a  home directory of ``/home/remote`` on the server
262
shell.example.com, then::
4798.4.3 by Neil Martinsen-Burrell
Add discussion of ~ in URLs
263
6622.1.30 by Jelmer Vernooij
Some more test fixes.
264
  brz+ssh://remote@shell.example.com/~/myproject/trunk
4798.4.3 by Neil Martinsen-Burrell
Add discussion of ~ in URLs
265
266
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).
267
6002.1.1 by John Arbash Meinel, Jelmer Vernooij
Add documentation on handling of special characters in URLs.
268
Many commands that accept URLs also accept location aliases too.
269
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.
270
"""
271
2241.2.5 by ghigo
add the topics transport
272
    return out
273
2023.1.2 by ghigo
add help topics module
274
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
275
_basic_help = \
6622.1.31 by Jelmer Vernooij
Fix more tests.
276
"""Breezy %s -- a free distributed version-control tool
6650.1.1 by Jelmer Vernooij
Update homepage URL.
277
https://www.breezy-vcs.org/
2023.1.2 by ghigo
add help topics module
278
279
Basic commands:
6622.1.30 by Jelmer Vernooij
Some more test fixes.
280
  brz init           makes this directory a versioned branch
281
  brz branch         make a copy of another branch
282
283
  brz add            make files or directories versioned
284
  brz ignore         ignore a file or pattern
285
  brz mv             move or rename a versioned file
286
287
  brz status         summarize changes in working copy
288
  brz diff           show detailed diffs
289
290
  brz merge          pull in changes from another branch
291
  brz commit         save some or all changes
292
  brz send           send changes via email
293
294
  brz log            show history of changes
295
  brz check          validate storage
296
297
  brz help init      more help on e.g. init command
298
  brz help commands  list all commands
299
  brz help topics    list all help topics
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
300
""" % breezy.__version__
2023.1.2 by ghigo
add help topics module
301
302
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
303
_global_options = \
1551.9.32 by Aaron Bentley
Add global option help
304
"""Global Options
305
306
These options may be used with any command, and may appear in front of any
6622.1.30 by Jelmer Vernooij
Some more test fixes.
307
command.  (e.g. ``brz --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.
308
309
--version      Print the version number. Must be supplied before the command.
310
--no-aliases   Do not process command aliases when running this command.
311
--builtin      Use the built-in version of a command, not the plugin version.
312
               This does not suppress other plugin effects.
313
--no-plugins   Do not process any plugins.
314
--no-l10n      Do not translate messages.
315
--concurrency  Number of processes that can be run concurrently (selftest).
316
317
--profile      Profile execution using the hotshot profiler.
318
--lsprof       Profile execution using the lsprof profiler.
319
--lsprof-file  Profile execution using the lsprof profiler, and write the
320
               results to a specified file.  If the filename ends with ".txt",
321
               text format will be used.  If the filename either starts with
322
               "callgrind.out" or end with ".callgrind", the output will be
323
               formatted for use with KCacheGrind. Otherwise, the output
324
               will be a pickle.
325
--coverage     Generate line coverage report in the specified directory.
326
327
-Oname=value   Override the ``name`` config option setting it to ``value`` for
328
               the duration of the command.  This can be used multiple times if
329
               several options need to be overridden.
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
330
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
331
See http://doc.bazaar.canonical.com/developers/profiling.html for more
332
information on profiling.
333
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
334
A number of debug flags are also available to assist troubleshooting and
4927.2.7 by Ian Clatworthy
Better linking in global-options topic
335
development.  See :doc:`debug-flags-help`.
1551.9.32 by Aaron Bentley
Add global option help
336
"""
337
2768.1.1 by Ian Clatworthy
Document standard options
338
_standard_options = \
339
"""Standard Options
340
341
Standard options are legal for all commands.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
342
2768.1.1 by Ian Clatworthy
Document standard options
343
--help, -h     Show help message.
2768.1.13 by Ian Clatworthy
Minor fixes to help
344
--verbose, -v  Display more information.
345
--quiet, -q    Only display errors and warnings.
2768.1.1 by Ian Clatworthy
Document standard options
346
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
347
Unlike global options, standard options can be used in aliases.
2768.1.1 by Ian Clatworthy
Document standard options
348
"""
349
350
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
351
_checkouts = \
352
"""Checkouts
353
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
354
Checkouts are source trees that are connected to a branch, so that when
355
you commit in the source tree, the commit goes into that branch.  They
356
allow you to use a simpler, more centralized workflow, ignoring some of
6622.1.31 by Jelmer Vernooij
Fix more tests.
357
Breezy's decentralized features until you want them. Using checkouts
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
358
with shared repositories is very similar to working with SVN or CVS, but
359
doesn't have the same restrictions.  And using checkouts still allows
360
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.
361
6622.1.30 by Jelmer Vernooij
Some more test fixes.
362
A checkout is created with the brz checkout command (see "help checkout").
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
363
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.
364
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.
365
checkout from (the master branch). Then if you make any commits they will be
366
made on the other branch first. This creates an instant mirror of your work, or
367
facilitates lockstep development, where each developer is working together,
368
continuously integrating the changes of others.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
369
6622.1.31 by Jelmer Vernooij
Fix more tests.
370
However the checkout is still a first class branch in Breezy terms, so that
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
371
you have the full history locally.  As you have a first class branch you can
372
also commit locally if you want, for instance due to the temporary loss af a
373
network connection. Use the --local option to commit to do this. All the local
374
commits will then be made on the master branch the next time you do a non-local
375
commit.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
376
377
If you are using a checkout from a shared branch you will periodically want to
378
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.
379
command. The changes need to be applied before any non-local commit, but
6622.1.31 by Jelmer Vernooij
Fix more tests.
380
Breezy will tell you if there are any changes and suggest that you use this
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
381
command when needed.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
382
383
It is also possible to create a "lightweight" checkout by passing the
384
--lightweight flag to checkout. A lightweight checkout is even closer to an
385
SVN checkout in that it is not a first class branch, it mainly consists of the
386
working tree. This means that any history operations must query the master
387
branch, which could be slow if a network connection is involved. Also, as you
388
don't have a local branch, then you cannot commit locally.
389
2374.1.1 by Ian Clatworthy
Help and man page fixes
390
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.
391
master branch. This means that if the master branch is on the same disk or LAN
392
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.
393
that modify the revision history (as only one copy of the branch needs to
394
be updated). Heavyweight checkouts will generally be faster for any command
395
that uses the history but does not change it, but if the master branch is on
396
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.
397
398
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
399
containing your branches, where you maintain only one working tree by
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
400
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.
401
work on a different branch.
402
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
403
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
404
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.
405
protocol , such as sftp://, and that you have write permissions at the other
406
end. Checkouts also work on the local file system, so that all that matters is
407
file permissions.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
408
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
409
You can change the master of a checkout by using the "switch" command (see
5031.2.2 by Matthew Fuller
Rewrap paragraph.
410
"help switch").  This will change the location that the commits are sent to.
411
The "bind" command can also be used to turn a normal branch into a heavy
412
checkout. If you would like to convert your heavy checkout into a normal
413
branch so that every commit is local, you can use the "unbind" command. To see
414
whether or not a branch is bound or not you can use the "info" command. If the
415
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.
416
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
417
Related commands::
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
418
419
  checkout    Create a checkout. Pass --lightweight to get a lightweight
420
              checkout
421
  update      Pull any changes in the master branch in to your checkout
422
  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
423
              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.
424
              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
425
  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.
426
              be sent to
5031.2.1 by Matthew Fuller
Suggest 'switch' rather than 'bind' for changing the branch of a
427
  bind        Turn a standalone branch into a heavy checkout so that any
428
              commits will be sent to the master branch
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
429
  unbind      Turn a heavy checkout into a standalone branch so that any
430
              commits are only made locally
4871.2.1 by Patrick Regan
Added info to related commands in checkouts
431
  info        Displays whether a branch is bound or unbound. If the branch is
432
              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.
433
"""
434
2401.2.1 by James Westby
Add a help topic for repositories.
435
_repositories = \
436
"""Repositories
437
6622.1.31 by Jelmer Vernooij
Fix more tests.
438
Repositories in Breezy are where committed information is stored. There is
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
439
a repository associated with every branch.
440
6622.1.30 by Jelmer Vernooij
Some more test fixes.
441
Repositories are a form of database. Breezy will usually maintain this for
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
442
good performance automatically, but in some situations (e.g. when doing
6622.1.30 by Jelmer Vernooij
Some more test fixes.
443
very many commits in a short time period) you may want to ask brz to
444
optimise the database indices. This can be done by the 'brz pack' command.
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
445
6622.1.30 by Jelmer Vernooij
Some more test fixes.
446
By default just running 'brz init' will create a repository within the new
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
447
branch but it is possible to create a shared repository which allows multiple
448
branches to share their information in the same location. When a new branch is
449
created it will first look to see if there is a containing shared repository it
450
can use.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
451
452
When two branches of the same project share a repository, there is
453
generally a large space saving. For some operations (e.g. branching
454
within the repository) this translates in to a large time saving.
2401.2.1 by James Westby
Add a help topic for repositories.
455
456
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.
457
init-repo). This command takes the location of the repository to create. This
6622.1.30 by Jelmer Vernooij
Some more test fixes.
458
means that 'brz init-repository repo' will create a directory named 'repo',
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
459
which contains a shared repository. Any new branches that are created in this
460
directory will then use it for storage.
2401.2.1 by James Westby
Add a help topic for repositories.
461
462
It is a good idea to create a repository whenever you might create more
463
than one branch of a project. This is true for both working areas where you
464
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.
465
projects. In the latter case, it is common to want branches without working
466
trees. Since the files in the branch will not be edited directly there is no
467
need to use up disk space for a working tree. To create a repository in which
468
the branches will not have working trees pass the '--no-trees' option to
469
'init-repository'.
2401.2.1 by James Westby
Add a help topic for repositories.
470
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
471
Related commands::
2401.2.1 by James Westby
Add a help topic for repositories.
472
473
  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.
474
                    in which new branches won't get a working tree.
2401.2.1 by James Westby
Add a help topic for repositories.
475
"""
476
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
477
2401.2.2 by James Westby
Add a working-trees help topic.
478
_working_trees = \
479
"""Working Trees
480
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
481
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.
482
see the files and edit them. The working tree is where you make changes to a
483
branch, and when you commit the current state of the working tree is the
484
snapshot that is recorded in the commit.
485
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
486
When you push a branch to a remote system, a working tree will not be
487
created. If one is already present the files will not be updated. The
488
branch information will be updated and the working tree will be marked
489
as out-of-date. Updating a working tree remotely is difficult, as there
490
may be uncommitted changes or the update may cause content conflicts that are
491
difficult to deal with remotely.
2401.2.2 by James Westby
Add a working-trees help topic.
492
493
If you have a branch with no working tree you can use the 'checkout' command
6622.1.30 by Jelmer Vernooij
Some more test fixes.
494
to create a working tree. If you run 'brz checkout .' from the branch it will
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
495
create the working tree. If the branch is updated remotely, you can update the
6622.1.30 by Jelmer Vernooij
Some more test fixes.
496
working tree by running 'brz update' in that directory.
2401.2.2 by James Westby
Add a working-trees help topic.
497
498
If you have a branch with a working tree that you do not want the 'remove-tree'
499
command will remove the tree if it is safe. This can be done to avoid the
500
warning about the remote working tree not being updated when pushing to the
501
branch. It can also be useful when working with a '--no-trees' repository
6622.1.30 by Jelmer Vernooij
Some more test fixes.
502
(see 'brz help repositories').
2401.2.2 by James Westby
Add a working-trees help topic.
503
504
If you want to have a working tree on a remote machine that you push to you
6622.1.30 by Jelmer Vernooij
Some more test fixes.
505
can either run 'brz update' in the remote branch after each push, or use some
2401.2.2 by James Westby
Add a working-trees help topic.
506
other method to update the tree during the push. There is an 'rspush' plugin
507
that will update the working tree using rsync as well as doing a push. There
6622.1.30 by Jelmer Vernooij
Some more test fixes.
508
is also a 'push-and-update' plugin that automates running 'brz update' via SSH
2401.2.2 by James Westby
Add a working-trees help topic.
509
after each push.
510
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
511
Useful commands::
2401.2.2 by James Westby
Add a working-trees help topic.
512
513
  checkout     Create a working tree when a branch does not have one.
514
  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
515
  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.
516
               this will update the tree to match the branch.
517
"""
518
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
519
520
_branches = \
521
"""Branches
522
523
A branch consists of the state of a project, including all of its
524
history. All branches have a repository associated (which is where the
525
branch history is stored), but multiple branches may share the same
526
repository (a shared repository). Branches can be copied and merged.
527
4971.2.2 by Neil Martinsen-Burrell
address Vincents comments
528
In addition, one branch may be bound to another one.  Binding to another
529
branch indicates that commits which happen in this branch must also 
6622.1.31 by Jelmer Vernooij
Fix more tests.
530
happen in the other branch.  Breezy ensures consistency by not allowing 
4971.2.2 by Neil Martinsen-Burrell
address Vincents comments
531
commits when the two branches are out of date.  In order for a commit 
532
to succeed, it may be necessary to update the current branch using 
6622.1.30 by Jelmer Vernooij
Some more test fixes.
533
``brz update``.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
534
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
535
Related commands::
536
3535.4.2 by Marius Kruger
Update branches help topic to avoid ambiguity.
537
  init    Change a directory into a versioned branch.
4431.2.1 by mernst at mit
branch documentation: clarify English word "copy"
538
  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
539
  merge   Perform a three-way merge.
4971.2.1 by Neil Martinsen-Burrell
add bound branch discussion in branches help topic
540
  bind    Bind a branch to another one.
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
541
"""
542
543
544
_standalone_trees = \
545
"""Standalone Trees
546
547
A standalone tree is a working tree with an associated repository. It
548
is an independently usable branch, with no dependencies on any other.
6622.1.30 by Jelmer Vernooij
Some more test fixes.
549
Creating a standalone tree (via brz init) is the quickest way to put
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
550
an existing project under version control.
551
552
Related Commands::
553
554
  init    Make a directory into a versioned branch.
555
"""
556
557
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
558
_status_flags = \
559
"""Status Flags
560
561
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
562
manner.  They are in the form::
563
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
564
   xxx   <filename>
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
565
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
566
where the columns' meanings are as follows.
567
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
568
Column 1 - versioning/renames::
569
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
570
  + File versioned
571
  - File unversioned
572
  R File renamed
573
  ? File unknown
6622.1.30 by Jelmer Vernooij
Some more test fixes.
574
  X File nonexistent (and unknown to brz)
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
575
  C File has conflicts
576
  P Entry for a pending merge (not a file)
577
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
578
Column 2 - contents::
579
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
580
  N File created
581
  D File deleted
582
  K File kind changed
583
  M File modified
584
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
585
Column 3 - execute::
586
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
587
  * The execute bit was changed
588
"""
589
1551.9.32 by Aaron Bentley
Add global option help
590
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
591
known_env_variables = [
6622.1.30 by Jelmer Vernooij
Some more test fixes.
592
    ("BRZPATH", "Path where brz is to look for shell plugin external commands."),
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
593
    ("BRZ_EMAIL", "E-Mail address of the user. Overrides EMAIL."),
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
594
    ("EMAIL", "E-Mail address of the user."),
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
595
    ("BRZ_EDITOR", "Editor for editing commit messages. Overrides EDITOR."),
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
596
    ("EDITOR", "Editor for editing commit messages."),
6622.1.30 by Jelmer Vernooij
Some more test fixes.
597
    ("BRZ_PLUGIN_PATH", "Paths where brz should look for plugins."),
598
    ("BRZ_DISABLE_PLUGINS", "Plugins that brz should not load."),
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
599
    ("BRZ_PLUGINS_AT", "Plugins to load from a directory not in BRZ_PLUGIN_PATH."),
6740.1.1 by Jelmer Vernooij
Rename bazaar.conf to breezy.conf.
600
    ("BRZ_HOME", "Directory holding breezy config dir. Overrides HOME."),
601
    ("BRZ_HOME (Win32)", "Directory holding breezy config dir. Overrides APPDATA and HOME."),
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
602
    ("BZR_REMOTE_PATH", "Full name of remote 'brz' command (for brz+ssh:// URLs)."),
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
603
    ("BRZ_SSH", "Path to SSH client, or one of paramiko, openssh, sshcorp, plink or lsh."),
6622.1.30 by Jelmer Vernooij
Some more test fixes.
604
    ("BRZ_LOG", "Location of .brz.log (use '/dev/null' to suppress log)."),
605
    ("BRZ_LOG (Win32)", "Location of .brz.log (use 'NUL' to suppress log)."),
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
606
    ("BRZ_COLUMNS", "Override implicit terminal width."),
607
    ("BRZ_CONCURRENCY", "Number of processes that can be run concurrently (selftest)"),
608
    ("BRZ_PROGRESS_BAR", "Override the progress display. Values are 'none' or 'text'."),
609
    ("BRZ_PDB", "Control whether to launch a debugger on error."),
610
    ("BRZ_SIGQUIT_PDB", "Control whether SIGQUIT behaves normally or invokes a breakin debugger."),
611
    ("BRZ_TEXTUI_INPUT", "Force console input mode for prompts to line-based (instead of char-based)."),
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
612
    ]
6503.2.1 by Jelmer Vernooij
Stick all environment variables in a big dictionary.
613
614
def _env_variables(topic):
615
    import textwrap
6565.1.1 by Robert Collins
* ``bzr help env-variables`` now points users at ``bzr help configuration``
616
    ret = ["Environment Variables\n\n"
6622.1.30 by Jelmer Vernooij
Some more test fixes.
617
        "See brz help configuration for more details.\n\n"]
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
618
    max_key_len = max([len(k[0]) for k in known_env_variables])
6503.2.1 by Jelmer Vernooij
Stick all environment variables in a big dictionary.
619
    desc_len = (80 - max_key_len - 2)
620
    ret.append("=" * max_key_len + " " + "=" * desc_len + "\n")
6503.2.4 by Jelmer Vernooij
Use tuples for known env variables list.
621
    for k, desc in known_env_variables:
6503.2.1 by Jelmer Vernooij
Stick all environment variables in a big dictionary.
622
        ret.append(k + (max_key_len + 1 - len(k)) * " ")
623
        ret.append("\n".join(textwrap.wrap(
624
            desc, width=desc_len, subsequent_indent=" " * (max_key_len + 1))))
625
        ret.append("\n")
626
    ret += "=" * max_key_len + " " + "=" * desc_len + "\n"
627
    return "".join(ret)
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
628
629
_files = \
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
630
r"""Files
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
631
6740.1.1 by Jelmer Vernooij
Rename bazaar.conf to breezy.conf.
632
:On Unix:   ~/.config/breezy/breezy.conf
6742.1.1 by emansije
Finishes some leftovers when renaming bazaar.conf to breezy.conf.
633
:On Windows: C:\\Documents and Settings\\username\\Application Data\\Breezy\\2.0\\breezy.conf
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
634
635
Contains the user's default configuration. The section ``[DEFAULT]`` is
636
used to define general configuration that will be applied everywhere.
637
The section ``[ALIASES]`` can be used to create command aliases for
638
commonly used options.
639
640
A typical config file might look something like::
641
642
  [DEFAULT]
643
  email=John Doe <jdoe@isp.com>
644
645
  [ALIASES]
646
  commit = commit --strict
647
  log10 = log --short -r -10..-1
648
"""
649
1551.19.11 by Aaron Bentley
Add criss-cross help topic
650
_criss_cross = \
3079.1.1 by Alexander Belchenko
topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
651
"""Criss-Cross
652
1551.19.11 by Aaron Bentley
Add criss-cross help topic
653
A criss-cross in the branch history can cause the default merge technique
654
to emit more conflicts than would normally be expected.
655
6622.1.30 by Jelmer Vernooij
Some more test fixes.
656
In complex merge cases, ``brz merge --lca`` or ``brz merge --weave`` may give
657
better results.  You may wish to ``brz revert`` the working tree and merge
658
again.  Alternatively, use ``brz remerge`` on particular conflicted files.
1551.19.11 by Aaron Bentley
Add criss-cross help topic
659
660
Criss-crosses occur in a branch's history if two branches merge the same thing
661
and then merge one another, or if two branches merge one another at the same
662
time.  They can be avoided by having each branch only merge from or into a
663
designated central branch (a "star topology").
664
6622.1.31 by Jelmer Vernooij
Fix more tests.
665
Criss-crosses cause problems because of the way merge works.  Breezy's default
1551.19.11 by Aaron Bentley
Add criss-cross help topic
666
merge is a three-way merger; in order to merge OTHER into THIS, it must
667
find a basis for comparison, BASE.  Using BASE, it can determine whether
668
differences between THIS and OTHER are due to one side adding lines, or
669
from another side removing lines.
670
671
Criss-crosses mean there is no good choice for a base.  Selecting the recent
672
merge points could cause one side's changes to be silently discarded.
6622.1.31 by Jelmer Vernooij
Fix more tests.
673
Selecting older merge points (which Breezy does) mean that extra conflicts
1551.19.11 by Aaron Bentley
Add criss-cross help topic
674
are emitted.
675
676
The ``weave`` merge type is not affected by this problem because it uses
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
677
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
678
differences.
3324.3.2 by Martin Pool
criss-cross help: suggest revert/merge
679
"""
1551.19.11 by Aaron Bentley
Add criss-cross help topic
680
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
681
_branches_out_of_sync = """Branches Out of Sync
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
682
683
When reconfiguring a checkout, tree or branch into a lightweight checkout,
684
a local branch must be destroyed.  (For checkouts, this is the local branch
685
that serves primarily as a cache.)  If the branch-to-be-destroyed does not
686
have the same last revision as the new reference branch for the lightweight
6622.1.31 by Jelmer Vernooij
Fix more tests.
687
checkout, data could be lost, so Breezy refuses.
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
688
689
How you deal with this depends on *why* the branches are out of sync.
690
691
If you have a checkout and have done local commits, you can get back in sync
6622.1.30 by Jelmer Vernooij
Some more test fixes.
692
by running "brz update" (and possibly "brz commit").
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
693
694
If you have a branch and the remote branch is out-of-date, you can push
6622.1.30 by Jelmer Vernooij
Some more test fixes.
695
the local changes using "brz push".  If the local branch is out of date, you
696
can do "brz pull".  If both branches have had changes, you can merge, commit
3338.1.4 by Aaron Bentley
Add sync-for-reconfigure help topic
697
and then push your changes.  If you decide that some of the changes aren't
698
useful, you can "push --overwrite" or "pull --overwrite" instead.
699
"""
700
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
701
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
702
_storage_formats = \
703
"""Storage Formats
704
705
To ensure that older clients do not access data incorrectly,
6622.1.31 by Jelmer Vernooij
Fix more tests.
706
Breezy's policy is to introduce a new storage format whenever
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
707
new features requiring new metadata are added. New storage
708
formats may also be introduced to improve performance and
709
scalability.
710
4634.87.1 by Andrew Bennetts
Cherrypick lp:bzr r4743: (igc) Fix help on formats now that 2a is released (Jared Hance)
711
The newest format, 2a, is highly recommended. If your
712
project is not using 2a, then you should suggest to the
713
project owner to upgrade.
714
715
4927.2.3 by Ian Clatworthy
improve formatting: better linking, notes, etc.
716
.. note::
717
718
   Some of the older formats have two variants:
719
   a plain one and a rich-root one. The latter include an additional
720
   field about the root of the tree. There is no performance cost
721
   for using a rich-root format but you cannot easily merge changes
722
   from a rich-root format into a plain format. As a consequence,
723
   moving a project to a rich-root format takes some co-ordination
724
   in that all contributors need to upgrade their repositories
725
   around the same time. 2a and all future formats will be
726
   implicitly rich-root.
727
728
See :doc:`current-formats-help` for the complete list of
729
currently supported formats. See :doc:`other-formats-help` for
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
730
descriptions of any available experimental and deprecated formats.
731
"""
732
733
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
734
# Register help topics
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
735
topic_registry.register("revisionspec", _help_on_revisionspec,
736
                        "Explain how to use --revision")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
737
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
738
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
739
def get_current_formats_topic(topic):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
740
    from breezy import controldir
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
741
    return "Current Storage Formats\n\n" + \
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
742
        controldir.format_registry.help_topic(topic)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
743
def get_other_formats_topic(topic):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
744
    from breezy import controldir
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
745
    return "Other Storage Formats\n\n" + \
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
746
        controldir.format_registry.help_topic(topic)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
747
topic_registry.register('current-formats', get_current_formats_topic,
748
    'Current storage formats')
749
topic_registry.register('other-formats', get_other_formats_topic,
750
    'Experimental and deprecated storage formats')
2768.1.1 by Ian Clatworthy
Document standard options
751
topic_registry.register('standard-options', _standard_options,
752
                        'Options that can be used with any command')
1551.9.34 by Aaron Bentley
Fix NEWS and whitespace
753
topic_registry.register('global-options', _global_options,
6622.1.31 by Jelmer Vernooij
Fix more tests.
754
                    'Options that control how Breezy runs')
2241.2.8 by ghigo
- rename transport urlspec
755
topic_registry.register('urlspec', _help_on_transport,
2241.2.5 by ghigo
add the topics transport
756
                        "Supported transport protocols")
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
757
topic_registry.register('status-flags', _status_flags,
758
                        "Help on status flags")
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
759
def get_bugs_topic(topic):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
760
    from breezy import bugtracker
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
761
    return ("Bug Tracker Settings\n\n" +
3154.1.1 by Ian Clatworthy
Minor tweaks to bug tracker integration documentation
762
        bugtracker.tracker_registry.help_topic(topic))
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
763
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
764
topic_registry.register('env-variables', _env_variables,
765
                        'Environment variable names and values')
766
topic_registry.register('files', _files,
767
                        'Information on configuration and log files')
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
768
topic_registry.register_lazy('hooks', 'breezy.hooks', 'hooks_help_text',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
769
                        'Points at which custom processing can be added')
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
770
topic_registry.register_lazy('location-alias', 'breezy.directory_service',
6319.2.1 by Jelmer Vernooij
Allow registering custom location aliases.
771
                        'AliasDirectory.help_text',
772
                        'Aliases for remembered locations')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
773
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
774
# Load some of the help topics from files. Note that topics which reproduce API
775
# details will tend to skew (quickly usually!) so please seek other solutions
776
# for such things.
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
777
topic_registry.register('authentication', _load_from_file,
778
                        'Information on configuring authentication')
779
topic_registry.register('configuration', _load_from_file,
780
                        'Details on the configuration settings available')
4927.2.1 by Ian Clatworthy
conflicts topic renamed to conflict-types and other minor help clean-ups
781
topic_registry.register('conflict-types', _load_from_file,
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
782
                        'Types of conflicts and what to do about them')
4110.2.7 by Martin Pool
Split debug flags into their own help topic
783
topic_registry.register('debug-flags', _load_from_file,
784
                        'Options to show or record debug information')
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
785
topic_registry.register('log-formats', _load_from_file,
786
                        'Details on the logging formats available')
6695.2.3 by Jelmer Vernooij
Add help topic.
787
topic_registry.register('missing-extensions', _load_from_file,
788
                        'What to do when compiled extensions are missing')
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):
6622.1.30 by Jelmer Vernooij
Some more test fixes.
835
    """A index for brz 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]
6622.1.30 by Jelmer Vernooij
Some more test fixes.
911
        # Map :doc:`xxx-help` to ``brz help xxx``
912
        line = re.sub(":doc:`(.+?)-help`", r'``brz 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