##// END OF EJS Templates
rebase: clarify comment about merge ancestor when rebasing merges...
rebase: clarify comment about merge ancestor when rebasing merges The code for picking a merge ancestor when rebasing merges had a long and incorrect comment. The comment would perhaps have been fine as commit message but does not make the code more readable or maintainable and is a bad substitute for correct and readable code. The correct essense of the comment is quite trivial: a merge of an ancestor of the rebase destination and an 'outside' revision can be rebased as if it was a linear change, using 'destination ancestor parent' as base and pretty much ignoring the 'outside' revision. The code path where the comment is placed is however also used for other kinds of merge rebases. The comment is thus not really correct and not helpful. I think it would be better to drop the comment and rewrite the code.

File last commit:

r13849:9f97de15 default
r23732:c51d6c04 default
Show More
environment.txt
101 lines | 3.7 KiB | text/plain | TextLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 HG
Path to the 'hg' executable, automatically passed when running
hooks, extensions or external tools. If unset or empty, this is
the hg executable's name if it's frozen, or an executable named
'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
Windows) is searched.
HGEDITOR
This is the name of the editor to run when committing. See EDITOR.
Brodie Rao
help: refer to user configuration file more consistently...
r12083 (deprecated, use configuration file)
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
HGENCODING
This overrides the default locale setting detected by Mercurial.
This setting is used to convert data including usernames,
changeset descriptions, tag names, and branches. This setting can
be overridden with the --encoding command-line option.
HGENCODINGMODE
This sets Mercurial's behavior for handling unknown characters
while transcoding user input. The default is "strict", which
causes Mercurial to abort if it can't map a character. Other
settings include "replace", which replaces unknown characters, and
"ignore", which drops them. This setting can be overridden with
the --encodingmode command-line option.
Matt Mackall
encoding: default ambiguous character to narrow...
r12866 HGENCODINGAMBIGUOUS
This sets Mercurial's behavior for handling characters with
"ambiguous" widths like accented Latin characters with East Asian
fonts. By default, Mercurial assumes ambiguous characters are
narrow, set this variable to "wide" if such characters cause
formatting problems.
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 HGMERGE
An executable to use for resolving merge conflicts. The program
will be executed with three arguments: local file, remote file,
ancestor file.
Brodie Rao
help: refer to user configuration file more consistently...
r12083 (deprecated, use configuration file)
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
HGRCPATH
Brodie Rao
help: refer to user configuration file more consistently...
r12083 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.
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
For each element in HGRCPATH:
- if it's a directory, all files ending with .rc are added
- otherwise, the file itself will be added
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 HGPLAIN
Brodie Rao
help: refer to user configuration file more consistently...
r12083 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
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 localization. This can be useful when scripting against Mercurial
in the face of existing user configuration.
Equivalent options set via command line flags or environment
variables are not overridden.
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 HGPLAINEXCEPT
This is a comma-separated list of features to preserve when
HGPLAIN is enabled. Currently the only value supported is "i18n",
which preserves internationalization in plain mode.
Setting HGPLAINEXCEPT to anything (even an empty string) will
enable plain mode.
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 HGUSER
This is the string used as the author of a commit. If not set,
available values will be considered in this order:
- HGUSER (deprecated)
Brodie Rao
help: refer to user configuration file more consistently...
r12083 - configuration files from the HGRCPATH
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 - EMAIL
- interactive prompt
- LOGNAME (with ``@hostname`` appended)
Brodie Rao
help: refer to user configuration file more consistently...
r12083 (deprecated, use configuration file)
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
EMAIL
May be used as the author of a commit; see HGUSER.
LOGNAME
May be used as the author of a commit; see HGUSER.
VISUAL
This is the name of the editor to use when committing. See EDITOR.
EDITOR
Sometimes Mercurial needs to open a text file in an editor for a
user to modify, for example when writing commit messages. The
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
non-empty one is chosen. If all of them are empty, the editor
defaults to 'vi'.
PYTHONPATH
This is used by Python to find imported modules and may need to be
set appropriately if this Mercurial is not installed system-wide.