upstream/mercurial-mirror Commit - r9540:cad36e49

help: un-indent help topics...

Martin Geisler -

r9540:cad36e49 default

parent child

help/dates.txt

0 +28 -28

@@ -1,36 +1,36 b''
1	Some commands allow the user to specify a date, e.g.:	1	Some commands allow the user to specify a date, e.g.:
2		2
3	- backout, commit, import, tag: Specify the commit date.	3	- backout, commit, import, tag: Specify the commit date.
4	- log, revert, update: Select revision(s) by date.	4	- log, revert, update: Select revision(s) by date.
5		5
6	Many date formats are valid. Here are some examples::	6	Many date formats are valid. Here are some examples::
7		7
8	"Wed Dec 6 13:18:29 2006" (local timezone assumed)	8	"Wed Dec 6 13:18:29 2006" (local timezone assumed)
9	"Dec 6 13:18 -0600" (year assumed, time offset provided)	9	"Dec 6 13:18 -0600" (year assumed, time offset provided)
10	"Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)	10	"Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
11	"Dec 6" (midnight)	11	"Dec 6" (midnight)
12	"13:18" (today assumed)	12	"13:18" (today assumed)
13	"3:39" (3:39AM assumed)	13	"3:39" (3:39AM assumed)
14	"3:39pm" (15:39)	14	"3:39pm" (15:39)
15	"2006-12-06 13:18:29" (ISO 8601 format)	15	"2006-12-06 13:18:29" (ISO 8601 format)
16	"2006-12-6 13:18"	16	"2006-12-6 13:18"
17	"2006-12-6"	17	"2006-12-6"
18	"12-6"	18	"12-6"
19	"12/6"	19	"12/6"
20	"12/6/6" (Dec 6 2006)	20	"12/6/6" (Dec 6 2006)
21		21
22	Lastly, there is Mercurial's internal format::	22	Lastly, there is Mercurial's internal format::
23		23
24	"1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)	24	"1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
25		25
26	This is the internal representation format for dates. unixtime is	26	This is the internal representation format for dates. unixtime is the
27	~~the~~ number of seconds since the epoch (1970-01-01 00:00 UTC).	27	number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
28	~~offset is~~ the offset of the local timezone, in seconds west of UTC	28	the offset of the local timezone, in seconds west of UTC (negative if
29	~~(negative if~~ the timezone is east of UTC).	29	the timezone is east of UTC).
30		30
31	The log command also accepts date ranges::	31	The log command also accepts date ranges::
32		32
33	"<{datetime}" - at or before a given date/time	33	"<{datetime}" - at or before a given date/time
34	">{datetime}" - on or after a given date/time	34	">{datetime}" - on or after a given date/time
35	"{datetime} to {datetime}" - a date range, inclusive	35	"{datetime} to {datetime}" - a date range, inclusive
36	"-{days}" - within a given number of days of today	36	"-{days}" - within a given number of days of today

help/diffs.txt

0 +24 -26

@@ -1,31 +1,29 b''
1	Mercurial's default format for showing changes between two	1	Mercurial's default format for showing changes between two versions of
2	~~versions of~~ a file is compatible with the unified format of GNU	2	a file is compatible with the unified format of GNU diff, which can be
3	~~diff, which can be~~ used by GNU patch and many other standard	3	used by GNU patch and many other standard tools.
4	tools.
5		4
6	While this standard format is often enough, it does not encode the	5	While this standard format is often enough, it does not encode the
7	following information:	6	following information:
8		7
9	- executable status and other permission bits	8	- executable status and other permission bits
10	- copy or rename information	9	- copy or rename information
11	- changes in binary files	10	- changes in binary files
12	- creation or deletion of empty files	11	- creation or deletion of empty files
13		12
14	Mercurial also supports the extended diff format from the git VCS	13	Mercurial also supports the extended diff format from the git VCS
15	which addresses these limitations. The git diff format is not	14	which addresses these limitations. The git diff format is not produced
16	~~produced~~ by default because a few widespread tools still do not	15	by default because a few widespread tools still do not understand this
17	understand this format.	16	format.
18		17
19	This means that when generating diffs from a Mercurial repository	18	This means that when generating diffs from a Mercurial repository
20	(e.g. with "hg export"), you should be careful about things like	19	(e.g. with "hg export"), you should be careful about things like file
21	~~file~~ copies and renames or other things mentioned above, because	20	copies and renames or other things mentioned above, because when
22	~~when~~ applying a standard diff to a different repository, this	21	applying a standard diff to a different repository, this extra
23	~~extra~~ information is lost. Mercurial's internal operations (like	22	information is lost. Mercurial's internal operations (like push and
24	~~push and~~ pull) are not affected by this, because they use an	23	pull) are not affected by this, because they use an internal binary
25	~~internal binary~~ format for communicating changes.	24	format for communicating changes.
26		25
27	To make Mercurial produce the git extended diff format, use the	26	To make Mercurial produce the git extended diff format, use the --git
28	~~--git~~ option available for many commands, or set 'git = True' in	27	option available for many commands, or set 'git = True' in the [diff]
29	~~the [diff]~~ section of your hgrc. You do not need to set this	28	section of your hgrc. You do not need to set this option when
30	~~option when~~ importing diffs in this format or using them in the mq	29	importing diffs in this format or using them in the mq extension.
31	extension.

