Mercurial > hg
changeset 12084:ff7c1118a83a
Merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Mon, 30 Aug 2010 13:00:22 +0200 |
| parents | 5e2216a35839 (current diff) ebfc46929f3e (diff) |
| children | 6f833fc3ccab |
| files | hgext/bookmarks.py hgext/color.py mercurial/commands.py tests/test-install.t |
| diffstat | 11 files changed, 46 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/mercurial.iss Mon Aug 30 11:39:43 2010 +0200 +++ b/contrib/win32/mercurial.iss Mon Aug 30 13:00:22 2010 +0200 @@ -52,6 +52,10 @@ Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl Source: contrib\xml.rnc; DestDir: {app}/Contrib Source: contrib\shrink-revlog.py; DestDir: {app}/Contrib +Source: contrib\mercurial.el; DestDir: {app}/Contrib +Source: contrib\mq.el; DestDir: {app}/Contrib +Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib +Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme Source: contrib\mergetools.hgrc; DestDir: {tmp}; Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
--- a/hgext/bookmarks.py Mon Aug 30 11:39:43 2010 +0200 +++ b/hgext/bookmarks.py Mon Aug 30 13:00:22 2010 +0200 @@ -18,7 +18,7 @@ By default, when several bookmarks point to the same changeset, they will all move forward together. It is possible to obtain a more git-like experience by adding the following configuration option to -your .hgrc:: +your configuration file:: [bookmarks] track.current = True
--- a/hgext/color.py Mon Aug 30 11:39:43 2010 +0200 +++ b/hgext/color.py Mon Aug 30 13:00:22 2010 +0200 @@ -29,7 +29,7 @@ function (aka ANSI escape codes). This module also provides the render_text function, which can be used to add effects to any text. -Default effects may be overridden from the .hgrc file:: +Default effects may be overridden from your configuration file:: [color] status.modified = blue bold underline red_background
--- a/hgext/hgk.py Mon Aug 30 11:39:43 2010 +0200 +++ b/hgext/hgk.py Mon Aug 30 13:00:22 2010 +0200 @@ -19,7 +19,7 @@ The :hg:`view` command will launch the hgk Tcl script. For this command to work, hgk must be in your search path. Alternately, you can specify -the path to hgk in your .hgrc file:: +the path to hgk in your configuration file:: [hgk] path=/location/of/hgk
--- a/hgext/pager.py Mon Aug 30 11:39:43 2010 +0200 +++ b/hgext/pager.py Mon Aug 30 13:00:22 2010 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. # -# To load the extension, add it to your .hgrc file: +# To load the extension, add it to your configuration file: # # [extension] # pager = @@ -46,7 +46,7 @@ If pager.attend is present, pager.ignore will be ignored. To ignore global commands like :hg:`version` or :hg:`help`, you have -to specify them in the global .hgrc +to specify them in your user configuration file. ''' import sys, os, signal, shlex, errno
--- a/mercurial/commands.py Mon Aug 30 11:39:43 2010 +0200 +++ b/mercurial/commands.py Mon Aug 30 13:00:22 2010 +0200 @@ -1335,7 +1335,8 @@ if patchproblems: if ui.config('ui', 'patch'): ui.write(_(" (Current patch tool may be incompatible with patch," - " or misconfigured. Please check your .hgrc file)\n")) + " or misconfigured. Please check your configuration" + " file)\n")) else: ui.write(_(" Internal patcher failure, please report this error" " to http://mercurial.selenic.com/bts/\n")) @@ -1351,10 +1352,12 @@ if not cmdpath: if editor == 'vi': ui.write(_(" No commit editor set and can't find vi in PATH\n")) - ui.write(_(" (specify a commit editor in your .hgrc file)\n")) + ui.write(_(" (specify a commit editor in your configuration" + " file)\n")) else: ui.write(_(" Can't find editor '%s' in PATH\n") % editor) - ui.write(_(" (specify a commit editor in your .hgrc file)\n")) + ui.write(_(" (specify a commit editor in your configuration" + " file)\n")) problems += 1 # check username @@ -1363,7 +1366,7 @@ ui.username() except util.Abort, e: ui.write(" %s\n" % e) - ui.write(_(" (specify a username in your .hgrc file)\n")) + ui.write(_(" (specify a username in your configuration file)\n")) problems += 1 if not problems: @@ -2724,8 +2727,8 @@ Show definition of symbolic path name NAME. If no name is given, show definition of all available names. - Path names are defined in the [paths] section of - ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a + Path names are defined in the [paths] section of your + configuration file and in ``/etc/mercurial/hgrc``. If run inside a repository, ``.hg/hgrc`` is used, too. The path names ``default`` and ``default-push`` have a special @@ -2960,11 +2963,11 @@ """redo merges or set/view the merge status of files Merges with unresolved conflicts are often the result of - non-interactive merging using the ``internal:merge`` hgrc setting, - or a command-line merge tool like ``diff3``. The resolve command - is used to manage the files involved in a merge, after :hg:`merge` - has been run, and before :hg:`commit` is run (i.e. the working - directory must have two parents). + non-interactive merging using the ``internal:merge`` configuration + setting, or a command-line merge tool like ``diff3``. The resolve + command is used to manage the files involved in a merge, after + :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the + working directory must have two parents). The resolve command can be used in the following ways:
--- a/mercurial/help/diffs.txt Mon Aug 30 11:39:43 2010 +0200 +++ b/mercurial/help/diffs.txt Mon Aug 30 13:00:22 2010 +0200 @@ -25,5 +25,5 @@ To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] -section of your hgrc. You do not need to set this option when -importing diffs in this format or using them in the mq extension. +section of your configuration file. You do not need to set this option +when importing diffs in this format or using them in the mq extension.
--- a/mercurial/help/environment.txt Mon Aug 30 11:39:43 2010 +0200 +++ b/mercurial/help/environment.txt Mon Aug 30 13:00:22 2010 +0200 @@ -8,7 +8,7 @@ HGEDITOR This is the name of the editor to run when committing. See EDITOR. - (deprecated, use .hgrc) + (deprecated, use configuration file) HGENCODING This overrides the default locale setting detected by Mercurial. @@ -29,13 +29,13 @@ will be executed with three arguments: local file, remote file, ancestor file. - (deprecated, use .hgrc) + (deprecated, use configuration file) HGRCPATH - A list of files or directories to search for hgrc files. Item - separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, - platform default search path is used. If empty, only the .hg/hgrc - from the current repository is read. + A list of files or directories to search for configuration + files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH + is not set, platform default search path is used. If empty, only + the .hg/hgrc from the current repository is read. For each element in HGRCPATH: @@ -43,9 +43,9 @@ - otherwise, the file itself will be added HGPLAIN - When set, this disables any options in .hgrc that might change - Mercurial's default output. This includes encoding, defaults, - verbose mode, debug mode, quiet mode, tracebacks, and + When set, this disables any configuration settings that might + change Mercurial's default output. This includes encoding, + defaults, verbose mode, debug mode, quiet mode, tracebacks, and localization. This can be useful when scripting against Mercurial in the face of existing user configuration. @@ -57,12 +57,12 @@ available values will be considered in this order: - HGUSER (deprecated) - - hgrc files from the HGRCPATH + - configuration files from the HGRCPATH - EMAIL - interactive prompt - LOGNAME (with ``@hostname`` appended) - (deprecated, use .hgrc) + (deprecated, use configuration file) EMAIL May be used as the author of a commit; see HGUSER.
--- a/mercurial/help/extensions.txt Mon Aug 30 11:39:43 2010 +0200 +++ b/mercurial/help/extensions.txt Mon Aug 30 13:00:22 2010 +0200 @@ -11,9 +11,9 @@ Mercurial. It is thus up to the user to activate extensions as needed. -To enable the "foo" extension, either shipped with Mercurial or in -the Python search path, create an entry for it in your hgrc, like -this:: +To enable the "foo" extension, either shipped with Mercurial or in the +Python search path, create an entry for it in your configuration file, +like this:: [extensions] foo = @@ -23,8 +23,8 @@ [extensions] myfeature = ~/.hgext/myfeature.py -To explicitly disable an extension enabled in an hgrc of broader -scope, prepend its path with !:: +To explicitly disable an extension enabled in a configuration file of +broader scope, prepend its path with !:: [extensions] # disabling extension bar residing in /path/to/extension/bar.py
--- a/mercurial/help/urls.txt Mon Aug 30 11:39:43 2010 +0200 +++ b/mercurial/help/urls.txt Mon Aug 30 13:00:22 2010 +0200 @@ -35,11 +35,11 @@ Host * Compression yes - Alternatively specify "ssh -C" as your ssh command in your hgrc or - with the --ssh command line option. + Alternatively specify "ssh -C" as your ssh command in your + configuration file or with the --ssh command line option. -These URLs can all be stored in your hgrc with path aliases under the -[paths] section like so:: +These URLs can all be stored in your configuration file with path +aliases under the [paths] section like so:: [paths] alias1 = URL1
--- a/tests/test-install.t Mon Aug 30 11:39:43 2010 +0200 +++ b/tests/test-install.t Mon Aug 30 13:00:22 2010 +0200 @@ -17,7 +17,7 @@ Checking commit editor... Checking username... no username supplied (see "hg help config") - (specify a username in your .hgrc file) + (specify a username in your configuration file) 1 problems detected, please check your install! $ true