Show More
@@ -34,7 +34,7 b' The following ``share.`` config options ' | |||
|
34 | 34 | requested in the :hg:`clone` command matches exactly to a repository |
|
35 | 35 | that was cloned before. |
|
36 | 36 | |
|
37 |
The default naming mode is "identity |
|
|
37 | The default naming mode is "identity". | |
|
38 | 38 | ''' |
|
39 | 39 | |
|
40 | 40 | from __future__ import absolute_import |
@@ -2072,7 +2072,7 b' def graft(ui, repo, *revs, **opts):' | |||
|
2072 | 2072 | (grafted from CHANGESETHASH) |
|
2073 | 2073 | |
|
2074 | 2074 | If --force is specified, revisions will be grafted even if they |
|
2075 | are already ancestors of or have been grafted to the destination. | |
|
2075 | are already ancestors of, or have been grafted to, the destination. | |
|
2076 | 2076 | This is useful when the revisions have since been backed out. |
|
2077 | 2077 | |
|
2078 | 2078 | If a graft merge results in conflicts, the graft process is |
@@ -3075,7 +3075,7 b' def incoming(ui, repo, source="default",' | |||
|
3075 | 3075 | |
|
3076 | 3076 | Show new changesets found in the specified path/URL or the default |
|
3077 | 3077 | pull location. These are the changesets that would have been pulled |
|
3078 |
|
|
|
3078 | by :hg:`pull` at the time you issued this command. | |
|
3079 | 3079 | |
|
3080 | 3080 | See pull for valid source format details. |
|
3081 | 3081 | |
@@ -3808,8 +3808,8 b' def phase(ui, repo, *revs, **opts):' | |||
|
3808 | 3808 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
3809 | 3809 | phase value of the specified revisions. |
|
3810 | 3810 | |
|
3811 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
|
3812 |
lower phase to a |
|
|
3811 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a | |
|
3812 | lower phase to a higher phase. Phases are ordered as follows:: | |
|
3813 | 3813 | |
|
3814 | 3814 | public < draft < secret |
|
3815 | 3815 |
@@ -23,7 +23,7 b' Complex default value' | |||
|
23 | 23 | --------------------- |
|
24 | 24 | |
|
25 | 25 | If the default provided is a callable, it is called to retrieve the default |
|
26 | value when accessing the config option. This is useful for default value that | |
|
26 | value when accessing the config option. This is useful for default values that | |
|
27 | 27 | are mutable like the empty list:: |
|
28 | 28 | |
|
29 | 29 | coreconfigitem('pager', 'ignore', |
@@ -31,8 +31,8 b' are mutable like the empty list::' | |||
|
31 | 31 | ) |
|
32 | 32 | |
|
33 | 33 | In addition, there are cases where the default is not fixed, but computed from |
|
34 |
other properties. In this case, use the ``dynamicdefault`` object as value |
|
|
35 |
the ``default`` parameter |
|
|
34 | other properties. In this case, use the ``dynamicdefault`` object as the value | |
|
35 | for the ``default`` parameter. A default value is then explicitly required when | |
|
36 | 36 | reading the option:: |
|
37 | 37 | |
|
38 | 38 | # registration |
@@ -41,7 +41,7 b' reading the option::' | |||
|
41 | 41 | ) |
|
42 | 42 | |
|
43 | 43 | # usage |
|
44 | ui.config('web', 'name', dirnam) | |
|
44 | ui.config('web', 'name', dirname) | |
|
45 | 45 | |
|
46 | 46 | Free form options |
|
47 | 47 | ----------------- |
@@ -63,7 +63,7 b' When ``generic=True`` is set, the option' | |||
|
63 | 63 | priority=-1, |
|
64 | 64 | ) |
|
65 | 65 | |
|
66 | The ``priority`` parameter control the order used to match the generic pattern | |
|
66 | The ``priority`` parameter controls the order used to match the generic pattern | |
|
67 | 67 | (lower first). |
|
68 | 68 | |
|
69 | 69 | Config Option in Extensions |
@@ -85,24 +85,24 b' for commands and others)::' | |||
|
85 | 85 | The ``dynamicdefault`` object is then available as |
|
86 | 86 | ``configitem.dynamicdefault``. |
|
87 | 87 | |
|
88 | Supporting older version | |
|
89 | ------------------------ | |
|
88 | Supporting older versions | |
|
89 | ------------------------- | |
|
90 | 90 | |
|
91 |
The regist |
|
|
91 | The registry was introduced in Mercurial 4.3, and the ``generic`` parameter was | |
|
92 | 92 | introduced in 4.4. Starting with Mercurial 4.4, all core options were registered |
|
93 | 93 | and developer warnings are emitted when accessing unregistered option. |
|
94 | 94 | |
|
95 |
Extensions supporting version older than Mercurial |
|
|
96 |
default value registered. The simplest way to register option while |
|
|
97 |
supporting older version is to use ``dynamicdefault`` for option |
|
|
98 |
default value. The existing code passing an explicit default can |
|
|
99 |
use until compatibility |
|
|
95 | Extensions supporting versions older than Mercurial 4.3 cannot rely on the | |
|
96 | default value being registered. The simplest way to register an option while | |
|
97 | still supporting an older version is to use ``dynamicdefault`` for options | |
|
98 | requiring a default value. The existing code passing an explicit default can | |
|
99 | then stay in use until compatibility with Mercurial 4.2 is dropped. | |
|
100 | 100 | |
|
101 |
As reminder here are the default value for each config type |
|
|
101 | As reminder, here are the default values for each config type: | |
|
102 | 102 | - config: None |
|
103 | 103 | - configbool: False |
|
104 | 104 | - configbytes: 0 |
|
105 | 105 | - configdate: None |
|
106 | 106 | - configint: None |
|
107 | 107 | - configlist: [] |
|
108 | - configpath: None | |
|
108 | - configpath: None |
@@ -76,7 +76,7 b' 8. Otherwise, ``:prompt`` is used.' | |||
|
76 | 76 | |
|
77 | 77 | After selecting a merge program, Mercurial will by default attempt |
|
78 | 78 | to merge the files using a simple merge algorithm first. Only if it doesn't |
|
79 |
succeed because of conflicting changes Mercuria |
|
|
79 | succeed because of conflicting changes will Mercurial actually execute the | |
|
80 | 80 | merge program. Whether to use the simple merge algorithm first can be |
|
81 | 81 | controlled by the premerge setting of the merge tool. Premerge is enabled by |
|
82 | 82 | default unless the file is binary or a symlink. |
@@ -28,7 +28,7 b' refuse to operate on them to prevent cre' | |||
|
28 | 28 | Phases can also be manually manipulated with the :hg:`phase` command |
|
29 | 29 | if needed. See :hg:`help -v phase` for examples. |
|
30 | 30 | |
|
31 |
To make your |
|
|
31 | To make your commits secret by default, put this in your | |
|
32 | 32 | configuration file:: |
|
33 | 33 | |
|
34 | 34 | [phases] |
@@ -89,7 +89,7 b' Examples' | |||
|
89 | 89 | |
|
90 | 90 | hg phase --force --draft . |
|
91 | 91 | |
|
92 | - show a list of changeset revision and phase:: | |
|
92 | - show a list of changeset revisions and each corresponding phase:: | |
|
93 | 93 | |
|
94 | 94 | hg log --template "{rev} {phase}\n" |
|
95 | 95 |
@@ -134,7 +134,7 b' insensitive match on a case-sensitive pr' | |||
|
134 | 134 | prefixed with ``(?i)``. |
|
135 | 135 | |
|
136 | 136 | For example, ``tag(r're:(?i)release')`` matches "release" or "RELEASE" |
|
137 | or "Release", etc | |
|
137 | or "Release", etc. | |
|
138 | 138 | |
|
139 | 139 | Predicates |
|
140 | 140 | ========== |
@@ -212,7 +212,7 b' Some sample queries:' | |||
|
212 | 212 | |
|
213 | 213 | hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())" |
|
214 | 214 | |
|
215 |
- Update to commit that bookmark @ is pointing t |
|
|
215 | - Update to the commit that bookmark @ is pointing to, without activating the | |
|
216 | 216 | bookmark (this works because the last revision of the revset is used):: |
|
217 | 217 | |
|
218 | 218 | hg update :@ |
@@ -813,7 +813,7 b' Test help topic with same name as extens' | |||
|
813 | 813 | $ echo "multirevs = multirevs.py" >> $HGRCPATH |
|
814 | 814 | |
|
815 | 815 | $ hg help multirevs | tail |
|
816 | bookmark (this works because the last revision of the revset is used): | |
|
816 | used): | |
|
817 | 817 | |
|
818 | 818 | hg update :@ |
|
819 | 819 |
@@ -1876,7 +1876,7 b' Test dynamic list of merge tools only sh' | |||
|
1876 | 1876 | Note: |
|
1877 | 1877 | After selecting a merge program, Mercurial will by default attempt to |
|
1878 | 1878 | merge the files using a simple merge algorithm first. Only if it |
|
1879 |
doesn't succeed because of conflicting changes |
|
|
1879 | doesn't succeed because of conflicting changes will Mercurial actually | |
|
1880 | 1880 | execute the merge program. Whether to use the simple merge algorithm |
|
1881 | 1881 | first can be controlled by the premerge setting of the merge tool. |
|
1882 | 1882 | Premerge is enabled by default unless the file is binary or a symlink. |
General Comments 0
You need to be logged in to leave comments.
Login now