##// END OF EJS Templates
doc: unify section level between help topics...
FUJIWARA Katsunori -
r17267:979b107e stable
parent child Browse files
Show More
@@ -64,16 +64,16 b' def get_cmd(cmd, cmdtable):'
64 return d
64 return d
65
65
66 def section(ui, s):
66 def section(ui, s):
67 ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
67 ui.write("%s\n%s\n\n" % (s, "\"" * encoding.colwidth(s)))
68
68
69 def subsection(ui, s):
69 def subsection(ui, s):
70 ui.write("%s\n%s\n\n" % (s, '"' * encoding.colwidth(s)))
70 ui.write("%s\n%s\n\n" % (s, '=' * encoding.colwidth(s)))
71
71
72 def subsubsection(ui, s):
72 def subsubsection(ui, s):
73 ui.write("%s\n%s\n\n" % (s, "." * encoding.colwidth(s)))
73 ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
74
74
75 def subsubsubsection(ui, s):
75 def subsubsubsection(ui, s):
76 ui.write("%s\n%s\n\n" % (s, "#" * encoding.colwidth(s)))
76 ui.write("%s\n%s\n\n" % (s, "." * encoding.colwidth(s)))
77
77
78
78
79 def show_doc(ui):
79 def show_doc(ui):
@@ -18,16 +18,16 b' Mercurial source code management system'
18
18
19
19
20 Synopsis
20 Synopsis
21 --------
21 """"""""
22 **hg** *command* [*option*]... [*argument*]...
22 **hg** *command* [*option*]... [*argument*]...
23
23
24 Description
24 Description
25 -----------
25 """""""""""
26 The **hg** command provides a command line interface to the Mercurial
26 The **hg** command provides a command line interface to the Mercurial
27 system.
27 system.
28
28
29 Command Elements
29 Command Elements
30 ----------------
30 """"""""""""""""
31
31
32 files...
32 files...
33 indicates one or more filename or relative path filenames; see
33 indicates one or more filename or relative path filenames; see
@@ -48,7 +48,7 b' repository path'
48 .. include:: hg.1.gendoc.txt
48 .. include:: hg.1.gendoc.txt
49
49
50 Files
50 Files
51 -----
51 """""
52
52
53 ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
53 ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
54 This file contains defaults and configuration. Values in
54 This file contains defaults and configuration. Values in
@@ -90,20 +90,20 b' if the ``.orig`` file already exists and'
90 it will be overwritten.
90 it will be overwritten.
91
91
92 Bugs
92 Bugs
93 ----
93 """"
94 Probably lots, please post them to the mailing list (see Resources_
94 Probably lots, please post them to the mailing list (see Resources_
95 below) when you find them.
95 below) when you find them.
96
96
97 See Also
97 See Also
98 --------
98 """"""""
99 |hgignore(5)|_, |hgrc(5)|_
99 |hgignore(5)|_, |hgrc(5)|_
100
100
101 Author
101 Author
102 ------
102 """"""
103 Written by Matt Mackall <mpm@selenic.com>
103 Written by Matt Mackall <mpm@selenic.com>
104
104
105 Resources
105 Resources
106 ---------
106 """""""""
107 Main Web Site: http://mercurial.selenic.com/
107 Main Web Site: http://mercurial.selenic.com/
108
108
109 Source code repository: http://selenic.com/hg
109 Source code repository: http://selenic.com/hg
@@ -111,7 +111,7 b' Source code repository: http://selenic.c'
111 Mailing list: http://selenic.com/mailman/listinfo/mercurial
111 Mailing list: http://selenic.com/mailman/listinfo/mercurial
112
112
113 Copying
113 Copying
114 -------
114 """""""
115 Copyright (C) 2005-2012 Matt Mackall.
115 Copyright (C) 2005-2012 Matt Mackall.
116 Free use of this software is granted under the terms of the GNU General
116 Free use of this software is granted under the terms of the GNU General
117 Public License version 2 or any later version.
117 Public License version 2 or any later version.
@@ -14,17 +14,17 b' syntax for Mercurial ignore files'
14 .. include:: ../mercurial/help/hgignore.txt
14 .. include:: ../mercurial/help/hgignore.txt
15
15
16 Author
16 Author
17 ------
17 ======
18 Vadim Gelfer <vadim.gelfer@gmail.com>
18 Vadim Gelfer <vadim.gelfer@gmail.com>
19
19
20 Mercurial was written by Matt Mackall <mpm@selenic.com>.
20 Mercurial was written by Matt Mackall <mpm@selenic.com>.
21
21
22 See Also
22 See Also
23 --------
23 ========
24 |hg(1)|_, |hgrc(5)|_
24 |hg(1)|_, |hgrc(5)|_
25
25
26 Copying
26 Copying
27 -------
27 =======
28 This manual page is copyright 2006 Vadim Gelfer.
28 This manual page is copyright 2006 Vadim Gelfer.
29 Mercurial is copyright 2005-2012 Matt Mackall.
29 Mercurial is copyright 2005-2012 Matt Mackall.
30 Free use of this software is granted under the terms of the GNU General
30 Free use of this software is granted under the terms of the GNU General
@@ -17,22 +17,22 b' configuration files for Mercurial'
17
17
18
18
19 Synopsis
19 Synopsis
20 --------
20 ========
21
21
22 .. include:: ../mercurial/help/config.txt
22 .. include:: ../mercurial/help/config.txt
23
23
24 Author
24 Author
25 ------
25 ======
26 Bryan O'Sullivan <bos@serpentine.com>.
26 Bryan O'Sullivan <bos@serpentine.com>.
27
27
28 Mercurial was written by Matt Mackall <mpm@selenic.com>.
28 Mercurial was written by Matt Mackall <mpm@selenic.com>.
29
29
30 See Also
30 See Also
31 --------
31 ========
32 |hg(1)|_, |hgignore(5)|_
32 |hg(1)|_, |hgignore(5)|_
33
33
34 Copying
34 Copying
35 -------
35 =======
36 This manual page is copyright 2005 Bryan O'Sullivan.
36 This manual page is copyright 2005 Bryan O'Sullivan.
37 Mercurial is copyright 2005-2012 Matt Mackall.
37 Mercurial is copyright 2005-2012 Matt Mackall.
38 Free use of this software is granted under the terms of the GNU General
38 Free use of this software is granted under the terms of the GNU General
@@ -32,7 +32,7 b' 4) Allow list for paths (section ``ac'
32 The allow and deny sections take key-value pairs.
32 The allow and deny sections take key-value pairs.
33
33
34 Branch-based Access Control
34 Branch-based Access Control
35 ...........................
35 ---------------------------
36
36
37 Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to
37 Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to
38 have branch-based access control. Keys in these sections can be
38 have branch-based access control. Keys in these sections can be
@@ -50,7 +50,7 b' You can add the "!" prefix to a user or '
50 of the match.
50 of the match.
51
51
52 Path-based Access Control
52 Path-based Access Control
53 .........................
53 -------------------------
54
54
55 Use the ``acl.deny`` and ``acl.allow`` sections to have path-based
55 Use the ``acl.deny`` and ``acl.allow`` sections to have path-based
56 access control. Keys in these sections accept a subtree pattern (with
56 access control. Keys in these sections accept a subtree pattern (with
@@ -58,7 +58,7 b' a glob syntax by default). The correspon'
58 syntax as the other sections above.
58 syntax as the other sections above.
59
59
60 Groups
60 Groups
61 ......
61 ------
62
62
63 Group names must be prefixed with an ``@`` symbol. Specifying a group
63 Group names must be prefixed with an ``@`` symbol. Specifying a group
64 name has the same effect as specifying all the users in that group.
64 name has the same effect as specifying all the users in that group.
@@ -69,7 +69,7 b' a Unix-like system, the list of users wi'
69 Otherwise, an exception will be raised.
69 Otherwise, an exception will be raised.
70
70
71 Example Configuration
71 Example Configuration
72 .....................
72 ---------------------
73
73
74 ::
74 ::
75
75
@@ -138,7 +138,7 b' def convert(ui, src, dest=None, revmapfi'
138 repository from "default" to a named branch.
138 repository from "default" to a named branch.
139
139
140 Mercurial Source
140 Mercurial Source
141 ''''''''''''''''
141 ################
142
142
143 The Mercurial source recognizes the following configuration
143 The Mercurial source recognizes the following configuration
144 options, which you can set on the command line with ``--config``:
144 options, which you can set on the command line with ``--config``:
@@ -155,7 +155,7 b' def convert(ui, src, dest=None, revmapfi'
155 It takes a hg revision identifier and defaults to 0.
155 It takes a hg revision identifier and defaults to 0.
156
156
157 CVS Source
157 CVS Source
158 ''''''''''
158 ##########
159
159
160 CVS source will use a sandbox (i.e. a checked-out copy) from CVS
160 CVS source will use a sandbox (i.e. a checked-out copy) from CVS
161 to indicate the starting point of what will be converted. Direct
161 to indicate the starting point of what will be converted. Direct
@@ -207,7 +207,7 b' def convert(ui, src, dest=None, revmapfi'
207 the command help for more details.
207 the command help for more details.
208
208
209 Subversion Source
209 Subversion Source
210 '''''''''''''''''
210 #################
211
211
212 Subversion source detects classical trunk/branches/tags layouts.
212 Subversion source detects classical trunk/branches/tags layouts.
213 By default, the supplied ``svn://repo/path/`` source URL is
213 By default, the supplied ``svn://repo/path/`` source URL is
@@ -239,7 +239,7 b' def convert(ui, src, dest=None, revmapfi'
239 The default is 0.
239 The default is 0.
240
240
241 Perforce Source
241 Perforce Source
242 '''''''''''''''
242 ###############
243
243
244 The Perforce (P4) importer can be given a p4 depot path or a
244 The Perforce (P4) importer can be given a p4 depot path or a
245 client specification as source. It will convert all files in the
245 client specification as source. It will convert all files in the
@@ -255,7 +255,7 b' def convert(ui, src, dest=None, revmapfi'
255 Perforce changelist number).
255 Perforce changelist number).
256
256
257 Mercurial Destination
257 Mercurial Destination
258 '''''''''''''''''''''
258 #####################
259
259
260 The following options are supported:
260 The following options are supported:
261
261
@@ -13,7 +13,7 b' The above entries will be referred to as'
13 ``ui.verbose``, respectively. See the Syntax section below.
13 ``ui.verbose``, respectively. See the Syntax section below.
14
14
15 Files
15 Files
16 -----
16 =====
17
17
18 Mercurial reads configuration data from several files, if they exist.
18 Mercurial reads configuration data from several files, if they exist.
19 These files do not exist by default and you will have to create the
19 These files do not exist by default and you will have to create the
@@ -86,7 +86,7 b' ones.'
86 order until one or more configuration files are detected.
86 order until one or more configuration files are detected.
87
87
88 Syntax
88 Syntax
89 ------
89 ======
90
90
91 A configuration file consists of sections, led by a ``[section]`` header
91 A configuration file consists of sections, led by a ``[section]`` header
92 and followed by ``name = value`` entries (sometimes called
92 and followed by ``name = value`` entries (sometimes called
@@ -171,14 +171,14 b' quotation marks at the beginning of a wo'
171 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
171 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
172
172
173 Sections
173 Sections
174 --------
174 ========
175
175
176 This section describes the different sections that may appear in a
176 This section describes the different sections that may appear in a
177 Mercurial configuration file, the purpose of each section, its possible
177 Mercurial configuration file, the purpose of each section, its possible
178 keys, and their possible values.
178 keys, and their possible values.
179
179
180 ``alias``
180 ``alias``
181 """""""""
181 ---------
182
182
183 Defines command aliases.
183 Defines command aliases.
184 Aliases allow you to define your own commands in terms of other
184 Aliases allow you to define your own commands in terms of other
@@ -238,7 +238,7 b' echo foo`` call above, ``$HG_ARGS`` woul'
238
238
239
239
240 ``annotate``
240 ``annotate``
241 """"""""""""
241 ------------
242
242
243 Settings used when displaying file annotations. All values are
243 Settings used when displaying file annotations. All values are
244 Booleans and default to False. See ``diff`` section for related
244 Booleans and default to False. See ``diff`` section for related
@@ -255,7 +255,7 b' options for the diff command.'
255
255
256
256
257 ``auth``
257 ``auth``
258 """"""""
258 --------
259
259
260 Authentication credentials for HTTP authentication. This section
260 Authentication credentials for HTTP authentication. This section
261 allows you to store usernames and passwords for use when logging
261 allows you to store usernames and passwords for use when logging
@@ -322,7 +322,7 b' for credentials as usual if required by '
322
322
323
323
324 ``decode/encode``
324 ``decode/encode``
325 """""""""""""""""
325 -----------------
326
326
327 Filters for transforming files on checkout/checkin. This would
327 Filters for transforming files on checkout/checkin. This would
328 typically be used for newline processing or other
328 typically be used for newline processing or other
@@ -369,7 +369,7 b' format. We suggest you use the ``eol`` e'
369
369
370
370
371 ``defaults``
371 ``defaults``
372 """"""""""""
372 ------------
373
373
374 (defaults are deprecated. Don't use them. Use aliases instead)
374 (defaults are deprecated. Don't use them. Use aliases instead)
375
375
@@ -389,7 +389,7 b' to the aliases of the commands defined.'
389
389
390
390
391 ``diff``
391 ``diff``
392 """"""""
392 --------
393
393
394 Settings used when displaying diffs. Everything except for ``unified``
394 Settings used when displaying diffs. Everything except for ``unified``
395 is a Boolean and defaults to False. See ``annotate`` section for
395 is a Boolean and defaults to False. See ``annotate`` section for
@@ -417,7 +417,7 b' related options for the annotate command'
417 Number of lines of context to show.
417 Number of lines of context to show.
418
418
419 ``email``
419 ``email``
420 """""""""
420 ---------
421
421
422 Settings for extensions that send email messages.
422 Settings for extensions that send email messages.
423
423
@@ -472,7 +472,7 b' Email example::'
472
472
473
473
474 ``extensions``
474 ``extensions``
475 """"""""""""""
475 --------------
476
476
477 Mercurial has an extension mechanism for adding new features. To
477 Mercurial has an extension mechanism for adding new features. To
478 enable an extension, create an entry for it in this section.
478 enable an extension, create an entry for it in this section.
@@ -499,7 +499,7 b' Example for ``~/.hgrc``::'
499
499
500
500
501 ``format``
501 ``format``
502 """"""""""
502 ----------
503
503
504 ``usestore``
504 ``usestore``
505 Enable or disable the "store" repository format which improves
505 Enable or disable the "store" repository format which improves
@@ -526,7 +526,7 b' Example for ``~/.hgrc``::'
526 repositories will be compatible with Mercurial before version 1.7.
526 repositories will be compatible with Mercurial before version 1.7.
527
527
528 ``graph``
528 ``graph``
529 """""""""
529 ---------
530
530
531 Web graph view configuration. This section let you change graph
531 Web graph view configuration. This section let you change graph
532 elements display properties by branches, for instance to make the
532 elements display properties by branches, for instance to make the
@@ -554,7 +554,7 b' Supported arguments:'
554 Set branch edges color in hexadecimal RGB notation.
554 Set branch edges color in hexadecimal RGB notation.
555
555
556 ``hooks``
556 ``hooks``
557 """""""""
557 ---------
558
558
559 Commands or Python functions that get automatically executed by
559 Commands or Python functions that get automatically executed by
560 various actions such as starting or finishing a commit. Multiple
560 various actions such as starting or finishing a commit. Multiple
@@ -733,7 +733,7 b' is treated as a failure.'
733
733
734
734
735 ``hostfingerprints``
735 ``hostfingerprints``
736 """"""""""""""""""""
736 --------------------
737
737
738 Fingerprints of the certificates of known HTTPS servers.
738 Fingerprints of the certificates of known HTTPS servers.
739 A HTTPS connection to a server with a fingerprint configured here will
739 A HTTPS connection to a server with a fingerprint configured here will
@@ -751,7 +751,7 b' This feature is only supported when usin'
751
751
752
752
753 ``http_proxy``
753 ``http_proxy``
754 """"""""""""""
754 --------------
755
755
756 Used to access web-based Mercurial repositories through a HTTP
756 Used to access web-based Mercurial repositories through a HTTP
757 proxy.
757 proxy.
@@ -775,7 +775,7 b' proxy.'
775 in ``http_proxy.no``. True or False. Default: False.
775 in ``http_proxy.no``. True or False. Default: False.
776
776
777 ``merge-patterns``
777 ``merge-patterns``
778 """"""""""""""""""
778 ------------------
779
779
780 This section specifies merge tools to associate with particular file
780 This section specifies merge tools to associate with particular file
781 patterns. Tools matched here will take precedence over the default
781 patterns. Tools matched here will take precedence over the default
@@ -789,7 +789,7 b' Example::'
789 **.jpg = myimgmerge
789 **.jpg = myimgmerge
790
790
791 ``merge-tools``
791 ``merge-tools``
792 """""""""""""""
792 ---------------
793
793
794 This section configures external merge tools to use for file-level
794 This section configures external merge tools to use for file-level
795 merges.
795 merges.
@@ -889,7 +889,7 b' Supported arguments:'
889
889
890
890
891 ``patch``
891 ``patch``
892 """""""""
892 ---------
893
893
894 Settings used when applying patches, for instance through the 'import'
894 Settings used when applying patches, for instance through the 'import'
895 command or with Mercurial Queues extension.
895 command or with Mercurial Queues extension.
@@ -907,7 +907,7 b' command or with Mercurial Queues extensi'
907
907
908
908
909 ``paths``
909 ``paths``
910 """""""""
910 ---------
911
911
912 Assigns symbolic names to repositories. The left side is the
912 Assigns symbolic names to repositories. The left side is the
913 symbolic name, and the right gives the directory or URL that is the
913 symbolic name, and the right gives the directory or URL that is the
@@ -924,7 +924,7 b' the following entries.'
924 is specified.
924 is specified.
925
925
926 ``phases``
926 ``phases``
927 """"""""""
927 ----------
928
928
929 Specifies default handling of phases. See :hg:`help phases` for more
929 Specifies default handling of phases. See :hg:`help phases` for more
930 information about working with phases.
930 information about working with phases.
@@ -940,7 +940,7 b' information about working with phases.'
940 Default: draft
940 Default: draft
941
941
942 ``profiling``
942 ``profiling``
943 """""""""""""
943 -------------
944
944
945 Specifies profiling type, format, and file output. Two profilers are
945 Specifies profiling type, format, and file output. Two profilers are
946 supported: an instrumenting profiler (named ``ls``), and a sampling
946 supported: an instrumenting profiler (named ``ls``), and a sampling
@@ -988,12 +988,12 b' profiling is done using lsprof.'
988 stderr
988 stderr
989
989
990 ``revsetalias``
990 ``revsetalias``
991 """""""""""""""
991 ---------------
992
992
993 Alias definitions for revsets. See :hg:`help revsets` for details.
993 Alias definitions for revsets. See :hg:`help revsets` for details.
994
994
995 ``server``
995 ``server``
996 """"""""""
996 ----------
997
997
998 Controls generic server settings.
998 Controls generic server settings.
999
999
@@ -1019,7 +1019,7 b' Controls generic server settings.'
1019 present. Default is False.
1019 present. Default is False.
1020
1020
1021 ``smtp``
1021 ``smtp``
1022 """"""""
1022 --------
1023
1023
1024 Configuration for extensions that need to send email messages.
1024 Configuration for extensions that need to send email messages.
1025
1025
@@ -1048,7 +1048,7 b' Configuration for extensions that need t'
1048
1048
1049
1049
1050 ``subpaths``
1050 ``subpaths``
1051 """"""""""""
1051 ------------
1052
1052
1053 Subrepository source URLs can go stale if a remote server changes name
1053 Subrepository source URLs can go stale if a remote server changes name
1054 or becomes temporarily unavailable. This section lets you define
1054 or becomes temporarily unavailable. This section lets you define
@@ -1070,7 +1070,7 b' rewrite rules are then applied on the fu'
1070 are applied in definition order.
1070 are applied in definition order.
1071
1071
1072 ``trusted``
1072 ``trusted``
1073 """""""""""
1073 -----------
1074
1074
1075 Mercurial will not use the settings in the
1075 Mercurial will not use the settings in the
1076 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1076 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
@@ -1094,7 +1094,7 b' user or service running Mercurial.'
1094
1094
1095
1095
1096 ``ui``
1096 ``ui``
1097 """"""
1097 ------
1098
1098
1099 User interface controls.
1099 User interface controls.
1100
1100
@@ -1213,7 +1213,7 b' User interface controls.'
1213
1213
1214
1214
1215 ``web``
1215 ``web``
1216 """""""
1216 -------
1217
1217
1218 Web interface configuration. The settings in this section apply to
1218 Web interface configuration. The settings in this section apply to
1219 both the builtin webserver (started by :hg:`serve`) and the script you
1219 both the builtin webserver (started by :hg:`serve`) and the script you
@@ -1,12 +1,12 b''
1 Synopsis
1 Synopsis
2 --------
2 ========
3
3
4 The Mercurial system uses a file called ``.hgignore`` in the root
4 The Mercurial system uses a file called ``.hgignore`` in the root
5 directory of a repository to control its behavior when it searches
5 directory of a repository to control its behavior when it searches
6 for files that it is not currently tracking.
6 for files that it is not currently tracking.
7
7
8 Description
8 Description
9 -----------
9 ===========
10
10
11 The working directory of a Mercurial repository will often contain
11 The working directory of a Mercurial repository will often contain
12 files that should not be tracked by Mercurial. These include backup
12 files that should not be tracked by Mercurial. These include backup
@@ -39,7 +39,7 b' added with :hg:`add X`, even if X would '
39 in .hgignore.
39 in .hgignore.
40
40
41 Syntax
41 Syntax
42 ------
42 ======
43
43
44 An ignore file is a plain text file consisting of a list of patterns,
44 An ignore file is a plain text file consisting of a list of patterns,
45 with one pattern per line. Empty lines are skipped. The ``#``
45 with one pattern per line. Empty lines are skipped. The ``#``
@@ -73,7 +73,7 b' regexp pattern, start it with ``^``.'
73 Please see :hg:`help patterns` for details.
73 Please see :hg:`help patterns` for details.
74
74
75 Example
75 Example
76 -------
76 =======
77
77
78 Here is an example ignore file. ::
78 Here is an example ignore file. ::
79
79
@@ -17,7 +17,7 b' conflict markers. Mercurial does not inc'
17 programs but relies on external tools for that.
17 programs but relies on external tools for that.
18
18
19 Available merge tools
19 Available merge tools
20 """""""""""""""""""""
20 =====================
21
21
22 External merge tools and their properties are configured in the
22 External merge tools and their properties are configured in the
23 merge-tools configuration section - see hgrc(5) - but they can often just
23 merge-tools configuration section - see hgrc(5) - but they can often just
@@ -40,7 +40,7 b' Internal tools are always available and '
40 not handle symlinks or binary files.
40 not handle symlinks or binary files.
41
41
42 Choosing a merge tool
42 Choosing a merge tool
43 """""""""""""""""""""
43 =====================
44
44
45 Mercurial uses these rules when deciding which merge tool to use:
45 Mercurial uses these rules when deciding which merge tool to use:
46
46
@@ -1,5 +1,5 b''
1 What are phases?
1 What are phases?
2 ----------------
2 ================
3
3
4 Phases are a system for tracking which changesets have been or should
4 Phases are a system for tracking which changesets have been or should
5 be shared. This helps prevent common mistakes when modifying history
5 be shared. This helps prevent common mistakes when modifying history
@@ -17,7 +17,7 b' changeset is public, all its ancestors a'
17 changeset phases should only be changed towards the public phase.
17 changeset phases should only be changed towards the public phase.
18
18
19 How are phases managed?
19 How are phases managed?
20 -----------------------
20 =======================
21
21
22 For the most part, phases should work transparently. By default, a
22 For the most part, phases should work transparently. By default, a
23 changeset is created in the draft phase and is moved into the public
23 changeset is created in the draft phase and is moved into the public
@@ -29,7 +29,7 b' Phases can also be manually manipulated '
29 if needed. See :hg:`help -v phase` for examples.
29 if needed. See :hg:`help -v phase` for examples.
30
30
31 Phases and servers
31 Phases and servers
32 ------------------
32 ==================
33
33
34 Normally, all servers are ``publishing`` by default. This means::
34 Normally, all servers are ``publishing`` by default. This means::
35
35
@@ -59,7 +59,7 b' See :hg:`help config` for more informati'
59 publishing.
59 publishing.
60
60
61 Examples
61 Examples
62 --------
62 ========
63
63
64 - list changesets in draft or secret phase::
64 - list changesets in draft or secret phase::
65
65
@@ -43,7 +43,7 b' 3. Nested repository states. They are de'
43
43
44
44
45 Adding a Subrepository
45 Adding a Subrepository
46 ----------------------
46 ======================
47
47
48 If ``.hgsub`` does not exist, create it and add it to the parent
48 If ``.hgsub`` does not exist, create it and add it to the parent
49 repository. Clone or checkout the external projects where you want it
49 repository. Clone or checkout the external projects where you want it
@@ -53,7 +53,7 b' subrepository is tracked and the next co'
53 ``.hgsubstate`` and bind it to the committed changeset.
53 ``.hgsubstate`` and bind it to the committed changeset.
54
54
55 Synchronizing a Subrepository
55 Synchronizing a Subrepository
56 -----------------------------
56 =============================
57
57
58 Subrepos do not automatically track the latest changeset of their
58 Subrepos do not automatically track the latest changeset of their
59 sources. Instead, they are updated to the changeset that corresponds
59 sources. Instead, they are updated to the changeset that corresponds
@@ -66,13 +66,13 b' subrepo at the desired revision, test in'
66 commit in the parent repository to record the new combination.
66 commit in the parent repository to record the new combination.
67
67
68 Deleting a Subrepository
68 Deleting a Subrepository
69 ------------------------
69 ========================
70
70
71 To remove a subrepository from the parent repository, delete its
71 To remove a subrepository from the parent repository, delete its
72 reference from ``.hgsub``, then remove its files.
72 reference from ``.hgsub``, then remove its files.
73
73
74 Interaction with Mercurial Commands
74 Interaction with Mercurial Commands
75 -----------------------------------
75 ===================================
76
76
77 :add: add does not recurse in subrepos unless -S/--subrepos is
77 :add: add does not recurse in subrepos unless -S/--subrepos is
78 specified. However, if you specify the full path of a file in a
78 specified. However, if you specify the full path of a file in a
@@ -132,7 +132,7 b' Interaction with Mercurial Commands'
132 can require network access when using subrepositories.
132 can require network access when using subrepositories.
133
133
134 Remapping Subrepositories Sources
134 Remapping Subrepositories Sources
135 ---------------------------------
135 =================================
136
136
137 A subrepository source location may change during a project life,
137 A subrepository source location may change during a project life,
138 invalidating references stored in the parent repository history. To
138 invalidating references stored in the parent repository history. To
@@ -120,7 +120,7 b''
120 to a named branch.
120 to a named branch.
121
121
122 Mercurial Source
122 Mercurial Source
123 ''''''''''''''''
123 ################
124
124
125 The Mercurial source recognizes the following configuration options, which
125 The Mercurial source recognizes the following configuration options, which
126 you can set on the command line with "--config":
126 you can set on the command line with "--config":
@@ -138,7 +138,7 b''
138 revision identifier and defaults to 0.
138 revision identifier and defaults to 0.
139
139
140 CVS Source
140 CVS Source
141 ''''''''''
141 ##########
142
142
143 CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
143 CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
144 indicate the starting point of what will be converted. Direct access to
144 indicate the starting point of what will be converted. Direct access to
@@ -188,7 +188,7 b''
188 more details.
188 more details.
189
189
190 Subversion Source
190 Subversion Source
191 '''''''''''''''''
191 #################
192
192
193 Subversion source detects classical trunk/branches/tags layouts. By
193 Subversion source detects classical trunk/branches/tags layouts. By
194 default, the supplied "svn://repo/path/" source URL is converted as a
194 default, the supplied "svn://repo/path/" source URL is converted as a
@@ -220,7 +220,7 b''
220 specify start Subversion revision number. The default is 0.
220 specify start Subversion revision number. The default is 0.
221
221
222 Perforce Source
222 Perforce Source
223 '''''''''''''''
223 ###############
224
224
225 The Perforce (P4) importer can be given a p4 depot path or a client
225 The Perforce (P4) importer can be given a p4 depot path or a client
226 specification as source. It will convert all files in the source to a flat
226 specification as source. It will convert all files in the source to a flat
@@ -236,7 +236,7 b''
236 number).
236 number).
237
237
238 Mercurial Destination
238 Mercurial Destination
239 '''''''''''''''''''''
239 #####################
240
240
241 The following options are supported:
241 The following options are supported:
242
242
General Comments 0
You need to be logged in to leave comments. Login now