help/extensions.txt

0 +26 -26

@@ -1,33 +1,33 b''
1	Mercurial has the ability to add new features through the use of	1	Mercurial has the ability to add new features through the use of
2	extensions. Extensions may add new commands, add options to	2	extensions. Extensions may add new commands, add options to
3	existing commands, change the default behavior of commands, or	3	existing commands, change the default behavior of commands, or
4	implement hooks.	4	implement hooks.
5		5
6	Extensions are not loaded by default for a variety of reasons:	6	Extensions are not loaded by default for a variety of reasons:
7	they can increase startup overhead; they may be meant for advanced	7	they can increase startup overhead; they may be meant for advanced
8	usage only; they may provide potentially dangerous abilities (such	8	usage only; they may provide potentially dangerous abilities (such
9	as letting you destroy or modify history); they might not be ready	9	as letting you destroy or modify history); they might not be ready
10	for prime time; or they may alter some usual behaviors of stock	10	for prime time; or they may alter some usual behaviors of stock
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
15	the Python search path, create an entry for it in your hgrc, like	15	the Python search path, create an entry for it in your hgrc, like
16	this::	16	this::
17		17
18	[extensions]	18	[extensions]
19	foo =	19	foo =
20		20
21	You may also specify the full path to an extension::	21	You may also specify the full path to an extension::
22		22
23	[extensions]	23	[extensions]
24	myfeature = ~/.hgext/myfeature.py	24	myfeature = ~/.hgext/myfeature.py
25		25
26	To explicitly disable an extension enabled in an hgrc of broader	26	To explicitly disable an extension enabled in an hgrc of broader
27	scope, prepend its path with !::	27	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
31	hgext.bar = !/path/to/extension/bar.py	31	hgext.bar = !/path/to/extension/bar.py
32	# ditto, but no path was supplied for extension baz	32	# ditto, but no path was supplied for extension baz
33	hgext.baz = !	33	hgext.baz = !

help/multirevs.txt

0 +10 -12

@@ -1,15 +1,13 b''
1	When Mercurial accepts more than one revision, they may be	1	When Mercurial accepts more than one revision, they may be specified
2	~~specified~~ individually, or provided as a topologically continuous	2	individually, or provided as a topologically continuous range,
3	~~range,~~ separated by the ":" character.	3	separated by the ":" character.
4		4
5	The syntax of range notation is [BEGIN]:[END], where BEGIN and END	5	The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
6	~~are~~ revision identifiers. Both BEGIN and END are optional. If	6	revision identifiers. Both BEGIN and END are optional. If BEGIN is not
7	~~BEGIN is not~~ specified, it defaults to revision number 0. If END	7	specified, it defaults to revision number 0. If END is not specified,
8	~~is not specified,~~ it defaults to the tip. The range ":" thus means	8	it defaults to the tip. The range ":" thus means "all revisions".
9	"all revisions".
10		9
11	If BEGIN is greater than END, revisions are treated in reverse	10	If BEGIN is greater than END, revisions are treated in reverse order.
12	order.
13		11
14	A range acts as a closed interval. This means that a range of 3:5	12	A range acts as a closed interval. This means that a range of 3:5
15	gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.	13	gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.

