##// END OF EJS Templates
i18n-de: translated record
i18n-de: translated record

File last commit:

r7904:fef5f3ef default
r7965:8503adbd default
Show More
help.py
410 lines | 16.4 KiB | text/x-python | PythonLexer
Matt Mackall
Add basic support for help topics and a dates topic
r3795 # help.py - help data for mercurial
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Martin Geisler
i18n: mark help strings for translation...
r7013 from i18n import _
Johannes Stezenbach
help: helptable is an ordered collection...
r6654 helptable = (
Martin Geisler
i18n: mark help strings for translation...
r7013 (["dates"], _("Date Formats"),
_(r'''
timeless
help: better formatting in "Date Formats" section
r7764 Some commands allow the user to specify a date, e.g.:
* backout, commit, import, tag: Specify the commit date.
* log, revert, update: Select revision(s) by date.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
Many date formats are valid. Here are some examples:
Matt Mackall
Add basic support for help topics and a dates topic
r3795
Matt Mackall
Update dates help topic
r3811 "Wed Dec 6 13:18:29 2006" (local timezone assumed)
"Dec 6 13:18 -0600" (year assumed, time offset provided)
"Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
"Dec 6" (midnight)
"13:18" (today assumed)
"3:39" (3:39AM assumed)
"3:39pm" (15:39)
Matt Mackall
fix iso date help
r6773 "2006-12-06 13:18:29" (ISO 8601 format)
Matt Mackall
Update dates help topic
r3811 "2006-12-6 13:18"
"2006-12-6"
"12-6"
"12/6"
"12/6/6" (Dec 6 2006)
Matt Mackall
Add basic support for help topics and a dates topic
r3795
Matt Mackall
Update dates help topic
r3811 Lastly, there is Mercurial's internal format:
Matt Mackall
Add basic support for help topics and a dates topic
r3795
Matt Mackall
Update dates help topic
r3811 "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
Matt Mackall
Add basic support for help topics and a dates topic
r3795
This is the internal representation format for dates. unixtime is
the number of seconds since the epoch (1970-01-01 00:00 UTC). offset
is the offset of the local timezone, in seconds west of UTC (negative
if the timezone is east of UTC).
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
The log command also accepts date ranges:
timeless
help: some language fixes for help topics
r7804 "<{datetime}" - at or before a given date/time
">{datetime}" - on or after a given date/time
"{datetime} to {datetime}" - a date range, inclusive
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163 "-{days}" - within a given number of days of today
Martin Geisler
i18n: mark help strings for translation...
r7013 ''')),
Johannes Stezenbach
help: helptable is an ordered collection...
r6654
Martin Geisler
i18n: mark help strings for translation...
r7013 (["patterns"], _("File Name Patterns"),
_(r'''
Johannes Stezenbach
help: helptable is an ordered collection...
r6654 Mercurial accepts several notations for identifying one or more
files at a time.
By default, Mercurial treats filenames as shell-style extended
glob patterns.
Alternate pattern notations must be specified explicitly.
timeless
help: some language fixes for help topics
r7804 To use a plain path name without any pattern matching, start it
Dirkjan Ochtman
help: get rid of double spaces
r7808 with "path:". These path names must completely match starting at
timeless
help: some language fixes for help topics
r7804 the current repository root.
Johannes Stezenbach
help: helptable is an ordered collection...
r6654
Dirkjan Ochtman
help: get rid of double spaces
r7808 To use an extended glob, start a name with "glob:". Globs are
timeless
help: some language fixes for help topics
r7804 rooted at the current directory; a glob such as "*.c" will only
match files in the current directory ending with ".c".
Johannes Stezenbach
help: helptable is an ordered collection...
r6654
The supported glob syntax extensions are "**" to match any string
timeless
help: some language fixes for help topics
r7804 across path separators and "{a,b}" to mean "a or b".
Matt Mackall
move patterns topics
r3799
Johannes Stezenbach
help: helptable is an ordered collection...
r6654 To use a Perl/Python regular expression, start a name with "re:".
Regexp pattern matching is anchored at the root of the repository.
Plain examples:
path:foo/bar a name bar in a directory named foo in the root of
the repository
path:path:name a file or directory named "path:name"
Glob examples:
glob:*.c any name ending in ".c" in the current directory
*.c any name ending in ".c" in the current directory
timeless
help: some language fixes for help topics
r7804 **.c any name ending in ".c" in any subdirectory of the
current directory including itself.
Johannes Stezenbach
help: helptable is an ordered collection...
r6654 foo/*.c any name ending in ".c" in the directory foo
timeless
help: some language fixes for help topics
r7804 foo/**.c any name ending in ".c" in any subdirectory of foo
including itself.
Johannes Stezenbach
help: helptable is an ordered collection...
r6654
Regexp examples:
re:.*\.c$ any name ending in ".c", anywhere in the repository
Martin Geisler
i18n: mark help strings for translation...
r7013 ''')),
Johannes Stezenbach
help: helptable is an ordered collection...
r6654
Martin Geisler
i18n: mark help strings for translation...
r7013 (['environment', 'env'], _('Environment Variables'),
_(r'''
Thomas Arendsen Hein
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
r4686 HG::
Thomas Arendsen Hein
Simplify/correct finding the hg executable (fixes issue644)...
r5062 Path to the 'hg' executable, automatically passed when running hooks,
timeless
help: some language fixes for help topics
r7804 extensions or external tools. If unset or empty, this is the hg
Dongsheng Song
Typo fix
r7828 executable's name if it's frozen, or an executable named 'hg'
timeless
help: some language fixes for help topics
r7804 (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
Windows) is searched.
Thomas Arendsen Hein
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
r4686
Matt Mackall
move environment topic
r3798 HGEDITOR::
timeless
help: some language fixes for help topics
r7804 This is the name of the editor to run when committing. See EDITOR.
Matt Mackall
move environment topic
r3798
(deprecated, use .hgrc)
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
timeless
help: some language fixes for help topics
r7804 while transcoding user input. The default is "strict", which
causes Mercurial to abort if it can't map a character. Other
Matt Mackall
move environment topic
r3798 settings include "replace", which replaces unknown characters, and
"ignore", which drops them. This setting can be overridden with
the --encodingmode command-line option.
HGMERGE::
An executable to use for resolving merge conflicts. The program
will be executed with three arguments: local file, remote file,
ancestor file.
(deprecated, use .hgrc)
HGRCPATH::
Dirkjan Ochtman
help: get rid of double spaces
r7808 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
timeless
help: some language fixes for help topics
r7804 from the current repository is read.
Matt Mackall
move environment topic
r3798
Dirkjan Ochtman
help: better explanation for some of the environment variables...
r7805 For each element in HGRCPATH:
Dongsheng Song
Clarify the usage of HGRCPATH
r7904 * if it's a directory, all files ending with .rc are added
* otherwise, the file itself will be added
Matt Mackall
move environment topic
r3798
HGUSER::
Dirkjan Ochtman
help: better explanation for some of the environment variables...
r7805 This is the string used as the author of a commit. If not set,
available values will be considered in this order:
* HGUSER (deprecated)
* hgrc files from the HGRCPATH
* EMAIL
* interactive prompt
* LOGNAME (with '@hostname' appended)
Matt Mackall
move environment topic
r3798
(deprecated, use .hgrc)
EMAIL::
Dirkjan Ochtman
help: better explanation for some of the environment variables...
r7805 May be used as the author of a commit; see HGUSER.
Matt Mackall
move environment topic
r3798
LOGNAME::
Dirkjan Ochtman
help: better explanation for some of the environment variables...
r7805 May be used as the author of a commit; see HGUSER.
Matt Mackall
move environment topic
r3798
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660 VISUAL::
This is the name of the editor to use when committing. See EDITOR.
Matt Mackall
move environment topic
r3798 EDITOR::
Matt Mackall
filemerge: remove the hgmerge script...
r6009 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
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660 defaults to 'vi'.
Matt Mackall
move environment topic
r3798
PYTHONPATH::
This is used by Python to find imported modules and may need to be set
timeless
help: some language fixes for help topics
r7804 appropriately if this Mercurial is not installed system-wide.
Martin Geisler
i18n: mark help strings for translation...
r7013 ''')),
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655
Martin Geisler
i18n: mark help strings for translation...
r7013 (['revs', 'revisions'], _('Specifying Single Revisions'),
_(r'''
timeless
help: some language fixes for help topics
r7804 Mercurial supports several ways to specify individual
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655 revisions.
A plain integer is treated as a revision number. Negative
Greg Ward
Typo fix in help.
r7887 integers are treated as topological offsets from the tip, with
timeless
help: some language fixes for help topics
r7804 -1 denoting the tip. As such, negative numbers are only useful
if you've memorized your local tree numbers and want to save
typing a single digit. This editor suggests copy and paste.
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655
A 40-digit hexadecimal string is treated as a unique revision
identifier.
A hexadecimal string less than 40 characters long is treated as a
unique revision identifier, and referred to as a short-form
identifier. A short-form identifier is only valid if it is the
timeless
help: some language fixes for help topics
r7804 prefix of exactly one full-length identifier.
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655
Any other string is treated as a tag name, which is a symbolic
name associated with a revision identifier. Tag names may not
contain the ":" character.
The reserved name "tip" is a special tag that always identifies
the most recent revision.
The reserved name "null" indicates the null revision. This is the
revision of an empty repository, and the parent of revision 0.
The reserved name "." indicates the working directory parent. If
no working directory is checked out, it is equivalent to null.
If an uncommitted merge is in progress, "." is the revision of
the first parent.
Martin Geisler
i18n: mark help strings for translation...
r7013 ''')),
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655
Martin Geisler
i18n: mark help strings for translation...
r7013 (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
_(r'''
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655 When Mercurial accepts more than one revision, they may be
timeless
help: some language fixes for help topics
r7804 specified individually, or provided as a topologically continuous
range, separated by the ":" character.
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655
The syntax of range notation is [BEGIN]:[END], where BEGIN and END
are revision identifiers. Both BEGIN and END are optional. If
BEGIN is not specified, it defaults to revision number 0. If END
is not specified, it defaults to the tip. The range ":" thus
means "all revisions".
If BEGIN is greater than END, revisions are treated in reverse
order.
A range acts as a closed interval. This means that a range of 3:5
timeless
help: some language fixes for help topics
r7804 gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
Martin Geisler
i18n: mark help strings for translation...
r7013 ''')),
Dirkjan Ochtman
help: add a topic on git diffs (issue1352)
r7293
Matt Mackall
update help on git diffs
r7387 (['diffs'], _('Diff Formats'),
Dirkjan Ochtman
help: add a topic on git diffs (issue1352)
r7293 _(r'''
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328 Mercurial's default format for showing changes between two versions
Matt Mackall
update help on git diffs
r7387 of a file is compatible with the unified format of GNU diff, which
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328 can be used by GNU patch and many other standard tools.
Dirkjan Ochtman
help: add a topic on git diffs (issue1352)
r7293
Matt Mackall
update help on git diffs
r7387 While this standard format is often enough, it does not encode the
following information:
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328
timeless
help: some language fixes for help topics
r7804 - executable status and other permission bits
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328 - copy or rename information
- changes in binary files
- creation or deletion of empty files
Dirkjan Ochtman
help: add a topic on git diffs (issue1352)
r7293
Matt Mackall
update help on git diffs
r7387 Mercurial also supports the extended diff format from the git VCS
which addresses these limitations. The git diff format is not
timeless
help: some language fixes for help topics
r7804 produced by default because a few widespread tools still do not
Matt Mackall
update help on git diffs
r7387 understand this format.
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328
Matt Mackall
update help on git diffs
r7387 This means that when generating diffs from a Mercurial repository
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328 (e.g. with "hg export"), you should be careful about things like
file copies and renames or other things mentioned above, because
when applying a standard diff to a different repository, this extra
information is lost. Mercurial's internal operations (like push and
Matt Mackall
update help on git diffs
r7387 pull) are not affected by this, because they use an internal binary
Thomas Arendsen Hein
Enhance gitdiffs help text
r7328 format for communicating changes.
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.
Dirkjan Ochtman
help: add a topic on git diffs (issue1352)
r7293 ''')),
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 (['templating'], _('Template Usage'),
Alexander Solovyov
help: add a topic about some of the templating features
r7677 _(r'''
Mercurial allows you to customize output of commands through
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 templates. You can either pass in a template from the command line,
via the --template option, or select an existing template-style (--style).
Alexander Solovyov
help: add a topic about some of the templating features
r7677
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 You can customize output for any "log-like" command: log, outgoing,
timeless
help: some language fixes for help topics
r7804 incoming, tip, parents, heads and glog.
Alexander Solovyov
help: add a topic about some of the templating features
r7677
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 Three styles are packaged with Mercurial: default (the style used
when no explicit preference is passed), compact and changelog. Usage:
Alexander Solovyov
help: add a topic about some of the templating features
r7677
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 $ hg log -r1 --style changelog
Alexander Solovyov
help: add a topic about some of the templating features
r7677
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 A template is a piece of text, with markup to invoke variable expansion:
$ hg log -r1 --template "{node}\n"
Alexander Solovyov
help: add a topic about some of the templating features
r7677 b56ce7b07c52de7d5fd79fb89701ea538af65746
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 Strings in curly braces are called keywords. The availability of
keywords depends on the exact context of the templater. These keywords
are usually available for templating a log-like command:
Alexander Solovyov
help: add a topic about some of the templating features
r7677
- author: String. The unmodified author of the changeset.
- branches: String. The name of the branch on which the changeset
was committed. Will be empty if the branch name was default.
- date: Date information. The date when the changeset was committed.
- desc: String. The text of the changeset description.
Alexander Solovyov <piranha at piranha.org.ua>
templater: ability to display diffstat for log-like commands
r7879 - diffstat: String. Statistics of changes with the following format:
"modified files: +added/-removed lines"
Alexander Solovyov
help: add a topic about some of the templating features
r7677 - files: List of strings. All files modified, added, or removed by
this changeset.
- file_adds: List of strings. Files added by this changeset.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - file_mods: List of strings. Files modified by this changeset.
Alexander Solovyov
help: add a topic about some of the templating features
r7677 - file_dels: List of strings. Files removed by this changeset.
- node: String. The changeset identification hash, as a 40-character
hexadecimal string.
- parents: List of strings. The parents of the changeset.
- rev: Integer. The repository-local changeset revision number.
- tags: List of strings. Any tags associated with the changeset.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 The "date" keyword does not produce human-readable output. If you
want to use a date in your output, you can use a filter to process it.
Filters are functions which return a string based on the input variable.
timeless
help: some language fixes for help topics
r7804 You can also use a chain of filters to get the desired output:
Alexander Solovyov
help: add a topic about some of the templating features
r7677
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 $ hg tip --template "{date|isodate}\n"
Alexander Solovyov
help: add a topic about some of the templating features
r7677 2008-08-21 18:22 +0000
List of filters:
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - addbreaks: Any text. Add an XHTML "<br />" tag before the end of
Alexander Solovyov
help: add a topic about some of the templating features
r7677 every line except the last.
Dirkjan Ochtman
help: better explanations for some of the template filters...
r7806 - age: Date. Returns a human-readable date/time difference between
the given date/time and the current date/time.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - basename: Any text. Treats the text as a path, and returns the
Dirkjan Ochtman
help: better explanations for some of the template filters...
r7806 last component of the path after splitting by the path
separator (ignoring trailing seprators). For example,
"foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar".
- date: Date. Returns a date in a Unix date format, including
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 the timezone: "Mon Sep 04 15:13:13 2006 0700".
Alexander Solovyov
help: add a topic about some of the templating features
r7677 - domain: Any text. Finds the first string that looks like an email
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 address, and extracts just the domain component.
Dirkjan Ochtman
help: better explanations for some of the template filters...
r7806 Example: 'User <user@example.com>' becomes 'example.com'.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - email: Any text. Extracts the first string that looks like an email
Dirkjan Ochtman
help: better explanations for some of the template filters...
r7806 address. Example: 'User <user@example.com>' becomes
'user@example.com'.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - escape: Any text. Replaces the special XML/XHTML characters "&",
Alexander Solovyov
help: add a topic about some of the templating features
r7677 "<" and ">" with XML entities.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - fill68: Any text. Wraps the text to fit in 68 columns.
- fill76: Any text. Wraps the text to fit in 76 columns.
- firstline: Any text. Returns the first line of text.
- hgdate: Date. Returns the date as a pair of numbers:
"1157407993 25200" (Unix timestamp, timezone offset).
- isodate: Date. Returns the date in ISO 8601 format.
- obfuscate: Any text. Returns the input text rendered as a sequence
Alexander Solovyov
help: add a topic about some of the templating features
r7677 of XML entities.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - person: Any text. Returns the text before an email address.
- rfc822date: Date. Returns a date using the same format used
Alexander Solovyov
help: add a topic about some of the templating features
r7677 in email headers.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - short: Changeset hash. Returns the short form of a changeset hash,
Alexander Solovyov
help: add a topic about some of the templating features
r7677 i.e. a 12-byte hexadecimal string.
Dirkjan Ochtman
help: better explanations for some of the template filters...
r7806 - shortdate: Date. Returns a date like "2006-09-18".
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - strip: Any text. Strips all leading and trailing whitespace.
- tabindent: Any text. Returns the text, with every line except the
Alexander Solovyov
help: add a topic about some of the templating features
r7677 first starting with a tab character.
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - urlescape: Any text. Escapes all "special" characters. For example,
"foo bar" becomes "foo%20bar".
- user: Any text. Returns the user portion of an email address.
Alexander Solovyov
help: add a topic about some of the templating features
r7677 ''')),
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693
(['urls'], _('Url Paths'),
_(r'''
Valid URLs are of the form:
local/filesystem/path (or file://local/filesystem/path)
http://[user[:pass]@]host[:port]/[path]
https://[user[:pass]@]host[:port]/[path]
ssh://[user[:pass]@]host[:port]/[path]
Paths in the local filesystem can either point to Mercurial
repositories or to bundle files (as created by 'hg bundle' or
'hg incoming --bundle').
An optional identifier after # indicates a particular branch, tag,
timeless
help: some language fixes for help topics
r7804 or changeset to use from the remote repository.
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693
Some features, such as pushing to http:// and https:// URLs are
only possible if the feature is explicitly enabled on the
remote Mercurial server.
Some notes about using SSH with Mercurial:
- SSH requires an accessible shell account on the destination machine
and a copy of hg in the remote path or specified with as remotecmd.
- path is relative to the remote user's home directory by default.
Use an extra slash at the start of a path to specify an absolute path:
ssh://example.com//tmp/repository
- Mercurial doesn't use its own compression via SSH; the right thing
to do is to configure it in your ~/.ssh/config, e.g.:
Host *.mylocalnetwork.example.com
Compression no
Host *
Compression yes
Alternatively specify "ssh -C" as your ssh command in your hgrc 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:
[paths]
alias1 = URL1
alias2 = URL2
...
You can then use the alias for any command that uses a url (for example
'hg pull alias1' would pull from the 'alias1' path).
timeless
help: some language fixes for help topics
r7804 Two path aliases are special because they are used as defaults
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693 when you do not provide the url to a command:
default:
When you create a repository with hg clone, the clone command saves
timeless
help: some language fixes for help topics
r7804 the location of the source repository as the new repository's
'default' path. This is then used when you omit path from push-
and pull-like commands (including in and out).
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693
default-push:
The push command will look for a path named 'default-push', and
prefer it over 'default' if both are defined.
''')),
Johannes Stezenbach
help: helptable is an ordered collection...
r6654 )