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