Show More
@@ -0,0 +1,37 b'' | |||||
|
1 | Mercurial reads configuration data from several files, if they exist. | |||
|
2 | Below we list the most specific file first. | |||
|
3 | ||||
|
4 | On Windows, these configuration files are read: | |||
|
5 | ||||
|
6 | - ``<repo>\.hg\hgrc`` | |||
|
7 | - ``%USERPROFILE%\.hgrc`` | |||
|
8 | - ``%USERPROFILE%\Mercurial.ini`` | |||
|
9 | - ``%HOME%\.hgrc`` | |||
|
10 | - ``%HOME%\Mercurial.ini`` | |||
|
11 | - ``C:\Mercurial\Mercurial.ini`` | |||
|
12 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` | |||
|
13 | - ``<install-dir>\Mercurial.ini`` | |||
|
14 | ||||
|
15 | On Unix, these files are read: | |||
|
16 | ||||
|
17 | - ``<repo>/.hg/hgrc`` | |||
|
18 | - ``$HOME/.hgrc`` | |||
|
19 | - ``/etc/mercurial/hgrc`` | |||
|
20 | - ``/etc/mercurial/hgrc.d/*.rc`` | |||
|
21 | - ``<install-root>/etc/mercurial/hgrc`` | |||
|
22 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` | |||
|
23 | ||||
|
24 | The configuration files for Mercurial use a simple ini-file format. A | |||
|
25 | configuration file consists of sections, led by a ``[section]`` header | |||
|
26 | and followed by ``name = value`` entries:: | |||
|
27 | ||||
|
28 | [ui] | |||
|
29 | username = Firstname Lastname <firstname.lastname@example.net> | |||
|
30 | verbose = True | |||
|
31 | ||||
|
32 | This above entries will be referred to as ``ui.username`` and | |||
|
33 | ``ui.verbose``, respectively. Please see the hgrc man page for a full | |||
|
34 | description of the possible configuration values: | |||
|
35 | ||||
|
36 | - on Unix-like systems: ``man hgrc`` | |||
|
37 | - online: http://www.selenic.com/mercurial/hgrc.5.html |
@@ -1,92 +1,93 b'' | |||||
1 | # help.py - help data for mercurial |
|
1 | # help.py - help data for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2006 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2, incorporated herein by reference. |
|
6 | # GNU General Public License version 2, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from i18n import gettext, _ |
|
8 | from i18n import gettext, _ | |
9 | import sys, os |
|
9 | import sys, os | |
10 | import extensions |
|
10 | import extensions | |
11 |
|
11 | |||
12 |
|
12 | |||
13 | def moduledoc(file): |
|
13 | def moduledoc(file): | |
14 | '''return the top-level python documentation for the given file |
|
14 | '''return the top-level python documentation for the given file | |
15 |
|
15 | |||
16 | Loosely inspired by pydoc.source_synopsis(), but rewritten to handle \''' |
|
16 | Loosely inspired by pydoc.source_synopsis(), but rewritten to handle \''' | |
17 | as well as """ and to return the whole text instead of just the synopsis''' |
|
17 | as well as """ and to return the whole text instead of just the synopsis''' | |
18 | result = [] |
|
18 | result = [] | |
19 |
|
19 | |||
20 | line = file.readline() |
|
20 | line = file.readline() | |
21 | while line[:1] == '#' or not line.strip(): |
|
21 | while line[:1] == '#' or not line.strip(): | |
22 | line = file.readline() |
|
22 | line = file.readline() | |
23 | if not line: break |
|
23 | if not line: break | |
24 |
|
24 | |||
25 | start = line[:3] |
|
25 | start = line[:3] | |
26 | if start == '"""' or start == "'''": |
|
26 | if start == '"""' or start == "'''": | |
27 | line = line[3:] |
|
27 | line = line[3:] | |
28 | while line: |
|
28 | while line: | |
29 | if line.rstrip().endswith(start): |
|
29 | if line.rstrip().endswith(start): | |
30 | line = line.split(start)[0] |
|
30 | line = line.split(start)[0] | |
31 | if line: |
|
31 | if line: | |
32 | result.append(line) |
|
32 | result.append(line) | |
33 | break |
|
33 | break | |
34 | elif not line: |
|
34 | elif not line: | |
35 | return None # unmatched delimiter |
|
35 | return None # unmatched delimiter | |
36 | result.append(line) |
|
36 | result.append(line) | |
37 | line = file.readline() |
|
37 | line = file.readline() | |
38 | else: |
|
38 | else: | |
39 | return None |
|
39 | return None | |
40 |
|
40 | |||
41 | return ''.join(result) |
|
41 | return ''.join(result) | |
42 |
|
42 | |||
43 | def listexts(header, exts, maxlength): |
|
43 | def listexts(header, exts, maxlength): | |
44 | '''return a text listing of the given extensions''' |
|
44 | '''return a text listing of the given extensions''' | |
45 | if not exts: |
|
45 | if not exts: | |
46 | return '' |
|
46 | return '' | |
47 | result = '\n%s\n\n' % header |
|
47 | result = '\n%s\n\n' % header | |
48 | for name, desc in sorted(exts.iteritems()): |
|
48 | for name, desc in sorted(exts.iteritems()): | |
49 | result += ' %-*s %s\n' % (maxlength + 2, ':%s:' % name, desc) |
|
49 | result += ' %-*s %s\n' % (maxlength + 2, ':%s:' % name, desc) | |
50 | return result |
|
50 | return result | |
51 |
|
51 | |||
52 | def extshelp(): |
|
52 | def extshelp(): | |
53 | doc = loaddoc('extensions')() |
|
53 | doc = loaddoc('extensions')() | |
54 |
|
54 | |||
55 | exts, maxlength = extensions.enabled() |
|
55 | exts, maxlength = extensions.enabled() | |
56 | doc += listexts(_('enabled extensions:'), exts, maxlength) |
|
56 | doc += listexts(_('enabled extensions:'), exts, maxlength) | |
57 |
|
57 | |||
58 | exts, maxlength = extensions.disabled() |
|
58 | exts, maxlength = extensions.disabled() | |
59 | doc += listexts(_('disabled extensions:'), exts, maxlength) |
|
59 | doc += listexts(_('disabled extensions:'), exts, maxlength) | |
60 |
|
60 | |||
61 | return doc |
|
61 | return doc | |
62 |
|
62 | |||
63 | def loaddoc(topic): |
|
63 | def loaddoc(topic): | |
64 | """Return a delayed loader for help/topic.txt.""" |
|
64 | """Return a delayed loader for help/topic.txt.""" | |
65 |
|
65 | |||
66 | def loader(): |
|
66 | def loader(): | |
67 | if hasattr(sys, 'frozen'): |
|
67 | if hasattr(sys, 'frozen'): | |
68 | module = sys.executable |
|
68 | module = sys.executable | |
69 | else: |
|
69 | else: | |
70 | module = __file__ |
|
70 | module = __file__ | |
71 | base = os.path.dirname(module) |
|
71 | base = os.path.dirname(module) | |
72 |
|
72 | |||
73 | for dir in ('.', '..'): |
|
73 | for dir in ('.', '..'): | |
74 | docdir = os.path.join(base, dir, 'help') |
|
74 | docdir = os.path.join(base, dir, 'help') | |
75 | if os.path.isdir(docdir): |
|
75 | if os.path.isdir(docdir): | |
76 | break |
|
76 | break | |
77 |
|
77 | |||
78 | path = os.path.join(docdir, topic + ".txt") |
|
78 | path = os.path.join(docdir, topic + ".txt") | |
79 | return gettext(open(path).read()) |
|
79 | return gettext(open(path).read()) | |
80 | return loader |
|
80 | return loader | |
81 |
|
81 | |||
82 | helptable = ( |
|
82 | helptable = ( | |
|
83 | (["config"], _("Configuration Files"), loaddoc('config')), | |||
83 | (["dates"], _("Date Formats"), loaddoc('dates')), |
|
84 | (["dates"], _("Date Formats"), loaddoc('dates')), | |
84 | (["patterns"], _("File Name Patterns"), loaddoc('patterns')), |
|
85 | (["patterns"], _("File Name Patterns"), loaddoc('patterns')), | |
85 | (['environment', 'env'], _('Environment Variables'), loaddoc('environment')), |
|
86 | (['environment', 'env'], _('Environment Variables'), loaddoc('environment')), | |
86 | (['revs', 'revisions'], _('Specifying Single Revisions'), loaddoc('revisions')), |
|
87 | (['revs', 'revisions'], _('Specifying Single Revisions'), loaddoc('revisions')), | |
87 | (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), loaddoc('multirevs')), |
|
88 | (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), loaddoc('multirevs')), | |
88 | (['diffs'], _('Diff Formats'), loaddoc('diffs')), |
|
89 | (['diffs'], _('Diff Formats'), loaddoc('diffs')), | |
89 | (['templating', 'templates'], _('Template Usage'), loaddoc('templates')), |
|
90 | (['templating', 'templates'], _('Template Usage'), loaddoc('templates')), | |
90 | (['urls'], _('URL Paths'), loaddoc('urls')), |
|
91 | (['urls'], _('URL Paths'), loaddoc('urls')), | |
91 | (["extensions"], _("Using additional features"), extshelp), |
|
92 | (["extensions"], _("Using additional features"), extshelp), | |
92 | ) |
|
93 | ) |
@@ -1,284 +1,286 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | adding b |
|
2 | adding b | |
3 | updating to branch default |
|
3 | updating to branch default | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | pulling from ../b |
|
5 | pulling from ../b | |
6 | searching for changes |
|
6 | searching for changes | |
7 | warning: repository is unrelated |
|
7 | warning: repository is unrelated | |
8 | adding changesets |
|
8 | adding changesets | |
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
11 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
12 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | (branch merge, don't forget to commit) |
|
14 | (branch merge, don't forget to commit) | |
15 | %% -R/--repository |
|
15 | %% -R/--repository | |
16 | changeset: 0:8580ff50825a |
|
16 | changeset: 0:8580ff50825a | |
17 | tag: tip |
|
17 | tag: tip | |
18 | user: test |
|
18 | user: test | |
19 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
19 | date: Thu Jan 01 00:00:01 1970 +0000 | |
20 | summary: a |
|
20 | summary: a | |
21 |
|
21 | |||
22 | changeset: 0:b6c483daf290 |
|
22 | changeset: 0:b6c483daf290 | |
23 | tag: tip |
|
23 | tag: tip | |
24 | user: test |
|
24 | user: test | |
25 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
25 | date: Thu Jan 01 00:00:01 1970 +0000 | |
26 | summary: b |
|
26 | summary: b | |
27 |
|
27 | |||
28 | %% implicit -R |
|
28 | %% implicit -R | |
29 | 0: a |
|
29 | 0: a | |
30 | 0: a |
|
30 | 0: a | |
31 | abort: There is no Mercurial repository here (.hg not found)! |
|
31 | abort: There is no Mercurial repository here (.hg not found)! | |
32 | abort: a/a not under root |
|
32 | abort: a/a not under root | |
33 | abort: There is no Mercurial repository here (.hg not found)! |
|
33 | abort: There is no Mercurial repository here (.hg not found)! | |
34 | %% abbrev of long option |
|
34 | %% abbrev of long option | |
35 | changeset: 1:b6c483daf290 |
|
35 | changeset: 1:b6c483daf290 | |
36 | tag: tip |
|
36 | tag: tip | |
37 | parent: -1:000000000000 |
|
37 | parent: -1:000000000000 | |
38 | user: test |
|
38 | user: test | |
39 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
39 | date: Thu Jan 01 00:00:01 1970 +0000 | |
40 | summary: b |
|
40 | summary: b | |
41 |
|
41 | |||
42 | %% earlygetopt with duplicate options (36d23de02da1) |
|
42 | %% earlygetopt with duplicate options (36d23de02da1) | |
43 | changeset: 1:b6c483daf290 |
|
43 | changeset: 1:b6c483daf290 | |
44 | tag: tip |
|
44 | tag: tip | |
45 | parent: -1:000000000000 |
|
45 | parent: -1:000000000000 | |
46 | user: test |
|
46 | user: test | |
47 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
47 | date: Thu Jan 01 00:00:01 1970 +0000 | |
48 | summary: b |
|
48 | summary: b | |
49 |
|
49 | |||
50 | changeset: 0:8580ff50825a |
|
50 | changeset: 0:8580ff50825a | |
51 | tag: tip |
|
51 | tag: tip | |
52 | user: test |
|
52 | user: test | |
53 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
53 | date: Thu Jan 01 00:00:01 1970 +0000 | |
54 | summary: a |
|
54 | summary: a | |
55 |
|
55 | |||
56 | %% earlygetopt short option without following space |
|
56 | %% earlygetopt short option without following space | |
57 | 0:b6c483daf290 |
|
57 | 0:b6c483daf290 | |
58 | %% earlygetopt with illegal abbreviations |
|
58 | %% earlygetopt with illegal abbreviations | |
59 | abort: Option --config may not be abbreviated! |
|
59 | abort: Option --config may not be abbreviated! | |
60 | abort: Option --cwd may not be abbreviated! |
|
60 | abort: Option --cwd may not be abbreviated! | |
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
64 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
64 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
65 | %% --cwd |
|
65 | %% --cwd | |
66 | changeset: 0:8580ff50825a |
|
66 | changeset: 0:8580ff50825a | |
67 | tag: tip |
|
67 | tag: tip | |
68 | user: test |
|
68 | user: test | |
69 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
69 | date: Thu Jan 01 00:00:01 1970 +0000 | |
70 | summary: a |
|
70 | summary: a | |
71 |
|
71 | |||
72 | %% -y/--noninteractive - just be sure it is parsed |
|
72 | %% -y/--noninteractive - just be sure it is parsed | |
73 | 0:8580ff50825a |
|
73 | 0:8580ff50825a | |
74 | 0:8580ff50825a |
|
74 | 0:8580ff50825a | |
75 | %% -q/--quiet |
|
75 | %% -q/--quiet | |
76 | 0:8580ff50825a |
|
76 | 0:8580ff50825a | |
77 | 0:b6c483daf290 |
|
77 | 0:b6c483daf290 | |
78 | 0:8580ff50825a |
|
78 | 0:8580ff50825a | |
79 | 1:b6c483daf290 |
|
79 | 1:b6c483daf290 | |
80 | %% -v/--verbose |
|
80 | %% -v/--verbose | |
81 | changeset: 1:b6c483daf290 |
|
81 | changeset: 1:b6c483daf290 | |
82 | tag: tip |
|
82 | tag: tip | |
83 | parent: -1:000000000000 |
|
83 | parent: -1:000000000000 | |
84 | user: test |
|
84 | user: test | |
85 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:01 1970 +0000 | |
86 | files: b |
|
86 | files: b | |
87 | description: |
|
87 | description: | |
88 | b |
|
88 | b | |
89 |
|
89 | |||
90 |
|
90 | |||
91 | changeset: 0:8580ff50825a |
|
91 | changeset: 0:8580ff50825a | |
92 | user: test |
|
92 | user: test | |
93 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
93 | date: Thu Jan 01 00:00:01 1970 +0000 | |
94 | files: a |
|
94 | files: a | |
95 | description: |
|
95 | description: | |
96 | a |
|
96 | a | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | changeset: 0:b6c483daf290 |
|
99 | changeset: 0:b6c483daf290 | |
100 | tag: tip |
|
100 | tag: tip | |
101 | user: test |
|
101 | user: test | |
102 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
102 | date: Thu Jan 01 00:00:01 1970 +0000 | |
103 | files: b |
|
103 | files: b | |
104 | description: |
|
104 | description: | |
105 | b |
|
105 | b | |
106 |
|
106 | |||
107 |
|
107 | |||
108 | %% --config |
|
108 | %% --config | |
109 | quuxfoo |
|
109 | quuxfoo | |
110 | abort: malformed --config option: |
|
110 | abort: malformed --config option: | |
111 | abort: malformed --config option: a.b |
|
111 | abort: malformed --config option: a.b | |
112 | abort: malformed --config option: a |
|
112 | abort: malformed --config option: a | |
113 | abort: malformed --config option: a.= |
|
113 | abort: malformed --config option: a.= | |
114 | abort: malformed --config option: .b= |
|
114 | abort: malformed --config option: .b= | |
115 | %% --debug |
|
115 | %% --debug | |
116 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a |
|
116 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a | |
117 | tag: tip |
|
117 | tag: tip | |
118 | parent: -1:0000000000000000000000000000000000000000 |
|
118 | parent: -1:0000000000000000000000000000000000000000 | |
119 | parent: -1:0000000000000000000000000000000000000000 |
|
119 | parent: -1:0000000000000000000000000000000000000000 | |
120 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 |
|
120 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 | |
121 | user: test |
|
121 | user: test | |
122 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
122 | date: Thu Jan 01 00:00:01 1970 +0000 | |
123 | files+: b |
|
123 | files+: b | |
124 | extra: branch=default |
|
124 | extra: branch=default | |
125 | description: |
|
125 | description: | |
126 | b |
|
126 | b | |
127 |
|
127 | |||
128 |
|
128 | |||
129 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
129 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab | |
130 | parent: -1:0000000000000000000000000000000000000000 |
|
130 | parent: -1:0000000000000000000000000000000000000000 | |
131 | parent: -1:0000000000000000000000000000000000000000 |
|
131 | parent: -1:0000000000000000000000000000000000000000 | |
132 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
132 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
133 | user: test |
|
133 | user: test | |
134 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
134 | date: Thu Jan 01 00:00:01 1970 +0000 | |
135 | files+: a |
|
135 | files+: a | |
136 | extra: branch=default |
|
136 | extra: branch=default | |
137 | description: |
|
137 | description: | |
138 | a |
|
138 | a | |
139 |
|
139 | |||
140 |
|
140 | |||
141 | %% --traceback |
|
141 | %% --traceback | |
142 | Traceback (most recent call last): |
|
142 | Traceback (most recent call last): | |
143 | %% --time |
|
143 | %% --time | |
144 | Time: real x.x secs (user x.x+x.x sys x.x+x.x) |
|
144 | Time: real x.x secs (user x.x+x.x sys x.x+x.x) | |
145 | %% --version |
|
145 | %% --version | |
146 | Mercurial Distributed SCM (version xxx) |
|
146 | Mercurial Distributed SCM (version xxx) | |
147 | %% -h/--help |
|
147 | %% -h/--help | |
148 | Mercurial Distributed SCM |
|
148 | Mercurial Distributed SCM | |
149 |
|
149 | |||
150 | list of commands: |
|
150 | list of commands: | |
151 |
|
151 | |||
152 | add add the specified files on the next commit |
|
152 | add add the specified files on the next commit | |
153 | addremove add all new files, delete all missing files |
|
153 | addremove add all new files, delete all missing files | |
154 | annotate show changeset information by line for each file |
|
154 | annotate show changeset information by line for each file | |
155 | archive create an unversioned archive of a repository revision |
|
155 | archive create an unversioned archive of a repository revision | |
156 | backout reverse effect of earlier changeset |
|
156 | backout reverse effect of earlier changeset | |
157 | bisect subdivision search of changesets |
|
157 | bisect subdivision search of changesets | |
158 | branch set or show the current branch name |
|
158 | branch set or show the current branch name | |
159 | branches list repository named branches |
|
159 | branches list repository named branches | |
160 | bundle create a changegroup file |
|
160 | bundle create a changegroup file | |
161 | cat output the current or given revision of files |
|
161 | cat output the current or given revision of files | |
162 | clone make a copy of an existing repository |
|
162 | clone make a copy of an existing repository | |
163 | commit commit the specified files or all outstanding changes |
|
163 | commit commit the specified files or all outstanding changes | |
164 | copy mark files as copied for the next commit |
|
164 | copy mark files as copied for the next commit | |
165 | diff diff repository (or selected files) |
|
165 | diff diff repository (or selected files) | |
166 | export dump the header and diffs for one or more changesets |
|
166 | export dump the header and diffs for one or more changesets | |
167 | forget forget the specified files on the next commit |
|
167 | forget forget the specified files on the next commit | |
168 | grep search for a pattern in specified files and revisions |
|
168 | grep search for a pattern in specified files and revisions | |
169 | heads show current repository heads or show branch heads |
|
169 | heads show current repository heads or show branch heads | |
170 | help show help for a given topic or a help overview |
|
170 | help show help for a given topic or a help overview | |
171 | identify identify the working copy or specified revision |
|
171 | identify identify the working copy or specified revision | |
172 | import import an ordered set of patches |
|
172 | import import an ordered set of patches | |
173 | incoming show new changesets found in source |
|
173 | incoming show new changesets found in source | |
174 | init create a new repository in the given directory |
|
174 | init create a new repository in the given directory | |
175 | locate locate files matching specific patterns |
|
175 | locate locate files matching specific patterns | |
176 | log show revision history of entire repository or files |
|
176 | log show revision history of entire repository or files | |
177 | manifest output the current or given revision of the project manifest |
|
177 | manifest output the current or given revision of the project manifest | |
178 | merge merge working directory with another revision |
|
178 | merge merge working directory with another revision | |
179 | outgoing show changesets not found in destination |
|
179 | outgoing show changesets not found in destination | |
180 | parents show the parents of the working directory or revision |
|
180 | parents show the parents of the working directory or revision | |
181 | paths show aliases for remote repositories |
|
181 | paths show aliases for remote repositories | |
182 | pull pull changes from the specified source |
|
182 | pull pull changes from the specified source | |
183 | push push changes to the specified destination |
|
183 | push push changes to the specified destination | |
184 | recover roll back an interrupted transaction |
|
184 | recover roll back an interrupted transaction | |
185 | remove remove the specified files on the next commit |
|
185 | remove remove the specified files on the next commit | |
186 | rename rename files; equivalent of copy + remove |
|
186 | rename rename files; equivalent of copy + remove | |
187 | resolve retry file merges from a merge or update |
|
187 | resolve retry file merges from a merge or update | |
188 | revert restore individual files or directories to an earlier state |
|
188 | revert restore individual files or directories to an earlier state | |
189 | rollback roll back the last transaction |
|
189 | rollback roll back the last transaction | |
190 | root print the root (top) of the current working directory |
|
190 | root print the root (top) of the current working directory | |
191 | serve export the repository via HTTP |
|
191 | serve export the repository via HTTP | |
192 | showconfig show combined config settings from all hgrc files |
|
192 | showconfig show combined config settings from all hgrc files | |
193 | status show changed files in the working directory |
|
193 | status show changed files in the working directory | |
194 | summary summarize working directory state |
|
194 | summary summarize working directory state | |
195 | tag add one or more tags for the current or given revision |
|
195 | tag add one or more tags for the current or given revision | |
196 | tags list repository tags |
|
196 | tags list repository tags | |
197 | tip show the tip revision |
|
197 | tip show the tip revision | |
198 | unbundle apply one or more changegroup files |
|
198 | unbundle apply one or more changegroup files | |
199 | update update working directory |
|
199 | update update working directory | |
200 | verify verify the integrity of the repository |
|
200 | verify verify the integrity of the repository | |
201 | version output version and copyright information |
|
201 | version output version and copyright information | |
202 |
|
202 | |||
203 | additional help topics: |
|
203 | additional help topics: | |
204 |
|
204 | |||
|
205 | config Configuration Files | |||
205 | dates Date Formats |
|
206 | dates Date Formats | |
206 | patterns File Name Patterns |
|
207 | patterns File Name Patterns | |
207 | environment Environment Variables |
|
208 | environment Environment Variables | |
208 | revisions Specifying Single Revisions |
|
209 | revisions Specifying Single Revisions | |
209 | multirevs Specifying Multiple Revisions |
|
210 | multirevs Specifying Multiple Revisions | |
210 | diffs Diff Formats |
|
211 | diffs Diff Formats | |
211 | templating Template Usage |
|
212 | templating Template Usage | |
212 | urls URL Paths |
|
213 | urls URL Paths | |
213 | extensions Using additional features |
|
214 | extensions Using additional features | |
214 |
|
215 | |||
215 | use "hg -v help" to show aliases and global options |
|
216 | use "hg -v help" to show aliases and global options | |
216 | Mercurial Distributed SCM |
|
217 | Mercurial Distributed SCM | |
217 |
|
218 | |||
218 | list of commands: |
|
219 | list of commands: | |
219 |
|
220 | |||
220 | add add the specified files on the next commit |
|
221 | add add the specified files on the next commit | |
221 | addremove add all new files, delete all missing files |
|
222 | addremove add all new files, delete all missing files | |
222 | annotate show changeset information by line for each file |
|
223 | annotate show changeset information by line for each file | |
223 | archive create an unversioned archive of a repository revision |
|
224 | archive create an unversioned archive of a repository revision | |
224 | backout reverse effect of earlier changeset |
|
225 | backout reverse effect of earlier changeset | |
225 | bisect subdivision search of changesets |
|
226 | bisect subdivision search of changesets | |
226 | branch set or show the current branch name |
|
227 | branch set or show the current branch name | |
227 | branches list repository named branches |
|
228 | branches list repository named branches | |
228 | bundle create a changegroup file |
|
229 | bundle create a changegroup file | |
229 | cat output the current or given revision of files |
|
230 | cat output the current or given revision of files | |
230 | clone make a copy of an existing repository |
|
231 | clone make a copy of an existing repository | |
231 | commit commit the specified files or all outstanding changes |
|
232 | commit commit the specified files or all outstanding changes | |
232 | copy mark files as copied for the next commit |
|
233 | copy mark files as copied for the next commit | |
233 | diff diff repository (or selected files) |
|
234 | diff diff repository (or selected files) | |
234 | export dump the header and diffs for one or more changesets |
|
235 | export dump the header and diffs for one or more changesets | |
235 | forget forget the specified files on the next commit |
|
236 | forget forget the specified files on the next commit | |
236 | grep search for a pattern in specified files and revisions |
|
237 | grep search for a pattern in specified files and revisions | |
237 | heads show current repository heads or show branch heads |
|
238 | heads show current repository heads or show branch heads | |
238 | help show help for a given topic or a help overview |
|
239 | help show help for a given topic or a help overview | |
239 | identify identify the working copy or specified revision |
|
240 | identify identify the working copy or specified revision | |
240 | import import an ordered set of patches |
|
241 | import import an ordered set of patches | |
241 | incoming show new changesets found in source |
|
242 | incoming show new changesets found in source | |
242 | init create a new repository in the given directory |
|
243 | init create a new repository in the given directory | |
243 | locate locate files matching specific patterns |
|
244 | locate locate files matching specific patterns | |
244 | log show revision history of entire repository or files |
|
245 | log show revision history of entire repository or files | |
245 | manifest output the current or given revision of the project manifest |
|
246 | manifest output the current or given revision of the project manifest | |
246 | merge merge working directory with another revision |
|
247 | merge merge working directory with another revision | |
247 | outgoing show changesets not found in destination |
|
248 | outgoing show changesets not found in destination | |
248 | parents show the parents of the working directory or revision |
|
249 | parents show the parents of the working directory or revision | |
249 | paths show aliases for remote repositories |
|
250 | paths show aliases for remote repositories | |
250 | pull pull changes from the specified source |
|
251 | pull pull changes from the specified source | |
251 | push push changes to the specified destination |
|
252 | push push changes to the specified destination | |
252 | recover roll back an interrupted transaction |
|
253 | recover roll back an interrupted transaction | |
253 | remove remove the specified files on the next commit |
|
254 | remove remove the specified files on the next commit | |
254 | rename rename files; equivalent of copy + remove |
|
255 | rename rename files; equivalent of copy + remove | |
255 | resolve retry file merges from a merge or update |
|
256 | resolve retry file merges from a merge or update | |
256 | revert restore individual files or directories to an earlier state |
|
257 | revert restore individual files or directories to an earlier state | |
257 | rollback roll back the last transaction |
|
258 | rollback roll back the last transaction | |
258 | root print the root (top) of the current working directory |
|
259 | root print the root (top) of the current working directory | |
259 | serve export the repository via HTTP |
|
260 | serve export the repository via HTTP | |
260 | showconfig show combined config settings from all hgrc files |
|
261 | showconfig show combined config settings from all hgrc files | |
261 | status show changed files in the working directory |
|
262 | status show changed files in the working directory | |
262 | summary summarize working directory state |
|
263 | summary summarize working directory state | |
263 | tag add one or more tags for the current or given revision |
|
264 | tag add one or more tags for the current or given revision | |
264 | tags list repository tags |
|
265 | tags list repository tags | |
265 | tip show the tip revision |
|
266 | tip show the tip revision | |
266 | unbundle apply one or more changegroup files |
|
267 | unbundle apply one or more changegroup files | |
267 | update update working directory |
|
268 | update update working directory | |
268 | verify verify the integrity of the repository |
|
269 | verify verify the integrity of the repository | |
269 | version output version and copyright information |
|
270 | version output version and copyright information | |
270 |
|
271 | |||
271 | additional help topics: |
|
272 | additional help topics: | |
272 |
|
273 | |||
|
274 | config Configuration Files | |||
273 | dates Date Formats |
|
275 | dates Date Formats | |
274 | patterns File Name Patterns |
|
276 | patterns File Name Patterns | |
275 | environment Environment Variables |
|
277 | environment Environment Variables | |
276 | revisions Specifying Single Revisions |
|
278 | revisions Specifying Single Revisions | |
277 | multirevs Specifying Multiple Revisions |
|
279 | multirevs Specifying Multiple Revisions | |
278 | diffs Diff Formats |
|
280 | diffs Diff Formats | |
279 | templating Template Usage |
|
281 | templating Template Usage | |
280 | urls URL Paths |
|
282 | urls URL Paths | |
281 | extensions Using additional features |
|
283 | extensions Using additional features | |
282 |
|
284 | |||
283 | use "hg -v help" to show aliases and global options |
|
285 | use "hg -v help" to show aliases and global options | |
284 | %% not tested: --debugger |
|
286 | %% not tested: --debugger |
@@ -1,352 +1,354 b'' | |||||
1 | Mercurial Distributed SCM |
|
1 | Mercurial Distributed SCM | |
2 |
|
2 | |||
3 | basic commands: |
|
3 | basic commands: | |
4 |
|
4 | |||
5 | add add the specified files on the next commit |
|
5 | add add the specified files on the next commit | |
6 | annotate show changeset information by line for each file |
|
6 | annotate show changeset information by line for each file | |
7 | clone make a copy of an existing repository |
|
7 | clone make a copy of an existing repository | |
8 | commit commit the specified files or all outstanding changes |
|
8 | commit commit the specified files or all outstanding changes | |
9 | diff diff repository (or selected files) |
|
9 | diff diff repository (or selected files) | |
10 | export dump the header and diffs for one or more changesets |
|
10 | export dump the header and diffs for one or more changesets | |
11 | forget forget the specified files on the next commit |
|
11 | forget forget the specified files on the next commit | |
12 | init create a new repository in the given directory |
|
12 | init create a new repository in the given directory | |
13 | log show revision history of entire repository or files |
|
13 | log show revision history of entire repository or files | |
14 | merge merge working directory with another revision |
|
14 | merge merge working directory with another revision | |
15 | pull pull changes from the specified source |
|
15 | pull pull changes from the specified source | |
16 | push push changes to the specified destination |
|
16 | push push changes to the specified destination | |
17 | remove remove the specified files on the next commit |
|
17 | remove remove the specified files on the next commit | |
18 | serve export the repository via HTTP |
|
18 | serve export the repository via HTTP | |
19 | status show changed files in the working directory |
|
19 | status show changed files in the working directory | |
20 | summary summarize working directory state |
|
20 | summary summarize working directory state | |
21 | update update working directory |
|
21 | update update working directory | |
22 |
|
22 | |||
23 | use "hg help" for the full list of commands or "hg -v" for details |
|
23 | use "hg help" for the full list of commands or "hg -v" for details | |
24 | add add the specified files on the next commit |
|
24 | add add the specified files on the next commit | |
25 | annotate show changeset information by line for each file |
|
25 | annotate show changeset information by line for each file | |
26 | clone make a copy of an existing repository |
|
26 | clone make a copy of an existing repository | |
27 | commit commit the specified files or all outstanding changes |
|
27 | commit commit the specified files or all outstanding changes | |
28 | diff diff repository (or selected files) |
|
28 | diff diff repository (or selected files) | |
29 | export dump the header and diffs for one or more changesets |
|
29 | export dump the header and diffs for one or more changesets | |
30 | forget forget the specified files on the next commit |
|
30 | forget forget the specified files on the next commit | |
31 | init create a new repository in the given directory |
|
31 | init create a new repository in the given directory | |
32 | log show revision history of entire repository or files |
|
32 | log show revision history of entire repository or files | |
33 | merge merge working directory with another revision |
|
33 | merge merge working directory with another revision | |
34 | pull pull changes from the specified source |
|
34 | pull pull changes from the specified source | |
35 | push push changes to the specified destination |
|
35 | push push changes to the specified destination | |
36 | remove remove the specified files on the next commit |
|
36 | remove remove the specified files on the next commit | |
37 | serve export the repository via HTTP |
|
37 | serve export the repository via HTTP | |
38 | status show changed files in the working directory |
|
38 | status show changed files in the working directory | |
39 | summary summarize working directory state |
|
39 | summary summarize working directory state | |
40 | update update working directory |
|
40 | update update working directory | |
41 | Mercurial Distributed SCM |
|
41 | Mercurial Distributed SCM | |
42 |
|
42 | |||
43 | list of commands: |
|
43 | list of commands: | |
44 |
|
44 | |||
45 | add add the specified files on the next commit |
|
45 | add add the specified files on the next commit | |
46 | addremove add all new files, delete all missing files |
|
46 | addremove add all new files, delete all missing files | |
47 | annotate show changeset information by line for each file |
|
47 | annotate show changeset information by line for each file | |
48 | archive create an unversioned archive of a repository revision |
|
48 | archive create an unversioned archive of a repository revision | |
49 | backout reverse effect of earlier changeset |
|
49 | backout reverse effect of earlier changeset | |
50 | bisect subdivision search of changesets |
|
50 | bisect subdivision search of changesets | |
51 | branch set or show the current branch name |
|
51 | branch set or show the current branch name | |
52 | branches list repository named branches |
|
52 | branches list repository named branches | |
53 | bundle create a changegroup file |
|
53 | bundle create a changegroup file | |
54 | cat output the current or given revision of files |
|
54 | cat output the current or given revision of files | |
55 | clone make a copy of an existing repository |
|
55 | clone make a copy of an existing repository | |
56 | commit commit the specified files or all outstanding changes |
|
56 | commit commit the specified files or all outstanding changes | |
57 | copy mark files as copied for the next commit |
|
57 | copy mark files as copied for the next commit | |
58 | diff diff repository (or selected files) |
|
58 | diff diff repository (or selected files) | |
59 | export dump the header and diffs for one or more changesets |
|
59 | export dump the header and diffs for one or more changesets | |
60 | forget forget the specified files on the next commit |
|
60 | forget forget the specified files on the next commit | |
61 | grep search for a pattern in specified files and revisions |
|
61 | grep search for a pattern in specified files and revisions | |
62 | heads show current repository heads or show branch heads |
|
62 | heads show current repository heads or show branch heads | |
63 | help show help for a given topic or a help overview |
|
63 | help show help for a given topic or a help overview | |
64 | identify identify the working copy or specified revision |
|
64 | identify identify the working copy or specified revision | |
65 | import import an ordered set of patches |
|
65 | import import an ordered set of patches | |
66 | incoming show new changesets found in source |
|
66 | incoming show new changesets found in source | |
67 | init create a new repository in the given directory |
|
67 | init create a new repository in the given directory | |
68 | locate locate files matching specific patterns |
|
68 | locate locate files matching specific patterns | |
69 | log show revision history of entire repository or files |
|
69 | log show revision history of entire repository or files | |
70 | manifest output the current or given revision of the project manifest |
|
70 | manifest output the current or given revision of the project manifest | |
71 | merge merge working directory with another revision |
|
71 | merge merge working directory with another revision | |
72 | outgoing show changesets not found in destination |
|
72 | outgoing show changesets not found in destination | |
73 | parents show the parents of the working directory or revision |
|
73 | parents show the parents of the working directory or revision | |
74 | paths show aliases for remote repositories |
|
74 | paths show aliases for remote repositories | |
75 | pull pull changes from the specified source |
|
75 | pull pull changes from the specified source | |
76 | push push changes to the specified destination |
|
76 | push push changes to the specified destination | |
77 | recover roll back an interrupted transaction |
|
77 | recover roll back an interrupted transaction | |
78 | remove remove the specified files on the next commit |
|
78 | remove remove the specified files on the next commit | |
79 | rename rename files; equivalent of copy + remove |
|
79 | rename rename files; equivalent of copy + remove | |
80 | resolve retry file merges from a merge or update |
|
80 | resolve retry file merges from a merge or update | |
81 | revert restore individual files or directories to an earlier state |
|
81 | revert restore individual files or directories to an earlier state | |
82 | rollback roll back the last transaction |
|
82 | rollback roll back the last transaction | |
83 | root print the root (top) of the current working directory |
|
83 | root print the root (top) of the current working directory | |
84 | serve export the repository via HTTP |
|
84 | serve export the repository via HTTP | |
85 | showconfig show combined config settings from all hgrc files |
|
85 | showconfig show combined config settings from all hgrc files | |
86 | status show changed files in the working directory |
|
86 | status show changed files in the working directory | |
87 | summary summarize working directory state |
|
87 | summary summarize working directory state | |
88 | tag add one or more tags for the current or given revision |
|
88 | tag add one or more tags for the current or given revision | |
89 | tags list repository tags |
|
89 | tags list repository tags | |
90 | tip show the tip revision |
|
90 | tip show the tip revision | |
91 | unbundle apply one or more changegroup files |
|
91 | unbundle apply one or more changegroup files | |
92 | update update working directory |
|
92 | update update working directory | |
93 | verify verify the integrity of the repository |
|
93 | verify verify the integrity of the repository | |
94 | version output version and copyright information |
|
94 | version output version and copyright information | |
95 |
|
95 | |||
96 | additional help topics: |
|
96 | additional help topics: | |
97 |
|
97 | |||
|
98 | config Configuration Files | |||
98 | dates Date Formats |
|
99 | dates Date Formats | |
99 | patterns File Name Patterns |
|
100 | patterns File Name Patterns | |
100 | environment Environment Variables |
|
101 | environment Environment Variables | |
101 | revisions Specifying Single Revisions |
|
102 | revisions Specifying Single Revisions | |
102 | multirevs Specifying Multiple Revisions |
|
103 | multirevs Specifying Multiple Revisions | |
103 | diffs Diff Formats |
|
104 | diffs Diff Formats | |
104 | templating Template Usage |
|
105 | templating Template Usage | |
105 | urls URL Paths |
|
106 | urls URL Paths | |
106 | extensions Using additional features |
|
107 | extensions Using additional features | |
107 |
|
108 | |||
108 | use "hg -v help" to show aliases and global options |
|
109 | use "hg -v help" to show aliases and global options | |
109 | add add the specified files on the next commit |
|
110 | add add the specified files on the next commit | |
110 | addremove add all new files, delete all missing files |
|
111 | addremove add all new files, delete all missing files | |
111 | annotate show changeset information by line for each file |
|
112 | annotate show changeset information by line for each file | |
112 | archive create an unversioned archive of a repository revision |
|
113 | archive create an unversioned archive of a repository revision | |
113 | backout reverse effect of earlier changeset |
|
114 | backout reverse effect of earlier changeset | |
114 | bisect subdivision search of changesets |
|
115 | bisect subdivision search of changesets | |
115 | branch set or show the current branch name |
|
116 | branch set or show the current branch name | |
116 | branches list repository named branches |
|
117 | branches list repository named branches | |
117 | bundle create a changegroup file |
|
118 | bundle create a changegroup file | |
118 | cat output the current or given revision of files |
|
119 | cat output the current or given revision of files | |
119 | clone make a copy of an existing repository |
|
120 | clone make a copy of an existing repository | |
120 | commit commit the specified files or all outstanding changes |
|
121 | commit commit the specified files or all outstanding changes | |
121 | copy mark files as copied for the next commit |
|
122 | copy mark files as copied for the next commit | |
122 | diff diff repository (or selected files) |
|
123 | diff diff repository (or selected files) | |
123 | export dump the header and diffs for one or more changesets |
|
124 | export dump the header and diffs for one or more changesets | |
124 | forget forget the specified files on the next commit |
|
125 | forget forget the specified files on the next commit | |
125 | grep search for a pattern in specified files and revisions |
|
126 | grep search for a pattern in specified files and revisions | |
126 | heads show current repository heads or show branch heads |
|
127 | heads show current repository heads or show branch heads | |
127 | help show help for a given topic or a help overview |
|
128 | help show help for a given topic or a help overview | |
128 | identify identify the working copy or specified revision |
|
129 | identify identify the working copy or specified revision | |
129 | import import an ordered set of patches |
|
130 | import import an ordered set of patches | |
130 | incoming show new changesets found in source |
|
131 | incoming show new changesets found in source | |
131 | init create a new repository in the given directory |
|
132 | init create a new repository in the given directory | |
132 | locate locate files matching specific patterns |
|
133 | locate locate files matching specific patterns | |
133 | log show revision history of entire repository or files |
|
134 | log show revision history of entire repository or files | |
134 | manifest output the current or given revision of the project manifest |
|
135 | manifest output the current or given revision of the project manifest | |
135 | merge merge working directory with another revision |
|
136 | merge merge working directory with another revision | |
136 | outgoing show changesets not found in destination |
|
137 | outgoing show changesets not found in destination | |
137 | parents show the parents of the working directory or revision |
|
138 | parents show the parents of the working directory or revision | |
138 | paths show aliases for remote repositories |
|
139 | paths show aliases for remote repositories | |
139 | pull pull changes from the specified source |
|
140 | pull pull changes from the specified source | |
140 | push push changes to the specified destination |
|
141 | push push changes to the specified destination | |
141 | recover roll back an interrupted transaction |
|
142 | recover roll back an interrupted transaction | |
142 | remove remove the specified files on the next commit |
|
143 | remove remove the specified files on the next commit | |
143 | rename rename files; equivalent of copy + remove |
|
144 | rename rename files; equivalent of copy + remove | |
144 | resolve retry file merges from a merge or update |
|
145 | resolve retry file merges from a merge or update | |
145 | revert restore individual files or directories to an earlier state |
|
146 | revert restore individual files or directories to an earlier state | |
146 | rollback roll back the last transaction |
|
147 | rollback roll back the last transaction | |
147 | root print the root (top) of the current working directory |
|
148 | root print the root (top) of the current working directory | |
148 | serve export the repository via HTTP |
|
149 | serve export the repository via HTTP | |
149 | showconfig show combined config settings from all hgrc files |
|
150 | showconfig show combined config settings from all hgrc files | |
150 | status show changed files in the working directory |
|
151 | status show changed files in the working directory | |
151 | summary summarize working directory state |
|
152 | summary summarize working directory state | |
152 | tag add one or more tags for the current or given revision |
|
153 | tag add one or more tags for the current or given revision | |
153 | tags list repository tags |
|
154 | tags list repository tags | |
154 | tip show the tip revision |
|
155 | tip show the tip revision | |
155 | unbundle apply one or more changegroup files |
|
156 | unbundle apply one or more changegroup files | |
156 | update update working directory |
|
157 | update update working directory | |
157 | verify verify the integrity of the repository |
|
158 | verify verify the integrity of the repository | |
158 | version output version and copyright information |
|
159 | version output version and copyright information | |
159 |
|
160 | |||
160 | additional help topics: |
|
161 | additional help topics: | |
161 |
|
162 | |||
|
163 | config Configuration Files | |||
162 | dates Date Formats |
|
164 | dates Date Formats | |
163 | patterns File Name Patterns |
|
165 | patterns File Name Patterns | |
164 | environment Environment Variables |
|
166 | environment Environment Variables | |
165 | revisions Specifying Single Revisions |
|
167 | revisions Specifying Single Revisions | |
166 | multirevs Specifying Multiple Revisions |
|
168 | multirevs Specifying Multiple Revisions | |
167 | diffs Diff Formats |
|
169 | diffs Diff Formats | |
168 | templating Template Usage |
|
170 | templating Template Usage | |
169 | urls URL Paths |
|
171 | urls URL Paths | |
170 | extensions Using additional features |
|
172 | extensions Using additional features | |
171 | hg add [OPTION]... [FILE]... |
|
173 | hg add [OPTION]... [FILE]... | |
172 |
|
174 | |||
173 | add the specified files on the next commit |
|
175 | add the specified files on the next commit | |
174 |
|
176 | |||
175 | Schedule files to be version controlled and added to the repository. |
|
177 | Schedule files to be version controlled and added to the repository. | |
176 |
|
178 | |||
177 | The files will be added to the repository at the next commit. To undo an |
|
179 | The files will be added to the repository at the next commit. To undo an | |
178 | add before that, see hg forget. |
|
180 | add before that, see hg forget. | |
179 |
|
181 | |||
180 | If no names are given, add all files to the repository. |
|
182 | If no names are given, add all files to the repository. | |
181 |
|
183 | |||
182 | options: |
|
184 | options: | |
183 |
|
185 | |||
184 | -I --include include names matching the given patterns |
|
186 | -I --include include names matching the given patterns | |
185 | -X --exclude exclude names matching the given patterns |
|
187 | -X --exclude exclude names matching the given patterns | |
186 | -n --dry-run do not perform actions, just print output |
|
188 | -n --dry-run do not perform actions, just print output | |
187 |
|
189 | |||
188 | use "hg -v help add" to show global options |
|
190 | use "hg -v help add" to show global options | |
189 | hg add: option --skjdfks not recognized |
|
191 | hg add: option --skjdfks not recognized | |
190 | hg add [OPTION]... [FILE]... |
|
192 | hg add [OPTION]... [FILE]... | |
191 |
|
193 | |||
192 | add the specified files on the next commit |
|
194 | add the specified files on the next commit | |
193 |
|
195 | |||
194 | Schedule files to be version controlled and added to the repository. |
|
196 | Schedule files to be version controlled and added to the repository. | |
195 |
|
197 | |||
196 | The files will be added to the repository at the next commit. To undo an |
|
198 | The files will be added to the repository at the next commit. To undo an | |
197 | add before that, see hg forget. |
|
199 | add before that, see hg forget. | |
198 |
|
200 | |||
199 | If no names are given, add all files to the repository. |
|
201 | If no names are given, add all files to the repository. | |
200 |
|
202 | |||
201 | options: |
|
203 | options: | |
202 |
|
204 | |||
203 | -I --include include names matching the given patterns |
|
205 | -I --include include names matching the given patterns | |
204 | -X --exclude exclude names matching the given patterns |
|
206 | -X --exclude exclude names matching the given patterns | |
205 | -n --dry-run do not perform actions, just print output |
|
207 | -n --dry-run do not perform actions, just print output | |
206 |
|
208 | |||
207 | use "hg -v help add" to show global options |
|
209 | use "hg -v help add" to show global options | |
208 | hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... |
|
210 | hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... | |
209 |
|
211 | |||
210 | diff repository (or selected files) |
|
212 | diff repository (or selected files) | |
211 |
|
213 | |||
212 | Show differences between revisions for the specified files. |
|
214 | Show differences between revisions for the specified files. | |
213 |
|
215 | |||
214 | Differences between files are shown using the unified diff format. |
|
216 | Differences between files are shown using the unified diff format. | |
215 |
|
217 | |||
216 | NOTE: diff may generate unexpected results for merges, as it will default |
|
218 | NOTE: diff may generate unexpected results for merges, as it will default | |
217 | to comparing against the working directory's first parent changeset if no |
|
219 | to comparing against the working directory's first parent changeset if no | |
218 | revisions are specified. |
|
220 | revisions are specified. | |
219 |
|
221 | |||
220 | When two revision arguments are given, then changes are shown between |
|
222 | When two revision arguments are given, then changes are shown between | |
221 | those revisions. If only one revision is specified then that revision is |
|
223 | those revisions. If only one revision is specified then that revision is | |
222 | compared to the working directory, and, when no revisions are specified, |
|
224 | compared to the working directory, and, when no revisions are specified, | |
223 | the working directory files are compared to its parent. |
|
225 | the working directory files are compared to its parent. | |
224 |
|
226 | |||
225 | Without the -a/--text option, diff will avoid generating diffs of files it |
|
227 | Without the -a/--text option, diff will avoid generating diffs of files it | |
226 | detects as binary. With -a, diff will generate a diff anyway, probably |
|
228 | detects as binary. With -a, diff will generate a diff anyway, probably | |
227 | with undesirable results. |
|
229 | with undesirable results. | |
228 |
|
230 | |||
229 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
231 | Use the -g/--git option to generate diffs in the git extended diff format. | |
230 | For more information, read 'hg help diffs'. |
|
232 | For more information, read 'hg help diffs'. | |
231 |
|
233 | |||
232 | options: |
|
234 | options: | |
233 |
|
235 | |||
234 | -r --rev revision |
|
236 | -r --rev revision | |
235 | -c --change change made by revision |
|
237 | -c --change change made by revision | |
236 | -a --text treat all files as text |
|
238 | -a --text treat all files as text | |
237 | -g --git use git extended diff format |
|
239 | -g --git use git extended diff format | |
238 | --nodates don't include dates in diff headers |
|
240 | --nodates don't include dates in diff headers | |
239 | -p --show-function show which function each change is in |
|
241 | -p --show-function show which function each change is in | |
240 | --inverse produce a diff that undoes the changes |
|
242 | --inverse produce a diff that undoes the changes | |
241 | -w --ignore-all-space ignore white space when comparing lines |
|
243 | -w --ignore-all-space ignore white space when comparing lines | |
242 | -b --ignore-space-change ignore changes in the amount of white space |
|
244 | -b --ignore-space-change ignore changes in the amount of white space | |
243 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
245 | -B --ignore-blank-lines ignore changes whose lines are all blank | |
244 | -U --unified number of lines of context to show |
|
246 | -U --unified number of lines of context to show | |
245 | --stat output diffstat-style summary of changes |
|
247 | --stat output diffstat-style summary of changes | |
246 | -I --include include names matching the given patterns |
|
248 | -I --include include names matching the given patterns | |
247 | -X --exclude exclude names matching the given patterns |
|
249 | -X --exclude exclude names matching the given patterns | |
248 |
|
250 | |||
249 | use "hg -v help diff" to show global options |
|
251 | use "hg -v help diff" to show global options | |
250 | hg status [OPTION]... [FILE]... |
|
252 | hg status [OPTION]... [FILE]... | |
251 |
|
253 | |||
252 | aliases: st |
|
254 | aliases: st | |
253 |
|
255 | |||
254 | show changed files in the working directory |
|
256 | show changed files in the working directory | |
255 |
|
257 | |||
256 | Show status of files in the repository. If names are given, only files |
|
258 | Show status of files in the repository. If names are given, only files | |
257 | that match are shown. Files that are clean or ignored or the source of a |
|
259 | that match are shown. Files that are clean or ignored or the source of a | |
258 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, |
|
260 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, | |
259 | -C/--copies or -A/--all are given. Unless options described with "show |
|
261 | -C/--copies or -A/--all are given. Unless options described with "show | |
260 | only ..." are given, the options -mardu are used. |
|
262 | only ..." are given, the options -mardu are used. | |
261 |
|
263 | |||
262 | Option -q/--quiet hides untracked (unknown and ignored) files unless |
|
264 | Option -q/--quiet hides untracked (unknown and ignored) files unless | |
263 | explicitly requested with -u/--unknown or -i/--ignored. |
|
265 | explicitly requested with -u/--unknown or -i/--ignored. | |
264 |
|
266 | |||
265 | NOTE: status may appear to disagree with diff if permissions have changed |
|
267 | NOTE: status may appear to disagree with diff if permissions have changed | |
266 | or a merge has occurred. The standard diff format does not report |
|
268 | or a merge has occurred. The standard diff format does not report | |
267 | permission changes and diff only reports changes relative to one merge |
|
269 | permission changes and diff only reports changes relative to one merge | |
268 | parent. |
|
270 | parent. | |
269 |
|
271 | |||
270 | If one revision is given, it is used as the base revision. If two |
|
272 | If one revision is given, it is used as the base revision. If two | |
271 | revisions are given, the differences between them are shown. |
|
273 | revisions are given, the differences between them are shown. | |
272 |
|
274 | |||
273 | The codes used to show the status of files are: |
|
275 | The codes used to show the status of files are: | |
274 |
|
276 | |||
275 | M = modified |
|
277 | M = modified | |
276 | A = added |
|
278 | A = added | |
277 | R = removed |
|
279 | R = removed | |
278 | C = clean |
|
280 | C = clean | |
279 | ! = missing (deleted by non-hg command, but still tracked) |
|
281 | ! = missing (deleted by non-hg command, but still tracked) | |
280 | ? = not tracked |
|
282 | ? = not tracked | |
281 | I = ignored |
|
283 | I = ignored | |
282 | = origin of the previous file listed as A (added) |
|
284 | = origin of the previous file listed as A (added) | |
283 |
|
285 | |||
284 | options: |
|
286 | options: | |
285 |
|
287 | |||
286 | -A --all show status of all files |
|
288 | -A --all show status of all files | |
287 | -m --modified show only modified files |
|
289 | -m --modified show only modified files | |
288 | -a --added show only added files |
|
290 | -a --added show only added files | |
289 | -r --removed show only removed files |
|
291 | -r --removed show only removed files | |
290 | -d --deleted show only deleted (but tracked) files |
|
292 | -d --deleted show only deleted (but tracked) files | |
291 | -c --clean show only files without changes |
|
293 | -c --clean show only files without changes | |
292 | -u --unknown show only unknown (not tracked) files |
|
294 | -u --unknown show only unknown (not tracked) files | |
293 | -i --ignored show only ignored files |
|
295 | -i --ignored show only ignored files | |
294 | -n --no-status hide status prefix |
|
296 | -n --no-status hide status prefix | |
295 | -C --copies show source of copied files |
|
297 | -C --copies show source of copied files | |
296 | -0 --print0 end filenames with NUL, for use with xargs |
|
298 | -0 --print0 end filenames with NUL, for use with xargs | |
297 | --rev show difference from revision |
|
299 | --rev show difference from revision | |
298 | -I --include include names matching the given patterns |
|
300 | -I --include include names matching the given patterns | |
299 | -X --exclude exclude names matching the given patterns |
|
301 | -X --exclude exclude names matching the given patterns | |
300 |
|
302 | |||
301 | use "hg -v help status" to show global options |
|
303 | use "hg -v help status" to show global options | |
302 | hg status [OPTION]... [FILE]... |
|
304 | hg status [OPTION]... [FILE]... | |
303 |
|
305 | |||
304 | show changed files in the working directory |
|
306 | show changed files in the working directory | |
305 | hg: unknown command 'foo' |
|
307 | hg: unknown command 'foo' | |
306 | Mercurial Distributed SCM |
|
308 | Mercurial Distributed SCM | |
307 |
|
309 | |||
308 | basic commands: |
|
310 | basic commands: | |
309 |
|
311 | |||
310 | add add the specified files on the next commit |
|
312 | add add the specified files on the next commit | |
311 | annotate show changeset information by line for each file |
|
313 | annotate show changeset information by line for each file | |
312 | clone make a copy of an existing repository |
|
314 | clone make a copy of an existing repository | |
313 | commit commit the specified files or all outstanding changes |
|
315 | commit commit the specified files or all outstanding changes | |
314 | diff diff repository (or selected files) |
|
316 | diff diff repository (or selected files) | |
315 | export dump the header and diffs for one or more changesets |
|
317 | export dump the header and diffs for one or more changesets | |
316 | forget forget the specified files on the next commit |
|
318 | forget forget the specified files on the next commit | |
317 | init create a new repository in the given directory |
|
319 | init create a new repository in the given directory | |
318 | log show revision history of entire repository or files |
|
320 | log show revision history of entire repository or files | |
319 | merge merge working directory with another revision |
|
321 | merge merge working directory with another revision | |
320 | pull pull changes from the specified source |
|
322 | pull pull changes from the specified source | |
321 | push push changes to the specified destination |
|
323 | push push changes to the specified destination | |
322 | remove remove the specified files on the next commit |
|
324 | remove remove the specified files on the next commit | |
323 | serve export the repository via HTTP |
|
325 | serve export the repository via HTTP | |
324 | status show changed files in the working directory |
|
326 | status show changed files in the working directory | |
325 | summary summarize working directory state |
|
327 | summary summarize working directory state | |
326 | update update working directory |
|
328 | update update working directory | |
327 |
|
329 | |||
328 | use "hg help" for the full list of commands or "hg -v" for details |
|
330 | use "hg help" for the full list of commands or "hg -v" for details | |
329 | hg: unknown command 'skjdfks' |
|
331 | hg: unknown command 'skjdfks' | |
330 | Mercurial Distributed SCM |
|
332 | Mercurial Distributed SCM | |
331 |
|
333 | |||
332 | basic commands: |
|
334 | basic commands: | |
333 |
|
335 | |||
334 | add add the specified files on the next commit |
|
336 | add add the specified files on the next commit | |
335 | annotate show changeset information by line for each file |
|
337 | annotate show changeset information by line for each file | |
336 | clone make a copy of an existing repository |
|
338 | clone make a copy of an existing repository | |
337 | commit commit the specified files or all outstanding changes |
|
339 | commit commit the specified files or all outstanding changes | |
338 | diff diff repository (or selected files) |
|
340 | diff diff repository (or selected files) | |
339 | export dump the header and diffs for one or more changesets |
|
341 | export dump the header and diffs for one or more changesets | |
340 | forget forget the specified files on the next commit |
|
342 | forget forget the specified files on the next commit | |
341 | init create a new repository in the given directory |
|
343 | init create a new repository in the given directory | |
342 | log show revision history of entire repository or files |
|
344 | log show revision history of entire repository or files | |
343 | merge merge working directory with another revision |
|
345 | merge merge working directory with another revision | |
344 | pull pull changes from the specified source |
|
346 | pull pull changes from the specified source | |
345 | push push changes to the specified destination |
|
347 | push push changes to the specified destination | |
346 | remove remove the specified files on the next commit |
|
348 | remove remove the specified files on the next commit | |
347 | serve export the repository via HTTP |
|
349 | serve export the repository via HTTP | |
348 | status show changed files in the working directory |
|
350 | status show changed files in the working directory | |
349 | summary summarize working directory state |
|
351 | summary summarize working directory state | |
350 | update update working directory |
|
352 | update update working directory | |
351 |
|
353 | |||
352 | use "hg help" for the full list of commands or "hg -v" for details |
|
354 | use "hg help" for the full list of commands or "hg -v" for details |
General Comments 0
You need to be logged in to leave comments.
Login now