Show More
@@ -18,7 +18,7 b' It is possible to use bookmark names in ' | |||||
18 | By default, when several bookmarks point to the same changeset, they |
|
18 | By default, when several bookmarks point to the same changeset, they | |
19 | will all move forward together. It is possible to obtain a more |
|
19 | will all move forward together. It is possible to obtain a more | |
20 | git-like experience by adding the following configuration option to |
|
20 | git-like experience by adding the following configuration option to | |
21 | your .hgrc:: |
|
21 | your configuration file:: | |
22 |
|
22 | |||
23 | [bookmarks] |
|
23 | [bookmarks] | |
24 | track.current = True |
|
24 | track.current = True |
@@ -29,7 +29,7 b' also available. Effects are rendered wit' | |||||
29 | function (aka ANSI escape codes). This module also provides the |
|
29 | function (aka ANSI escape codes). This module also provides the | |
30 | render_text function, which can be used to add effects to any text. |
|
30 | render_text function, which can be used to add effects to any text. | |
31 |
|
31 | |||
32 |
Default effects may be overridden from |
|
32 | Default effects may be overridden from your configuration file:: | |
33 |
|
33 | |||
34 | [color] |
|
34 | [color] | |
35 | status.modified = blue bold underline red_background |
|
35 | status.modified = blue bold underline red_background |
@@ -19,7 +19,7 b' repository, and needs to be enabled.' | |||||
19 |
|
19 | |||
20 | The :hg:`view` command will launch the hgk Tcl script. For this command |
|
20 | The :hg:`view` command will launch the hgk Tcl script. For this command | |
21 | to work, hgk must be in your search path. Alternately, you can specify |
|
21 | to work, hgk must be in your search path. Alternately, you can specify | |
22 |
the path to hgk in your |
|
22 | the path to hgk in your configuration file:: | |
23 |
|
23 | |||
24 | [hgk] |
|
24 | [hgk] | |
25 | path=/location/of/hgk |
|
25 | path=/location/of/hgk |
@@ -5,7 +5,7 b'' | |||||
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 | # |
|
7 | # | |
8 |
# To load the extension, add it to your |
|
8 | # To load the extension, add it to your configuration file: | |
9 | # |
|
9 | # | |
10 | # [extension] |
|
10 | # [extension] | |
11 | # pager = |
|
11 | # pager = | |
@@ -46,7 +46,7 b' paged.' | |||||
46 | If pager.attend is present, pager.ignore will be ignored. |
|
46 | If pager.attend is present, pager.ignore will be ignored. | |
47 |
|
47 | |||
48 | To ignore global commands like :hg:`version` or :hg:`help`, you have |
|
48 | To ignore global commands like :hg:`version` or :hg:`help`, you have | |
49 | to specify them in the global .hgrc |
|
49 | to specify them in your user configuration file. | |
50 | ''' |
|
50 | ''' | |
51 |
|
51 | |||
52 | import sys, os, signal, shlex, errno |
|
52 | import sys, os, signal, shlex, errno |
@@ -1341,7 +1341,8 b' def debuginstall(ui):' | |||||
1341 | if patchproblems: |
|
1341 | if patchproblems: | |
1342 | if ui.config('ui', 'patch'): |
|
1342 | if ui.config('ui', 'patch'): | |
1343 | ui.write(_(" (Current patch tool may be incompatible with patch," |
|
1343 | ui.write(_(" (Current patch tool may be incompatible with patch," | |
1344 |
" or misconfigured. Please check your |
|
1344 | " or misconfigured. Please check your configuration" | |
|
1345 | " file)\n")) | |||
1345 | else: |
|
1346 | else: | |
1346 | ui.write(_(" Internal patcher failure, please report this error" |
|
1347 | ui.write(_(" Internal patcher failure, please report this error" | |
1347 | " to http://mercurial.selenic.com/bts/\n")) |
|
1348 | " to http://mercurial.selenic.com/bts/\n")) | |
@@ -1357,10 +1358,12 b' def debuginstall(ui):' | |||||
1357 | if not cmdpath: |
|
1358 | if not cmdpath: | |
1358 | if editor == 'vi': |
|
1359 | if editor == 'vi': | |
1359 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
1360 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
1360 |
ui.write(_(" (specify a commit editor in your |
|
1361 | ui.write(_(" (specify a commit editor in your configuration" | |
|
1362 | " file)\n")) | |||
1361 | else: |
|
1363 | else: | |
1362 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
1364 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
1363 |
ui.write(_(" (specify a commit editor in your |
|
1365 | ui.write(_(" (specify a commit editor in your configuration" | |
|
1366 | " file)\n")) | |||
1364 | problems += 1 |
|
1367 | problems += 1 | |
1365 |
|
1368 | |||
1366 | # check username |
|
1369 | # check username | |
@@ -1369,7 +1372,7 b' def debuginstall(ui):' | |||||
1369 | user = ui.username() |
|
1372 | user = ui.username() | |
1370 | except util.Abort, e: |
|
1373 | except util.Abort, e: | |
1371 | ui.write(" %s\n" % e) |
|
1374 | ui.write(" %s\n" % e) | |
1372 |
ui.write(_(" (specify a username in your |
|
1375 | ui.write(_(" (specify a username in your configuration file)\n")) | |
1373 | problems += 1 |
|
1376 | problems += 1 | |
1374 |
|
1377 | |||
1375 | if not problems: |
|
1378 | if not problems: | |
@@ -2727,8 +2730,8 b' def paths(ui, repo, search=None):' | |||||
2727 | Show definition of symbolic path name NAME. If no name is given, |
|
2730 | Show definition of symbolic path name NAME. If no name is given, | |
2728 | show definition of all available names. |
|
2731 | show definition of all available names. | |
2729 |
|
2732 | |||
2730 | Path names are defined in the [paths] section of |
|
2733 | Path names are defined in the [paths] section of your | |
2731 |
``/etc/mercurial/ |
|
2734 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
2732 | repository, ``.hg/hgrc`` is used, too. |
|
2735 | repository, ``.hg/hgrc`` is used, too. | |
2733 |
|
2736 | |||
2734 | The path names ``default`` and ``default-push`` have a special |
|
2737 | The path names ``default`` and ``default-push`` have a special | |
@@ -2963,11 +2966,11 b' def resolve(ui, repo, *pats, **opts):' | |||||
2963 | """redo merges or set/view the merge status of files |
|
2966 | """redo merges or set/view the merge status of files | |
2964 |
|
2967 | |||
2965 | Merges with unresolved conflicts are often the result of |
|
2968 | Merges with unresolved conflicts are often the result of | |
2966 |
non-interactive merging using the ``internal:merge`` |
|
2969 | non-interactive merging using the ``internal:merge`` configuration | |
2967 |
or a command-line merge tool like ``diff3``. The resolve |
|
2970 | setting, or a command-line merge tool like ``diff3``. The resolve | |
2968 |
is used to manage the files involved in a merge, after |
|
2971 | command is used to manage the files involved in a merge, after | |
2969 |
has been run, and before :hg:`commit` is run (i.e. the |
|
2972 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
2970 | directory must have two parents). |
|
2973 | working directory must have two parents). | |
2971 |
|
2974 | |||
2972 | The resolve command can be used in the following ways: |
|
2975 | The resolve command can be used in the following ways: | |
2973 |
|
2976 |
@@ -25,5 +25,5 b' format for communicating changes.' | |||||
25 |
|
25 | |||
26 | To make Mercurial produce the git extended diff format, use the --git |
|
26 | To make Mercurial produce the git extended diff format, use the --git | |
27 | option available for many commands, or set 'git = True' in the [diff] |
|
27 | option available for many commands, or set 'git = True' in the [diff] | |
28 |
section of your |
|
28 | section of your configuration file. You do not need to set this option | |
29 | importing diffs in this format or using them in the mq extension. |
|
29 | when importing diffs in this format or using them in the mq extension. |
@@ -8,7 +8,7 b' HG' | |||||
8 | HGEDITOR |
|
8 | HGEDITOR | |
9 | This is the name of the editor to run when committing. See EDITOR. |
|
9 | This is the name of the editor to run when committing. See EDITOR. | |
10 |
|
10 | |||
11 |
(deprecated, use |
|
11 | (deprecated, use configuration file) | |
12 |
|
12 | |||
13 | HGENCODING |
|
13 | HGENCODING | |
14 | This overrides the default locale setting detected by Mercurial. |
|
14 | This overrides the default locale setting detected by Mercurial. | |
@@ -29,13 +29,13 b' HGMERGE' | |||||
29 | will be executed with three arguments: local file, remote file, |
|
29 | will be executed with three arguments: local file, remote file, | |
30 | ancestor file. |
|
30 | ancestor file. | |
31 |
|
31 | |||
32 |
(deprecated, use |
|
32 | (deprecated, use configuration file) | |
33 |
|
33 | |||
34 | HGRCPATH |
|
34 | HGRCPATH | |
35 |
A list of files or directories to search for |
|
35 | A list of files or directories to search for configuration | |
36 |
separator is ":" on Unix, ";" on Windows. If HGRCPATH |
|
36 | files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH | |
37 |
platform default search path is used. If empty, only |
|
37 | is not set, platform default search path is used. If empty, only | |
38 | from the current repository is read. |
|
38 | the .hg/hgrc from the current repository is read. | |
39 |
|
39 | |||
40 | For each element in HGRCPATH: |
|
40 | For each element in HGRCPATH: | |
41 |
|
41 | |||
@@ -43,9 +43,9 b' HGRCPATH' | |||||
43 | - otherwise, the file itself will be added |
|
43 | - otherwise, the file itself will be added | |
44 |
|
44 | |||
45 | HGPLAIN |
|
45 | HGPLAIN | |
46 |
When set, this disables any |
|
46 | When set, this disables any configuration settings that might | |
47 |
Mercurial's default output. This includes encoding, |
|
47 | change Mercurial's default output. This includes encoding, | |
48 | verbose mode, debug mode, quiet mode, tracebacks, and |
|
48 | defaults, verbose mode, debug mode, quiet mode, tracebacks, and | |
49 | localization. This can be useful when scripting against Mercurial |
|
49 | localization. This can be useful when scripting against Mercurial | |
50 | in the face of existing user configuration. |
|
50 | in the face of existing user configuration. | |
51 |
|
51 | |||
@@ -57,12 +57,12 b' HGUSER' | |||||
57 | available values will be considered in this order: |
|
57 | available values will be considered in this order: | |
58 |
|
58 | |||
59 | - HGUSER (deprecated) |
|
59 | - HGUSER (deprecated) | |
60 |
- |
|
60 | - configuration files from the HGRCPATH | |
61 |
|
61 | |||
62 | - interactive prompt |
|
62 | - interactive prompt | |
63 | - LOGNAME (with ``@hostname`` appended) |
|
63 | - LOGNAME (with ``@hostname`` appended) | |
64 |
|
64 | |||
65 |
(deprecated, use |
|
65 | (deprecated, use configuration file) | |
66 |
|
66 | |||
67 |
|
67 | |||
68 | May be used as the author of a commit; see HGUSER. |
|
68 | May be used as the author of a commit; see HGUSER. |
@@ -11,9 +11,9 b' for prime time; or they may alter some u' | |||||
11 | Mercurial. It is thus up to the user to activate extensions as |
|
11 | Mercurial. It is thus up to the user to activate extensions as | |
12 | needed. |
|
12 | needed. | |
13 |
|
13 | |||
14 | To enable the "foo" extension, either shipped with Mercurial or in |
|
14 | To enable the "foo" extension, either shipped with Mercurial or in the | |
15 |
|
|
15 | Python search path, create an entry for it in your configuration file, | |
16 | this:: |
|
16 | like this:: | |
17 |
|
17 | |||
18 | [extensions] |
|
18 | [extensions] | |
19 | foo = |
|
19 | foo = | |
@@ -23,8 +23,8 b' You may also specify the full path to an' | |||||
23 | [extensions] |
|
23 | [extensions] | |
24 | myfeature = ~/.hgext/myfeature.py |
|
24 | myfeature = ~/.hgext/myfeature.py | |
25 |
|
25 | |||
26 |
To explicitly disable an extension enabled in a |
|
26 | To explicitly disable an extension enabled in a configuration file of | |
27 | scope, prepend its path with !:: |
|
27 | broader scope, prepend its path with !:: | |
28 |
|
28 | |||
29 | [extensions] |
|
29 | [extensions] | |
30 | # disabling extension bar residing in /path/to/extension/bar.py |
|
30 | # disabling extension bar residing in /path/to/extension/bar.py |
@@ -35,11 +35,11 b' Some notes about using SSH with Mercuria' | |||||
35 | Host * |
|
35 | Host * | |
36 | Compression yes |
|
36 | Compression yes | |
37 |
|
37 | |||
38 |
Alternatively specify "ssh -C" as your ssh command in your |
|
38 | Alternatively specify "ssh -C" as your ssh command in your | |
39 | with the --ssh command line option. |
|
39 | configuration file or with the --ssh command line option. | |
40 |
|
40 | |||
41 |
These URLs can all be stored in your |
|
41 | These URLs can all be stored in your configuration file with path | |
42 | [paths] section like so:: |
|
42 | aliases under the [paths] section like so:: | |
43 |
|
43 | |||
44 | [paths] |
|
44 | [paths] | |
45 | alias1 = URL1 |
|
45 | alias1 = URL1 |
@@ -14,5 +14,5 b' Checking patch...' | |||||
14 | Checking commit editor... |
|
14 | Checking commit editor... | |
15 | Checking username... |
|
15 | Checking username... | |
16 | no username supplied (see "hg help config") |
|
16 | no username supplied (see "hg help config") | |
17 |
(specify a username in your |
|
17 | (specify a username in your configuration file) | |
18 | 1 problems detected, please check your install! |
|
18 | 1 problems detected, please check your install! |
General Comments 0
You need to be logged in to leave comments.
Login now