/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2070.4.5 by John Arbash Meinel
cleanup copyright line
1
# Copyright (C) 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
36
from bzrlib import registry
37
38
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
39
# Section identifiers (map topics to the right place in the manual)
40
SECT_COMMAND = "command"
41
SECT_CONCEPT = "concept"
42
SECT_HIDDEN =  "hidden"
43
SECT_LIST    = "list"
44
SECT_PLUGIN  = "plugin"
45
46
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
47
class HelpTopicRegistry(registry.Registry):
2070.4.15 by John Arbash Meinel
Fixes from Martin
48
    """A Registry customized for handling help topics."""
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
49
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
50
    def register(self, topic, detail, summary, section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
51
        """Register a new help topic.
52
53
        :param topic: Name of documentation entry
54
        :param detail: Function or string object providing detailed
55
            documentation for topic.  Function interface is detail(topic).
56
            This should return a text string of the detailed information.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
57
            See the module documentation for details on help text formatting.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
58
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
59
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
60
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
61
        # The detail is stored as the 'object' and the metadata as the info
62
        info=(summary,section)
63
        super(HelpTopicRegistry, self).register(topic, detail, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
64
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
65
    def register_lazy(self, topic, module_name, member_name, summary,
66
                      section=SECT_LIST):
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
67
        """Register a new help topic, and import the details on demand.
68
69
        :param topic: Name of documentation entry
70
        :param module_name: The module to find the detailed help.
71
        :param member_name: The member of the module to use for detailed help.
72
        :param summary: String providing single-line documentation for topic.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
73
        :param section: Section in reference manual - see SECT_* identifiers.
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
74
        """
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
75
        # The detail is stored as the 'object' and the metadata as the info
76
        info=(summary,section)
2070.4.15 by John Arbash Meinel
Fixes from Martin
77
        super(HelpTopicRegistry, self).register_lazy(topic, module_name,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
78
                                                     member_name, info=info)
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
79
80
    def get_detail(self, topic):
81
        """Get the detailed help on a given topic."""
82
        obj = self.get(topic)
83
        if callable(obj):
84
            return obj(topic)
85
        else:
86
            return obj
87
88
    def get_summary(self, topic):
89
        """Get the single line summary for the topic."""
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
90
        info = self.get_info(topic)
91
        if info is None:
92
            return None
93
        else:
94
            return info[0]
95
96
    def get_section(self, topic):
97
        """Get the section for the topic."""
98
        info = self.get_info(topic)
99
        if info is None:
100
            return None
101
        else:
102
            return info[1]
103
104
    def get_topics_for_section(self, section):
105
        """Get the set of topics in a section."""
106
        result = set()
107
        for topic in self.keys():
108
            if section == self.get_section(topic):
109
                result.add(topic)
110
        return result
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
111
112
113
topic_registry = HelpTopicRegistry()
2023.1.2 by ghigo
add help topics module
114
115
116
#----------------------------------------------------
117
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
118
def _help_on_topics(dummy):
2023.1.2 by ghigo
add help topics module
119
    """Write out the help for topics to outfile"""
120
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
121
    topics = topic_registry.keys()
2070.4.2 by John Arbash Meinel
cleanup help_topics.py
122
    lmax = max(len(topic) for topic in topics)
2023.1.4 by ghigo
the ''bzr help topics'' output is shorter
123
        
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
124
    out = []
2023.1.2 by ghigo
add help topics module
125
    for topic in topics:
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
126
        summary = topic_registry.get_summary(topic)
127
        out.append("%-*s %s\n" % (lmax, topic, summary))
128
    return ''.join(out)
129
130
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
131
def _load_from_file(topic_name):
132
    """Load help from a file.
133
134
    The help is already expected to be in ReStructuredText format.
135
    """
136
    # FIXME ...
137
    bzr_dir = "."
138
    filename = "%s/doc/en/user-reference/%s.txt" % (bzr_dir,topic_name)
139
    lines = open(filename).readlines()
140
    return ''.join(lines)
141
142
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
143
def _help_on_revisionspec(name):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
144
    """Generate the help for revision specs."""
145
    import re
2023.1.2 by ghigo
add help topics module
146
    import bzrlib.revisionspec
147
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
148
    out = []
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
149
    out.append("Revision Identifiers\n")
150
    out.append("A revision, or a range bound, can be one of the following.\n")
151
    details = []
152
    details.append("\nFurther details are given below.\n")
2023.1.2 by ghigo
add help topics module
153
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
154
    # The help text is indented 4 spaces - this re cleans that up below
155
    indent_re = re.compile(r'^    ', re.MULTILINE)
2023.1.2 by ghigo
add help topics module
156
    for i in bzrlib.revisionspec.SPEC_TYPES:
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
157
        doc = i.help_txt
158
        if doc == bzrlib.revisionspec.RevisionSpec.help_txt:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
159
            summary = "N/A"
160
            doc = summary + "\n"
161
        else:
162
            # Extract out the top line summary from the body and
163
            # clean-up the unwanted whitespace
164
            summary,doc = doc.split("\n", 1)
165
            #doc = indent_re.sub('', doc)
166
            while (doc[-2:] == '\n\n' or doc[-1:] == ' '):
167
                doc = doc[:-1]
168
        
169
        # Note: The leading : here are HACKs to get reStructuredText
170
        # 'field' formatting - we know that the prefix ends in a ':'.
171
        out.append(":%s\n\t%s" % (i.prefix, summary))
172
        details.append(":%s\n%s" % (i.prefix, doc))
173
174
    return '\n'.join(out + details)
2023.1.2 by ghigo
add help topics module
175
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
176
2241.2.5 by ghigo
add the topics transport
177
def _help_on_transport(name):
178
    from bzrlib.transport import (
179
        transport_list_registry,
180
    )
181
    import textwrap
182
183
    def add_string(proto, help, maxl, prefix_width=20):
184
       help_lines = textwrap.wrap(help, maxl - prefix_width)
185
       line_with_indent = '\n' + ' ' * prefix_width
186
       help_text = line_with_indent.join(help_lines)
187
       return "%-20s%s\n" % (proto, help_text)
188
2241.2.8 by ghigo
- rename transport urlspec
189
    def sort_func(a,b):
190
        a1 = a[:a.rfind("://")]
191
        b1 = b[:b.rfind("://")]
192
        if a1>b1:
193
            return +1
194
        elif a1<b1:
195
            return -1
196
        else:
197
            return 0
198
2241.2.5 by ghigo
add the topics transport
199
    protl = []
200
    decl = []
201
    protos = transport_list_registry.keys( )
2241.2.8 by ghigo
- rename transport urlspec
202
    protos.sort(sort_func)
2241.2.5 by ghigo
add the topics transport
203
    for proto in protos:
204
        shorthelp = transport_list_registry.get_help(proto)
205
        if not shorthelp:
206
            continue
207
        if proto.endswith("://"):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
208
            protl.append(add_string(proto, shorthelp, 79))
2241.2.5 by ghigo
add the topics transport
209
        else:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
210
            decl.append(add_string(proto, shorthelp, 79))
211
212
213
    out = "URL Identifiers\n\n" + \
214
            "Supported URL prefixes::\n\n  " + \
215
            '  '.join(protl)
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
216
217
    if len(decl):
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
218
        out += "\nSupported modifiers::\n\n  " + \
219
            '  '.join(decl)
2241.2.5 by ghigo
add the topics transport
220
221
    return out
222
2023.1.2 by ghigo
add help topics module
223
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
224
_basic_help = \
2023.1.2 by ghigo
add help topics module
225
"""Bazaar -- a free distributed version-control tool
226
http://bazaar-vcs.org/
227
228
Basic commands:
229
  bzr init           makes this directory a versioned branch
230
  bzr branch         make a copy of another branch
231
232
  bzr add            make files or directories versioned
233
  bzr ignore         ignore a file or pattern
234
  bzr mv             move or rename a versioned file
235
236
  bzr status         summarize changes in working copy
237
  bzr diff           show detailed diffs
238
239
  bzr merge          pull in changes from another branch
240
  bzr commit         save some or all changes
241
242
  bzr log            show history of changes
243
  bzr check          validate storage
244
245
  bzr help init      more help on e.g. init command
246
  bzr help commands  list all commands
247
  bzr help topics    list all help topics
248
"""
249
250
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
251
_global_options = \
1551.9.32 by Aaron Bentley
Add global option help
252
"""Global Options
253
254
These options may be used with any command, and may appear in front of any
2768.1.1 by Ian Clatworthy
Document standard options
255
command.  (e.g. "bzr --profile help").
1551.9.32 by Aaron Bentley
Add global option help
256
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
257
--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
258
--no-aliases   Do not process command aliases when running this command.
1551.9.32 by Aaron Bentley
Add global option help
259
--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
260
               This does not suppress other plugin effects.
261
--no-plugins   Do not process any plugins.
1551.9.32 by Aaron Bentley
Add global option help
262
2748.1.1 by Ian Clatworthy
(Daniel Watkins) help global-options now lists all debug flags
263
--profile      Profile execution using the hotshot profiler.
264
--lsprof       Profile execution using the lsprof profiler.
1551.9.32 by Aaron Bentley
Add global option help
265
--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
266
               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
267
               text format will be used.  If the filename either starts with
268
               "callgrind.out" or end with ".callgrind", the output will be
269
               formatted for use with KCacheGrind. Otherwise, the output
270
               will be a pickle.
2493.2.7 by Aaron Bentley
Add info to --lsprof-file entry in global options
271
272
See doc/developers/profiling.txt for more information on profiling.
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
273
A number of debug flags are also available to assist troubleshooting and
274
development.
1551.9.32 by Aaron Bentley
Add global option help
275
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
276
-Dauth         Trace authentication sections used.
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
277
-Derror        Instead of normal error handling, always print a traceback on
278
               error.
279
-Devil         Capture call sites that do expensive or badly-scaling
280
               operations.
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
281
-Dhashcache    Log every time a working file is read to determine its hash.
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
282
-Dhooks        Trace hook execution.
3052.3.3 by Vincent Ladeuil
Add -Dhttp support.
283
-Dhttp         Trace http connections, requests and responses
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
284
-Dhpss         Trace smart protocol requests and responses.
285
-Dindex        Trace major index operations.
286
-Dlock         Trace when lockdir locks are taken or released.
1551.19.17 by Aaron Bentley
Add debugging flag for merges
287
-Dmerge        Emit information for debugging merges.
1551.9.32 by Aaron Bentley
Add global option help
288
"""
289
2768.1.1 by Ian Clatworthy
Document standard options
290
_standard_options = \
291
"""Standard Options
292
293
Standard options are legal for all commands.
294
      
295
--help, -h     Show help message.
2768.1.13 by Ian Clatworthy
Minor fixes to help
296
--verbose, -v  Display more information.
297
--quiet, -q    Only display errors and warnings.
2768.1.1 by Ian Clatworthy
Document standard options
298
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
299
Unlike global options, standard options can be used in aliases.
2768.1.1 by Ian Clatworthy
Document standard options
300
"""
301
302
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
303
_checkouts = \
304
"""Checkouts
305
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
306
Checkouts are source trees that are connected to a branch, so that when
307
you commit in the source tree, the commit goes into that branch.  They
308
allow you to use a simpler, more centralized workflow, ignoring some of
309
Bazaar's decentralized features until you want them. Using checkouts
310
with shared repositories is very similar to working with SVN or CVS, but
311
doesn't have the same restrictions.  And using checkouts still allows
312
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.
313
314
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.
315
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.
316
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.
317
checkout from (the master branch). Then if you make any commits they will be
318
made on the other branch first. This creates an instant mirror of your work, or
319
facilitates lockstep development, where each developer is working together,
320
continuously integrating the changes of others.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
321
322
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.
323
you have the full history locally.  As you have a first class branch you can
324
also commit locally if you want, for instance due to the temporary loss af a
325
network connection. Use the --local option to commit to do this. All the local
326
commits will then be made on the master branch the next time you do a non-local
327
commit.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
328
329
If you are using a checkout from a shared branch you will periodically want to
330
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.
331
command. The changes need to be applied before any non-local commit, but
332
Bazaar will tell you if there are any changes and suggest that you use this
333
command when needed.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
334
335
It is also possible to create a "lightweight" checkout by passing the
336
--lightweight flag to checkout. A lightweight checkout is even closer to an
337
SVN checkout in that it is not a first class branch, it mainly consists of the
338
working tree. This means that any history operations must query the master
339
branch, which could be slow if a network connection is involved. Also, as you
340
don't have a local branch, then you cannot commit locally.
341
2374.1.1 by Ian Clatworthy
Help and man page fixes
342
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.
343
master branch. This means that if the master branch is on the same disk or LAN
344
a lightweight checkout will be faster than a heavyweight one for any commands
345
that modify the revision history (as only one copy branch needs to be updated).
346
Heavyweight checkouts will generally be faster for any command that uses the
347
history but does not change it, but if the master branch is on the same disk
348
then there wont be a noticeable difference.
349
350
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
351
containing your branches, where you maintain only one working tree by
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
352
switching the master branch that the checkout points to when you want to 
353
work on a different branch.
354
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
355
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
356
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.
357
protocol , such as sftp://, and that you have write permissions at the other
358
end. Checkouts also work on the local file system, so that all that matters is
359
file permissions.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
360
361
You can change the master of a checkout by using the "bind" command (see "help
362
bind"). This will change the location that the commits are sent to. The bind
2245.7.2 by James Westby
Update the checkouts help topic with the comments from Aaron.
363
command can also be used to turn a branch into a heavy checkout. If you
364
would like to convert your heavy checkout into a normal branch so that every
365
commit is local, you can use the "unbind" command.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
366
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
367
Related commands::
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
368
369
  checkout    Create a checkout. Pass --lightweight to get a lightweight
370
              checkout
371
  update      Pull any changes in the master branch in to your checkout
372
  commit      Make a commit that is sent to the master branch. If you have
373
              a heavy checkout then the --local option will commit to the 
374
              checkout without sending the commit to the master
375
  bind        Change the master branch that the commits in the checkout will
376
              be sent to
377
  unbind      Turn a heavy checkout into a standalone branch so that any
378
              commits are only made locally
379
"""
380
2401.2.1 by James Westby
Add a help topic for repositories.
381
_repositories = \
382
"""Repositories
383
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
384
Repositories in Bazaar are where committed information is stored. There is
385
a repository associated with every branch.
386
387
Repositories are a form of database. Bzr will usually maintain this for
388
good performance automatically, but in some situations (e.g. when doing
389
very many commits in a short time period) you may want to ask bzr to 
390
optimise the database indices. This can be done by the 'bzr pack' command.
391
392
By default just running 'bzr init' will create a repository within the new
393
branch but it is possible to create a shared repository which allows multiple
394
branches to share their information in the same location. When a new branch is
395
created it will first look to see if there is a containing shared repository it
396
can use.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
397
398
When two branches of the same project share a repository, there is
399
generally a large space saving. For some operations (e.g. branching
400
within the repository) this translates in to a large time saving.
2401.2.1 by James Westby
Add a help topic for repositories.
401
402
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.
403
init-repo). This command takes the location of the repository to create. This
404
means that 'bzr init-repository repo' will create a directory named 'repo',
405
which contains a shared repository. Any new branches that are created in this
406
directory will then use it for storage.
2401.2.1 by James Westby
Add a help topic for repositories.
407
408
It is a good idea to create a repository whenever you might create more
409
than one branch of a project. This is true for both working areas where you
410
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.
411
projects. In the latter case, it is common to want branches without working
412
trees. Since the files in the branch will not be edited directly there is no
413
need to use up disk space for a working tree. To create a repository in which
414
the branches will not have working trees pass the '--no-trees' option to
415
'init-repository'.
2401.2.1 by James Westby
Add a help topic for repositories.
416
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
417
Related commands::
2401.2.1 by James Westby
Add a help topic for repositories.
418
419
  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.
420
                    in which new branches won't get a working tree.
2401.2.1 by James Westby
Add a help topic for repositories.
421
"""
422
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
423
2401.2.2 by James Westby
Add a working-trees help topic.
424
_working_trees = \
425
"""Working Trees
426
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
427
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.
428
see the files and edit them. The working tree is where you make changes to a
429
branch, and when you commit the current state of the working tree is the
430
snapshot that is recorded in the commit.
431
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
432
When you push a branch to a remote system, a working tree will not be
433
created. If one is already present the files will not be updated. The
434
branch information will be updated and the working tree will be marked
435
as out-of-date. Updating a working tree remotely is difficult, as there
436
may be uncommitted changes or the update may cause content conflicts that are
437
difficult to deal with remotely.
2401.2.2 by James Westby
Add a working-trees help topic.
438
439
If you have a branch with no working tree you can use the 'checkout' command
440
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.
441
create the working tree. If the branch is updated remotely, you can update the
442
working tree by running 'bzr update' in that directory.
2401.2.2 by James Westby
Add a working-trees help topic.
443
444
If you have a branch with a working tree that you do not want the 'remove-tree'
445
command will remove the tree if it is safe. This can be done to avoid the
446
warning about the remote working tree not being updated when pushing to the
447
branch. It can also be useful when working with a '--no-trees' repository
448
(see 'bzr help repositories').
449
450
If you want to have a working tree on a remote machine that you push to you
451
can either run 'bzr update' in the remote branch after each push, or use some
452
other method to update the tree during the push. There is an 'rspush' plugin
453
that will update the working tree using rsync as well as doing a push. There
454
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
455
after each push.
456
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
457
Useful commands::
2401.2.2 by James Westby
Add a working-trees help topic.
458
459
  checkout     Create a working tree when a branch does not have one.
460
  remove-tree  Removes the working tree from a branch when it is safe to do so.
461
  update       When a working tree is out of sync with it's associated branch
462
               this will update the tree to match the branch.
463
"""
464
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
465
466
_branches = \
467
"""Branches
468
469
A branch consists of the state of a project, including all of its
470
history. All branches have a repository associated (which is where the
471
branch history is stored), but multiple branches may share the same
472
repository (a shared repository). Branches can be copied and merged.
473
474
Related commands::
475
476
  init    Make a directory into a versioned branch.
477
  branch  Create a new copy of a branch.
478
  merge   Perform a three-way merge.
479
"""
480
481
482
_standalone_trees = \
483
"""Standalone Trees
484
485
A standalone tree is a working tree with an associated repository. It
486
is an independently usable branch, with no dependencies on any other.
487
Creating a standalone tree (via bzr init) is the quickest way to put
488
an existing project under version control.
489
490
Related Commands::
491
492
  init    Make a directory into a versioned branch.
493
"""
494
495
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
496
_status_flags = \
497
"""Status Flags
498
499
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
500
manner.  They are in the form::
501
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
502
   xxx   <filename>
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
503
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
504
where the columns' meanings are as follows.
505
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
506
Column 1 - versioning/renames::
507
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
508
  + File versioned
509
  - File unversioned
510
  R File renamed
511
  ? File unknown
512
  C File has conflicts
513
  P Entry for a pending merge (not a file)
514
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
515
Column 2 - contents::
516
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
517
  N File created
518
  D File deleted
519
  K File kind changed
520
  M File modified
521
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
522
Column 3 - execute::
523
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
524
  * The execute bit was changed
525
"""
526
1551.9.32 by Aaron Bentley
Add global option help
527
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
528
_env_variables = \
529
"""Environment Variables
530
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
531
================ =================================================================
532
BZRPATH          Path where bzr is to look for shell plugin external commands.
533
BZR_EMAIL        E-Mail address of the user. Overrides EMAIL.
534
EMAIL            E-Mail address of the user.
535
BZR_EDITOR       Editor for editing commit messages. Overrides EDITOR.
536
EDITOR           Editor for editing commit messages.
537
BZR_PLUGIN_PATH  Paths where bzr should look for plugins.
538
BZR_HOME         Directory holding .bazaar config dir. Overrides HOME.
539
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
2967.2.1 by Rob Weir
Document BZR_REMOTE_PATH in 'bzr help env-variables'
540
BZR_REMOTE_PATH  Full name of remote 'bzr' command (for bzr+ssh:// URLs).
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
541
================ =================================================================
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
542
"""
543
544
545
_files = \
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
546
r"""Files
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
547
548
:On Linux:   ~/.bazaar/bazaar.conf
549
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
550
551
Contains the user's default configuration. The section ``[DEFAULT]`` is
552
used to define general configuration that will be applied everywhere.
553
The section ``[ALIASES]`` can be used to create command aliases for
554
commonly used options.
555
556
A typical config file might look something like::
557
558
  [DEFAULT]
559
  email=John Doe <jdoe@isp.com>
560
561
  [ALIASES]
562
  commit = commit --strict
563
  log10 = log --short -r -10..-1
564
"""
565
1551.19.11 by Aaron Bentley
Add criss-cross help topic
566
_criss_cross = \
3079.1.1 by Alexander Belchenko
topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
567
"""Criss-Cross
568
1551.19.11 by Aaron Bentley
Add criss-cross help topic
569
A criss-cross in the branch history can cause the default merge technique
570
to emit more conflicts than would normally be expected.
571
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
572
If you encounter criss-crosses, you can use merge --weave instead, which
573
should provide a much better result.
1551.19.11 by Aaron Bentley
Add criss-cross help topic
574
575
Criss-crosses occur in a branch's history if two branches merge the same thing
576
and then merge one another, or if two branches merge one another at the same
577
time.  They can be avoided by having each branch only merge from or into a
578
designated central branch (a "star topology").
579
580
Criss-crosses cause problems because of the way merge works.  Bazaar's default
581
merge is a three-way merger; in order to merge OTHER into THIS, it must
582
find a basis for comparison, BASE.  Using BASE, it can determine whether
583
differences between THIS and OTHER are due to one side adding lines, or
584
from another side removing lines.
585
586
Criss-crosses mean there is no good choice for a base.  Selecting the recent
587
merge points could cause one side's changes to be silently discarded.
588
Selecting older merge points (which Bazaar does) mean that extra conflicts
589
are emitted.
590
591
The ``weave`` merge type is not affected by this problem because it uses
1551.19.13 by Aaron Bentley
Update assuming --weave is cheap
592
line-origin detection instead of a basis revision to determine the cause of
593
differences."""
1551.19.11 by Aaron Bentley
Add criss-cross help topic
594
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
595
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
596
# Register help topics
2070.4.13 by John Arbash Meinel
Switch help_topics to use a Registry.
597
topic_registry.register("revisionspec", _help_on_revisionspec,
598
                        "Explain how to use --revision")
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
599
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
600
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
601
def get_format_topic(topic):
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
602
    from bzrlib import bzrdir
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
603
    return "Storage Formats\n\n" + bzrdir.format_registry.help_topic(topic)
2204.4.10 by Aaron Bentley
Capitalize 'D' in 'directory formats'
604
topic_registry.register('formats', get_format_topic, 'Directory formats')
2768.1.1 by Ian Clatworthy
Document standard options
605
topic_registry.register('standard-options', _standard_options,
606
                        'Options that can be used with any command')
1551.9.34 by Aaron Bentley
Fix NEWS and whitespace
607
topic_registry.register('global-options', _global_options,
2768.1.14 by Ian Clatworthy
Incorporate feedback from poolie
608
                    'Options that control how Bazaar runs')
2241.2.8 by ghigo
- rename transport urlspec
609
topic_registry.register('urlspec', _help_on_transport,
2241.2.5 by ghigo
add the topics transport
610
                        "Supported transport protocols")
2520.1.1 by Daniel Watkins
Added 'help status-flags'.
611
topic_registry.register('status-flags', _status_flags,
612
                        "Help on status flags")
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
613
def get_bugs_topic(topic):
614
    from bzrlib import bugtracker
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
615
    return "Bug Trackers\n\n" + bugtracker.tracker_registry.help_topic(topic)
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
616
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker support')
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
617
topic_registry.register('env-variables', _env_variables,
618
                        'Environment variable names and values')
619
topic_registry.register('files', _files,
620
                        'Information on configuration and log files')
621
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
622
# Load some of the help topics from files
623
topic_registry.register('authentication', _load_from_file,
624
                        'Information on configuring authentication')
625
topic_registry.register('configuration', _load_from_file,
626
                        'Details on the configuration settings available')
627
topic_registry.register('conflicts', _load_from_file,
628
                        'Types of conflicts and what to do about them')
629
topic_registry.register('hooks', _load_from_file,
630
                        'Points at which custom processing can be added')
631
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
632
633
# Register concept topics.
634
# Note that we might choose to remove these from the online help in the
635
# future or implement them via loading content from files. In the meantime,
636
# please keep them concise.
637
topic_registry.register('branches', _branches,
638
                        'Information on what a branch is', SECT_CONCEPT)
639
topic_registry.register('checkouts', _checkouts,
640
                        'Information on what a checkout is', SECT_CONCEPT)
2401.2.1 by James Westby
Add a help topic for repositories.
641
topic_registry.register('repositories', _repositories,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
642
                        'Basic information on shared repositories.',
643
                        SECT_CONCEPT)
2804.2.1 by Ian Clatworthy
add branches and standalone-trees as help topics
644
topic_registry.register('standalone-trees', _standalone_trees,
645
                        'Information on what a standalone tree is',
646
                        SECT_CONCEPT)
2401.2.2 by James Westby
Add a working-trees help topic.
647
topic_registry.register('working-trees', _working_trees,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
648
                        'Information on working trees', SECT_CONCEPT)
1551.19.11 by Aaron Bentley
Add criss-cross help topic
649
topic_registry.register('criss-cross', _criss_cross,
650
                        'Information on criss-cross merging', SECT_CONCEPT)
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
651
2432.1.1 by Robert Collins
Add a HelpTopicContext object.
652
2432.1.15 by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name.
653
class HelpTopicIndex(object):
654
    """A index for bzr help that returns topics."""
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
655
2432.1.17 by Robert Collins
Add prefixes to HelpIndexes.
656
    def __init__(self):
657
        self.prefix = ''
658
2432.1.8 by Robert Collins
HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
659
    def get_topics(self, topic):
660
        """Search for topic in the HelpTopicRegistry.
661
662
        :param topic: A topic to search for. None is treated as 'basic'.
663
        :return: A list which is either empty or contains a single
664
            RegisteredTopic entry.
665
        """
666
        if topic is None:
667
            topic = 'basic'
668
        if topic in topic_registry:
669
            return [RegisteredTopic(topic)]
670
        else:
671
            return []
672
673
674
class RegisteredTopic(object):
675
    """A help topic which has been registered in the HelpTopicRegistry.
676
677
    These topics consist of nothing more than the name of the topic - all
678
    data is retrieved on demand from the registry.
679
    """
680
681
    def __init__(self, topic):
682
        """Constructor.
683
684
        :param topic: The name of the topic that this represents.
685
        """
686
        self.topic = topic
2432.1.10 by Robert Collins
Add get_help_text() to RegisteredTopic to get the help as a string.
687
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
688
    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.
689
        """Return a string with the help for this topic.
690
691
        :param additional_see_also: Additional help topics to be
692
            cross-referenced.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
693
        :param plain: if False, raw help (reStructuredText) is
694
            returned instead of plain text.
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
695
        """
696
        result = topic_registry.get_detail(self.topic)
2432.1.25 by Robert Collins
Return plugin module docstrings for 'bzr help plugin'.
697
        # there is code duplicated here and in bzrlib/plugin.py's 
698
        # matching Topic code. This should probably be factored in
699
        # 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.
700
        if additional_see_also is not None:
701
            see_also = sorted(set(additional_see_also))
702
        else:
703
            see_also = None
704
        if see_also:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
705
            result += '\n:See also: '
2432.1.22 by Robert Collins
Teach RegisteredTopic to support the additional_see_also list of related help terms.
706
            result += ', '.join(see_also)
707
            result += '\n'
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
708
        if plain:
709
            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.
710
        return result
2432.1.27 by Robert Collins
Add a get_help_topic method to RegisteredTopic.
711
712
    def get_help_topic(self):
713
        """Return the help topic this can be found under."""
714
        return self.topic
2485.1.1 by James Westby
Update the help topics to the latest bzr.dev.
715
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
716
717
def help_as_plain_text(text):
718
    """Minimal converter of reStructuredText to plain text."""
719
    lines = text.splitlines()
720
    result = []
721
    for line in lines:
722
        if line.startswith(':'):
723
            line = line[1:]
724
        elif line.endswith('::'):
725
            line = line[:-1]
726
        result.append(line)
727
    return "\n".join(result) + "\n"