help/patterns.txt

0 +29 -29

@@ -1,41 +1,41 b''
1	Mercurial accepts several notations for identifying one or more	1	Mercurial accepts several notations for identifying one or more files
2	~~files~~ at a time.	2	at a time.
3		3
4	By default, Mercurial treats filenames as shell-style extended	4	By default, Mercurial treats filenames as shell-style extended glob
5	~~glob~~ patterns.	5	patterns.
6		6
7	Alternate pattern notations must be specified explicitly.	7	Alternate pattern notations must be specified explicitly.
8		8
9	To use a plain path name without any pattern matching, start it	9	To use a plain path name without any pattern matching, start it with
10	~~with~~ "path:". These path names must completely match starting at	10	"path:". These path names must completely match starting at the
11	~~the~~ current repository root.	11	current repository root.
12		12
13	To use an extended glob, start a name with "glob:". Globs are	13	To use an extended glob, start a name with "glob:". Globs are rooted
14	~~rooted~~ at the current directory; a glob such as "``*.c``" will	14	at the current directory; a glob such as "``*.c``" will only match
15	~~only match~~ files in the current directory ending with ".c".	15	files in the current directory ending with ".c".
16		16
17	The supported glob syntax extensions are "``**``" to match any	17	The supported glob syntax extensions are "``**``" to match any string
18	~~string~~ across path separators and "{a,b}" to mean "a or b".	18	across path separators and "{a,b}" to mean "a or b".
19		19
20	To use a Perl/Python regular expression, start a name with "re:".	20	To use a Perl/Python regular expression, start a name with "re:".
21	Regexp pattern matching is anchored at the root of the repository.	21	Regexp pattern matching is anchored at the root of the repository.
22		22
23	Plain examples::	23	Plain examples::
24		24
25	path:foo/bar a name bar in a directory named foo in the root	25	path:foo/bar a name bar in a directory named foo in the root
26	of the repository	26	of the repository
27	path:path:name a file or directory named "path:name"	27	path:path:name a file or directory named "path:name"
28		28
29	Glob examples::	29	Glob examples::
30		30
31	glob:*.c any name ending in ".c" in the current directory	31	glob:*.c any name ending in ".c" in the current directory
32	*.c any name ending in ".c" in the current directory	32	*.c any name ending in ".c" in the current directory
33	**.c any name ending in ".c" in any subdirectory of the	33	**.c any name ending in ".c" in any subdirectory of the
34	current directory including itself.	34	current directory including itself.
35	foo/*.c any name ending in ".c" in the directory foo	35	foo/*.c any name ending in ".c" in the directory foo
36	foo/**.c any name ending in ".c" in any subdirectory of foo	36	foo/**.c any name ending in ".c" in any subdirectory of foo
37	including itself.	37	including itself.
38		38
39	Regexp examples::	39	Regexp examples::
40		40
41	re:.*\.c$ any name ending in ".c", anywhere in the repository	41	re:.*\.c$ any name ending in ".c", anywhere in the repository

help/revisions.txt

0 +22 -22

@@ -1,29 +1,29 b''
1	Mercurial supports several ways to specify individual revisions.	1	Mercurial supports several ways to specify individual revisions.
2		2
3	A plain integer is treated as a revision number. Negative integers	3	A plain integer is treated as a revision number. Negative integers are
4	~~are~~ treated as sequential offsets from the tip, with -1 denoting	4	treated as sequential offsets from the tip, with -1 denoting the tip,
5	~~the tip,~~ -2 denoting the revision prior to the tip, and so forth.	5	-2 denoting the revision prior to the tip, and so forth.
6		6
7	A 40-digit hexadecimal string is treated as a unique revision	7	A 40-digit hexadecimal string is treated as a unique revision
8	identifier.	8	identifier.
9		9
10	A hexadecimal string less than 40 characters long is treated as a	10	A hexadecimal string less than 40 characters long is treated as a
11	unique revision identifier and is referred to as a short-form	11	unique revision identifier and is referred to as a short-form
12	identifier. A short-form identifier is only valid if it is the	12	identifier. A short-form identifier is only valid if it is the prefix
13	~~prefix~~ of exactly one full-length identifier.	13	of exactly one full-length identifier.
14		14
15	Any other string is treated as a tag or branch name. A tag name is	15	Any other string is treated as a tag or branch name. A tag name is a
16	a symbolic name associated with a revision identifier. A branch	16	symbolic name associated with a revision identifier. A branch name
17	~~name~~ denotes the tipmost revision of that branch. Tag and branch	17	denotes the tipmost revision of that branch. Tag and branch names must
18	~~names must~~ not contain the ":" character.	18	not contain the ":" character.
19		19
20	The reserved name "tip" is a special tag that always identifies	20	The reserved name "tip" is a special tag that always identifies the
21	~~the~~ most recent revision.	21	most recent revision.
22		22
23	The reserved name "null" indicates the null revision. This is the	23	The reserved name "null" indicates the null revision. This is the
24	revision of an empty repository, and the parent of revision 0.	24	revision of an empty repository, and the parent of revision 0.
25		25
26	The reserved name "." indicates the working directory parent. If	26	The reserved name "." indicates the working directory parent. If no
27	no working directory is checked out, it is equivalent to null. If	27	working directory is checked out, it is equivalent to null. If an
28	an uncommitted merge is in progress, "." is the revision of the	28	uncommitted merge is in progress, "." is the revision of the first
29	first parent.	29	parent.

help/templates.txt

0 +102 -102

@@ -1,113 +1,113 b''
1	Mercurial allows you to customize output of commands through	1	Mercurial allows you to customize output of commands through
2	templates. You can either pass in a template from the command	2	templates. You can either pass in a template from the command
3	line, via the --template option, or select an existing	3	line, via the --template option, or select an existing
4	template-style (--style).	4	template-style (--style).
5		5
6	You can customize output for any "log-like" command: log,	6	You can customize output for any "log-like" command: log,
7	outgoing, incoming, tip, parents, heads and glog.	7	outgoing, incoming, tip, parents, heads and glog.
8		8
9	Three styles are packaged with Mercurial: default (the style used	9	Three styles are packaged with Mercurial: default (the style used
10	when no explicit preference is passed), compact and changelog.	10	when no explicit preference is passed), compact and changelog.
11	Usage::	11	Usage::
12		12
13	$ hg log -r1 --style changelog	13	$ hg log -r1 --style changelog
14		14
15	A template is a piece of text, with markup to invoke variable	15	A template is a piece of text, with markup to invoke variable
16	expansion::	16	expansion::
17		17
18	$ hg log -r1 --template "{node}\n"	18	$ hg log -r1 --template "{node}\n"
19	b56ce7b07c52de7d5fd79fb89701ea538af65746	19	b56ce7b07c52de7d5fd79fb89701ea538af65746
20		20
21	Strings in curly braces are called keywords. The availability of	21	Strings in curly braces are called keywords. The availability of
22	keywords depends on the exact context of the templater. These	22	keywords depends on the exact context of the templater. These
23	keywords are usually available for templating a log-like command:	23	keywords are usually available for templating a log-like command:
24		24
25	:author: String. The unmodified author of the changeset.	25	:author: String. The unmodified author of the changeset.
26	:branches: String. The name of the branch on which the changeset	26	:branches: String. The name of the branch on which the changeset
27	was committed. Will be empty if the branch name was	27	was committed. Will be empty if the branch name was
28	default.	28	default.
29	:date: Date information. The date when the changeset was	29	:date: Date information. The date when the changeset was
30	committed.	30	committed.
31	:desc: String. The text of the changeset description.	31	:desc: String. The text of the changeset description.
32	:diffstat: String. Statistics of changes with the following	32	:diffstat: String. Statistics of changes with the following
33	format: "modified files: +added/-removed lines"	33	format: "modified files: +added/-removed lines"
34	:files: List of strings. All files modified, added, or removed	34	:files: List of strings. All files modified, added, or removed
35	by this changeset.	35	by this changeset.
36	:file_adds: List of strings. Files added by this changeset.	36	:file_adds: List of strings. Files added by this changeset.
37	:file_mods: List of strings. Files modified by this changeset.	37	:file_mods: List of strings. Files modified by this changeset.
38	:file_dels: List of strings. Files removed by this changeset.	38	:file_dels: List of strings. Files removed by this changeset.
39	:node: String. The changeset identification hash, as a	39	:node: String. The changeset identification hash, as a
40	40-character hexadecimal string.	40	40-character hexadecimal string.
41	:parents: List of strings. The parents of the changeset.	41	:parents: List of strings. The parents of the changeset.
42	:rev: Integer. The repository-local changeset revision	42	:rev: Integer. The repository-local changeset revision
43	number.	43	number.
44	:tags: List of strings. Any tags associated with the	44	:tags: List of strings. Any tags associated with the
45	changeset.	45	changeset.
46	:latesttag: String. Most recent global tag in the ancestors of this	46	:latesttag: String. Most recent global tag in the ancestors of this
47	changeset.	47	changeset.
48	:latesttagdistance: Integer. Longest path to the latest tag.	48	:latesttagdistance: Integer. Longest path to the latest tag.
49		49
50	The "date" keyword does not produce human-readable output. If you	50	The "date" keyword does not produce human-readable output. If you
51	want to use a date in your output, you can use a filter to process	51	want to use a date in your output, you can use a filter to process
52	it. Filters are functions which return a string based on the input	52	it. Filters are functions which return a string based on the input
53	variable. You can also use a chain of filters to get the desired	53	variable. You can also use a chain of filters to get the desired
54	output::	54	output::
55		55
56	$ hg tip --template "{date\|isodate}\n"	56	$ hg tip --template "{date\|isodate}\n"
57	2008-08-21 18:22 +0000	57	2008-08-21 18:22 +0000
58		58
59	List of filters:	59	List of filters:
60		60
61	:addbreaks: Any text. Add an XHTML "<br />" tag before the end of	61	:addbreaks: Any text. Add an XHTML "<br />" tag before the end of
62	every line except the last.	62	every line except the last.
63	:age: Date. Returns a human-readable date/time difference	63	:age: Date. Returns a human-readable date/time difference
64	between the given date/time and the current	64	between the given date/time and the current
65	date/time.	65	date/time.
66	:basename: Any text. Treats the text as a path, and returns the	66	:basename: Any text. Treats the text as a path, and returns the
67	last component of the path after splitting by the	67	last component of the path after splitting by the
68	path separator (ignoring trailing separators). For	68	path separator (ignoring trailing separators). For
69	example, "foo/bar/baz" becomes "baz" and "foo/bar//"	69	example, "foo/bar/baz" becomes "baz" and "foo/bar//"
70	becomes "bar".	70	becomes "bar".
71	:stripdir: Treat the text as path and strip a directory level,	71	:stripdir: Treat the text as path and strip a directory level,
72	if possible. For example, "foo" and "foo/bar" becomes	72	if possible. For example, "foo" and "foo/bar" becomes
73	"foo".	73	"foo".
74	:date: Date. Returns a date in a Unix date format, including	74	:date: Date. Returns a date in a Unix date format, including
75	the timezone: "Mon Sep 04 15:13:13 2006 0700".	75	the timezone: "Mon Sep 04 15:13:13 2006 0700".
76	:domain: Any text. Finds the first string that looks like an	76	:domain: Any text. Finds the first string that looks like an
77	email address, and extracts just the domain	77	email address, and extracts just the domain
78	component. Example: 'User <user@example.com>' becomes	78	component. Example: 'User <user@example.com>' becomes
79	'example.com'.	79	'example.com'.
80	:email: Any text. Extracts the first string that looks like	80	:email: Any text. Extracts the first string that looks like
81	an email address. Example: 'User <user@example.com>'	81	an email address. Example: 'User <user@example.com>'
82	becomes 'user@example.com'.	82	becomes 'user@example.com'.
83	:escape: Any text. Replaces the special XML/XHTML characters	83	:escape: Any text. Replaces the special XML/XHTML characters
84	"&", "<" and ">" with XML entities.	84	"&", "<" and ">" with XML entities.
85	:fill68: Any text. Wraps the text to fit in 68 columns.	85	:fill68: Any text. Wraps the text to fit in 68 columns.
86	:fill76: Any text. Wraps the text to fit in 76 columns.	86	:fill76: Any text. Wraps the text to fit in 76 columns.
87	:firstline: Any text. Returns the first line of text.	87	:firstline: Any text. Returns the first line of text.
88	:nonempty: Any text. Returns '(none)' if the string is empty.	88	:nonempty: Any text. Returns '(none)' if the string is empty.
89	:hgdate: Date. Returns the date as a pair of numbers:	89	:hgdate: Date. Returns the date as a pair of numbers:
90	"1157407993 25200" (Unix timestamp, timezone offset).	90	"1157407993 25200" (Unix timestamp, timezone offset).
91	:isodate: Date. Returns the date in ISO 8601 format:	91	:isodate: Date. Returns the date in ISO 8601 format:
92	"2009-08-18 13:00 +0200".	92	"2009-08-18 13:00 +0200".
93	:isodatesec: Date. Returns the date in ISO 8601 format, including	93	:isodatesec: Date. Returns the date in ISO 8601 format, including
94	seconds: "2009-08-18 13:00:13 +0200". See also the	94	seconds: "2009-08-18 13:00:13 +0200". See also the
95	rfc3339date filter.	95	rfc3339date filter.
96	:localdate: Date. Converts a date to local date.	96	:localdate: Date. Converts a date to local date.
97	:obfuscate: Any text. Returns the input text rendered as a	97	:obfuscate: Any text. Returns the input text rendered as a
98	sequence of XML entities.	98	sequence of XML entities.
99	:person: Any text. Returns the text before an email address.	99	:person: Any text. Returns the text before an email address.
100	:rfc822date: Date. Returns a date using the same format used in	100	:rfc822date: Date. Returns a date using the same format used in
101	email headers: "Tue, 18 Aug 2009 13:00:13 +0200".	101	email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
102	:rfc3339date: Date. Returns a date using the Internet date format	102	:rfc3339date: Date. Returns a date using the Internet date format
103	specified in RFC 3339: "2009-08-18T13:00:13+02:00".	103	specified in RFC 3339: "2009-08-18T13:00:13+02:00".
104	:short: Changeset hash. Returns the short form of a changeset	104	:short: Changeset hash. Returns the short form of a changeset
105	hash, i.e. a 12-byte hexadecimal string.	105	hash, i.e. a 12-byte hexadecimal string.
106	:shortdate: Date. Returns a date like "2006-09-18".	106	:shortdate: Date. Returns a date like "2006-09-18".
107	:strip: Any text. Strips all leading and trailing whitespace.	107	:strip: Any text. Strips all leading and trailing whitespace.
108	:tabindent: Any text. Returns the text, with every line except	108	:tabindent: Any text. Returns the text, with every line except
109	the first starting with a tab character.	109	the first starting with a tab character.
110	:urlescape: Any text. Escapes all "special" characters. For	110	:urlescape: Any text. Escapes all "special" characters. For
111	example, "foo bar" becomes "foo%20bar".	111	example, "foo bar" becomes "foo%20bar".
112	:user: Any text. Returns the user portion of an email	112	:user: Any text. Returns the user portion of an email
113	address.	113	address.

help/urls.txt

0 +49 -52

@@ -1,66 +1,63 b''
1	Valid URLs are of the form::	1	Valid URLs are of the form::
		2
		3	local/filesystem/path[#revision]
		4	file://local/filesystem/path[#revision]
		5	http://[user[:pass]@]host[:port]/[path][#revision]
		6	https://[user[:pass]@]host[:port]/[path][#revision]
		7	ssh://[user[:pass]@]host[:port]/[path][#revision]
2		8
3	local/filesystem/path[#revision]	9	Paths in the local filesystem can either point to Mercurial
4	file://local/filesystem/path[#revision]	10	repositories or to bundle files (as created by 'hg bundle' or 'hg
5	http://[user[:pass]@]host[:port]/[path][#revision]	11	incoming --bundle').
6	https://[user[:pass]@]host[:port]/[path][#revision]
7	ssh://[user[:pass]@]host[:port]/[path][#revision]
8		12
9	Paths in the local filesystem can either point to Mercurial	13	An optional identifier after # indicates a particular branch, tag, or
10	repositories or to bundle files (as created by 'hg bundle' or 'hg	14	changeset to use from the remote repository. See also 'hg help
11	incoming --bundle').	15	revisions'.
12		16
13	An optional identifier after # indicates a particular branch, tag,	17	Some features, such as pushing to http:// and https:// URLs are only
14	or changeset to use from the remote repository. See also 'hg help	18	possible if the feature is explicitly enabled on the remote Mercurial
15	revisions'.	19	server.
16		20
17	Some features, such as pushing to http:// and https:// URLs are	21	Some notes about using SSH with Mercurial:
18	only possible if the feature is explicitly enabled on the remote
19	Mercurial server.
20		22
21	Some notes about using SSH with Mercurial:	23	- SSH requires an accessible shell account on the destination machine
		24	and a copy of hg in the remote path or specified with as remotecmd.
		25	- path is relative to the remote user's home directory by default. Use
		26	an extra slash at the start of a path to specify an absolute path::
22		27
23	- SSH requires an accessible shell account on the destination	28	ssh://example.com//tmp/repository
24	machine and a copy of hg in the remote path or specified with as
25	remotecmd.
26	- path is relative to the remote user's home directory by default.
27	Use an extra slash at the start of a path to specify an absolute
28	path::
29		29
30	ssh://example.com//tmp/repository	30	- Mercurial doesn't use its own compression via SSH; the right thing
		31	to do is to configure it in your ~/.ssh/config, e.g.::
31		32
32	- Mercurial doesn't use its own compression via SSH; the right	33	Host *.mylocalnetwork.example.com
33	thing to do is to configure it in your ~/.ssh/config, e.g.::	34	Compression no
		35	Host *
		36	Compression yes
		37
		38	Alternatively specify "ssh -C" as your ssh command in your hgrc or
		39	with the --ssh command line option.
34		40
35	Host *.mylocalnetwork.example.com	41	These URLs can all be stored in your hgrc with path aliases under the
36	Compression no	42	[paths] section like so::
37	Host *
38	Compression yes
39		43
40	Alternatively specify "ssh -C" as your ssh command in your hgrc	44	[paths]
41	or with the --ssh command line option.	45	alias1 = URL1
42		46	alias2 = URL2
43	These URLs can all be stored in your hgrc with path aliases under	47	...
44	the [paths] section like so::
45		48
46	[paths]	49	You can then use the alias for any command that uses a URL (for
47	alias1 = URL1	50	example 'hg pull alias1' would pull from the 'alias1' path).
48	alias2 = URL2
49	...
50		51
51	You can then use the alias for any command that uses a URL (for	52	Two path aliases are special because they are used as defaults when
52	example 'hg pull alias1' would pull from the 'alias1' path).	53	you do not provide the URL to a command:
53
54	Two path aliases are special because they are used as defaults
55	when you do not provide the URL to a command:
56		54
57	default:	55	default:
58	When you create a repository with hg clone, the clone command	56	When you create a repository with hg clone, the clone command saves
59	~~saves~~ the location of the source repository as the new	57	the location of the source repository as the new repository's
60	~~repository's~~ 'default' path. This is then used when you omit	58	'default' path. This is then used when you omit path from push- and
61	~~path from push- and~~ pull-like commands (including incoming and	59	pull-like commands (including incoming and outgoing).
62	outgoing).
63		60
64	default-push:	61	default-push:
65	The push command will look for a path named 'default-push', and	62	The push command will look for a path named 'default-push', and
66	prefer it over 'default' if both are defined.	63	prefer it over 'default' if both are defined.

mercurial/commands.py

0 +1 -1

                         doc = doc()
                     ui.write("%s\n\n" % header)
-                    ui.write("%s\n" % minirst.format(doc, textwidth))
+                    ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
                 def helpext(name):
                     try:

mercurial/minirst.py

0 +3 -1

                                          subsequent_indent=subindent)
-            def format(text, width):
+            def format(text, width, indent=0):
                 """Parse and format the text according to width."""
                 blocks = findblocks(text)
+                for b in blocks:
+                    b['indent'] += indent
                 blocks = findliteralblocks(blocks)
                 blocks = findsections(blocks)
                 blocks = findbulletlists(blocks)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages