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