##// END OF EJS Templates
consolidated url help into urls help topic and added information about path aliases
consolidated url help into urls help topic and added information about path aliases

File last commit:

r7693:e040f9d6 default
r7693:e040f9d6 default
Show More
help.py
392 lines | 15.5 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'''
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163 Some commands allow the user to specify a date:
backout, commit, import, tag: Specify the commit date.
log, revert, update: Select revision(s) by date.
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:
"<{date}" - on or before a given date
">{date}" - on or after a given date
"{date} to {date}" - a date range, inclusive
"-{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.
To use a plain path name without any pattern matching, start a
name with "path:". These path names must match completely, from
the root of the current repository.
To use an extended glob, start a name with "glob:". Globs are
rooted at the current directory; a glob such as "*.c" will match
files ending in ".c" in the current directory only.
The supported glob syntax extensions are "**" to match any string
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
**.c any name ending in ".c" in the current directory, or
any subdirectory
foo/*.c any name ending in ".c" in the directory foo
foo/**.c any name ending in ".c" in the directory foo, or any
subdirectory
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,
extensions or external tools. If unset or empty, an executable named
'hg' (with com/exe/bat/cmd extension 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::
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660 This is the name of the editor to use 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
while transcoding user inputs. The default is "strict", which
causes Mercurial to abort if it can't translate 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.
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::
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 .hg/hgrc of
current repository is read.
For each element in path, if a directory, all entries in directory
ending with ".rc" are added to path. Else, element itself is
added to path.
HGUSER::
This is the string used for the author of a commit.
(deprecated, use .hgrc)
EMAIL::
If HGUSER is not set, this will be used as the author for a commit.
LOGNAME::
If neither HGUSER nor EMAIL is set, LOGNAME will be used (with
'@hostname' appended) as the author value for a commit.
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
appropriately if 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'''
Johannes Stezenbach
help: move "revision syntax" help topics into online help...
r6655 Mercurial accepts several notations for identifying individual
revisions.
A plain integer is treated as a revision number. Negative
integers are treated as offsets from the tip, with -1 denoting the
tip.
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
prefix of one full-length identifier.
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
specified individually, or provided as a continuous range,
separated by the ":" character.
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
gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.
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
- executable status
- 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
produced by default because there are very few tools which
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,
incoming, tip, parents, heads and glog are all template-enabled.
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.
- 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.
You can also use a chain of filters to get the wanted 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: some improvements for the templating topic
r7678 - age: Date. Returns a human-readable age for the given date.
- basename: Any text. Treats the text as a path, and returns the
Alexander Solovyov
help: add a topic about some of the templating features
r7677 basename. For example, "foo/bar/baz" becomes "baz".
Dirkjan Ochtman
help: some improvements for the templating topic
r7678 - date: Date. Returns a date in a Unix date command format, including
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.
- email: Any text. Extracts the first string that looks like an email
Alexander Solovyov
help: add a topic about some of the templating features
r7677 address.
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: some improvements for the templating topic
r7678 - shortdate: Date. Returns a date like "2006-09-04".
- 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,
or changeset to deal with in the remote repository.
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).
Two path aliases are more important because they are used as defaults
when you do not provide the url to a command:
default:
When you create a repository with hg clone, the clone command saves
the location of the source repository as the 'default' path. This is
then used when you omit a path from the push and pull commands.
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 )