annotate doc/hg.1.txt @ 1907:7718885070b1

let commands that show changesets use templates. mechanism is same as hgweb templates. old show_changeset code is still used for now if no template given, because it is faster than template code when verbose or debug. simple template can be given on command line using -t, --template. example: hg log -t '{author|person}\n' complex template can be put in template map file, given on command line using --map-file. we give two example map files: map-log.compact prints 3 lines of output for every change. map-log.verbose prints exact same output as default "hg log -v". map files are searched where user says, then in template path as backup. example: hg log --map-file map-log.compact defaults can be set in hgrc with ui.logtemplate and ui.logmap.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 27 Feb 2006 13:18:57 -0800
parents 47f4fbee32c5
children 74cf2b2f43d4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
1 HG(1)
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
2 =====
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
3 Matt Mackall <mpm@selenic.com>
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
4
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
5 NAME
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
6 ----
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
7 hg - Mercurial source code management system
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
8
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
9 SYNOPSIS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
10 --------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
11 'hg' [-v -d -q -y] <command> [command options] [files]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
12
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
13 DESCRIPTION
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
14 -----------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
15 The hg(1) command provides a command line interface to the Mercurial system.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
16
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
17 OPTIONS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
18 -------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
19
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
20 -R, --repository::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
21 repository root directory
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
22
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
23 --cwd::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
24 change working directory
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
25
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
26 -y, --noninteractive::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
27 do not prompt, assume 'yes' for any required answers
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
28
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
29 -q, --quiet::
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
30 suppress output
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
31
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
32 -v, --verbose::
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
33 enable additional output
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
34
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
35 --debug::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
36 enable debugging output
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
37
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
38 --traceback::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
39 print traceback on exception
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
40
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
41 --time::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
42 time how long the command takes
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
43
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
44 --profile::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
45 print command execution profile
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
46
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
47 --version::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
48 output version information and exit
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
49
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
50 -h, --help::
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
51 display help and exit
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
52
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
53 COMMAND ELEMENTS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
54 ----------------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
55
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
56 files ...::
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
57 indicates one or more filename or relative path filenames; see
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
58 "FILE NAME PATTERNS" for information on pattern matching
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
59
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
60 path::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
61 indicates a path on the local machine
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
62
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
63 revision::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
64 indicates a changeset which can be specified as a changeset revision
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
65 number, a tag, or a unique substring of the changeset hash value
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
66
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
67 repository path::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
68 either the pathname of a local repository or the URI of a remote
181
038e4d8602bd updated for .hgpaths and http/old-http protocol name change
jake@edge2.net
parents: 177
diff changeset
69 repository. There are two available URI protocols, http:// which is
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
70 fast and the old-http:// protocol which is much slower but does not
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
71 require a special server on the web host.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
72
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
73 COMMANDS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
74 --------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
75
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
76 add [options] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
77 Schedule files to be version controlled and added to the repository.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
78
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
79 The files will be added to the repository at the next commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
80
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
81 If no names are given, add all files in the current directory and
728
f6588fd14272 Fix typo.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
82 its subdirectories.
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
83
766
b444a7e053f1 Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 761
diff changeset
84 addremove [options] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
85 Add all new files and remove all missing files from the repository.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
86
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
87 New files are ignored if they match any of the patterns in .hgignore. As
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
88 with add, these changes take effect at the next commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
89
1522
d07d729ce306 Added --date option to annotate.
lupus@debian.org
parents: 1456
diff changeset
90 annotate [-r <rev> -u -n -c -d] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
91 List changes in files, showing the revision id responsible for each line
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
92
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
93 This command is useful to discover who did a change or when a change took
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
94 place.
1016
836667830fee Teach annotate about binary files
mpm@selenic.com
parents: 1015
diff changeset
95
836667830fee Teach annotate about binary files
mpm@selenic.com
parents: 1015
diff changeset
96 Without the -a option, annotate will avoid processing files it
836667830fee Teach annotate about binary files
mpm@selenic.com
parents: 1015
diff changeset
97 detects as binary. With -a, annotate will generate an annotation
836667830fee Teach annotate about binary files
mpm@selenic.com
parents: 1015
diff changeset
98 anyway, probably with undesirable results.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
99
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
100 options:
1016
836667830fee Teach annotate about binary files
mpm@selenic.com
parents: 1015
diff changeset
101 -a, --text treat all files as text
811
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
102 -I, --include <pat> include names matching the given patterns
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
103 -X, --exclude <pat> exclude names matching the given patterns
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
104 -r, --revision <rev> annotate the specified revision
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
105 -u, --user list the author
1522
d07d729ce306 Added --date option to annotate.
lupus@debian.org
parents: 1456
diff changeset
106 -d, --date list the commit date
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
107 -c, --changeset list the changeset
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
108 -n, --number list the revision number (default)
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
109
1218
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
110 bundle <file> <other>::
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
111 (EXPERIMENTAL)
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
112
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
113 Generate a compressed changegroup file collecting all changesets
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
114 not found in the other repository.
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
115
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
116 This file can then be transferred using conventional means and
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
117 applied to another repository with the unbundle command. This is
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
118 useful when native push and pull are not available or when
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
119 exporting an entire repository is undesirable. The standard file
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
120 extension is ".hg".
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
121
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
122 Unlike import/export, this exactly preserves all changeset
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
123 contents including permissions, rename data, and revision history.
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
124
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
125 cat [options] <file ...>::
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
126 Print the specified files as they were at the given revision.
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
127 If no revision is given then the tip is used.
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
128
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
129 Output may be to a file, in which case the name of the file is
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
130 given using a format string. The formatting rules are the same as
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
131 for the export command, with the following additions:
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
132
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
133 %s basename of file being printed
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
134 %d dirname of file being printed, or '.' if in repo root
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
135 %p root-relative path name of file being printed
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
136
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
137 options:
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
138 -I, --include <pat> include names matching the given patterns
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
139 -X, --exclude <pat> exclude names matching the given patterns
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
140 -o, --output <filespec> print output to file with formatted name
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
141 -r, --rev <rev> print the given revision
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
142
1281
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
143 clone [options] <source> [dest]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
144 Create a copy of an existing repository in a new directory.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
145
523
003df62ae39f [PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents: 509
diff changeset
146 If no destination directory name is specified, it defaults to the
003df62ae39f [PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents: 509
diff changeset
147 basename of the source.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
148
1281
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
149 The location of the source is added to the new repository's
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
150 .hg/hgrc file, as the default to be used for future pulls.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
151
1281
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
152 For efficiency, hardlinks are used for cloning whenever the source
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
153 and destination are on the same filesystem. Some filesystems,
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
154 such as AFS, implement hardlinking incorrectly, but do not report
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
155 errors. In these cases, use the --pull option to avoid
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
156 hardlinking.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
157
1658
f5e194047f1e doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com>
parents: 1657
diff changeset
158 See pull for valid source format details.
f5e194047f1e doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com>
parents: 1657
diff changeset
159
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
160 options:
505
dc1f735dfaac [PATCH] Fix "no-update" option to clone
mpm@selenic.com
parents: 498
diff changeset
161 -U, --noupdate do not update the new working directory
1281
84df9951532a Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1274
diff changeset
162 --pull use pull protocol to copy metadata
963
84355e3e4493 Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents: 962
diff changeset
163 -e, --ssh specify ssh command to use
84355e3e4493 Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents: 962
diff changeset
164 --remotecmd specify hg command to run on the remote side
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
165
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 811
diff changeset
166 commit [options] [files...]::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
167 Commit changes to the given files into the repository.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
168
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
169 If a list of files is omitted, all changes reported by "hg status"
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 811
diff changeset
170 from the root of the repository will be commited.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
171
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
172 The HGEDITOR or EDITOR environment variables are used to start an
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
173 editor to add a commit comment.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
174
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
175 Options:
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
176
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
177 -A, --addremove run addremove during commit
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 811
diff changeset
178 -I, --include <pat> include names matching the given patterns
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 811
diff changeset
179 -X, --exclude <pat> exclude names matching the given patterns
761
0fb498458905 Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents: 750
diff changeset
180 -m, --message <text> use <text> as commit message
1084
069b4311a81b updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents: 1045
diff changeset
181 -l, --logfile <file> read the commit message from <file>
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
182 -d, --date <datecode> record datecode as commit date
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
183 -u, --user <user> record user as commiter
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
184
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
185 aliases: ci
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
186
1249
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
187 copy <source ...> <dest>::
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
188 Mark dest as having copies of source files. If dest is a
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
189 directory, copies are put in that directory. If dest is a file,
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
190 there can only be one source.
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
191
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
192 By default, this command copies the contents of files as they
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
193 stand in the working directory. If invoked with --after, the
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
194 operation is recorded, but no copying is performed.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
195
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
196 This command takes effect in the next commit.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
197
1256
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
198 NOTE: This command should be treated as experimental. While it
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
199 should properly record copied files, this information is not yet
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
200 fully used by merge, nor fully reported by log.
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
201
1249
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1247
diff changeset
202 Options:
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
203 -A, --after record a copy that has already occurred
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
204 -I, --include <pat> include names matching the given patterns
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
205 -X, --exclude <pat> exclude names matching the given patterns
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
206 -f, --force forcibly copy over an existing managed file
1308
2073e5a71008 Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1281
diff changeset
207
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
208 aliases: cp
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
209
1015
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
210 diff [-a] [-r revision] [-r revision] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
211 Show differences between revisions for the specified files.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
212
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
213 Differences between files are shown using the unified diff format.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
214
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
215 When two revision arguments are given, then changes are shown
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
216 between those revisions. If only one revision is specified then
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
217 that revision is compared to the working directory, and, when no
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
218 revisions are specified, the working directory files are compared
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
219 to its parent.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
220
1015
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
221 Without the -a option, diff will avoid generating diffs of files
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
222 it detects as binary. With -a, diff will generate a diff anyway,
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
223 probably with undesirable results.
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
224
734
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
225 options:
1728
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1658
diff changeset
226 -a, --text treat all files as text
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1658
diff changeset
227 -I, --include <pat> include names matching the given patterns
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1658
diff changeset
228 -p, --show-function show which function each change is in
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1658
diff changeset
229 -X, --exclude <pat> exclude names matching the given patterns
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1658
diff changeset
230 -w, --ignore-all-space ignore white space when comparing lines
734
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
231
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
232 export [-o filespec] [revision] ...::
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
233 Print the changeset header and diffs for one or more revisions.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
234
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
235 The information shown in the changeset header is: author,
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
236 changeset hash, parent and commit comment.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
237
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
238 Output may be to a file, in which case the name of the file is
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
239 given using a format string. The formatting rules are as follows:
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
240
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
241 %% literal "%" character
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
242 %H changeset hash (40 bytes of hexadecimal)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
243 %N number of patches being generated
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
244 %R changeset revision number
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
245 %b basename of the exporting repository
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
246 %h short-form changeset hash (12 bytes of hexadecimal)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
247 %n zero-padded sequence number, starting at 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
248 %r zero-padded changeset revision number
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
249
1015
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
250 Without the -a option, export will avoid generating diffs of files
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
251 it detects as binary. With -a, export will generate a diff anyway,
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
252 probably with undesirable results.
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
253
1015
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
254 options:
22571b8d35d3 Add automatic binary file detection to diff and export
mpm@selenic.com
parents: 981
diff changeset
255 -a, --text treat all files as text
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
256 -o, --output <filespec> print output to file with formatted name
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
257
810
790a0ff306f2 Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 766
diff changeset
258 forget [options] [files]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
259 Undo an 'hg add' scheduled for the next commit.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
260
810
790a0ff306f2 Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 766
diff changeset
261 options:
811
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
262 -I, --include <pat> include names matching the given patterns
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
263 -X, --exclude <pat> exclude names matching the given patterns
810
790a0ff306f2 Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 766
diff changeset
264
1146
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
265 grep [options] pattern [files]::
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
266 Search revisions of files for a regular expression.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
267
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
268 This command behaves differently than Unix grep. It only accepts
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
269 Python/Perl regexps. It searches repository history, not the
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
270 working directory. It always prints the revision number in which
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
271 a match appears.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
272
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
273 By default, grep only prints output for the first revision of a
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
274 file in which it finds a match. To get it to print every revision
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
275 that contains a change in match status ("-" for a match that
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
276 becomes a non-match, or "+" for a non-match that becomes a match),
1212
ccb6201e3f28 Change grep -e to grep --all
mpm@selenic.com
parents: 1211
diff changeset
277 use the --all flag.
1146
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
278
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
279 options:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
280 -0, --print0 end fields with NUL
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
281 -I, --include <pat> include names matching the given patterns
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
282 -X, --exclude <pat> exclude names matching the given patterns
1212
ccb6201e3f28 Change grep -e to grep --all
mpm@selenic.com
parents: 1211
diff changeset
283 --all print all revisions that match
1146
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
284 -i, --ignore-case ignore case when matching
1274
fe3dd937e803 Fix man page typos
Florian La Roche <laroche@redhat.com>
parents: 1265
diff changeset
285 -l, --files-with-matches print only filenames and revs that match
1146
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
286 -n, --line-number print matching line numbers
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
287 -r <rev>, --rev <rev> search in given revision range
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
288 -u, --user print user who committed change
9061f79c6c6f grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents: 1113
diff changeset
289
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
290 heads::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
291 Show all repository head changesets.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
292
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
293 Repository "heads" are changesets that don't have children
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
294 changesets. They are where development generally takes place and
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
295 are the usual targets for update and merge operations.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
296
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
297 options:
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
298 -b, --branches show branches
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
299 --map-file <file> display using template map file
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
300 -r, --rev <rev> show only heads which are descendants of rev
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
301 -t, --template <tpl> display using template
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
302
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
303 identify::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
304 Print a short summary of the current state of the repo.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
305
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
306 This summary identifies the repository state using one or two parent
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
307 hash identifiers, followed by a "+" if there are uncommitted changes
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
308 in the working directory, followed by a list of tags for this revision.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
309
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
310 aliases: id
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
311
966
022bcc738389 hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents: 963
diff changeset
312 import [-p <n> -b <base> -f] <patches>::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
313 Import a list of patches and commit them individually.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
314
1211
1c455338ad95 Fold import -m option into import -f
mpm@selenic.com
parents: 1192
diff changeset
315 If there are outstanding changes in the working directory, import
1c455338ad95 Fold import -m option into import -f
mpm@selenic.com
parents: 1192
diff changeset
316 will abort unless given the -f flag.
1c455338ad95 Fold import -m option into import -f
mpm@selenic.com
parents: 1192
diff changeset
317
1190
737f9b90c571 Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents: 1188
diff changeset
318 If a patch looks like a mail message (its first line starts with
737f9b90c571 Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents: 1188
diff changeset
319 "From " or looks like an RFC822 header), it will not be applied
1211
1c455338ad95 Fold import -m option into import -f
mpm@selenic.com
parents: 1192
diff changeset
320 unless the -f option is used. The importer neither parses nor
1c455338ad95 Fold import -m option into import -f
mpm@selenic.com
parents: 1192
diff changeset
321 discards mail headers, so use -f only to override the "mailness"
1190
737f9b90c571 Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents: 1188
diff changeset
322 safety check, not to import a real mail message.
737f9b90c571 Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents: 1188
diff changeset
323
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
324 options:
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
325 -p, --strip <n> directory strip option for patch. This has the same
1045
b35d5b86e240 run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1036
diff changeset
326 meaning as the corresponding patch option
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
327 -b <path> base directory to read patches from
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
328 -f, --force skip check for outstanding uncommitted changes
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
329
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
330 aliases: patch
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
331
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
332 incoming [-p] [source]::
928
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
333 Show new changesets found in the specified repo or the default
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
334 pull repo. These are the changesets that would be pulled if a pull
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
335 was requested.
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
336
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
337 Currently only local repositories are supported.
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
338
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
339 options:
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
340 -M, --no-merges do not show merges
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
341 --map-file <file> display using template map file
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
342 -n, --newest-first show newest records first
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
343 -p, --patch show patch
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
344 -t, --template <tpl> display using template
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
345
940
1300271ba8de Add in and out aliases
mpm@selenic.com
parents: 928
diff changeset
346 aliases: in
1300271ba8de Add in and out aliases
mpm@selenic.com
parents: 928
diff changeset
347
907
652507dc9fce Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents: 896
diff changeset
348 init [dest]::
652507dc9fce Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents: 896
diff changeset
349 Initialize a new repository in the given directory. If the given
652507dc9fce Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents: 896
diff changeset
350 directory does not exist, it is created.
652507dc9fce Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents: 896
diff changeset
351
652507dc9fce Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents: 896
diff changeset
352 If no directory is given, the current directory is used.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
353
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
354 locate [options] [files]::
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
355 Print all files under Mercurial control whose names match the
629
2fdf3b1659b9 Clarify man page entry for locate a little.
Bryan O'Sullivan <bos@serpentine.com>
parents: 627
diff changeset
356 given patterns.
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
357
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
358 This command searches the current directory and its
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
359 subdirectories. To search an entire repository, move to the root
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
360 of the repository.
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
361
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
362 If no patterns are given to match, this command prints all file
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
363 names.
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
364
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
365 If you want to feed the output of this command into the "xargs"
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
366 command, use the "-0" option to both this command and "xargs".
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
367 This will avoid the problem of "xargs" treating single filenames
1274
fe3dd937e803 Fix man page typos
Florian La Roche <laroche@redhat.com>
parents: 1265
diff changeset
368 that contain white space as multiple filenames.
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
369
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
370 options:
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
371
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
372 -0, --print0 end filenames with NUL, for use with xargs
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
373 -f, --fullpath print complete paths from the filesystem root
811
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
374 -I, --include <pat> include names matching the given patterns
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
375 -r, --rev <rev> search the repository as it stood at rev
811
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
376 -X, --exclude <pat> exclude names matching the given patterns
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
377
1036
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
378 log [-r revision ...] [-p] [files]::
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
379 Print the revision history of the specified files or the entire project.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
380
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
381 By default this command outputs: changeset id and hash, tags,
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
382 parents, user, date and time, and a summary for each commit. The
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
383 -v switch adds some more detail, such as changed files, manifest
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
384 hashes or message signatures.
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
385
612
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
386 options:
1036
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
387 -I, --include <pat> include names matching the given patterns
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
388 -X, --exclude <pat> exclude names matching the given patterns
1758
47f4fbee32c5 add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1756
diff changeset
389 -b, --branch show branches
47f4fbee32c5 add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1756
diff changeset
390 -k, --keyword <str> search for keywords
1756
f29857aaa053 add -l,--limit to log command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1740
diff changeset
391 -l, --limit <num> print no more than this many changes
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
392 --map-file <file> display using template map file
1758
47f4fbee32c5 add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1756
diff changeset
393 -M, --no-merges do not show merges
47f4fbee32c5 add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1756
diff changeset
394 -m, --only-merges only show merges
1036
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
395 -r, --rev <A> show the specified revision or range
7c00f5f2c967 Update hg log docs
mpm@selenic.com
parents: 1016
diff changeset
396 -p, --patch show patch
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
397 -t, --template <tpl> display using template
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 523
diff changeset
398
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
399 aliases: history
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
400
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
401 manifest [revision]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
402 Print a list of version controlled files for the given revision.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
403
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
404 The manifest is the list of files being version controlled. If no revision
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
405 is given then the tip is used.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
406
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
407 outgoing [-p] [dest]::
928
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
408 Show changesets not found in the specified destination repo or the
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
409 default push repo. These are the changesets that would be pushed
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
410 if a push was requested.
6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents: 924
diff changeset
411
1658
f5e194047f1e doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com>
parents: 1657
diff changeset
412 See pull for valid source format details.
f5e194047f1e doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com>
parents: 1657
diff changeset
413
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
414 options:
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
415 -M, --no-merges do not show merges
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
416 --map-file <file> display using template map file
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
417 -p, --patch show patch
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
418 -n, --newest-first show newest records first
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
419 -t, --template <tpl> display using template
1192
6e165de907c5 Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents: 1191
diff changeset
420
940
1300271ba8de Add in and out aliases
mpm@selenic.com
parents: 928
diff changeset
421 aliases: out
1300271ba8de Add in and out aliases
mpm@selenic.com
parents: 928
diff changeset
422
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
423 parents::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
424 Print the working directory's parent revisions.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
425
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
426 options:
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
427 -b, --branches show branches
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
428 --map-file <file> display using template map file
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
429 -t, --template <tpl> display using template
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
430
924
ab681ea2857e updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents: 910
diff changeset
431 paths [NAME]::
ab681ea2857e updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents: 910
diff changeset
432 Show definition of symbolic path name NAME. If no name is given, show
ab681ea2857e updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents: 910
diff changeset
433 definition of available names.
ab681ea2857e updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents: 910
diff changeset
434
951
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
435 Path names are defined in the [paths] section of /etc/mercurial/hgrc
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
436 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
924
ab681ea2857e updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents: 910
diff changeset
437
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
438 pull <repository path>::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
439 Pull changes from a remote repository to a local one.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
440
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
441 This finds all changes from the repository at the specified path
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
442 or URL and adds them to the local repository. By default, this
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
443 does not update the copy of the project in the working directory.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
444
962
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
445 Valid URLs are of the form:
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
446
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
447 local/filesystem/path
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
448 http://[user@]host[:port][/path]
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
449 https://[user@]host[:port][/path]
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
450 ssh://[user@]host[:port][/path]
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
451
1265
979c04997448 Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1256
diff changeset
452 SSH requires an accessible shell account on the destination machine
979c04997448 Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1256
diff changeset
453 and a copy of hg in the remote path. With SSH, paths are relative
979c04997448 Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1256
diff changeset
454 to the remote user's home directory by default; use two slashes at
979c04997448 Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1256
diff changeset
455 the start of a path to specify it as relative to the filesystem root.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
456
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
457 options:
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
458 -u, --update update the working directory to tip after pull
963
84355e3e4493 Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents: 962
diff changeset
459 -e, --ssh specify ssh command to use
84355e3e4493 Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents: 962
diff changeset
460 --remotecmd specify hg command to run on the remote side
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
461
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
462 push <destination>::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
463 Push changes from the local repository to the given destination.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
464
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
465 This is the symmetrical operation for pull. It helps to move
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
466 changes from the current repository to a different one. If the
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
467 destination is local this is identical to a pull in that directory
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
468 from the current one.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
469
962
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
470 By default, push will refuse to run if it detects the result would
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
471 increase the number of remote heads. This generally indicates the
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
472 the client has forgotten to sync and merge before pushing.
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
473
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
474 Valid URLs are of the form:
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
475
962
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
476 local/filesystem/path
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
477 ssh://[user@]host[:port][/path]
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
478
962
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
479 SSH requires an accessible shell account on the destination
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
480 machine and a copy of hg in the remote path.
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
481
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
482 options:
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
483
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
484 -f, --force force update
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
485 -e, --ssh specify ssh command to use
5730e90c025b Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents: 953
diff changeset
486 --remotecmd specify hg command to run on the remote side
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
487
747
c3ce3976ae75 Add -m for rawcommit
mpm@selenic.com
parents: 746
diff changeset
488 rawcommit [-p -d -u -F -m -l]::
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 1608
diff changeset
489 Lowlevel commit, for use in helper scripts. (DEPRECATED)
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
490
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
491 This command is not intended to be used by normal users, as it is
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
492 primarily useful for importing from other SCMs.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
493
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 1608
diff changeset
494 This command is now deprecated and will be removed in a future
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 1608
diff changeset
495 release, please use debugsetparents and commit instead.
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 1608
diff changeset
496
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
497 recover::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
498 Recover from an interrupted commit or pull.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
499
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
500 This command tries to fix the repository status after an interrupted
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
501 operation. It should only be necessary when Mercurial suggests it.
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
502
1188
b3ceb2d470fc Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1187
diff changeset
503 remove [options] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
504 Schedule the indicated files for removal from the repository.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
505
1045
b35d5b86e240 run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1036
diff changeset
506 This command schedules the files to be removed at the next commit.
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
507 This only removes files from the current branch, not from the
1247
7a70dafbf4b9 Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1218
diff changeset
508 entire project history. If the files still exist in the working
7a70dafbf4b9 Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1218
diff changeset
509 directory, they will be deleted from it.
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
510
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
511 aliases: rm
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
512
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
513 rename <source ...> <dest>::
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
514 Mark dest as copies of sources; mark sources for deletion. If
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
515 dest is a directory, copies are put in that directory. If dest is
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
516 a file, there can only be one source.
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
517
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
518 By default, this command copies the contents of files as they
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
519 stand in the working directory. If invoked with --after, the
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
520 operation is recorded, but no copying is performed.
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
521
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
522 This command takes effect in the next commit.
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
523
1256
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
524 NOTE: This command should be treated as experimental. While it
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
525 should properly record rename files, this information is not yet
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
526 fully used by merge, nor fully reported by log.
8054fdb0b145 mark copy/rename as experimental in the docs
mpm@selenic.com
parents: 1254
diff changeset
527
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
528 Options:
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
529 -A, --after record a rename that has already occurred
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
530 -f, --force forcibly copy over an existing managed file
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
531
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
532 aliases: mv
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
533
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
534 revert [names ...]::
1608
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
535 The revert command has two modes of operation.
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
536
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
537 In its default mode, it reverts any uncommitted modifications made
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
538 to the named files or directories. This restores the contents of
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
539 the affected files to an unmodified state.
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
540
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
541 Using the -r option, it reverts the given files or directories to
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
542 their state as of an earlier revision. This can be helpful to "roll
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
543 back" some or all of a change that should not have been committed.
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
544
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
545 Revert modifies the working directory. It does not commit any
722fd16f6f8c document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1522
diff changeset
546 changes, or change the parent of the current working directory.
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
547
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
548 If a file has been deleted, it is recreated. If the executable
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
549 mode of a file was changed, it is reset.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
550
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
551 If a directory is given, all files in that directory and its
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
552 subdirectories are reverted.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
553
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
554 If no arguments are given, all files in the current directory and
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
555 its subdirectories are reverted.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
556
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
557 options:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
558 -r, --rev <rev> revision to revert to
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
559 -n, --nonrecursive do not recurse into subdirectories
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
560
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
561 root::
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
562 Print the root directory of the current repository.
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
563
606
ea4526f9b1a5 [PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents: 605
diff changeset
564 serve [options]::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
565 Start a local HTTP repository browser and pull server.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
566
605
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
567 By default, the server logs accesses to stdout and errors to
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
568 stderr. Use the "-A" and "-E" options to log to files.
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
569
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
570 options:
605
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
571 -A, --accesslog <file> name of access log file to write to
1740
f95654385065 add --daemon option to serve command. for issue 45.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1731
diff changeset
572 -d, --daemon run server in background, as a daemon
605
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
573 -E, --errorlog <file> name of error log file to write to
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
574 -a, --address <addr> address to use
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
575 -p, --port <n> port to use (default: 8000)
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
576 -n, --name <name> name to show in web pages (default: working dir)
1740
f95654385065 add --daemon option to serve command. for issue 45.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1731
diff changeset
577 --pid-file <file> write server process ID to given file
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
578 -t, --templatedir <path> web templates to use
825
0108c602feb9 Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents: 814
diff changeset
579 -6, --ipv6 use IPv6 in addition to IPv4
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
580
731
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
581 status [options] [files]::
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
582 Show changed files in the working directory. If no names are
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
583 given, all files are shown. Otherwise, only files matching the
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
584 given names are shown.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
585
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
586 The codes used to show the status of files are:
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
587
746
9095e3456ea7 Change C to M in status
mpm@selenic.com
parents: 745
diff changeset
588 M = changed
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
589 A = added
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
590 R = removed
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
591 ? = not tracked
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
592
731
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
593 options:
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
594
840
141744605b51 hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents: 839
diff changeset
595 -m, --modified show only modified files
141744605b51 hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents: 839
diff changeset
596 -a, --added show only added files
141744605b51 hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents: 839
diff changeset
597 -r, --removed show only removed files
141744605b51 hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents: 839
diff changeset
598 -u, --unknown show only unknown (not tracked) files
1113
6130de75bb2a Updated manpage and help.
TK Soh <teekaysoh@yahoo.com>
parents: 1088
diff changeset
599 -n, --no-status hide status prefix
1088
39b916b1d8e4 updated manpage for new options of status
TK Soh <teekaysoh@yahoo.com>
parents: 1084
diff changeset
600 -0, --print0 end filenames with NUL, for use with xargs
811
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
601 -I, --include <pat> include names matching the given patterns
fa9aaf3bbdd7 Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents: 810
diff changeset
602 -X, --exclude <pat> exclude names matching the given patterns
731
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
603
750
25986be9a1aa Add tag -t, deprecate tag -m
mpm@selenic.com
parents: 747
diff changeset
604 tag [-l -m <text> -d <datecode> -u <user>] <name> [revision]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
605 Name a particular revision using <name>.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
606
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
607 Tags are used to name particular revisions of the repository and are
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
608 very useful to compare different revision, to go back to significant
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
609 earlier versions or to mark branch points as releases, etc.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
610
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
611 If no revision is given, the tip is used.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
612
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
613 To facilitate version control, distribution, and merging of tags,
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
614 they are stored as a file named ".hgtags" which is managed
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
615 similarly to other project files and can be hand-edited if
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
616 necessary.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
617
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
618 options:
631
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
619 -l, --local make the tag local
761
0fb498458905 Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents: 750
diff changeset
620 -m, --message <text> message for tag commit log entry
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
621 -d, --date <datecode> datecode for commit
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
622 -u, --user <user> user for commit
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
623
631
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
624 Note: Local tags are not version-controlled or distributed and are
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
625 stored in the .hg/localtags file. If there exists a local tag and
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
626 a public tag with the same name, local tag is used.
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
627
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
628 tags::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
629 List the repository tags.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
630
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
631 This lists both regular and local tags.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
632
1731
251729df9cc6 add -p option to tip. for issue 64.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1728
diff changeset
633 tip [-p]::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
634 Show the tip revision.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
635
1731
251729df9cc6 add -p option to tip. for issue 64.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1728
diff changeset
636 options:
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
637 -b, --branches show branches
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
638 --map-file <file> display using template map file
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
639 -p, --patch show patch
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1758
diff changeset
640 -t, --template <tpl> display using template
1731
251729df9cc6 add -p option to tip. for issue 64.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1728
diff changeset
641
1218
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
642 unbundle <file>::
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
643 (EXPERIMENTAL)
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
644
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
645 Apply a compressed changegroup file generated by the bundle
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
646 command.
cde6818e082a Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents: 1216
diff changeset
647
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
648 undo::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
649 Undo the last commit or pull transaction.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
650
595
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
651 Roll back the last pull or commit transaction on the
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
652 repository, restoring the project to its earlier state.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
653
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
654 This command should be used with care. There is only one level of
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
655 undo and there is no redo.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
656
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
657 This command is not intended for use on public repositories. Once
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
658 a change is visible for pull by other users, undoing it locally is
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
659 ineffective.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
660
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
661 update [-m -C] [revision]::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
662 Update the working directory to the specified revision.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
663
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
664 By default, update will refuse to run if doing so would require
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
665 merging or discarding local changes.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
666
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
667 With the -m option, a merge will be performed.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
668
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
669 With the -C option, local changes will be lost.
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
670
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
671 options:
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
672 -m, --merge allow merging of branches
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
673 -C, --clean overwrite locally modified files
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
674
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
675 aliases: up checkout co
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
676
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
677 verify::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
678 Verify the integrity of the current repository.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
679
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
680 This will perform an extensive check of the repository's
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
681 integrity, validating the hashes and checksums of each entry in
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
682 the changelog, manifest, and tracked files, as well as the
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
683 integrity of their crosslinks and indices.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
684
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
685 FILE NAME PATTERNS
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
686 ------------------
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
687
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
688 Mercurial accepts several notations for identifying one or more
1274
fe3dd937e803 Fix man page typos
Florian La Roche <laroche@redhat.com>
parents: 1265
diff changeset
689 files at a time.
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
690
1274
fe3dd937e803 Fix man page typos
Florian La Roche <laroche@redhat.com>
parents: 1265
diff changeset
691 By default, Mercurial treats filenames as shell-style extended
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
692 glob patterns.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
693
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
694 Alternate pattern notations must be specified explicitly.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
695
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
696 To use a plain path name without any pattern matching, start a
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
697 name with "path:". These path names must match completely, from
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
698 the root of the current repository.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
699
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
700 To use an extended glob, start a name with "glob:". Globs are
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
701 rooted at the current directory; a glob such as "*.c" will match
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
702 files ending in ".c" in the current directory only.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
703
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
704 The supported glob syntax extensions are "**" to match any string
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
705 across path separators, and "{a,b}" to mean "a or b".
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
706
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
707 To use a Perl/Python regular expression, start a name with "re:".
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
708 Regexp pattern matching is anchored at the root of the repository.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
709
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
710 Plain examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
711
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
712 path:foo/bar a name bar in a directory named foo in the root of
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
713 the repository
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
714 path:path:name a file or directory named "path:name"
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
715
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
716 Glob examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
717
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
718 glob:*.c any name ending in ".c" in the current directory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
719 *.c any name ending in ".c" in the current directory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
720 **.c any name ending in ".c" in the current directory, or
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
721 any subdirectory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
722 foo/*.c any name ending in ".c" in the directory foo
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
723 foo/**.c any name ending in ".c" in the directory foo, or any
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
724 subdirectory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
725
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
726 Regexp examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
727
1045
b35d5b86e240 run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1036
diff changeset
728 re:.*\.c$ any name ending in ".c", anywhere in the repository
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
729
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
730
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
731 SPECIFYING SINGLE REVISIONS
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
732 ---------------------------
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
733
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
734 Mercurial accepts several notations for identifying individual
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
735 revisions.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
736
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
737 A plain integer is treated as a revision number. Negative
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
738 integers are treated as offsets from the tip, with -1 denoting the
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
739 tip.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
740
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
741 A 40-digit hexadecimal string is treated as a unique revision
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
742 identifier.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
743
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
744 A hexadecimal string less than 40 characters long is treated as a
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
745 unique revision identifier, and referred to as a short-form
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
746 identifier. A short-form identifier is only valid if it is the
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
747 prefix of one full-length identifier.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
748
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
749 Any other string is treated as a tag name, which is a symbolic
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
750 name associated with a revision identifier. Tag names may not
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
751 contain the ":" character.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
752
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
753 The reserved name "tip" is a special tag that always identifies
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
754 the most recent revision.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
755
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
756 SPECIFYING MULTIPLE REVISIONS
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
757 -----------------------------
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
758
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
759 When Mercurial accepts more than one revision, they may be
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
760 specified individually, or provided as a continuous range,
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
761 separated by the ":" character.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
762
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
763 The syntax of range notation is [BEGIN]:[END], where BEGIN and END
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
764 are revision identifiers. Both BEGIN and END are optional. If
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
765 BEGIN is not specified, it defaults to revision number 0. If END
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
766 is not specified, it defaults to the tip. The range ":" thus
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
767 means "all revisions".
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
768
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
769 If BEGIN is greater than END, revisions are treated in reverse
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
770 order.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
771
860
8ccbac05cf59 Use correct term "closed interval" for ranges.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 840
diff changeset
772 A range acts as a closed interval. This means that a range of 3:5
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
773 gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
774
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
775 ENVIRONMENT VARIABLES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
776 ---------------------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
777
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
778 HGEDITOR::
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
779 This is the name of the editor to use when committing. Defaults to the
1216
1639fc7c2ccf Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1212
diff changeset
780 value of EDITOR.
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
781
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
782 (deprecated, use .hgrc)
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
783
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
784 HGMERGE::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
785 An executable to use for resolving merge conflicts. The program
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
786 will be executed with three arguments: local file, remote file,
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
787 ancestor file.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
788
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
789 The default program is "hgmerge", which is a shell script provided
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
790 by Mercurial with some sensible defaults.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
791
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
792 (deprecated, use .hgrc)
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
793
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
794 HGUSER::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
795 This is the string used for the author of a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
796
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
797 (deprecated, use .hgrc)
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
798
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
799 EMAIL::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
800 If HGUSER is not set, this will be used as the author for a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
801
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
802 LOGNAME::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
803 If neither HGUSER nor EMAIL is set, LOGNAME will be used (with
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
804 '@hostname' appended) as the author value for a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
805
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
806 EDITOR::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
807 This is the name of the editor used in the hgmerge script. It will be
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
808 used for commit messages if HGEDITOR isn't set. Defaults to 'vi'.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
809
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
810 PYTHONPATH::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
811 This is used by Python to find imported modules and may need to be set
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
812 appropriately if Mercurial is not installed system-wide.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
813
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
814 FILES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
815 -----
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
816 .hgignore::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
817 This file contains regular expressions (one per line) that describe file
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
818 names that should be ignored by hg.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
819
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
820 .hgtags::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
821 This file contains changeset hash values and text tag names (one of each
1045
b35d5b86e240 run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1036
diff changeset
822 separated by spaces) that correspond to tagged versions of the repository
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
823 contents.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
824
951
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
825 /etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
826 This file contains defaults and configuration. Values in .hg/hgrc
951
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
827 override those in $HOME/.hgrc, and these override settings made in the
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
828 global /etc/mercurial/hgrc configuration. See hgrc(5) for details of
859de3ebc041 Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 940
diff changeset
829 the contents and format of these files.
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 196
diff changeset
830
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
831 BUGS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
832 ----
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
833 Probably lots, please post them to the mailing list (See Resources below)
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
834 when you find them.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
835
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
836 SEE ALSO
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
837 --------
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
838 hgrc(5)
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
839
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
840 AUTHOR
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
841 ------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
842 Written by Matt Mackall <mpm@selenic.com>
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
843
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
844 RESOURCES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
845 ---------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
846 http://selenic.com/mercurial[Main Web Site]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
847
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
848 http://www.serpentine.com/mercurial[Wiki site]
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
849
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
850 http://selenic.com/hg[Source code repository]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
851
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
852 http://selenic.com/mailman/listinfo/mercurial[Mailing list]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
853
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
854 COPYING
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
855 -------
1341
3ab6e55ee361 Fix copyright symbol in docs
Vincent Danjean
parents: 1308
diff changeset
856 Copyright \(C) 2005 Matt Mackall.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
857 Free use of this software is granted under the terms of the GNU General
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
858 Public License (GPL).