##// END OF EJS Templates
update: add flag to require update destination...
Ryan McElroy -
r31557:79d98e1b default
parent child Browse files
Show More
@@ -1,5454 +1,5459 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22 from . import (
22 from . import (
23 archival,
23 archival,
24 bookmarks,
24 bookmarks,
25 bundle2,
25 bundle2,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 destutil,
29 destutil,
30 dirstateguard,
30 dirstateguard,
31 discovery,
31 discovery,
32 encoding,
32 encoding,
33 error,
33 error,
34 exchange,
34 exchange,
35 extensions,
35 extensions,
36 graphmod,
36 graphmod,
37 hbisect,
37 hbisect,
38 help,
38 help,
39 hg,
39 hg,
40 lock as lockmod,
40 lock as lockmod,
41 merge as mergemod,
41 merge as mergemod,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 phases,
44 phases,
45 pycompat,
45 pycompat,
46 revsetlang,
46 revsetlang,
47 scmutil,
47 scmutil,
48 server,
48 server,
49 sshserver,
49 sshserver,
50 streamclone,
50 streamclone,
51 templatekw,
51 templatekw,
52 ui as uimod,
52 ui as uimod,
53 util,
53 util,
54 )
54 )
55
55
56 release = lockmod.release
56 release = lockmod.release
57
57
58 table = {}
58 table = {}
59
59
60 command = cmdutil.command(table)
60 command = cmdutil.command(table)
61
61
62 # label constants
62 # label constants
63 # until 3.5, bookmarks.current was the advertised name, not
63 # until 3.5, bookmarks.current was the advertised name, not
64 # bookmarks.active, so we must use both to avoid breaking old
64 # bookmarks.active, so we must use both to avoid breaking old
65 # custom styles
65 # custom styles
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
67
67
68 # common command options
68 # common command options
69
69
70 globalopts = [
70 globalopts = [
71 ('R', 'repository', '',
71 ('R', 'repository', '',
72 _('repository root directory or name of overlay bundle file'),
72 _('repository root directory or name of overlay bundle file'),
73 _('REPO')),
73 _('REPO')),
74 ('', 'cwd', '',
74 ('', 'cwd', '',
75 _('change working directory'), _('DIR')),
75 _('change working directory'), _('DIR')),
76 ('y', 'noninteractive', None,
76 ('y', 'noninteractive', None,
77 _('do not prompt, automatically pick the first choice for all prompts')),
77 _('do not prompt, automatically pick the first choice for all prompts')),
78 ('q', 'quiet', None, _('suppress output')),
78 ('q', 'quiet', None, _('suppress output')),
79 ('v', 'verbose', None, _('enable additional output')),
79 ('v', 'verbose', None, _('enable additional output')),
80 ('', 'color', '',
80 ('', 'color', '',
81 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
81 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
82 # and should not be translated
82 # and should not be translated
83 _("when to colorize (boolean, always, auto, never, or debug)"),
83 _("when to colorize (boolean, always, auto, never, or debug)"),
84 _('TYPE')),
84 _('TYPE')),
85 ('', 'config', [],
85 ('', 'config', [],
86 _('set/override config option (use \'section.name=value\')'),
86 _('set/override config option (use \'section.name=value\')'),
87 _('CONFIG')),
87 _('CONFIG')),
88 ('', 'debug', None, _('enable debugging output')),
88 ('', 'debug', None, _('enable debugging output')),
89 ('', 'debugger', None, _('start debugger')),
89 ('', 'debugger', None, _('start debugger')),
90 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
90 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
91 _('ENCODE')),
91 _('ENCODE')),
92 ('', 'encodingmode', encoding.encodingmode,
92 ('', 'encodingmode', encoding.encodingmode,
93 _('set the charset encoding mode'), _('MODE')),
93 _('set the charset encoding mode'), _('MODE')),
94 ('', 'traceback', None, _('always print a traceback on exception')),
94 ('', 'traceback', None, _('always print a traceback on exception')),
95 ('', 'time', None, _('time how long the command takes')),
95 ('', 'time', None, _('time how long the command takes')),
96 ('', 'profile', None, _('print command execution profile')),
96 ('', 'profile', None, _('print command execution profile')),
97 ('', 'version', None, _('output version information and exit')),
97 ('', 'version', None, _('output version information and exit')),
98 ('h', 'help', None, _('display help and exit')),
98 ('h', 'help', None, _('display help and exit')),
99 ('', 'hidden', False, _('consider hidden changesets')),
99 ('', 'hidden', False, _('consider hidden changesets')),
100 ('', 'pager', 'auto',
100 ('', 'pager', 'auto',
101 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
101 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
102 ]
102 ]
103
103
104 dryrunopts = [('n', 'dry-run', None,
104 dryrunopts = [('n', 'dry-run', None,
105 _('do not perform actions, just print output'))]
105 _('do not perform actions, just print output'))]
106
106
107 remoteopts = [
107 remoteopts = [
108 ('e', 'ssh', '',
108 ('e', 'ssh', '',
109 _('specify ssh command to use'), _('CMD')),
109 _('specify ssh command to use'), _('CMD')),
110 ('', 'remotecmd', '',
110 ('', 'remotecmd', '',
111 _('specify hg command to run on the remote side'), _('CMD')),
111 _('specify hg command to run on the remote side'), _('CMD')),
112 ('', 'insecure', None,
112 ('', 'insecure', None,
113 _('do not verify server certificate (ignoring web.cacerts config)')),
113 _('do not verify server certificate (ignoring web.cacerts config)')),
114 ]
114 ]
115
115
116 walkopts = [
116 walkopts = [
117 ('I', 'include', [],
117 ('I', 'include', [],
118 _('include names matching the given patterns'), _('PATTERN')),
118 _('include names matching the given patterns'), _('PATTERN')),
119 ('X', 'exclude', [],
119 ('X', 'exclude', [],
120 _('exclude names matching the given patterns'), _('PATTERN')),
120 _('exclude names matching the given patterns'), _('PATTERN')),
121 ]
121 ]
122
122
123 commitopts = [
123 commitopts = [
124 ('m', 'message', '',
124 ('m', 'message', '',
125 _('use text as commit message'), _('TEXT')),
125 _('use text as commit message'), _('TEXT')),
126 ('l', 'logfile', '',
126 ('l', 'logfile', '',
127 _('read commit message from file'), _('FILE')),
127 _('read commit message from file'), _('FILE')),
128 ]
128 ]
129
129
130 commitopts2 = [
130 commitopts2 = [
131 ('d', 'date', '',
131 ('d', 'date', '',
132 _('record the specified date as commit date'), _('DATE')),
132 _('record the specified date as commit date'), _('DATE')),
133 ('u', 'user', '',
133 ('u', 'user', '',
134 _('record the specified user as committer'), _('USER')),
134 _('record the specified user as committer'), _('USER')),
135 ]
135 ]
136
136
137 # hidden for now
137 # hidden for now
138 formatteropts = [
138 formatteropts = [
139 ('T', 'template', '',
139 ('T', 'template', '',
140 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
140 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
141 ]
141 ]
142
142
143 templateopts = [
143 templateopts = [
144 ('', 'style', '',
144 ('', 'style', '',
145 _('display using template map file (DEPRECATED)'), _('STYLE')),
145 _('display using template map file (DEPRECATED)'), _('STYLE')),
146 ('T', 'template', '',
146 ('T', 'template', '',
147 _('display with template'), _('TEMPLATE')),
147 _('display with template'), _('TEMPLATE')),
148 ]
148 ]
149
149
150 logopts = [
150 logopts = [
151 ('p', 'patch', None, _('show patch')),
151 ('p', 'patch', None, _('show patch')),
152 ('g', 'git', None, _('use git extended diff format')),
152 ('g', 'git', None, _('use git extended diff format')),
153 ('l', 'limit', '',
153 ('l', 'limit', '',
154 _('limit number of changes displayed'), _('NUM')),
154 _('limit number of changes displayed'), _('NUM')),
155 ('M', 'no-merges', None, _('do not show merges')),
155 ('M', 'no-merges', None, _('do not show merges')),
156 ('', 'stat', None, _('output diffstat-style summary of changes')),
156 ('', 'stat', None, _('output diffstat-style summary of changes')),
157 ('G', 'graph', None, _("show the revision DAG")),
157 ('G', 'graph', None, _("show the revision DAG")),
158 ] + templateopts
158 ] + templateopts
159
159
160 diffopts = [
160 diffopts = [
161 ('a', 'text', None, _('treat all files as text')),
161 ('a', 'text', None, _('treat all files as text')),
162 ('g', 'git', None, _('use git extended diff format')),
162 ('g', 'git', None, _('use git extended diff format')),
163 ('', 'nodates', None, _('omit dates from diff headers'))
163 ('', 'nodates', None, _('omit dates from diff headers'))
164 ]
164 ]
165
165
166 diffwsopts = [
166 diffwsopts = [
167 ('w', 'ignore-all-space', None,
167 ('w', 'ignore-all-space', None,
168 _('ignore white space when comparing lines')),
168 _('ignore white space when comparing lines')),
169 ('b', 'ignore-space-change', None,
169 ('b', 'ignore-space-change', None,
170 _('ignore changes in the amount of white space')),
170 _('ignore changes in the amount of white space')),
171 ('B', 'ignore-blank-lines', None,
171 ('B', 'ignore-blank-lines', None,
172 _('ignore changes whose lines are all blank')),
172 _('ignore changes whose lines are all blank')),
173 ]
173 ]
174
174
175 diffopts2 = [
175 diffopts2 = [
176 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
176 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
177 ('p', 'show-function', None, _('show which function each change is in')),
177 ('p', 'show-function', None, _('show which function each change is in')),
178 ('', 'reverse', None, _('produce a diff that undoes the changes')),
178 ('', 'reverse', None, _('produce a diff that undoes the changes')),
179 ] + diffwsopts + [
179 ] + diffwsopts + [
180 ('U', 'unified', '',
180 ('U', 'unified', '',
181 _('number of lines of context to show'), _('NUM')),
181 _('number of lines of context to show'), _('NUM')),
182 ('', 'stat', None, _('output diffstat-style summary of changes')),
182 ('', 'stat', None, _('output diffstat-style summary of changes')),
183 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
183 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
184 ]
184 ]
185
185
186 mergetoolopts = [
186 mergetoolopts = [
187 ('t', 'tool', '', _('specify merge tool')),
187 ('t', 'tool', '', _('specify merge tool')),
188 ]
188 ]
189
189
190 similarityopts = [
190 similarityopts = [
191 ('s', 'similarity', '',
191 ('s', 'similarity', '',
192 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
192 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
193 ]
193 ]
194
194
195 subrepoopts = [
195 subrepoopts = [
196 ('S', 'subrepos', None,
196 ('S', 'subrepos', None,
197 _('recurse into subrepositories'))
197 _('recurse into subrepositories'))
198 ]
198 ]
199
199
200 debugrevlogopts = [
200 debugrevlogopts = [
201 ('c', 'changelog', False, _('open changelog')),
201 ('c', 'changelog', False, _('open changelog')),
202 ('m', 'manifest', False, _('open manifest')),
202 ('m', 'manifest', False, _('open manifest')),
203 ('', 'dir', '', _('open directory manifest')),
203 ('', 'dir', '', _('open directory manifest')),
204 ]
204 ]
205
205
206 # Commands start here, listed alphabetically
206 # Commands start here, listed alphabetically
207
207
208 @command('^add',
208 @command('^add',
209 walkopts + subrepoopts + dryrunopts,
209 walkopts + subrepoopts + dryrunopts,
210 _('[OPTION]... [FILE]...'),
210 _('[OPTION]... [FILE]...'),
211 inferrepo=True)
211 inferrepo=True)
212 def add(ui, repo, *pats, **opts):
212 def add(ui, repo, *pats, **opts):
213 """add the specified files on the next commit
213 """add the specified files on the next commit
214
214
215 Schedule files to be version controlled and added to the
215 Schedule files to be version controlled and added to the
216 repository.
216 repository.
217
217
218 The files will be added to the repository at the next commit. To
218 The files will be added to the repository at the next commit. To
219 undo an add before that, see :hg:`forget`.
219 undo an add before that, see :hg:`forget`.
220
220
221 If no names are given, add all files to the repository (except
221 If no names are given, add all files to the repository (except
222 files matching ``.hgignore``).
222 files matching ``.hgignore``).
223
223
224 .. container:: verbose
224 .. container:: verbose
225
225
226 Examples:
226 Examples:
227
227
228 - New (unknown) files are added
228 - New (unknown) files are added
229 automatically by :hg:`add`::
229 automatically by :hg:`add`::
230
230
231 $ ls
231 $ ls
232 foo.c
232 foo.c
233 $ hg status
233 $ hg status
234 ? foo.c
234 ? foo.c
235 $ hg add
235 $ hg add
236 adding foo.c
236 adding foo.c
237 $ hg status
237 $ hg status
238 A foo.c
238 A foo.c
239
239
240 - Specific files to be added can be specified::
240 - Specific files to be added can be specified::
241
241
242 $ ls
242 $ ls
243 bar.c foo.c
243 bar.c foo.c
244 $ hg status
244 $ hg status
245 ? bar.c
245 ? bar.c
246 ? foo.c
246 ? foo.c
247 $ hg add bar.c
247 $ hg add bar.c
248 $ hg status
248 $ hg status
249 A bar.c
249 A bar.c
250 ? foo.c
250 ? foo.c
251
251
252 Returns 0 if all files are successfully added.
252 Returns 0 if all files are successfully added.
253 """
253 """
254
254
255 m = scmutil.match(repo[None], pats, opts)
255 m = scmutil.match(repo[None], pats, opts)
256 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
256 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259 @command('addremove',
259 @command('addremove',
260 similarityopts + subrepoopts + walkopts + dryrunopts,
260 similarityopts + subrepoopts + walkopts + dryrunopts,
261 _('[OPTION]... [FILE]...'),
261 _('[OPTION]... [FILE]...'),
262 inferrepo=True)
262 inferrepo=True)
263 def addremove(ui, repo, *pats, **opts):
263 def addremove(ui, repo, *pats, **opts):
264 """add all new files, delete all missing files
264 """add all new files, delete all missing files
265
265
266 Add all new files and remove all missing files from the
266 Add all new files and remove all missing files from the
267 repository.
267 repository.
268
268
269 Unless names are given, new files are ignored if they match any of
269 Unless names are given, new files are ignored if they match any of
270 the patterns in ``.hgignore``. As with add, these changes take
270 the patterns in ``.hgignore``. As with add, these changes take
271 effect at the next commit.
271 effect at the next commit.
272
272
273 Use the -s/--similarity option to detect renamed files. This
273 Use the -s/--similarity option to detect renamed files. This
274 option takes a percentage between 0 (disabled) and 100 (files must
274 option takes a percentage between 0 (disabled) and 100 (files must
275 be identical) as its parameter. With a parameter greater than 0,
275 be identical) as its parameter. With a parameter greater than 0,
276 this compares every removed file with every added file and records
276 this compares every removed file with every added file and records
277 those similar enough as renames. Detecting renamed files this way
277 those similar enough as renames. Detecting renamed files this way
278 can be expensive. After using this option, :hg:`status -C` can be
278 can be expensive. After using this option, :hg:`status -C` can be
279 used to check which files were identified as moved or renamed. If
279 used to check which files were identified as moved or renamed. If
280 not specified, -s/--similarity defaults to 100 and only renames of
280 not specified, -s/--similarity defaults to 100 and only renames of
281 identical files are detected.
281 identical files are detected.
282
282
283 .. container:: verbose
283 .. container:: verbose
284
284
285 Examples:
285 Examples:
286
286
287 - A number of files (bar.c and foo.c) are new,
287 - A number of files (bar.c and foo.c) are new,
288 while foobar.c has been removed (without using :hg:`remove`)
288 while foobar.c has been removed (without using :hg:`remove`)
289 from the repository::
289 from the repository::
290
290
291 $ ls
291 $ ls
292 bar.c foo.c
292 bar.c foo.c
293 $ hg status
293 $ hg status
294 ! foobar.c
294 ! foobar.c
295 ? bar.c
295 ? bar.c
296 ? foo.c
296 ? foo.c
297 $ hg addremove
297 $ hg addremove
298 adding bar.c
298 adding bar.c
299 adding foo.c
299 adding foo.c
300 removing foobar.c
300 removing foobar.c
301 $ hg status
301 $ hg status
302 A bar.c
302 A bar.c
303 A foo.c
303 A foo.c
304 R foobar.c
304 R foobar.c
305
305
306 - A file foobar.c was moved to foo.c without using :hg:`rename`.
306 - A file foobar.c was moved to foo.c without using :hg:`rename`.
307 Afterwards, it was edited slightly::
307 Afterwards, it was edited slightly::
308
308
309 $ ls
309 $ ls
310 foo.c
310 foo.c
311 $ hg status
311 $ hg status
312 ! foobar.c
312 ! foobar.c
313 ? foo.c
313 ? foo.c
314 $ hg addremove --similarity 90
314 $ hg addremove --similarity 90
315 removing foobar.c
315 removing foobar.c
316 adding foo.c
316 adding foo.c
317 recording removal of foobar.c as rename to foo.c (94% similar)
317 recording removal of foobar.c as rename to foo.c (94% similar)
318 $ hg status -C
318 $ hg status -C
319 A foo.c
319 A foo.c
320 foobar.c
320 foobar.c
321 R foobar.c
321 R foobar.c
322
322
323 Returns 0 if all files are successfully added.
323 Returns 0 if all files are successfully added.
324 """
324 """
325 try:
325 try:
326 sim = float(opts.get('similarity') or 100)
326 sim = float(opts.get('similarity') or 100)
327 except ValueError:
327 except ValueError:
328 raise error.Abort(_('similarity must be a number'))
328 raise error.Abort(_('similarity must be a number'))
329 if sim < 0 or sim > 100:
329 if sim < 0 or sim > 100:
330 raise error.Abort(_('similarity must be between 0 and 100'))
330 raise error.Abort(_('similarity must be between 0 and 100'))
331 matcher = scmutil.match(repo[None], pats, opts)
331 matcher = scmutil.match(repo[None], pats, opts)
332 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
332 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
333
333
334 @command('^annotate|blame',
334 @command('^annotate|blame',
335 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
335 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
336 ('', 'follow', None,
336 ('', 'follow', None,
337 _('follow copies/renames and list the filename (DEPRECATED)')),
337 _('follow copies/renames and list the filename (DEPRECATED)')),
338 ('', 'no-follow', None, _("don't follow copies and renames")),
338 ('', 'no-follow', None, _("don't follow copies and renames")),
339 ('a', 'text', None, _('treat all files as text')),
339 ('a', 'text', None, _('treat all files as text')),
340 ('u', 'user', None, _('list the author (long with -v)')),
340 ('u', 'user', None, _('list the author (long with -v)')),
341 ('f', 'file', None, _('list the filename')),
341 ('f', 'file', None, _('list the filename')),
342 ('d', 'date', None, _('list the date (short with -q)')),
342 ('d', 'date', None, _('list the date (short with -q)')),
343 ('n', 'number', None, _('list the revision number (default)')),
343 ('n', 'number', None, _('list the revision number (default)')),
344 ('c', 'changeset', None, _('list the changeset')),
344 ('c', 'changeset', None, _('list the changeset')),
345 ('l', 'line-number', None, _('show line number at the first appearance'))
345 ('l', 'line-number', None, _('show line number at the first appearance'))
346 ] + diffwsopts + walkopts + formatteropts,
346 ] + diffwsopts + walkopts + formatteropts,
347 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
347 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
348 inferrepo=True)
348 inferrepo=True)
349 def annotate(ui, repo, *pats, **opts):
349 def annotate(ui, repo, *pats, **opts):
350 """show changeset information by line for each file
350 """show changeset information by line for each file
351
351
352 List changes in files, showing the revision id responsible for
352 List changes in files, showing the revision id responsible for
353 each line.
353 each line.
354
354
355 This command is useful for discovering when a change was made and
355 This command is useful for discovering when a change was made and
356 by whom.
356 by whom.
357
357
358 If you include --file, --user, or --date, the revision number is
358 If you include --file, --user, or --date, the revision number is
359 suppressed unless you also include --number.
359 suppressed unless you also include --number.
360
360
361 Without the -a/--text option, annotate will avoid processing files
361 Without the -a/--text option, annotate will avoid processing files
362 it detects as binary. With -a, annotate will annotate the file
362 it detects as binary. With -a, annotate will annotate the file
363 anyway, although the results will probably be neither useful
363 anyway, although the results will probably be neither useful
364 nor desirable.
364 nor desirable.
365
365
366 Returns 0 on success.
366 Returns 0 on success.
367 """
367 """
368 if not pats:
368 if not pats:
369 raise error.Abort(_('at least one filename or pattern is required'))
369 raise error.Abort(_('at least one filename or pattern is required'))
370
370
371 if opts.get('follow'):
371 if opts.get('follow'):
372 # --follow is deprecated and now just an alias for -f/--file
372 # --follow is deprecated and now just an alias for -f/--file
373 # to mimic the behavior of Mercurial before version 1.5
373 # to mimic the behavior of Mercurial before version 1.5
374 opts['file'] = True
374 opts['file'] = True
375
375
376 ctx = scmutil.revsingle(repo, opts.get('rev'))
376 ctx = scmutil.revsingle(repo, opts.get('rev'))
377
377
378 fm = ui.formatter('annotate', opts)
378 fm = ui.formatter('annotate', opts)
379 if ui.quiet:
379 if ui.quiet:
380 datefunc = util.shortdate
380 datefunc = util.shortdate
381 else:
381 else:
382 datefunc = util.datestr
382 datefunc = util.datestr
383 if ctx.rev() is None:
383 if ctx.rev() is None:
384 def hexfn(node):
384 def hexfn(node):
385 if node is None:
385 if node is None:
386 return None
386 return None
387 else:
387 else:
388 return fm.hexfunc(node)
388 return fm.hexfunc(node)
389 if opts.get('changeset'):
389 if opts.get('changeset'):
390 # omit "+" suffix which is appended to node hex
390 # omit "+" suffix which is appended to node hex
391 def formatrev(rev):
391 def formatrev(rev):
392 if rev is None:
392 if rev is None:
393 return '%d' % ctx.p1().rev()
393 return '%d' % ctx.p1().rev()
394 else:
394 else:
395 return '%d' % rev
395 return '%d' % rev
396 else:
396 else:
397 def formatrev(rev):
397 def formatrev(rev):
398 if rev is None:
398 if rev is None:
399 return '%d+' % ctx.p1().rev()
399 return '%d+' % ctx.p1().rev()
400 else:
400 else:
401 return '%d ' % rev
401 return '%d ' % rev
402 def formathex(hex):
402 def formathex(hex):
403 if hex is None:
403 if hex is None:
404 return '%s+' % fm.hexfunc(ctx.p1().node())
404 return '%s+' % fm.hexfunc(ctx.p1().node())
405 else:
405 else:
406 return '%s ' % hex
406 return '%s ' % hex
407 else:
407 else:
408 hexfn = fm.hexfunc
408 hexfn = fm.hexfunc
409 formatrev = formathex = str
409 formatrev = formathex = str
410
410
411 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
411 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
412 ('number', ' ', lambda x: x[0].rev(), formatrev),
412 ('number', ' ', lambda x: x[0].rev(), formatrev),
413 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
413 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
414 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
414 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
415 ('file', ' ', lambda x: x[0].path(), str),
415 ('file', ' ', lambda x: x[0].path(), str),
416 ('line_number', ':', lambda x: x[1], str),
416 ('line_number', ':', lambda x: x[1], str),
417 ]
417 ]
418 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
418 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
419
419
420 if (not opts.get('user') and not opts.get('changeset')
420 if (not opts.get('user') and not opts.get('changeset')
421 and not opts.get('date') and not opts.get('file')):
421 and not opts.get('date') and not opts.get('file')):
422 opts['number'] = True
422 opts['number'] = True
423
423
424 linenumber = opts.get('line_number') is not None
424 linenumber = opts.get('line_number') is not None
425 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
425 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
426 raise error.Abort(_('at least one of -n/-c is required for -l'))
426 raise error.Abort(_('at least one of -n/-c is required for -l'))
427
427
428 ui.pager('annotate')
428 ui.pager('annotate')
429
429
430 if fm.isplain():
430 if fm.isplain():
431 def makefunc(get, fmt):
431 def makefunc(get, fmt):
432 return lambda x: fmt(get(x))
432 return lambda x: fmt(get(x))
433 else:
433 else:
434 def makefunc(get, fmt):
434 def makefunc(get, fmt):
435 return get
435 return get
436 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
436 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
437 if opts.get(op)]
437 if opts.get(op)]
438 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
438 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
439 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
439 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
440 if opts.get(op))
440 if opts.get(op))
441
441
442 def bad(x, y):
442 def bad(x, y):
443 raise error.Abort("%s: %s" % (x, y))
443 raise error.Abort("%s: %s" % (x, y))
444
444
445 m = scmutil.match(ctx, pats, opts, badfn=bad)
445 m = scmutil.match(ctx, pats, opts, badfn=bad)
446
446
447 follow = not opts.get('no_follow')
447 follow = not opts.get('no_follow')
448 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
448 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
449 whitespace=True)
449 whitespace=True)
450 for abs in ctx.walk(m):
450 for abs in ctx.walk(m):
451 fctx = ctx[abs]
451 fctx = ctx[abs]
452 if not opts.get('text') and util.binary(fctx.data()):
452 if not opts.get('text') and util.binary(fctx.data()):
453 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
453 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
454 continue
454 continue
455
455
456 lines = fctx.annotate(follow=follow, linenumber=linenumber,
456 lines = fctx.annotate(follow=follow, linenumber=linenumber,
457 diffopts=diffopts)
457 diffopts=diffopts)
458 if not lines:
458 if not lines:
459 continue
459 continue
460 formats = []
460 formats = []
461 pieces = []
461 pieces = []
462
462
463 for f, sep in funcmap:
463 for f, sep in funcmap:
464 l = [f(n) for n, dummy in lines]
464 l = [f(n) for n, dummy in lines]
465 if fm.isplain():
465 if fm.isplain():
466 sizes = [encoding.colwidth(x) for x in l]
466 sizes = [encoding.colwidth(x) for x in l]
467 ml = max(sizes)
467 ml = max(sizes)
468 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
468 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
469 else:
469 else:
470 formats.append(['%s' for x in l])
470 formats.append(['%s' for x in l])
471 pieces.append(l)
471 pieces.append(l)
472
472
473 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
473 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
474 fm.startitem()
474 fm.startitem()
475 fm.write(fields, "".join(f), *p)
475 fm.write(fields, "".join(f), *p)
476 fm.write('line', ": %s", l[1])
476 fm.write('line', ": %s", l[1])
477
477
478 if not lines[-1][1].endswith('\n'):
478 if not lines[-1][1].endswith('\n'):
479 fm.plain('\n')
479 fm.plain('\n')
480
480
481 fm.end()
481 fm.end()
482
482
483 @command('archive',
483 @command('archive',
484 [('', 'no-decode', None, _('do not pass files through decoders')),
484 [('', 'no-decode', None, _('do not pass files through decoders')),
485 ('p', 'prefix', '', _('directory prefix for files in archive'),
485 ('p', 'prefix', '', _('directory prefix for files in archive'),
486 _('PREFIX')),
486 _('PREFIX')),
487 ('r', 'rev', '', _('revision to distribute'), _('REV')),
487 ('r', 'rev', '', _('revision to distribute'), _('REV')),
488 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
488 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
489 ] + subrepoopts + walkopts,
489 ] + subrepoopts + walkopts,
490 _('[OPTION]... DEST'))
490 _('[OPTION]... DEST'))
491 def archive(ui, repo, dest, **opts):
491 def archive(ui, repo, dest, **opts):
492 '''create an unversioned archive of a repository revision
492 '''create an unversioned archive of a repository revision
493
493
494 By default, the revision used is the parent of the working
494 By default, the revision used is the parent of the working
495 directory; use -r/--rev to specify a different revision.
495 directory; use -r/--rev to specify a different revision.
496
496
497 The archive type is automatically detected based on file
497 The archive type is automatically detected based on file
498 extension (to override, use -t/--type).
498 extension (to override, use -t/--type).
499
499
500 .. container:: verbose
500 .. container:: verbose
501
501
502 Examples:
502 Examples:
503
503
504 - create a zip file containing the 1.0 release::
504 - create a zip file containing the 1.0 release::
505
505
506 hg archive -r 1.0 project-1.0.zip
506 hg archive -r 1.0 project-1.0.zip
507
507
508 - create a tarball excluding .hg files::
508 - create a tarball excluding .hg files::
509
509
510 hg archive project.tar.gz -X ".hg*"
510 hg archive project.tar.gz -X ".hg*"
511
511
512 Valid types are:
512 Valid types are:
513
513
514 :``files``: a directory full of files (default)
514 :``files``: a directory full of files (default)
515 :``tar``: tar archive, uncompressed
515 :``tar``: tar archive, uncompressed
516 :``tbz2``: tar archive, compressed using bzip2
516 :``tbz2``: tar archive, compressed using bzip2
517 :``tgz``: tar archive, compressed using gzip
517 :``tgz``: tar archive, compressed using gzip
518 :``uzip``: zip archive, uncompressed
518 :``uzip``: zip archive, uncompressed
519 :``zip``: zip archive, compressed using deflate
519 :``zip``: zip archive, compressed using deflate
520
520
521 The exact name of the destination archive or directory is given
521 The exact name of the destination archive or directory is given
522 using a format string; see :hg:`help export` for details.
522 using a format string; see :hg:`help export` for details.
523
523
524 Each member added to an archive file has a directory prefix
524 Each member added to an archive file has a directory prefix
525 prepended. Use -p/--prefix to specify a format string for the
525 prepended. Use -p/--prefix to specify a format string for the
526 prefix. The default is the basename of the archive, with suffixes
526 prefix. The default is the basename of the archive, with suffixes
527 removed.
527 removed.
528
528
529 Returns 0 on success.
529 Returns 0 on success.
530 '''
530 '''
531
531
532 ctx = scmutil.revsingle(repo, opts.get('rev'))
532 ctx = scmutil.revsingle(repo, opts.get('rev'))
533 if not ctx:
533 if not ctx:
534 raise error.Abort(_('no working directory: please specify a revision'))
534 raise error.Abort(_('no working directory: please specify a revision'))
535 node = ctx.node()
535 node = ctx.node()
536 dest = cmdutil.makefilename(repo, dest, node)
536 dest = cmdutil.makefilename(repo, dest, node)
537 if os.path.realpath(dest) == repo.root:
537 if os.path.realpath(dest) == repo.root:
538 raise error.Abort(_('repository root cannot be destination'))
538 raise error.Abort(_('repository root cannot be destination'))
539
539
540 kind = opts.get('type') or archival.guesskind(dest) or 'files'
540 kind = opts.get('type') or archival.guesskind(dest) or 'files'
541 prefix = opts.get('prefix')
541 prefix = opts.get('prefix')
542
542
543 if dest == '-':
543 if dest == '-':
544 if kind == 'files':
544 if kind == 'files':
545 raise error.Abort(_('cannot archive plain files to stdout'))
545 raise error.Abort(_('cannot archive plain files to stdout'))
546 dest = cmdutil.makefileobj(repo, dest)
546 dest = cmdutil.makefileobj(repo, dest)
547 if not prefix:
547 if not prefix:
548 prefix = os.path.basename(repo.root) + '-%h'
548 prefix = os.path.basename(repo.root) + '-%h'
549
549
550 prefix = cmdutil.makefilename(repo, prefix, node)
550 prefix = cmdutil.makefilename(repo, prefix, node)
551 matchfn = scmutil.match(ctx, [], opts)
551 matchfn = scmutil.match(ctx, [], opts)
552 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
552 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
553 matchfn, prefix, subrepos=opts.get('subrepos'))
553 matchfn, prefix, subrepos=opts.get('subrepos'))
554
554
555 @command('backout',
555 @command('backout',
556 [('', 'merge', None, _('merge with old dirstate parent after backout')),
556 [('', 'merge', None, _('merge with old dirstate parent after backout')),
557 ('', 'commit', None,
557 ('', 'commit', None,
558 _('commit if no conflicts were encountered (DEPRECATED)')),
558 _('commit if no conflicts were encountered (DEPRECATED)')),
559 ('', 'no-commit', None, _('do not commit')),
559 ('', 'no-commit', None, _('do not commit')),
560 ('', 'parent', '',
560 ('', 'parent', '',
561 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
561 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
562 ('r', 'rev', '', _('revision to backout'), _('REV')),
562 ('r', 'rev', '', _('revision to backout'), _('REV')),
563 ('e', 'edit', False, _('invoke editor on commit messages')),
563 ('e', 'edit', False, _('invoke editor on commit messages')),
564 ] + mergetoolopts + walkopts + commitopts + commitopts2,
564 ] + mergetoolopts + walkopts + commitopts + commitopts2,
565 _('[OPTION]... [-r] REV'))
565 _('[OPTION]... [-r] REV'))
566 def backout(ui, repo, node=None, rev=None, **opts):
566 def backout(ui, repo, node=None, rev=None, **opts):
567 '''reverse effect of earlier changeset
567 '''reverse effect of earlier changeset
568
568
569 Prepare a new changeset with the effect of REV undone in the
569 Prepare a new changeset with the effect of REV undone in the
570 current working directory. If no conflicts were encountered,
570 current working directory. If no conflicts were encountered,
571 it will be committed immediately.
571 it will be committed immediately.
572
572
573 If REV is the parent of the working directory, then this new changeset
573 If REV is the parent of the working directory, then this new changeset
574 is committed automatically (unless --no-commit is specified).
574 is committed automatically (unless --no-commit is specified).
575
575
576 .. note::
576 .. note::
577
577
578 :hg:`backout` cannot be used to fix either an unwanted or
578 :hg:`backout` cannot be used to fix either an unwanted or
579 incorrect merge.
579 incorrect merge.
580
580
581 .. container:: verbose
581 .. container:: verbose
582
582
583 Examples:
583 Examples:
584
584
585 - Reverse the effect of the parent of the working directory.
585 - Reverse the effect of the parent of the working directory.
586 This backout will be committed immediately::
586 This backout will be committed immediately::
587
587
588 hg backout -r .
588 hg backout -r .
589
589
590 - Reverse the effect of previous bad revision 23::
590 - Reverse the effect of previous bad revision 23::
591
591
592 hg backout -r 23
592 hg backout -r 23
593
593
594 - Reverse the effect of previous bad revision 23 and
594 - Reverse the effect of previous bad revision 23 and
595 leave changes uncommitted::
595 leave changes uncommitted::
596
596
597 hg backout -r 23 --no-commit
597 hg backout -r 23 --no-commit
598 hg commit -m "Backout revision 23"
598 hg commit -m "Backout revision 23"
599
599
600 By default, the pending changeset will have one parent,
600 By default, the pending changeset will have one parent,
601 maintaining a linear history. With --merge, the pending
601 maintaining a linear history. With --merge, the pending
602 changeset will instead have two parents: the old parent of the
602 changeset will instead have two parents: the old parent of the
603 working directory and a new child of REV that simply undoes REV.
603 working directory and a new child of REV that simply undoes REV.
604
604
605 Before version 1.7, the behavior without --merge was equivalent
605 Before version 1.7, the behavior without --merge was equivalent
606 to specifying --merge followed by :hg:`update --clean .` to
606 to specifying --merge followed by :hg:`update --clean .` to
607 cancel the merge and leave the child of REV as a head to be
607 cancel the merge and leave the child of REV as a head to be
608 merged separately.
608 merged separately.
609
609
610 See :hg:`help dates` for a list of formats valid for -d/--date.
610 See :hg:`help dates` for a list of formats valid for -d/--date.
611
611
612 See :hg:`help revert` for a way to restore files to the state
612 See :hg:`help revert` for a way to restore files to the state
613 of another revision.
613 of another revision.
614
614
615 Returns 0 on success, 1 if nothing to backout or there are unresolved
615 Returns 0 on success, 1 if nothing to backout or there are unresolved
616 files.
616 files.
617 '''
617 '''
618 wlock = lock = None
618 wlock = lock = None
619 try:
619 try:
620 wlock = repo.wlock()
620 wlock = repo.wlock()
621 lock = repo.lock()
621 lock = repo.lock()
622 return _dobackout(ui, repo, node, rev, **opts)
622 return _dobackout(ui, repo, node, rev, **opts)
623 finally:
623 finally:
624 release(lock, wlock)
624 release(lock, wlock)
625
625
626 def _dobackout(ui, repo, node=None, rev=None, **opts):
626 def _dobackout(ui, repo, node=None, rev=None, **opts):
627 if opts.get('commit') and opts.get('no_commit'):
627 if opts.get('commit') and opts.get('no_commit'):
628 raise error.Abort(_("cannot use --commit with --no-commit"))
628 raise error.Abort(_("cannot use --commit with --no-commit"))
629 if opts.get('merge') and opts.get('no_commit'):
629 if opts.get('merge') and opts.get('no_commit'):
630 raise error.Abort(_("cannot use --merge with --no-commit"))
630 raise error.Abort(_("cannot use --merge with --no-commit"))
631
631
632 if rev and node:
632 if rev and node:
633 raise error.Abort(_("please specify just one revision"))
633 raise error.Abort(_("please specify just one revision"))
634
634
635 if not rev:
635 if not rev:
636 rev = node
636 rev = node
637
637
638 if not rev:
638 if not rev:
639 raise error.Abort(_("please specify a revision to backout"))
639 raise error.Abort(_("please specify a revision to backout"))
640
640
641 date = opts.get('date')
641 date = opts.get('date')
642 if date:
642 if date:
643 opts['date'] = util.parsedate(date)
643 opts['date'] = util.parsedate(date)
644
644
645 cmdutil.checkunfinished(repo)
645 cmdutil.checkunfinished(repo)
646 cmdutil.bailifchanged(repo)
646 cmdutil.bailifchanged(repo)
647 node = scmutil.revsingle(repo, rev).node()
647 node = scmutil.revsingle(repo, rev).node()
648
648
649 op1, op2 = repo.dirstate.parents()
649 op1, op2 = repo.dirstate.parents()
650 if not repo.changelog.isancestor(node, op1):
650 if not repo.changelog.isancestor(node, op1):
651 raise error.Abort(_('cannot backout change that is not an ancestor'))
651 raise error.Abort(_('cannot backout change that is not an ancestor'))
652
652
653 p1, p2 = repo.changelog.parents(node)
653 p1, p2 = repo.changelog.parents(node)
654 if p1 == nullid:
654 if p1 == nullid:
655 raise error.Abort(_('cannot backout a change with no parents'))
655 raise error.Abort(_('cannot backout a change with no parents'))
656 if p2 != nullid:
656 if p2 != nullid:
657 if not opts.get('parent'):
657 if not opts.get('parent'):
658 raise error.Abort(_('cannot backout a merge changeset'))
658 raise error.Abort(_('cannot backout a merge changeset'))
659 p = repo.lookup(opts['parent'])
659 p = repo.lookup(opts['parent'])
660 if p not in (p1, p2):
660 if p not in (p1, p2):
661 raise error.Abort(_('%s is not a parent of %s') %
661 raise error.Abort(_('%s is not a parent of %s') %
662 (short(p), short(node)))
662 (short(p), short(node)))
663 parent = p
663 parent = p
664 else:
664 else:
665 if opts.get('parent'):
665 if opts.get('parent'):
666 raise error.Abort(_('cannot use --parent on non-merge changeset'))
666 raise error.Abort(_('cannot use --parent on non-merge changeset'))
667 parent = p1
667 parent = p1
668
668
669 # the backout should appear on the same branch
669 # the backout should appear on the same branch
670 branch = repo.dirstate.branch()
670 branch = repo.dirstate.branch()
671 bheads = repo.branchheads(branch)
671 bheads = repo.branchheads(branch)
672 rctx = scmutil.revsingle(repo, hex(parent))
672 rctx = scmutil.revsingle(repo, hex(parent))
673 if not opts.get('merge') and op1 != node:
673 if not opts.get('merge') and op1 != node:
674 dsguard = dirstateguard.dirstateguard(repo, 'backout')
674 dsguard = dirstateguard.dirstateguard(repo, 'backout')
675 try:
675 try:
676 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
676 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
677 'backout')
677 'backout')
678 stats = mergemod.update(repo, parent, True, True, node, False)
678 stats = mergemod.update(repo, parent, True, True, node, False)
679 repo.setparents(op1, op2)
679 repo.setparents(op1, op2)
680 dsguard.close()
680 dsguard.close()
681 hg._showstats(repo, stats)
681 hg._showstats(repo, stats)
682 if stats[3]:
682 if stats[3]:
683 repo.ui.status(_("use 'hg resolve' to retry unresolved "
683 repo.ui.status(_("use 'hg resolve' to retry unresolved "
684 "file merges\n"))
684 "file merges\n"))
685 return 1
685 return 1
686 finally:
686 finally:
687 ui.setconfig('ui', 'forcemerge', '', '')
687 ui.setconfig('ui', 'forcemerge', '', '')
688 lockmod.release(dsguard)
688 lockmod.release(dsguard)
689 else:
689 else:
690 hg.clean(repo, node, show_stats=False)
690 hg.clean(repo, node, show_stats=False)
691 repo.dirstate.setbranch(branch)
691 repo.dirstate.setbranch(branch)
692 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
692 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
693
693
694 if opts.get('no_commit'):
694 if opts.get('no_commit'):
695 msg = _("changeset %s backed out, "
695 msg = _("changeset %s backed out, "
696 "don't forget to commit.\n")
696 "don't forget to commit.\n")
697 ui.status(msg % short(node))
697 ui.status(msg % short(node))
698 return 0
698 return 0
699
699
700 def commitfunc(ui, repo, message, match, opts):
700 def commitfunc(ui, repo, message, match, opts):
701 editform = 'backout'
701 editform = 'backout'
702 e = cmdutil.getcommiteditor(editform=editform, **opts)
702 e = cmdutil.getcommiteditor(editform=editform, **opts)
703 if not message:
703 if not message:
704 # we don't translate commit messages
704 # we don't translate commit messages
705 message = "Backed out changeset %s" % short(node)
705 message = "Backed out changeset %s" % short(node)
706 e = cmdutil.getcommiteditor(edit=True, editform=editform)
706 e = cmdutil.getcommiteditor(edit=True, editform=editform)
707 return repo.commit(message, opts.get('user'), opts.get('date'),
707 return repo.commit(message, opts.get('user'), opts.get('date'),
708 match, editor=e)
708 match, editor=e)
709 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
709 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
710 if not newnode:
710 if not newnode:
711 ui.status(_("nothing changed\n"))
711 ui.status(_("nothing changed\n"))
712 return 1
712 return 1
713 cmdutil.commitstatus(repo, newnode, branch, bheads)
713 cmdutil.commitstatus(repo, newnode, branch, bheads)
714
714
715 def nice(node):
715 def nice(node):
716 return '%d:%s' % (repo.changelog.rev(node), short(node))
716 return '%d:%s' % (repo.changelog.rev(node), short(node))
717 ui.status(_('changeset %s backs out changeset %s\n') %
717 ui.status(_('changeset %s backs out changeset %s\n') %
718 (nice(repo.changelog.tip()), nice(node)))
718 (nice(repo.changelog.tip()), nice(node)))
719 if opts.get('merge') and op1 != node:
719 if opts.get('merge') and op1 != node:
720 hg.clean(repo, op1, show_stats=False)
720 hg.clean(repo, op1, show_stats=False)
721 ui.status(_('merging with changeset %s\n')
721 ui.status(_('merging with changeset %s\n')
722 % nice(repo.changelog.tip()))
722 % nice(repo.changelog.tip()))
723 try:
723 try:
724 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
724 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
725 'backout')
725 'backout')
726 return hg.merge(repo, hex(repo.changelog.tip()))
726 return hg.merge(repo, hex(repo.changelog.tip()))
727 finally:
727 finally:
728 ui.setconfig('ui', 'forcemerge', '', '')
728 ui.setconfig('ui', 'forcemerge', '', '')
729 return 0
729 return 0
730
730
731 @command('bisect',
731 @command('bisect',
732 [('r', 'reset', False, _('reset bisect state')),
732 [('r', 'reset', False, _('reset bisect state')),
733 ('g', 'good', False, _('mark changeset good')),
733 ('g', 'good', False, _('mark changeset good')),
734 ('b', 'bad', False, _('mark changeset bad')),
734 ('b', 'bad', False, _('mark changeset bad')),
735 ('s', 'skip', False, _('skip testing changeset')),
735 ('s', 'skip', False, _('skip testing changeset')),
736 ('e', 'extend', False, _('extend the bisect range')),
736 ('e', 'extend', False, _('extend the bisect range')),
737 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
737 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
738 ('U', 'noupdate', False, _('do not update to target'))],
738 ('U', 'noupdate', False, _('do not update to target'))],
739 _("[-gbsr] [-U] [-c CMD] [REV]"))
739 _("[-gbsr] [-U] [-c CMD] [REV]"))
740 def bisect(ui, repo, rev=None, extra=None, command=None,
740 def bisect(ui, repo, rev=None, extra=None, command=None,
741 reset=None, good=None, bad=None, skip=None, extend=None,
741 reset=None, good=None, bad=None, skip=None, extend=None,
742 noupdate=None):
742 noupdate=None):
743 """subdivision search of changesets
743 """subdivision search of changesets
744
744
745 This command helps to find changesets which introduce problems. To
745 This command helps to find changesets which introduce problems. To
746 use, mark the earliest changeset you know exhibits the problem as
746 use, mark the earliest changeset you know exhibits the problem as
747 bad, then mark the latest changeset which is free from the problem
747 bad, then mark the latest changeset which is free from the problem
748 as good. Bisect will update your working directory to a revision
748 as good. Bisect will update your working directory to a revision
749 for testing (unless the -U/--noupdate option is specified). Once
749 for testing (unless the -U/--noupdate option is specified). Once
750 you have performed tests, mark the working directory as good or
750 you have performed tests, mark the working directory as good or
751 bad, and bisect will either update to another candidate changeset
751 bad, and bisect will either update to another candidate changeset
752 or announce that it has found the bad revision.
752 or announce that it has found the bad revision.
753
753
754 As a shortcut, you can also use the revision argument to mark a
754 As a shortcut, you can also use the revision argument to mark a
755 revision as good or bad without checking it out first.
755 revision as good or bad without checking it out first.
756
756
757 If you supply a command, it will be used for automatic bisection.
757 If you supply a command, it will be used for automatic bisection.
758 The environment variable HG_NODE will contain the ID of the
758 The environment variable HG_NODE will contain the ID of the
759 changeset being tested. The exit status of the command will be
759 changeset being tested. The exit status of the command will be
760 used to mark revisions as good or bad: status 0 means good, 125
760 used to mark revisions as good or bad: status 0 means good, 125
761 means to skip the revision, 127 (command not found) will abort the
761 means to skip the revision, 127 (command not found) will abort the
762 bisection, and any other non-zero exit status means the revision
762 bisection, and any other non-zero exit status means the revision
763 is bad.
763 is bad.
764
764
765 .. container:: verbose
765 .. container:: verbose
766
766
767 Some examples:
767 Some examples:
768
768
769 - start a bisection with known bad revision 34, and good revision 12::
769 - start a bisection with known bad revision 34, and good revision 12::
770
770
771 hg bisect --bad 34
771 hg bisect --bad 34
772 hg bisect --good 12
772 hg bisect --good 12
773
773
774 - advance the current bisection by marking current revision as good or
774 - advance the current bisection by marking current revision as good or
775 bad::
775 bad::
776
776
777 hg bisect --good
777 hg bisect --good
778 hg bisect --bad
778 hg bisect --bad
779
779
780 - mark the current revision, or a known revision, to be skipped (e.g. if
780 - mark the current revision, or a known revision, to be skipped (e.g. if
781 that revision is not usable because of another issue)::
781 that revision is not usable because of another issue)::
782
782
783 hg bisect --skip
783 hg bisect --skip
784 hg bisect --skip 23
784 hg bisect --skip 23
785
785
786 - skip all revisions that do not touch directories ``foo`` or ``bar``::
786 - skip all revisions that do not touch directories ``foo`` or ``bar``::
787
787
788 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
788 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
789
789
790 - forget the current bisection::
790 - forget the current bisection::
791
791
792 hg bisect --reset
792 hg bisect --reset
793
793
794 - use 'make && make tests' to automatically find the first broken
794 - use 'make && make tests' to automatically find the first broken
795 revision::
795 revision::
796
796
797 hg bisect --reset
797 hg bisect --reset
798 hg bisect --bad 34
798 hg bisect --bad 34
799 hg bisect --good 12
799 hg bisect --good 12
800 hg bisect --command "make && make tests"
800 hg bisect --command "make && make tests"
801
801
802 - see all changesets whose states are already known in the current
802 - see all changesets whose states are already known in the current
803 bisection::
803 bisection::
804
804
805 hg log -r "bisect(pruned)"
805 hg log -r "bisect(pruned)"
806
806
807 - see the changeset currently being bisected (especially useful
807 - see the changeset currently being bisected (especially useful
808 if running with -U/--noupdate)::
808 if running with -U/--noupdate)::
809
809
810 hg log -r "bisect(current)"
810 hg log -r "bisect(current)"
811
811
812 - see all changesets that took part in the current bisection::
812 - see all changesets that took part in the current bisection::
813
813
814 hg log -r "bisect(range)"
814 hg log -r "bisect(range)"
815
815
816 - you can even get a nice graph::
816 - you can even get a nice graph::
817
817
818 hg log --graph -r "bisect(range)"
818 hg log --graph -r "bisect(range)"
819
819
820 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
820 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
821
821
822 Returns 0 on success.
822 Returns 0 on success.
823 """
823 """
824 # backward compatibility
824 # backward compatibility
825 if rev in "good bad reset init".split():
825 if rev in "good bad reset init".split():
826 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
826 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
827 cmd, rev, extra = rev, extra, None
827 cmd, rev, extra = rev, extra, None
828 if cmd == "good":
828 if cmd == "good":
829 good = True
829 good = True
830 elif cmd == "bad":
830 elif cmd == "bad":
831 bad = True
831 bad = True
832 else:
832 else:
833 reset = True
833 reset = True
834 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
834 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
835 raise error.Abort(_('incompatible arguments'))
835 raise error.Abort(_('incompatible arguments'))
836
836
837 cmdutil.checkunfinished(repo)
837 cmdutil.checkunfinished(repo)
838
838
839 if reset:
839 if reset:
840 hbisect.resetstate(repo)
840 hbisect.resetstate(repo)
841 return
841 return
842
842
843 state = hbisect.load_state(repo)
843 state = hbisect.load_state(repo)
844
844
845 # update state
845 # update state
846 if good or bad or skip:
846 if good or bad or skip:
847 if rev:
847 if rev:
848 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
848 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
849 else:
849 else:
850 nodes = [repo.lookup('.')]
850 nodes = [repo.lookup('.')]
851 if good:
851 if good:
852 state['good'] += nodes
852 state['good'] += nodes
853 elif bad:
853 elif bad:
854 state['bad'] += nodes
854 state['bad'] += nodes
855 elif skip:
855 elif skip:
856 state['skip'] += nodes
856 state['skip'] += nodes
857 hbisect.save_state(repo, state)
857 hbisect.save_state(repo, state)
858 if not (state['good'] and state['bad']):
858 if not (state['good'] and state['bad']):
859 return
859 return
860
860
861 def mayupdate(repo, node, show_stats=True):
861 def mayupdate(repo, node, show_stats=True):
862 """common used update sequence"""
862 """common used update sequence"""
863 if noupdate:
863 if noupdate:
864 return
864 return
865 cmdutil.bailifchanged(repo)
865 cmdutil.bailifchanged(repo)
866 return hg.clean(repo, node, show_stats=show_stats)
866 return hg.clean(repo, node, show_stats=show_stats)
867
867
868 displayer = cmdutil.show_changeset(ui, repo, {})
868 displayer = cmdutil.show_changeset(ui, repo, {})
869
869
870 if command:
870 if command:
871 changesets = 1
871 changesets = 1
872 if noupdate:
872 if noupdate:
873 try:
873 try:
874 node = state['current'][0]
874 node = state['current'][0]
875 except LookupError:
875 except LookupError:
876 raise error.Abort(_('current bisect revision is unknown - '
876 raise error.Abort(_('current bisect revision is unknown - '
877 'start a new bisect to fix'))
877 'start a new bisect to fix'))
878 else:
878 else:
879 node, p2 = repo.dirstate.parents()
879 node, p2 = repo.dirstate.parents()
880 if p2 != nullid:
880 if p2 != nullid:
881 raise error.Abort(_('current bisect revision is a merge'))
881 raise error.Abort(_('current bisect revision is a merge'))
882 if rev:
882 if rev:
883 node = repo[scmutil.revsingle(repo, rev, node)].node()
883 node = repo[scmutil.revsingle(repo, rev, node)].node()
884 try:
884 try:
885 while changesets:
885 while changesets:
886 # update state
886 # update state
887 state['current'] = [node]
887 state['current'] = [node]
888 hbisect.save_state(repo, state)
888 hbisect.save_state(repo, state)
889 status = ui.system(command, environ={'HG_NODE': hex(node)},
889 status = ui.system(command, environ={'HG_NODE': hex(node)},
890 blockedtag='bisect_check')
890 blockedtag='bisect_check')
891 if status == 125:
891 if status == 125:
892 transition = "skip"
892 transition = "skip"
893 elif status == 0:
893 elif status == 0:
894 transition = "good"
894 transition = "good"
895 # status < 0 means process was killed
895 # status < 0 means process was killed
896 elif status == 127:
896 elif status == 127:
897 raise error.Abort(_("failed to execute %s") % command)
897 raise error.Abort(_("failed to execute %s") % command)
898 elif status < 0:
898 elif status < 0:
899 raise error.Abort(_("%s killed") % command)
899 raise error.Abort(_("%s killed") % command)
900 else:
900 else:
901 transition = "bad"
901 transition = "bad"
902 state[transition].append(node)
902 state[transition].append(node)
903 ctx = repo[node]
903 ctx = repo[node]
904 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
904 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
905 hbisect.checkstate(state)
905 hbisect.checkstate(state)
906 # bisect
906 # bisect
907 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
907 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
908 # update to next check
908 # update to next check
909 node = nodes[0]
909 node = nodes[0]
910 mayupdate(repo, node, show_stats=False)
910 mayupdate(repo, node, show_stats=False)
911 finally:
911 finally:
912 state['current'] = [node]
912 state['current'] = [node]
913 hbisect.save_state(repo, state)
913 hbisect.save_state(repo, state)
914 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
914 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
915 return
915 return
916
916
917 hbisect.checkstate(state)
917 hbisect.checkstate(state)
918
918
919 # actually bisect
919 # actually bisect
920 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
920 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
921 if extend:
921 if extend:
922 if not changesets:
922 if not changesets:
923 extendnode = hbisect.extendrange(repo, state, nodes, good)
923 extendnode = hbisect.extendrange(repo, state, nodes, good)
924 if extendnode is not None:
924 if extendnode is not None:
925 ui.write(_("Extending search to changeset %d:%s\n")
925 ui.write(_("Extending search to changeset %d:%s\n")
926 % (extendnode.rev(), extendnode))
926 % (extendnode.rev(), extendnode))
927 state['current'] = [extendnode.node()]
927 state['current'] = [extendnode.node()]
928 hbisect.save_state(repo, state)
928 hbisect.save_state(repo, state)
929 return mayupdate(repo, extendnode.node())
929 return mayupdate(repo, extendnode.node())
930 raise error.Abort(_("nothing to extend"))
930 raise error.Abort(_("nothing to extend"))
931
931
932 if changesets == 0:
932 if changesets == 0:
933 hbisect.printresult(ui, repo, state, displayer, nodes, good)
933 hbisect.printresult(ui, repo, state, displayer, nodes, good)
934 else:
934 else:
935 assert len(nodes) == 1 # only a single node can be tested next
935 assert len(nodes) == 1 # only a single node can be tested next
936 node = nodes[0]
936 node = nodes[0]
937 # compute the approximate number of remaining tests
937 # compute the approximate number of remaining tests
938 tests, size = 0, 2
938 tests, size = 0, 2
939 while size <= changesets:
939 while size <= changesets:
940 tests, size = tests + 1, size * 2
940 tests, size = tests + 1, size * 2
941 rev = repo.changelog.rev(node)
941 rev = repo.changelog.rev(node)
942 ui.write(_("Testing changeset %d:%s "
942 ui.write(_("Testing changeset %d:%s "
943 "(%d changesets remaining, ~%d tests)\n")
943 "(%d changesets remaining, ~%d tests)\n")
944 % (rev, short(node), changesets, tests))
944 % (rev, short(node), changesets, tests))
945 state['current'] = [node]
945 state['current'] = [node]
946 hbisect.save_state(repo, state)
946 hbisect.save_state(repo, state)
947 return mayupdate(repo, node)
947 return mayupdate(repo, node)
948
948
949 @command('bookmarks|bookmark',
949 @command('bookmarks|bookmark',
950 [('f', 'force', False, _('force')),
950 [('f', 'force', False, _('force')),
951 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
951 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
952 ('d', 'delete', False, _('delete a given bookmark')),
952 ('d', 'delete', False, _('delete a given bookmark')),
953 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
953 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
954 ('i', 'inactive', False, _('mark a bookmark inactive')),
954 ('i', 'inactive', False, _('mark a bookmark inactive')),
955 ] + formatteropts,
955 ] + formatteropts,
956 _('hg bookmarks [OPTIONS]... [NAME]...'))
956 _('hg bookmarks [OPTIONS]... [NAME]...'))
957 def bookmark(ui, repo, *names, **opts):
957 def bookmark(ui, repo, *names, **opts):
958 '''create a new bookmark or list existing bookmarks
958 '''create a new bookmark or list existing bookmarks
959
959
960 Bookmarks are labels on changesets to help track lines of development.
960 Bookmarks are labels on changesets to help track lines of development.
961 Bookmarks are unversioned and can be moved, renamed and deleted.
961 Bookmarks are unversioned and can be moved, renamed and deleted.
962 Deleting or moving a bookmark has no effect on the associated changesets.
962 Deleting or moving a bookmark has no effect on the associated changesets.
963
963
964 Creating or updating to a bookmark causes it to be marked as 'active'.
964 Creating or updating to a bookmark causes it to be marked as 'active'.
965 The active bookmark is indicated with a '*'.
965 The active bookmark is indicated with a '*'.
966 When a commit is made, the active bookmark will advance to the new commit.
966 When a commit is made, the active bookmark will advance to the new commit.
967 A plain :hg:`update` will also advance an active bookmark, if possible.
967 A plain :hg:`update` will also advance an active bookmark, if possible.
968 Updating away from a bookmark will cause it to be deactivated.
968 Updating away from a bookmark will cause it to be deactivated.
969
969
970 Bookmarks can be pushed and pulled between repositories (see
970 Bookmarks can be pushed and pulled between repositories (see
971 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
971 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
972 diverged, a new 'divergent bookmark' of the form 'name@path' will
972 diverged, a new 'divergent bookmark' of the form 'name@path' will
973 be created. Using :hg:`merge` will resolve the divergence.
973 be created. Using :hg:`merge` will resolve the divergence.
974
974
975 A bookmark named '@' has the special property that :hg:`clone` will
975 A bookmark named '@' has the special property that :hg:`clone` will
976 check it out by default if it exists.
976 check it out by default if it exists.
977
977
978 .. container:: verbose
978 .. container:: verbose
979
979
980 Examples:
980 Examples:
981
981
982 - create an active bookmark for a new line of development::
982 - create an active bookmark for a new line of development::
983
983
984 hg book new-feature
984 hg book new-feature
985
985
986 - create an inactive bookmark as a place marker::
986 - create an inactive bookmark as a place marker::
987
987
988 hg book -i reviewed
988 hg book -i reviewed
989
989
990 - create an inactive bookmark on another changeset::
990 - create an inactive bookmark on another changeset::
991
991
992 hg book -r .^ tested
992 hg book -r .^ tested
993
993
994 - rename bookmark turkey to dinner::
994 - rename bookmark turkey to dinner::
995
995
996 hg book -m turkey dinner
996 hg book -m turkey dinner
997
997
998 - move the '@' bookmark from another branch::
998 - move the '@' bookmark from another branch::
999
999
1000 hg book -f @
1000 hg book -f @
1001 '''
1001 '''
1002 force = opts.get('force')
1002 force = opts.get('force')
1003 rev = opts.get('rev')
1003 rev = opts.get('rev')
1004 delete = opts.get('delete')
1004 delete = opts.get('delete')
1005 rename = opts.get('rename')
1005 rename = opts.get('rename')
1006 inactive = opts.get('inactive')
1006 inactive = opts.get('inactive')
1007
1007
1008 def checkformat(mark):
1008 def checkformat(mark):
1009 mark = mark.strip()
1009 mark = mark.strip()
1010 if not mark:
1010 if not mark:
1011 raise error.Abort(_("bookmark names cannot consist entirely of "
1011 raise error.Abort(_("bookmark names cannot consist entirely of "
1012 "whitespace"))
1012 "whitespace"))
1013 scmutil.checknewlabel(repo, mark, 'bookmark')
1013 scmutil.checknewlabel(repo, mark, 'bookmark')
1014 return mark
1014 return mark
1015
1015
1016 def checkconflict(repo, mark, cur, force=False, target=None):
1016 def checkconflict(repo, mark, cur, force=False, target=None):
1017 if mark in marks and not force:
1017 if mark in marks and not force:
1018 if target:
1018 if target:
1019 if marks[mark] == target and target == cur:
1019 if marks[mark] == target and target == cur:
1020 # re-activating a bookmark
1020 # re-activating a bookmark
1021 return
1021 return
1022 anc = repo.changelog.ancestors([repo[target].rev()])
1022 anc = repo.changelog.ancestors([repo[target].rev()])
1023 bmctx = repo[marks[mark]]
1023 bmctx = repo[marks[mark]]
1024 divs = [repo[b].node() for b in marks
1024 divs = [repo[b].node() for b in marks
1025 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1025 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1026
1026
1027 # allow resolving a single divergent bookmark even if moving
1027 # allow resolving a single divergent bookmark even if moving
1028 # the bookmark across branches when a revision is specified
1028 # the bookmark across branches when a revision is specified
1029 # that contains a divergent bookmark
1029 # that contains a divergent bookmark
1030 if bmctx.rev() not in anc and target in divs:
1030 if bmctx.rev() not in anc and target in divs:
1031 bookmarks.deletedivergent(repo, [target], mark)
1031 bookmarks.deletedivergent(repo, [target], mark)
1032 return
1032 return
1033
1033
1034 deletefrom = [b for b in divs
1034 deletefrom = [b for b in divs
1035 if repo[b].rev() in anc or b == target]
1035 if repo[b].rev() in anc or b == target]
1036 bookmarks.deletedivergent(repo, deletefrom, mark)
1036 bookmarks.deletedivergent(repo, deletefrom, mark)
1037 if bookmarks.validdest(repo, bmctx, repo[target]):
1037 if bookmarks.validdest(repo, bmctx, repo[target]):
1038 ui.status(_("moving bookmark '%s' forward from %s\n") %
1038 ui.status(_("moving bookmark '%s' forward from %s\n") %
1039 (mark, short(bmctx.node())))
1039 (mark, short(bmctx.node())))
1040 return
1040 return
1041 raise error.Abort(_("bookmark '%s' already exists "
1041 raise error.Abort(_("bookmark '%s' already exists "
1042 "(use -f to force)") % mark)
1042 "(use -f to force)") % mark)
1043 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1043 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1044 and not force):
1044 and not force):
1045 raise error.Abort(
1045 raise error.Abort(
1046 _("a bookmark cannot have the name of an existing branch"))
1046 _("a bookmark cannot have the name of an existing branch"))
1047
1047
1048 if delete and rename:
1048 if delete and rename:
1049 raise error.Abort(_("--delete and --rename are incompatible"))
1049 raise error.Abort(_("--delete and --rename are incompatible"))
1050 if delete and rev:
1050 if delete and rev:
1051 raise error.Abort(_("--rev is incompatible with --delete"))
1051 raise error.Abort(_("--rev is incompatible with --delete"))
1052 if rename and rev:
1052 if rename and rev:
1053 raise error.Abort(_("--rev is incompatible with --rename"))
1053 raise error.Abort(_("--rev is incompatible with --rename"))
1054 if not names and (delete or rev):
1054 if not names and (delete or rev):
1055 raise error.Abort(_("bookmark name required"))
1055 raise error.Abort(_("bookmark name required"))
1056
1056
1057 if delete or rename or names or inactive:
1057 if delete or rename or names or inactive:
1058 wlock = lock = tr = None
1058 wlock = lock = tr = None
1059 try:
1059 try:
1060 wlock = repo.wlock()
1060 wlock = repo.wlock()
1061 lock = repo.lock()
1061 lock = repo.lock()
1062 cur = repo.changectx('.').node()
1062 cur = repo.changectx('.').node()
1063 marks = repo._bookmarks
1063 marks = repo._bookmarks
1064 if delete:
1064 if delete:
1065 tr = repo.transaction('bookmark')
1065 tr = repo.transaction('bookmark')
1066 for mark in names:
1066 for mark in names:
1067 if mark not in marks:
1067 if mark not in marks:
1068 raise error.Abort(_("bookmark '%s' does not exist") %
1068 raise error.Abort(_("bookmark '%s' does not exist") %
1069 mark)
1069 mark)
1070 if mark == repo._activebookmark:
1070 if mark == repo._activebookmark:
1071 bookmarks.deactivate(repo)
1071 bookmarks.deactivate(repo)
1072 del marks[mark]
1072 del marks[mark]
1073
1073
1074 elif rename:
1074 elif rename:
1075 tr = repo.transaction('bookmark')
1075 tr = repo.transaction('bookmark')
1076 if not names:
1076 if not names:
1077 raise error.Abort(_("new bookmark name required"))
1077 raise error.Abort(_("new bookmark name required"))
1078 elif len(names) > 1:
1078 elif len(names) > 1:
1079 raise error.Abort(_("only one new bookmark name allowed"))
1079 raise error.Abort(_("only one new bookmark name allowed"))
1080 mark = checkformat(names[0])
1080 mark = checkformat(names[0])
1081 if rename not in marks:
1081 if rename not in marks:
1082 raise error.Abort(_("bookmark '%s' does not exist")
1082 raise error.Abort(_("bookmark '%s' does not exist")
1083 % rename)
1083 % rename)
1084 checkconflict(repo, mark, cur, force)
1084 checkconflict(repo, mark, cur, force)
1085 marks[mark] = marks[rename]
1085 marks[mark] = marks[rename]
1086 if repo._activebookmark == rename and not inactive:
1086 if repo._activebookmark == rename and not inactive:
1087 bookmarks.activate(repo, mark)
1087 bookmarks.activate(repo, mark)
1088 del marks[rename]
1088 del marks[rename]
1089 elif names:
1089 elif names:
1090 tr = repo.transaction('bookmark')
1090 tr = repo.transaction('bookmark')
1091 newact = None
1091 newact = None
1092 for mark in names:
1092 for mark in names:
1093 mark = checkformat(mark)
1093 mark = checkformat(mark)
1094 if newact is None:
1094 if newact is None:
1095 newact = mark
1095 newact = mark
1096 if inactive and mark == repo._activebookmark:
1096 if inactive and mark == repo._activebookmark:
1097 bookmarks.deactivate(repo)
1097 bookmarks.deactivate(repo)
1098 return
1098 return
1099 tgt = cur
1099 tgt = cur
1100 if rev:
1100 if rev:
1101 tgt = scmutil.revsingle(repo, rev).node()
1101 tgt = scmutil.revsingle(repo, rev).node()
1102 checkconflict(repo, mark, cur, force, tgt)
1102 checkconflict(repo, mark, cur, force, tgt)
1103 marks[mark] = tgt
1103 marks[mark] = tgt
1104 if not inactive and cur == marks[newact] and not rev:
1104 if not inactive and cur == marks[newact] and not rev:
1105 bookmarks.activate(repo, newact)
1105 bookmarks.activate(repo, newact)
1106 elif cur != tgt and newact == repo._activebookmark:
1106 elif cur != tgt and newact == repo._activebookmark:
1107 bookmarks.deactivate(repo)
1107 bookmarks.deactivate(repo)
1108 elif inactive:
1108 elif inactive:
1109 if len(marks) == 0:
1109 if len(marks) == 0:
1110 ui.status(_("no bookmarks set\n"))
1110 ui.status(_("no bookmarks set\n"))
1111 elif not repo._activebookmark:
1111 elif not repo._activebookmark:
1112 ui.status(_("no active bookmark\n"))
1112 ui.status(_("no active bookmark\n"))
1113 else:
1113 else:
1114 bookmarks.deactivate(repo)
1114 bookmarks.deactivate(repo)
1115 if tr is not None:
1115 if tr is not None:
1116 marks.recordchange(tr)
1116 marks.recordchange(tr)
1117 tr.close()
1117 tr.close()
1118 finally:
1118 finally:
1119 lockmod.release(tr, lock, wlock)
1119 lockmod.release(tr, lock, wlock)
1120 else: # show bookmarks
1120 else: # show bookmarks
1121 fm = ui.formatter('bookmarks', opts)
1121 fm = ui.formatter('bookmarks', opts)
1122 hexfn = fm.hexfunc
1122 hexfn = fm.hexfunc
1123 marks = repo._bookmarks
1123 marks = repo._bookmarks
1124 if len(marks) == 0 and fm.isplain():
1124 if len(marks) == 0 and fm.isplain():
1125 ui.status(_("no bookmarks set\n"))
1125 ui.status(_("no bookmarks set\n"))
1126 for bmark, n in sorted(marks.iteritems()):
1126 for bmark, n in sorted(marks.iteritems()):
1127 active = repo._activebookmark
1127 active = repo._activebookmark
1128 if bmark == active:
1128 if bmark == active:
1129 prefix, label = '*', activebookmarklabel
1129 prefix, label = '*', activebookmarklabel
1130 else:
1130 else:
1131 prefix, label = ' ', ''
1131 prefix, label = ' ', ''
1132
1132
1133 fm.startitem()
1133 fm.startitem()
1134 if not ui.quiet:
1134 if not ui.quiet:
1135 fm.plain(' %s ' % prefix, label=label)
1135 fm.plain(' %s ' % prefix, label=label)
1136 fm.write('bookmark', '%s', bmark, label=label)
1136 fm.write('bookmark', '%s', bmark, label=label)
1137 pad = " " * (25 - encoding.colwidth(bmark))
1137 pad = " " * (25 - encoding.colwidth(bmark))
1138 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1138 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1139 repo.changelog.rev(n), hexfn(n), label=label)
1139 repo.changelog.rev(n), hexfn(n), label=label)
1140 fm.data(active=(bmark == active))
1140 fm.data(active=(bmark == active))
1141 fm.plain('\n')
1141 fm.plain('\n')
1142 fm.end()
1142 fm.end()
1143
1143
1144 @command('branch',
1144 @command('branch',
1145 [('f', 'force', None,
1145 [('f', 'force', None,
1146 _('set branch name even if it shadows an existing branch')),
1146 _('set branch name even if it shadows an existing branch')),
1147 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1147 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1148 _('[-fC] [NAME]'))
1148 _('[-fC] [NAME]'))
1149 def branch(ui, repo, label=None, **opts):
1149 def branch(ui, repo, label=None, **opts):
1150 """set or show the current branch name
1150 """set or show the current branch name
1151
1151
1152 .. note::
1152 .. note::
1153
1153
1154 Branch names are permanent and global. Use :hg:`bookmark` to create a
1154 Branch names are permanent and global. Use :hg:`bookmark` to create a
1155 light-weight bookmark instead. See :hg:`help glossary` for more
1155 light-weight bookmark instead. See :hg:`help glossary` for more
1156 information about named branches and bookmarks.
1156 information about named branches and bookmarks.
1157
1157
1158 With no argument, show the current branch name. With one argument,
1158 With no argument, show the current branch name. With one argument,
1159 set the working directory branch name (the branch will not exist
1159 set the working directory branch name (the branch will not exist
1160 in the repository until the next commit). Standard practice
1160 in the repository until the next commit). Standard practice
1161 recommends that primary development take place on the 'default'
1161 recommends that primary development take place on the 'default'
1162 branch.
1162 branch.
1163
1163
1164 Unless -f/--force is specified, branch will not let you set a
1164 Unless -f/--force is specified, branch will not let you set a
1165 branch name that already exists.
1165 branch name that already exists.
1166
1166
1167 Use -C/--clean to reset the working directory branch to that of
1167 Use -C/--clean to reset the working directory branch to that of
1168 the parent of the working directory, negating a previous branch
1168 the parent of the working directory, negating a previous branch
1169 change.
1169 change.
1170
1170
1171 Use the command :hg:`update` to switch to an existing branch. Use
1171 Use the command :hg:`update` to switch to an existing branch. Use
1172 :hg:`commit --close-branch` to mark this branch head as closed.
1172 :hg:`commit --close-branch` to mark this branch head as closed.
1173 When all heads of a branch are closed, the branch will be
1173 When all heads of a branch are closed, the branch will be
1174 considered closed.
1174 considered closed.
1175
1175
1176 Returns 0 on success.
1176 Returns 0 on success.
1177 """
1177 """
1178 if label:
1178 if label:
1179 label = label.strip()
1179 label = label.strip()
1180
1180
1181 if not opts.get('clean') and not label:
1181 if not opts.get('clean') and not label:
1182 ui.write("%s\n" % repo.dirstate.branch())
1182 ui.write("%s\n" % repo.dirstate.branch())
1183 return
1183 return
1184
1184
1185 with repo.wlock():
1185 with repo.wlock():
1186 if opts.get('clean'):
1186 if opts.get('clean'):
1187 label = repo[None].p1().branch()
1187 label = repo[None].p1().branch()
1188 repo.dirstate.setbranch(label)
1188 repo.dirstate.setbranch(label)
1189 ui.status(_('reset working directory to branch %s\n') % label)
1189 ui.status(_('reset working directory to branch %s\n') % label)
1190 elif label:
1190 elif label:
1191 if not opts.get('force') and label in repo.branchmap():
1191 if not opts.get('force') and label in repo.branchmap():
1192 if label not in [p.branch() for p in repo[None].parents()]:
1192 if label not in [p.branch() for p in repo[None].parents()]:
1193 raise error.Abort(_('a branch of the same name already'
1193 raise error.Abort(_('a branch of the same name already'
1194 ' exists'),
1194 ' exists'),
1195 # i18n: "it" refers to an existing branch
1195 # i18n: "it" refers to an existing branch
1196 hint=_("use 'hg update' to switch to it"))
1196 hint=_("use 'hg update' to switch to it"))
1197 scmutil.checknewlabel(repo, label, 'branch')
1197 scmutil.checknewlabel(repo, label, 'branch')
1198 repo.dirstate.setbranch(label)
1198 repo.dirstate.setbranch(label)
1199 ui.status(_('marked working directory as branch %s\n') % label)
1199 ui.status(_('marked working directory as branch %s\n') % label)
1200
1200
1201 # find any open named branches aside from default
1201 # find any open named branches aside from default
1202 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1202 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1203 if n != "default" and not c]
1203 if n != "default" and not c]
1204 if not others:
1204 if not others:
1205 ui.status(_('(branches are permanent and global, '
1205 ui.status(_('(branches are permanent and global, '
1206 'did you want a bookmark?)\n'))
1206 'did you want a bookmark?)\n'))
1207
1207
1208 @command('branches',
1208 @command('branches',
1209 [('a', 'active', False,
1209 [('a', 'active', False,
1210 _('show only branches that have unmerged heads (DEPRECATED)')),
1210 _('show only branches that have unmerged heads (DEPRECATED)')),
1211 ('c', 'closed', False, _('show normal and closed branches')),
1211 ('c', 'closed', False, _('show normal and closed branches')),
1212 ] + formatteropts,
1212 ] + formatteropts,
1213 _('[-c]'))
1213 _('[-c]'))
1214 def branches(ui, repo, active=False, closed=False, **opts):
1214 def branches(ui, repo, active=False, closed=False, **opts):
1215 """list repository named branches
1215 """list repository named branches
1216
1216
1217 List the repository's named branches, indicating which ones are
1217 List the repository's named branches, indicating which ones are
1218 inactive. If -c/--closed is specified, also list branches which have
1218 inactive. If -c/--closed is specified, also list branches which have
1219 been marked closed (see :hg:`commit --close-branch`).
1219 been marked closed (see :hg:`commit --close-branch`).
1220
1220
1221 Use the command :hg:`update` to switch to an existing branch.
1221 Use the command :hg:`update` to switch to an existing branch.
1222
1222
1223 Returns 0.
1223 Returns 0.
1224 """
1224 """
1225
1225
1226 ui.pager('branches')
1226 ui.pager('branches')
1227 fm = ui.formatter('branches', opts)
1227 fm = ui.formatter('branches', opts)
1228 hexfunc = fm.hexfunc
1228 hexfunc = fm.hexfunc
1229
1229
1230 allheads = set(repo.heads())
1230 allheads = set(repo.heads())
1231 branches = []
1231 branches = []
1232 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1232 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1233 isactive = not isclosed and bool(set(heads) & allheads)
1233 isactive = not isclosed and bool(set(heads) & allheads)
1234 branches.append((tag, repo[tip], isactive, not isclosed))
1234 branches.append((tag, repo[tip], isactive, not isclosed))
1235 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1235 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1236 reverse=True)
1236 reverse=True)
1237
1237
1238 for tag, ctx, isactive, isopen in branches:
1238 for tag, ctx, isactive, isopen in branches:
1239 if active and not isactive:
1239 if active and not isactive:
1240 continue
1240 continue
1241 if isactive:
1241 if isactive:
1242 label = 'branches.active'
1242 label = 'branches.active'
1243 notice = ''
1243 notice = ''
1244 elif not isopen:
1244 elif not isopen:
1245 if not closed:
1245 if not closed:
1246 continue
1246 continue
1247 label = 'branches.closed'
1247 label = 'branches.closed'
1248 notice = _(' (closed)')
1248 notice = _(' (closed)')
1249 else:
1249 else:
1250 label = 'branches.inactive'
1250 label = 'branches.inactive'
1251 notice = _(' (inactive)')
1251 notice = _(' (inactive)')
1252 current = (tag == repo.dirstate.branch())
1252 current = (tag == repo.dirstate.branch())
1253 if current:
1253 if current:
1254 label = 'branches.current'
1254 label = 'branches.current'
1255
1255
1256 fm.startitem()
1256 fm.startitem()
1257 fm.write('branch', '%s', tag, label=label)
1257 fm.write('branch', '%s', tag, label=label)
1258 rev = ctx.rev()
1258 rev = ctx.rev()
1259 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1259 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1260 fmt = ' ' * padsize + ' %d:%s'
1260 fmt = ' ' * padsize + ' %d:%s'
1261 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1261 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1262 label='log.changeset changeset.%s' % ctx.phasestr())
1262 label='log.changeset changeset.%s' % ctx.phasestr())
1263 fm.context(ctx=ctx)
1263 fm.context(ctx=ctx)
1264 fm.data(active=isactive, closed=not isopen, current=current)
1264 fm.data(active=isactive, closed=not isopen, current=current)
1265 if not ui.quiet:
1265 if not ui.quiet:
1266 fm.plain(notice)
1266 fm.plain(notice)
1267 fm.plain('\n')
1267 fm.plain('\n')
1268 fm.end()
1268 fm.end()
1269
1269
1270 @command('bundle',
1270 @command('bundle',
1271 [('f', 'force', None, _('run even when the destination is unrelated')),
1271 [('f', 'force', None, _('run even when the destination is unrelated')),
1272 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1272 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1273 _('REV')),
1273 _('REV')),
1274 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1274 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1275 _('BRANCH')),
1275 _('BRANCH')),
1276 ('', 'base', [],
1276 ('', 'base', [],
1277 _('a base changeset assumed to be available at the destination'),
1277 _('a base changeset assumed to be available at the destination'),
1278 _('REV')),
1278 _('REV')),
1279 ('a', 'all', None, _('bundle all changesets in the repository')),
1279 ('a', 'all', None, _('bundle all changesets in the repository')),
1280 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1280 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1281 ] + remoteopts,
1281 ] + remoteopts,
1282 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1282 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1283 def bundle(ui, repo, fname, dest=None, **opts):
1283 def bundle(ui, repo, fname, dest=None, **opts):
1284 """create a changegroup file
1284 """create a changegroup file
1285
1285
1286 Generate a changegroup file collecting changesets to be added
1286 Generate a changegroup file collecting changesets to be added
1287 to a repository.
1287 to a repository.
1288
1288
1289 To create a bundle containing all changesets, use -a/--all
1289 To create a bundle containing all changesets, use -a/--all
1290 (or --base null). Otherwise, hg assumes the destination will have
1290 (or --base null). Otherwise, hg assumes the destination will have
1291 all the nodes you specify with --base parameters. Otherwise, hg
1291 all the nodes you specify with --base parameters. Otherwise, hg
1292 will assume the repository has all the nodes in destination, or
1292 will assume the repository has all the nodes in destination, or
1293 default-push/default if no destination is specified.
1293 default-push/default if no destination is specified.
1294
1294
1295 You can change bundle format with the -t/--type option. You can
1295 You can change bundle format with the -t/--type option. You can
1296 specify a compression, a bundle version or both using a dash
1296 specify a compression, a bundle version or both using a dash
1297 (comp-version). The available compression methods are: none, bzip2,
1297 (comp-version). The available compression methods are: none, bzip2,
1298 and gzip (by default, bundles are compressed using bzip2). The
1298 and gzip (by default, bundles are compressed using bzip2). The
1299 available formats are: v1, v2 (default to most suitable).
1299 available formats are: v1, v2 (default to most suitable).
1300
1300
1301 The bundle file can then be transferred using conventional means
1301 The bundle file can then be transferred using conventional means
1302 and applied to another repository with the unbundle or pull
1302 and applied to another repository with the unbundle or pull
1303 command. This is useful when direct push and pull are not
1303 command. This is useful when direct push and pull are not
1304 available or when exporting an entire repository is undesirable.
1304 available or when exporting an entire repository is undesirable.
1305
1305
1306 Applying bundles preserves all changeset contents including
1306 Applying bundles preserves all changeset contents including
1307 permissions, copy/rename information, and revision history.
1307 permissions, copy/rename information, and revision history.
1308
1308
1309 Returns 0 on success, 1 if no changes found.
1309 Returns 0 on success, 1 if no changes found.
1310 """
1310 """
1311 revs = None
1311 revs = None
1312 if 'rev' in opts:
1312 if 'rev' in opts:
1313 revstrings = opts['rev']
1313 revstrings = opts['rev']
1314 revs = scmutil.revrange(repo, revstrings)
1314 revs = scmutil.revrange(repo, revstrings)
1315 if revstrings and not revs:
1315 if revstrings and not revs:
1316 raise error.Abort(_('no commits to bundle'))
1316 raise error.Abort(_('no commits to bundle'))
1317
1317
1318 bundletype = opts.get('type', 'bzip2').lower()
1318 bundletype = opts.get('type', 'bzip2').lower()
1319 try:
1319 try:
1320 bcompression, cgversion, params = exchange.parsebundlespec(
1320 bcompression, cgversion, params = exchange.parsebundlespec(
1321 repo, bundletype, strict=False)
1321 repo, bundletype, strict=False)
1322 except error.UnsupportedBundleSpecification as e:
1322 except error.UnsupportedBundleSpecification as e:
1323 raise error.Abort(str(e),
1323 raise error.Abort(str(e),
1324 hint=_("see 'hg help bundle' for supported "
1324 hint=_("see 'hg help bundle' for supported "
1325 "values for --type"))
1325 "values for --type"))
1326
1326
1327 # Packed bundles are a pseudo bundle format for now.
1327 # Packed bundles are a pseudo bundle format for now.
1328 if cgversion == 's1':
1328 if cgversion == 's1':
1329 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1329 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1330 hint=_("use 'hg debugcreatestreamclonebundle'"))
1330 hint=_("use 'hg debugcreatestreamclonebundle'"))
1331
1331
1332 if opts.get('all'):
1332 if opts.get('all'):
1333 if dest:
1333 if dest:
1334 raise error.Abort(_("--all is incompatible with specifying "
1334 raise error.Abort(_("--all is incompatible with specifying "
1335 "a destination"))
1335 "a destination"))
1336 if opts.get('base'):
1336 if opts.get('base'):
1337 ui.warn(_("ignoring --base because --all was specified\n"))
1337 ui.warn(_("ignoring --base because --all was specified\n"))
1338 base = ['null']
1338 base = ['null']
1339 else:
1339 else:
1340 base = scmutil.revrange(repo, opts.get('base'))
1340 base = scmutil.revrange(repo, opts.get('base'))
1341 # TODO: get desired bundlecaps from command line.
1341 # TODO: get desired bundlecaps from command line.
1342 bundlecaps = None
1342 bundlecaps = None
1343 if cgversion not in changegroup.supportedoutgoingversions(repo):
1343 if cgversion not in changegroup.supportedoutgoingversions(repo):
1344 raise error.Abort(_("repository does not support bundle version %s") %
1344 raise error.Abort(_("repository does not support bundle version %s") %
1345 cgversion)
1345 cgversion)
1346
1346
1347 if base:
1347 if base:
1348 if dest:
1348 if dest:
1349 raise error.Abort(_("--base is incompatible with specifying "
1349 raise error.Abort(_("--base is incompatible with specifying "
1350 "a destination"))
1350 "a destination"))
1351 common = [repo.lookup(rev) for rev in base]
1351 common = [repo.lookup(rev) for rev in base]
1352 heads = revs and map(repo.lookup, revs) or None
1352 heads = revs and map(repo.lookup, revs) or None
1353 outgoing = discovery.outgoing(repo, common, heads)
1353 outgoing = discovery.outgoing(repo, common, heads)
1354 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1354 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1355 bundlecaps=bundlecaps,
1355 bundlecaps=bundlecaps,
1356 version=cgversion)
1356 version=cgversion)
1357 outgoing = None
1357 outgoing = None
1358 else:
1358 else:
1359 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1359 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1360 dest, branches = hg.parseurl(dest, opts.get('branch'))
1360 dest, branches = hg.parseurl(dest, opts.get('branch'))
1361 other = hg.peer(repo, opts, dest)
1361 other = hg.peer(repo, opts, dest)
1362 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1362 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1363 heads = revs and map(repo.lookup, revs) or revs
1363 heads = revs and map(repo.lookup, revs) or revs
1364 outgoing = discovery.findcommonoutgoing(repo, other,
1364 outgoing = discovery.findcommonoutgoing(repo, other,
1365 onlyheads=heads,
1365 onlyheads=heads,
1366 force=opts.get('force'),
1366 force=opts.get('force'),
1367 portable=True)
1367 portable=True)
1368 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1368 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1369 bundlecaps, version=cgversion)
1369 bundlecaps, version=cgversion)
1370 if not cg:
1370 if not cg:
1371 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1371 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1372 return 1
1372 return 1
1373
1373
1374 if cgversion == '01': #bundle1
1374 if cgversion == '01': #bundle1
1375 if bcompression is None:
1375 if bcompression is None:
1376 bcompression = 'UN'
1376 bcompression = 'UN'
1377 bversion = 'HG10' + bcompression
1377 bversion = 'HG10' + bcompression
1378 bcompression = None
1378 bcompression = None
1379 else:
1379 else:
1380 assert cgversion == '02'
1380 assert cgversion == '02'
1381 bversion = 'HG20'
1381 bversion = 'HG20'
1382
1382
1383 # TODO compression options should be derived from bundlespec parsing.
1383 # TODO compression options should be derived from bundlespec parsing.
1384 # This is a temporary hack to allow adjusting bundle compression
1384 # This is a temporary hack to allow adjusting bundle compression
1385 # level without a) formalizing the bundlespec changes to declare it
1385 # level without a) formalizing the bundlespec changes to declare it
1386 # b) introducing a command flag.
1386 # b) introducing a command flag.
1387 compopts = {}
1387 compopts = {}
1388 complevel = ui.configint('experimental', 'bundlecomplevel')
1388 complevel = ui.configint('experimental', 'bundlecomplevel')
1389 if complevel is not None:
1389 if complevel is not None:
1390 compopts['level'] = complevel
1390 compopts['level'] = complevel
1391
1391
1392 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1392 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1393 compopts=compopts)
1393 compopts=compopts)
1394
1394
1395 @command('cat',
1395 @command('cat',
1396 [('o', 'output', '',
1396 [('o', 'output', '',
1397 _('print output to file with formatted name'), _('FORMAT')),
1397 _('print output to file with formatted name'), _('FORMAT')),
1398 ('r', 'rev', '', _('print the given revision'), _('REV')),
1398 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 ('', 'decode', None, _('apply any matching decode filter')),
1399 ('', 'decode', None, _('apply any matching decode filter')),
1400 ] + walkopts,
1400 ] + walkopts,
1401 _('[OPTION]... FILE...'),
1401 _('[OPTION]... FILE...'),
1402 inferrepo=True)
1402 inferrepo=True)
1403 def cat(ui, repo, file1, *pats, **opts):
1403 def cat(ui, repo, file1, *pats, **opts):
1404 """output the current or given revision of files
1404 """output the current or given revision of files
1405
1405
1406 Print the specified files as they were at the given revision. If
1406 Print the specified files as they were at the given revision. If
1407 no revision is given, the parent of the working directory is used.
1407 no revision is given, the parent of the working directory is used.
1408
1408
1409 Output may be to a file, in which case the name of the file is
1409 Output may be to a file, in which case the name of the file is
1410 given using a format string. The formatting rules as follows:
1410 given using a format string. The formatting rules as follows:
1411
1411
1412 :``%%``: literal "%" character
1412 :``%%``: literal "%" character
1413 :``%s``: basename of file being printed
1413 :``%s``: basename of file being printed
1414 :``%d``: dirname of file being printed, or '.' if in repository root
1414 :``%d``: dirname of file being printed, or '.' if in repository root
1415 :``%p``: root-relative path name of file being printed
1415 :``%p``: root-relative path name of file being printed
1416 :``%H``: changeset hash (40 hexadecimal digits)
1416 :``%H``: changeset hash (40 hexadecimal digits)
1417 :``%R``: changeset revision number
1417 :``%R``: changeset revision number
1418 :``%h``: short-form changeset hash (12 hexadecimal digits)
1418 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 :``%r``: zero-padded changeset revision number
1419 :``%r``: zero-padded changeset revision number
1420 :``%b``: basename of the exporting repository
1420 :``%b``: basename of the exporting repository
1421
1421
1422 Returns 0 on success.
1422 Returns 0 on success.
1423 """
1423 """
1424 ctx = scmutil.revsingle(repo, opts.get('rev'))
1424 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 m = scmutil.match(ctx, (file1,) + pats, opts)
1425 m = scmutil.match(ctx, (file1,) + pats, opts)
1426
1426
1427 ui.pager('cat')
1427 ui.pager('cat')
1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1429
1429
1430 @command('^clone',
1430 @command('^clone',
1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1432 'directory (only a repository)')),
1432 'directory (only a repository)')),
1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1434 _('REV')),
1434 _('REV')),
1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1439 ] + remoteopts,
1439 ] + remoteopts,
1440 _('[OPTION]... SOURCE [DEST]'),
1440 _('[OPTION]... SOURCE [DEST]'),
1441 norepo=True)
1441 norepo=True)
1442 def clone(ui, source, dest=None, **opts):
1442 def clone(ui, source, dest=None, **opts):
1443 """make a copy of an existing repository
1443 """make a copy of an existing repository
1444
1444
1445 Create a copy of an existing repository in a new directory.
1445 Create a copy of an existing repository in a new directory.
1446
1446
1447 If no destination directory name is specified, it defaults to the
1447 If no destination directory name is specified, it defaults to the
1448 basename of the source.
1448 basename of the source.
1449
1449
1450 The location of the source is added to the new repository's
1450 The location of the source is added to the new repository's
1451 ``.hg/hgrc`` file, as the default to be used for future pulls.
1451 ``.hg/hgrc`` file, as the default to be used for future pulls.
1452
1452
1453 Only local paths and ``ssh://`` URLs are supported as
1453 Only local paths and ``ssh://`` URLs are supported as
1454 destinations. For ``ssh://`` destinations, no working directory or
1454 destinations. For ``ssh://`` destinations, no working directory or
1455 ``.hg/hgrc`` will be created on the remote side.
1455 ``.hg/hgrc`` will be created on the remote side.
1456
1456
1457 If the source repository has a bookmark called '@' set, that
1457 If the source repository has a bookmark called '@' set, that
1458 revision will be checked out in the new repository by default.
1458 revision will be checked out in the new repository by default.
1459
1459
1460 To check out a particular version, use -u/--update, or
1460 To check out a particular version, use -u/--update, or
1461 -U/--noupdate to create a clone with no working directory.
1461 -U/--noupdate to create a clone with no working directory.
1462
1462
1463 To pull only a subset of changesets, specify one or more revisions
1463 To pull only a subset of changesets, specify one or more revisions
1464 identifiers with -r/--rev or branches with -b/--branch. The
1464 identifiers with -r/--rev or branches with -b/--branch. The
1465 resulting clone will contain only the specified changesets and
1465 resulting clone will contain only the specified changesets and
1466 their ancestors. These options (or 'clone src#rev dest') imply
1466 their ancestors. These options (or 'clone src#rev dest') imply
1467 --pull, even for local source repositories.
1467 --pull, even for local source repositories.
1468
1468
1469 .. note::
1469 .. note::
1470
1470
1471 Specifying a tag will include the tagged changeset but not the
1471 Specifying a tag will include the tagged changeset but not the
1472 changeset containing the tag.
1472 changeset containing the tag.
1473
1473
1474 .. container:: verbose
1474 .. container:: verbose
1475
1475
1476 For efficiency, hardlinks are used for cloning whenever the
1476 For efficiency, hardlinks are used for cloning whenever the
1477 source and destination are on the same filesystem (note this
1477 source and destination are on the same filesystem (note this
1478 applies only to the repository data, not to the working
1478 applies only to the repository data, not to the working
1479 directory). Some filesystems, such as AFS, implement hardlinking
1479 directory). Some filesystems, such as AFS, implement hardlinking
1480 incorrectly, but do not report errors. In these cases, use the
1480 incorrectly, but do not report errors. In these cases, use the
1481 --pull option to avoid hardlinking.
1481 --pull option to avoid hardlinking.
1482
1482
1483 In some cases, you can clone repositories and the working
1483 In some cases, you can clone repositories and the working
1484 directory using full hardlinks with ::
1484 directory using full hardlinks with ::
1485
1485
1486 $ cp -al REPO REPOCLONE
1486 $ cp -al REPO REPOCLONE
1487
1487
1488 This is the fastest way to clone, but it is not always safe. The
1488 This is the fastest way to clone, but it is not always safe. The
1489 operation is not atomic (making sure REPO is not modified during
1489 operation is not atomic (making sure REPO is not modified during
1490 the operation is up to you) and you have to make sure your
1490 the operation is up to you) and you have to make sure your
1491 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1491 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1492 so). Also, this is not compatible with certain extensions that
1492 so). Also, this is not compatible with certain extensions that
1493 place their metadata under the .hg directory, such as mq.
1493 place their metadata under the .hg directory, such as mq.
1494
1494
1495 Mercurial will update the working directory to the first applicable
1495 Mercurial will update the working directory to the first applicable
1496 revision from this list:
1496 revision from this list:
1497
1497
1498 a) null if -U or the source repository has no changesets
1498 a) null if -U or the source repository has no changesets
1499 b) if -u . and the source repository is local, the first parent of
1499 b) if -u . and the source repository is local, the first parent of
1500 the source repository's working directory
1500 the source repository's working directory
1501 c) the changeset specified with -u (if a branch name, this means the
1501 c) the changeset specified with -u (if a branch name, this means the
1502 latest head of that branch)
1502 latest head of that branch)
1503 d) the changeset specified with -r
1503 d) the changeset specified with -r
1504 e) the tipmost head specified with -b
1504 e) the tipmost head specified with -b
1505 f) the tipmost head specified with the url#branch source syntax
1505 f) the tipmost head specified with the url#branch source syntax
1506 g) the revision marked with the '@' bookmark, if present
1506 g) the revision marked with the '@' bookmark, if present
1507 h) the tipmost head of the default branch
1507 h) the tipmost head of the default branch
1508 i) tip
1508 i) tip
1509
1509
1510 When cloning from servers that support it, Mercurial may fetch
1510 When cloning from servers that support it, Mercurial may fetch
1511 pre-generated data from a server-advertised URL. When this is done,
1511 pre-generated data from a server-advertised URL. When this is done,
1512 hooks operating on incoming changesets and changegroups may fire twice,
1512 hooks operating on incoming changesets and changegroups may fire twice,
1513 once for the bundle fetched from the URL and another for any additional
1513 once for the bundle fetched from the URL and another for any additional
1514 data not fetched from this URL. In addition, if an error occurs, the
1514 data not fetched from this URL. In addition, if an error occurs, the
1515 repository may be rolled back to a partial clone. This behavior may
1515 repository may be rolled back to a partial clone. This behavior may
1516 change in future releases. See :hg:`help -e clonebundles` for more.
1516 change in future releases. See :hg:`help -e clonebundles` for more.
1517
1517
1518 Examples:
1518 Examples:
1519
1519
1520 - clone a remote repository to a new directory named hg/::
1520 - clone a remote repository to a new directory named hg/::
1521
1521
1522 hg clone https://www.mercurial-scm.org/repo/hg/
1522 hg clone https://www.mercurial-scm.org/repo/hg/
1523
1523
1524 - create a lightweight local clone::
1524 - create a lightweight local clone::
1525
1525
1526 hg clone project/ project-feature/
1526 hg clone project/ project-feature/
1527
1527
1528 - clone from an absolute path on an ssh server (note double-slash)::
1528 - clone from an absolute path on an ssh server (note double-slash)::
1529
1529
1530 hg clone ssh://user@server//home/projects/alpha/
1530 hg clone ssh://user@server//home/projects/alpha/
1531
1531
1532 - do a high-speed clone over a LAN while checking out a
1532 - do a high-speed clone over a LAN while checking out a
1533 specified version::
1533 specified version::
1534
1534
1535 hg clone --uncompressed http://server/repo -u 1.5
1535 hg clone --uncompressed http://server/repo -u 1.5
1536
1536
1537 - create a repository without changesets after a particular revision::
1537 - create a repository without changesets after a particular revision::
1538
1538
1539 hg clone -r 04e544 experimental/ good/
1539 hg clone -r 04e544 experimental/ good/
1540
1540
1541 - clone (and track) a particular named branch::
1541 - clone (and track) a particular named branch::
1542
1542
1543 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1543 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1544
1544
1545 See :hg:`help urls` for details on specifying URLs.
1545 See :hg:`help urls` for details on specifying URLs.
1546
1546
1547 Returns 0 on success.
1547 Returns 0 on success.
1548 """
1548 """
1549 if opts.get('noupdate') and opts.get('updaterev'):
1549 if opts.get('noupdate') and opts.get('updaterev'):
1550 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1550 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1551
1551
1552 r = hg.clone(ui, opts, source, dest,
1552 r = hg.clone(ui, opts, source, dest,
1553 pull=opts.get('pull'),
1553 pull=opts.get('pull'),
1554 stream=opts.get('uncompressed'),
1554 stream=opts.get('uncompressed'),
1555 rev=opts.get('rev'),
1555 rev=opts.get('rev'),
1556 update=opts.get('updaterev') or not opts.get('noupdate'),
1556 update=opts.get('updaterev') or not opts.get('noupdate'),
1557 branch=opts.get('branch'),
1557 branch=opts.get('branch'),
1558 shareopts=opts.get('shareopts'))
1558 shareopts=opts.get('shareopts'))
1559
1559
1560 return r is None
1560 return r is None
1561
1561
1562 @command('^commit|ci',
1562 @command('^commit|ci',
1563 [('A', 'addremove', None,
1563 [('A', 'addremove', None,
1564 _('mark new/missing files as added/removed before committing')),
1564 _('mark new/missing files as added/removed before committing')),
1565 ('', 'close-branch', None,
1565 ('', 'close-branch', None,
1566 _('mark a branch head as closed')),
1566 _('mark a branch head as closed')),
1567 ('', 'amend', None, _('amend the parent of the working directory')),
1567 ('', 'amend', None, _('amend the parent of the working directory')),
1568 ('s', 'secret', None, _('use the secret phase for committing')),
1568 ('s', 'secret', None, _('use the secret phase for committing')),
1569 ('e', 'edit', None, _('invoke editor on commit messages')),
1569 ('e', 'edit', None, _('invoke editor on commit messages')),
1570 ('i', 'interactive', None, _('use interactive mode')),
1570 ('i', 'interactive', None, _('use interactive mode')),
1571 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1571 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1572 _('[OPTION]... [FILE]...'),
1572 _('[OPTION]... [FILE]...'),
1573 inferrepo=True)
1573 inferrepo=True)
1574 def commit(ui, repo, *pats, **opts):
1574 def commit(ui, repo, *pats, **opts):
1575 """commit the specified files or all outstanding changes
1575 """commit the specified files or all outstanding changes
1576
1576
1577 Commit changes to the given files into the repository. Unlike a
1577 Commit changes to the given files into the repository. Unlike a
1578 centralized SCM, this operation is a local operation. See
1578 centralized SCM, this operation is a local operation. See
1579 :hg:`push` for a way to actively distribute your changes.
1579 :hg:`push` for a way to actively distribute your changes.
1580
1580
1581 If a list of files is omitted, all changes reported by :hg:`status`
1581 If a list of files is omitted, all changes reported by :hg:`status`
1582 will be committed.
1582 will be committed.
1583
1583
1584 If you are committing the result of a merge, do not provide any
1584 If you are committing the result of a merge, do not provide any
1585 filenames or -I/-X filters.
1585 filenames or -I/-X filters.
1586
1586
1587 If no commit message is specified, Mercurial starts your
1587 If no commit message is specified, Mercurial starts your
1588 configured editor where you can enter a message. In case your
1588 configured editor where you can enter a message. In case your
1589 commit fails, you will find a backup of your message in
1589 commit fails, you will find a backup of your message in
1590 ``.hg/last-message.txt``.
1590 ``.hg/last-message.txt``.
1591
1591
1592 The --close-branch flag can be used to mark the current branch
1592 The --close-branch flag can be used to mark the current branch
1593 head closed. When all heads of a branch are closed, the branch
1593 head closed. When all heads of a branch are closed, the branch
1594 will be considered closed and no longer listed.
1594 will be considered closed and no longer listed.
1595
1595
1596 The --amend flag can be used to amend the parent of the
1596 The --amend flag can be used to amend the parent of the
1597 working directory with a new commit that contains the changes
1597 working directory with a new commit that contains the changes
1598 in the parent in addition to those currently reported by :hg:`status`,
1598 in the parent in addition to those currently reported by :hg:`status`,
1599 if there are any. The old commit is stored in a backup bundle in
1599 if there are any. The old commit is stored in a backup bundle in
1600 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1600 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1601 on how to restore it).
1601 on how to restore it).
1602
1602
1603 Message, user and date are taken from the amended commit unless
1603 Message, user and date are taken from the amended commit unless
1604 specified. When a message isn't specified on the command line,
1604 specified. When a message isn't specified on the command line,
1605 the editor will open with the message of the amended commit.
1605 the editor will open with the message of the amended commit.
1606
1606
1607 It is not possible to amend public changesets (see :hg:`help phases`)
1607 It is not possible to amend public changesets (see :hg:`help phases`)
1608 or changesets that have children.
1608 or changesets that have children.
1609
1609
1610 See :hg:`help dates` for a list of formats valid for -d/--date.
1610 See :hg:`help dates` for a list of formats valid for -d/--date.
1611
1611
1612 Returns 0 on success, 1 if nothing changed.
1612 Returns 0 on success, 1 if nothing changed.
1613
1613
1614 .. container:: verbose
1614 .. container:: verbose
1615
1615
1616 Examples:
1616 Examples:
1617
1617
1618 - commit all files ending in .py::
1618 - commit all files ending in .py::
1619
1619
1620 hg commit --include "set:**.py"
1620 hg commit --include "set:**.py"
1621
1621
1622 - commit all non-binary files::
1622 - commit all non-binary files::
1623
1623
1624 hg commit --exclude "set:binary()"
1624 hg commit --exclude "set:binary()"
1625
1625
1626 - amend the current commit and set the date to now::
1626 - amend the current commit and set the date to now::
1627
1627
1628 hg commit --amend --date now
1628 hg commit --amend --date now
1629 """
1629 """
1630 wlock = lock = None
1630 wlock = lock = None
1631 try:
1631 try:
1632 wlock = repo.wlock()
1632 wlock = repo.wlock()
1633 lock = repo.lock()
1633 lock = repo.lock()
1634 return _docommit(ui, repo, *pats, **opts)
1634 return _docommit(ui, repo, *pats, **opts)
1635 finally:
1635 finally:
1636 release(lock, wlock)
1636 release(lock, wlock)
1637
1637
1638 def _docommit(ui, repo, *pats, **opts):
1638 def _docommit(ui, repo, *pats, **opts):
1639 opts = pycompat.byteskwargs(opts)
1639 opts = pycompat.byteskwargs(opts)
1640 if opts.get('interactive'):
1640 if opts.get('interactive'):
1641 opts.pop('interactive')
1641 opts.pop('interactive')
1642 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1642 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1643 cmdutil.recordfilter, *pats,
1643 cmdutil.recordfilter, *pats,
1644 **pycompat.strkwargs(opts))
1644 **pycompat.strkwargs(opts))
1645 # ret can be 0 (no changes to record) or the value returned by
1645 # ret can be 0 (no changes to record) or the value returned by
1646 # commit(), 1 if nothing changed or None on success.
1646 # commit(), 1 if nothing changed or None on success.
1647 return 1 if ret == 0 else ret
1647 return 1 if ret == 0 else ret
1648
1648
1649 if opts.get('subrepos'):
1649 if opts.get('subrepos'):
1650 if opts.get('amend'):
1650 if opts.get('amend'):
1651 raise error.Abort(_('cannot amend with --subrepos'))
1651 raise error.Abort(_('cannot amend with --subrepos'))
1652 # Let --subrepos on the command line override config setting.
1652 # Let --subrepos on the command line override config setting.
1653 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1653 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1654
1654
1655 cmdutil.checkunfinished(repo, commit=True)
1655 cmdutil.checkunfinished(repo, commit=True)
1656
1656
1657 branch = repo[None].branch()
1657 branch = repo[None].branch()
1658 bheads = repo.branchheads(branch)
1658 bheads = repo.branchheads(branch)
1659
1659
1660 extra = {}
1660 extra = {}
1661 if opts.get('close_branch'):
1661 if opts.get('close_branch'):
1662 extra['close'] = 1
1662 extra['close'] = 1
1663
1663
1664 if not bheads:
1664 if not bheads:
1665 raise error.Abort(_('can only close branch heads'))
1665 raise error.Abort(_('can only close branch heads'))
1666 elif opts.get('amend'):
1666 elif opts.get('amend'):
1667 if repo[None].parents()[0].p1().branch() != branch and \
1667 if repo[None].parents()[0].p1().branch() != branch and \
1668 repo[None].parents()[0].p2().branch() != branch:
1668 repo[None].parents()[0].p2().branch() != branch:
1669 raise error.Abort(_('can only close branch heads'))
1669 raise error.Abort(_('can only close branch heads'))
1670
1670
1671 if opts.get('amend'):
1671 if opts.get('amend'):
1672 if ui.configbool('ui', 'commitsubrepos'):
1672 if ui.configbool('ui', 'commitsubrepos'):
1673 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1673 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1674
1674
1675 old = repo['.']
1675 old = repo['.']
1676 if not old.mutable():
1676 if not old.mutable():
1677 raise error.Abort(_('cannot amend public changesets'))
1677 raise error.Abort(_('cannot amend public changesets'))
1678 if len(repo[None].parents()) > 1:
1678 if len(repo[None].parents()) > 1:
1679 raise error.Abort(_('cannot amend while merging'))
1679 raise error.Abort(_('cannot amend while merging'))
1680 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1680 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1681 if not allowunstable and old.children():
1681 if not allowunstable and old.children():
1682 raise error.Abort(_('cannot amend changeset with children'))
1682 raise error.Abort(_('cannot amend changeset with children'))
1683
1683
1684 # Currently histedit gets confused if an amend happens while histedit
1684 # Currently histedit gets confused if an amend happens while histedit
1685 # is in progress. Since we have a checkunfinished command, we are
1685 # is in progress. Since we have a checkunfinished command, we are
1686 # temporarily honoring it.
1686 # temporarily honoring it.
1687 #
1687 #
1688 # Note: eventually this guard will be removed. Please do not expect
1688 # Note: eventually this guard will be removed. Please do not expect
1689 # this behavior to remain.
1689 # this behavior to remain.
1690 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1690 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1691 cmdutil.checkunfinished(repo)
1691 cmdutil.checkunfinished(repo)
1692
1692
1693 # commitfunc is used only for temporary amend commit by cmdutil.amend
1693 # commitfunc is used only for temporary amend commit by cmdutil.amend
1694 def commitfunc(ui, repo, message, match, opts):
1694 def commitfunc(ui, repo, message, match, opts):
1695 return repo.commit(message,
1695 return repo.commit(message,
1696 opts.get('user') or old.user(),
1696 opts.get('user') or old.user(),
1697 opts.get('date') or old.date(),
1697 opts.get('date') or old.date(),
1698 match,
1698 match,
1699 extra=extra)
1699 extra=extra)
1700
1700
1701 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1701 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1702 if node == old.node():
1702 if node == old.node():
1703 ui.status(_("nothing changed\n"))
1703 ui.status(_("nothing changed\n"))
1704 return 1
1704 return 1
1705 else:
1705 else:
1706 def commitfunc(ui, repo, message, match, opts):
1706 def commitfunc(ui, repo, message, match, opts):
1707 overrides = {}
1707 overrides = {}
1708 if opts.get('secret'):
1708 if opts.get('secret'):
1709 overrides[('phases', 'new-commit')] = 'secret'
1709 overrides[('phases', 'new-commit')] = 'secret'
1710
1710
1711 baseui = repo.baseui
1711 baseui = repo.baseui
1712 with baseui.configoverride(overrides, 'commit'):
1712 with baseui.configoverride(overrides, 'commit'):
1713 with ui.configoverride(overrides, 'commit'):
1713 with ui.configoverride(overrides, 'commit'):
1714 editform = cmdutil.mergeeditform(repo[None],
1714 editform = cmdutil.mergeeditform(repo[None],
1715 'commit.normal')
1715 'commit.normal')
1716 editor = cmdutil.getcommiteditor(
1716 editor = cmdutil.getcommiteditor(
1717 editform=editform, **pycompat.strkwargs(opts))
1717 editform=editform, **pycompat.strkwargs(opts))
1718 return repo.commit(message,
1718 return repo.commit(message,
1719 opts.get('user'),
1719 opts.get('user'),
1720 opts.get('date'),
1720 opts.get('date'),
1721 match,
1721 match,
1722 editor=editor,
1722 editor=editor,
1723 extra=extra)
1723 extra=extra)
1724
1724
1725 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1725 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1726
1726
1727 if not node:
1727 if not node:
1728 stat = cmdutil.postcommitstatus(repo, pats, opts)
1728 stat = cmdutil.postcommitstatus(repo, pats, opts)
1729 if stat[3]:
1729 if stat[3]:
1730 ui.status(_("nothing changed (%d missing files, see "
1730 ui.status(_("nothing changed (%d missing files, see "
1731 "'hg status')\n") % len(stat[3]))
1731 "'hg status')\n") % len(stat[3]))
1732 else:
1732 else:
1733 ui.status(_("nothing changed\n"))
1733 ui.status(_("nothing changed\n"))
1734 return 1
1734 return 1
1735
1735
1736 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1736 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1737
1737
1738 @command('config|showconfig|debugconfig',
1738 @command('config|showconfig|debugconfig',
1739 [('u', 'untrusted', None, _('show untrusted configuration options')),
1739 [('u', 'untrusted', None, _('show untrusted configuration options')),
1740 ('e', 'edit', None, _('edit user config')),
1740 ('e', 'edit', None, _('edit user config')),
1741 ('l', 'local', None, _('edit repository config')),
1741 ('l', 'local', None, _('edit repository config')),
1742 ('g', 'global', None, _('edit global config'))] + formatteropts,
1742 ('g', 'global', None, _('edit global config'))] + formatteropts,
1743 _('[-u] [NAME]...'),
1743 _('[-u] [NAME]...'),
1744 optionalrepo=True)
1744 optionalrepo=True)
1745 def config(ui, repo, *values, **opts):
1745 def config(ui, repo, *values, **opts):
1746 """show combined config settings from all hgrc files
1746 """show combined config settings from all hgrc files
1747
1747
1748 With no arguments, print names and values of all config items.
1748 With no arguments, print names and values of all config items.
1749
1749
1750 With one argument of the form section.name, print just the value
1750 With one argument of the form section.name, print just the value
1751 of that config item.
1751 of that config item.
1752
1752
1753 With multiple arguments, print names and values of all config
1753 With multiple arguments, print names and values of all config
1754 items with matching section names.
1754 items with matching section names.
1755
1755
1756 With --edit, start an editor on the user-level config file. With
1756 With --edit, start an editor on the user-level config file. With
1757 --global, edit the system-wide config file. With --local, edit the
1757 --global, edit the system-wide config file. With --local, edit the
1758 repository-level config file.
1758 repository-level config file.
1759
1759
1760 With --debug, the source (filename and line number) is printed
1760 With --debug, the source (filename and line number) is printed
1761 for each config item.
1761 for each config item.
1762
1762
1763 See :hg:`help config` for more information about config files.
1763 See :hg:`help config` for more information about config files.
1764
1764
1765 Returns 0 on success, 1 if NAME does not exist.
1765 Returns 0 on success, 1 if NAME does not exist.
1766
1766
1767 """
1767 """
1768
1768
1769 if opts.get('edit') or opts.get('local') or opts.get('global'):
1769 if opts.get('edit') or opts.get('local') or opts.get('global'):
1770 if opts.get('local') and opts.get('global'):
1770 if opts.get('local') and opts.get('global'):
1771 raise error.Abort(_("can't use --local and --global together"))
1771 raise error.Abort(_("can't use --local and --global together"))
1772
1772
1773 if opts.get('local'):
1773 if opts.get('local'):
1774 if not repo:
1774 if not repo:
1775 raise error.Abort(_("can't use --local outside a repository"))
1775 raise error.Abort(_("can't use --local outside a repository"))
1776 paths = [repo.vfs.join('hgrc')]
1776 paths = [repo.vfs.join('hgrc')]
1777 elif opts.get('global'):
1777 elif opts.get('global'):
1778 paths = scmutil.systemrcpath()
1778 paths = scmutil.systemrcpath()
1779 else:
1779 else:
1780 paths = scmutil.userrcpath()
1780 paths = scmutil.userrcpath()
1781
1781
1782 for f in paths:
1782 for f in paths:
1783 if os.path.exists(f):
1783 if os.path.exists(f):
1784 break
1784 break
1785 else:
1785 else:
1786 if opts.get('global'):
1786 if opts.get('global'):
1787 samplehgrc = uimod.samplehgrcs['global']
1787 samplehgrc = uimod.samplehgrcs['global']
1788 elif opts.get('local'):
1788 elif opts.get('local'):
1789 samplehgrc = uimod.samplehgrcs['local']
1789 samplehgrc = uimod.samplehgrcs['local']
1790 else:
1790 else:
1791 samplehgrc = uimod.samplehgrcs['user']
1791 samplehgrc = uimod.samplehgrcs['user']
1792
1792
1793 f = paths[0]
1793 f = paths[0]
1794 fp = open(f, "w")
1794 fp = open(f, "w")
1795 fp.write(samplehgrc)
1795 fp.write(samplehgrc)
1796 fp.close()
1796 fp.close()
1797
1797
1798 editor = ui.geteditor()
1798 editor = ui.geteditor()
1799 ui.system("%s \"%s\"" % (editor, f),
1799 ui.system("%s \"%s\"" % (editor, f),
1800 onerr=error.Abort, errprefix=_("edit failed"),
1800 onerr=error.Abort, errprefix=_("edit failed"),
1801 blockedtag='config_edit')
1801 blockedtag='config_edit')
1802 return
1802 return
1803 ui.pager('config')
1803 ui.pager('config')
1804 fm = ui.formatter('config', opts)
1804 fm = ui.formatter('config', opts)
1805 for f in scmutil.rcpath():
1805 for f in scmutil.rcpath():
1806 ui.debug('read config from: %s\n' % f)
1806 ui.debug('read config from: %s\n' % f)
1807 untrusted = bool(opts.get('untrusted'))
1807 untrusted = bool(opts.get('untrusted'))
1808 if values:
1808 if values:
1809 sections = [v for v in values if '.' not in v]
1809 sections = [v for v in values if '.' not in v]
1810 items = [v for v in values if '.' in v]
1810 items = [v for v in values if '.' in v]
1811 if len(items) > 1 or items and sections:
1811 if len(items) > 1 or items and sections:
1812 raise error.Abort(_('only one config item permitted'))
1812 raise error.Abort(_('only one config item permitted'))
1813 matched = False
1813 matched = False
1814 for section, name, value in ui.walkconfig(untrusted=untrusted):
1814 for section, name, value in ui.walkconfig(untrusted=untrusted):
1815 source = ui.configsource(section, name, untrusted)
1815 source = ui.configsource(section, name, untrusted)
1816 value = pycompat.bytestr(value)
1816 value = pycompat.bytestr(value)
1817 if fm.isplain():
1817 if fm.isplain():
1818 source = source or 'none'
1818 source = source or 'none'
1819 value = value.replace('\n', '\\n')
1819 value = value.replace('\n', '\\n')
1820 entryname = section + '.' + name
1820 entryname = section + '.' + name
1821 if values:
1821 if values:
1822 for v in values:
1822 for v in values:
1823 if v == section:
1823 if v == section:
1824 fm.startitem()
1824 fm.startitem()
1825 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1825 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1826 fm.write('name value', '%s=%s\n', entryname, value)
1826 fm.write('name value', '%s=%s\n', entryname, value)
1827 matched = True
1827 matched = True
1828 elif v == entryname:
1828 elif v == entryname:
1829 fm.startitem()
1829 fm.startitem()
1830 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1830 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1831 fm.write('value', '%s\n', value)
1831 fm.write('value', '%s\n', value)
1832 fm.data(name=entryname)
1832 fm.data(name=entryname)
1833 matched = True
1833 matched = True
1834 else:
1834 else:
1835 fm.startitem()
1835 fm.startitem()
1836 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1836 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1837 fm.write('name value', '%s=%s\n', entryname, value)
1837 fm.write('name value', '%s=%s\n', entryname, value)
1838 matched = True
1838 matched = True
1839 fm.end()
1839 fm.end()
1840 if matched:
1840 if matched:
1841 return 0
1841 return 0
1842 return 1
1842 return 1
1843
1843
1844 @command('copy|cp',
1844 @command('copy|cp',
1845 [('A', 'after', None, _('record a copy that has already occurred')),
1845 [('A', 'after', None, _('record a copy that has already occurred')),
1846 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1846 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1847 ] + walkopts + dryrunopts,
1847 ] + walkopts + dryrunopts,
1848 _('[OPTION]... [SOURCE]... DEST'))
1848 _('[OPTION]... [SOURCE]... DEST'))
1849 def copy(ui, repo, *pats, **opts):
1849 def copy(ui, repo, *pats, **opts):
1850 """mark files as copied for the next commit
1850 """mark files as copied for the next commit
1851
1851
1852 Mark dest as having copies of source files. If dest is a
1852 Mark dest as having copies of source files. If dest is a
1853 directory, copies are put in that directory. If dest is a file,
1853 directory, copies are put in that directory. If dest is a file,
1854 the source must be a single file.
1854 the source must be a single file.
1855
1855
1856 By default, this command copies the contents of files as they
1856 By default, this command copies the contents of files as they
1857 exist in the working directory. If invoked with -A/--after, the
1857 exist in the working directory. If invoked with -A/--after, the
1858 operation is recorded, but no copying is performed.
1858 operation is recorded, but no copying is performed.
1859
1859
1860 This command takes effect with the next commit. To undo a copy
1860 This command takes effect with the next commit. To undo a copy
1861 before that, see :hg:`revert`.
1861 before that, see :hg:`revert`.
1862
1862
1863 Returns 0 on success, 1 if errors are encountered.
1863 Returns 0 on success, 1 if errors are encountered.
1864 """
1864 """
1865 with repo.wlock(False):
1865 with repo.wlock(False):
1866 return cmdutil.copy(ui, repo, pats, opts)
1866 return cmdutil.copy(ui, repo, pats, opts)
1867
1867
1868 @command('^diff',
1868 @command('^diff',
1869 [('r', 'rev', [], _('revision'), _('REV')),
1869 [('r', 'rev', [], _('revision'), _('REV')),
1870 ('c', 'change', '', _('change made by revision'), _('REV'))
1870 ('c', 'change', '', _('change made by revision'), _('REV'))
1871 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1871 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1872 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1872 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1873 inferrepo=True)
1873 inferrepo=True)
1874 def diff(ui, repo, *pats, **opts):
1874 def diff(ui, repo, *pats, **opts):
1875 """diff repository (or selected files)
1875 """diff repository (or selected files)
1876
1876
1877 Show differences between revisions for the specified files.
1877 Show differences between revisions for the specified files.
1878
1878
1879 Differences between files are shown using the unified diff format.
1879 Differences between files are shown using the unified diff format.
1880
1880
1881 .. note::
1881 .. note::
1882
1882
1883 :hg:`diff` may generate unexpected results for merges, as it will
1883 :hg:`diff` may generate unexpected results for merges, as it will
1884 default to comparing against the working directory's first
1884 default to comparing against the working directory's first
1885 parent changeset if no revisions are specified.
1885 parent changeset if no revisions are specified.
1886
1886
1887 When two revision arguments are given, then changes are shown
1887 When two revision arguments are given, then changes are shown
1888 between those revisions. If only one revision is specified then
1888 between those revisions. If only one revision is specified then
1889 that revision is compared to the working directory, and, when no
1889 that revision is compared to the working directory, and, when no
1890 revisions are specified, the working directory files are compared
1890 revisions are specified, the working directory files are compared
1891 to its first parent.
1891 to its first parent.
1892
1892
1893 Alternatively you can specify -c/--change with a revision to see
1893 Alternatively you can specify -c/--change with a revision to see
1894 the changes in that changeset relative to its first parent.
1894 the changes in that changeset relative to its first parent.
1895
1895
1896 Without the -a/--text option, diff will avoid generating diffs of
1896 Without the -a/--text option, diff will avoid generating diffs of
1897 files it detects as binary. With -a, diff will generate a diff
1897 files it detects as binary. With -a, diff will generate a diff
1898 anyway, probably with undesirable results.
1898 anyway, probably with undesirable results.
1899
1899
1900 Use the -g/--git option to generate diffs in the git extended diff
1900 Use the -g/--git option to generate diffs in the git extended diff
1901 format. For more information, read :hg:`help diffs`.
1901 format. For more information, read :hg:`help diffs`.
1902
1902
1903 .. container:: verbose
1903 .. container:: verbose
1904
1904
1905 Examples:
1905 Examples:
1906
1906
1907 - compare a file in the current working directory to its parent::
1907 - compare a file in the current working directory to its parent::
1908
1908
1909 hg diff foo.c
1909 hg diff foo.c
1910
1910
1911 - compare two historical versions of a directory, with rename info::
1911 - compare two historical versions of a directory, with rename info::
1912
1912
1913 hg diff --git -r 1.0:1.2 lib/
1913 hg diff --git -r 1.0:1.2 lib/
1914
1914
1915 - get change stats relative to the last change on some date::
1915 - get change stats relative to the last change on some date::
1916
1916
1917 hg diff --stat -r "date('may 2')"
1917 hg diff --stat -r "date('may 2')"
1918
1918
1919 - diff all newly-added files that contain a keyword::
1919 - diff all newly-added files that contain a keyword::
1920
1920
1921 hg diff "set:added() and grep(GNU)"
1921 hg diff "set:added() and grep(GNU)"
1922
1922
1923 - compare a revision and its parents::
1923 - compare a revision and its parents::
1924
1924
1925 hg diff -c 9353 # compare against first parent
1925 hg diff -c 9353 # compare against first parent
1926 hg diff -r 9353^:9353 # same using revset syntax
1926 hg diff -r 9353^:9353 # same using revset syntax
1927 hg diff -r 9353^2:9353 # compare against the second parent
1927 hg diff -r 9353^2:9353 # compare against the second parent
1928
1928
1929 Returns 0 on success.
1929 Returns 0 on success.
1930 """
1930 """
1931
1931
1932 revs = opts.get('rev')
1932 revs = opts.get('rev')
1933 change = opts.get('change')
1933 change = opts.get('change')
1934 stat = opts.get('stat')
1934 stat = opts.get('stat')
1935 reverse = opts.get('reverse')
1935 reverse = opts.get('reverse')
1936
1936
1937 if revs and change:
1937 if revs and change:
1938 msg = _('cannot specify --rev and --change at the same time')
1938 msg = _('cannot specify --rev and --change at the same time')
1939 raise error.Abort(msg)
1939 raise error.Abort(msg)
1940 elif change:
1940 elif change:
1941 node2 = scmutil.revsingle(repo, change, None).node()
1941 node2 = scmutil.revsingle(repo, change, None).node()
1942 node1 = repo[node2].p1().node()
1942 node1 = repo[node2].p1().node()
1943 else:
1943 else:
1944 node1, node2 = scmutil.revpair(repo, revs)
1944 node1, node2 = scmutil.revpair(repo, revs)
1945
1945
1946 if reverse:
1946 if reverse:
1947 node1, node2 = node2, node1
1947 node1, node2 = node2, node1
1948
1948
1949 diffopts = patch.diffallopts(ui, opts)
1949 diffopts = patch.diffallopts(ui, opts)
1950 m = scmutil.match(repo[node2], pats, opts)
1950 m = scmutil.match(repo[node2], pats, opts)
1951 ui.pager('diff')
1951 ui.pager('diff')
1952 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1952 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1953 listsubrepos=opts.get('subrepos'),
1953 listsubrepos=opts.get('subrepos'),
1954 root=opts.get('root'))
1954 root=opts.get('root'))
1955
1955
1956 @command('^export',
1956 @command('^export',
1957 [('o', 'output', '',
1957 [('o', 'output', '',
1958 _('print output to file with formatted name'), _('FORMAT')),
1958 _('print output to file with formatted name'), _('FORMAT')),
1959 ('', 'switch-parent', None, _('diff against the second parent')),
1959 ('', 'switch-parent', None, _('diff against the second parent')),
1960 ('r', 'rev', [], _('revisions to export'), _('REV')),
1960 ('r', 'rev', [], _('revisions to export'), _('REV')),
1961 ] + diffopts,
1961 ] + diffopts,
1962 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1962 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1963 def export(ui, repo, *changesets, **opts):
1963 def export(ui, repo, *changesets, **opts):
1964 """dump the header and diffs for one or more changesets
1964 """dump the header and diffs for one or more changesets
1965
1965
1966 Print the changeset header and diffs for one or more revisions.
1966 Print the changeset header and diffs for one or more revisions.
1967 If no revision is given, the parent of the working directory is used.
1967 If no revision is given, the parent of the working directory is used.
1968
1968
1969 The information shown in the changeset header is: author, date,
1969 The information shown in the changeset header is: author, date,
1970 branch name (if non-default), changeset hash, parent(s) and commit
1970 branch name (if non-default), changeset hash, parent(s) and commit
1971 comment.
1971 comment.
1972
1972
1973 .. note::
1973 .. note::
1974
1974
1975 :hg:`export` may generate unexpected diff output for merge
1975 :hg:`export` may generate unexpected diff output for merge
1976 changesets, as it will compare the merge changeset against its
1976 changesets, as it will compare the merge changeset against its
1977 first parent only.
1977 first parent only.
1978
1978
1979 Output may be to a file, in which case the name of the file is
1979 Output may be to a file, in which case the name of the file is
1980 given using a format string. The formatting rules are as follows:
1980 given using a format string. The formatting rules are as follows:
1981
1981
1982 :``%%``: literal "%" character
1982 :``%%``: literal "%" character
1983 :``%H``: changeset hash (40 hexadecimal digits)
1983 :``%H``: changeset hash (40 hexadecimal digits)
1984 :``%N``: number of patches being generated
1984 :``%N``: number of patches being generated
1985 :``%R``: changeset revision number
1985 :``%R``: changeset revision number
1986 :``%b``: basename of the exporting repository
1986 :``%b``: basename of the exporting repository
1987 :``%h``: short-form changeset hash (12 hexadecimal digits)
1987 :``%h``: short-form changeset hash (12 hexadecimal digits)
1988 :``%m``: first line of the commit message (only alphanumeric characters)
1988 :``%m``: first line of the commit message (only alphanumeric characters)
1989 :``%n``: zero-padded sequence number, starting at 1
1989 :``%n``: zero-padded sequence number, starting at 1
1990 :``%r``: zero-padded changeset revision number
1990 :``%r``: zero-padded changeset revision number
1991
1991
1992 Without the -a/--text option, export will avoid generating diffs
1992 Without the -a/--text option, export will avoid generating diffs
1993 of files it detects as binary. With -a, export will generate a
1993 of files it detects as binary. With -a, export will generate a
1994 diff anyway, probably with undesirable results.
1994 diff anyway, probably with undesirable results.
1995
1995
1996 Use the -g/--git option to generate diffs in the git extended diff
1996 Use the -g/--git option to generate diffs in the git extended diff
1997 format. See :hg:`help diffs` for more information.
1997 format. See :hg:`help diffs` for more information.
1998
1998
1999 With the --switch-parent option, the diff will be against the
1999 With the --switch-parent option, the diff will be against the
2000 second parent. It can be useful to review a merge.
2000 second parent. It can be useful to review a merge.
2001
2001
2002 .. container:: verbose
2002 .. container:: verbose
2003
2003
2004 Examples:
2004 Examples:
2005
2005
2006 - use export and import to transplant a bugfix to the current
2006 - use export and import to transplant a bugfix to the current
2007 branch::
2007 branch::
2008
2008
2009 hg export -r 9353 | hg import -
2009 hg export -r 9353 | hg import -
2010
2010
2011 - export all the changesets between two revisions to a file with
2011 - export all the changesets between two revisions to a file with
2012 rename information::
2012 rename information::
2013
2013
2014 hg export --git -r 123:150 > changes.txt
2014 hg export --git -r 123:150 > changes.txt
2015
2015
2016 - split outgoing changes into a series of patches with
2016 - split outgoing changes into a series of patches with
2017 descriptive names::
2017 descriptive names::
2018
2018
2019 hg export -r "outgoing()" -o "%n-%m.patch"
2019 hg export -r "outgoing()" -o "%n-%m.patch"
2020
2020
2021 Returns 0 on success.
2021 Returns 0 on success.
2022 """
2022 """
2023 changesets += tuple(opts.get('rev', []))
2023 changesets += tuple(opts.get('rev', []))
2024 if not changesets:
2024 if not changesets:
2025 changesets = ['.']
2025 changesets = ['.']
2026 revs = scmutil.revrange(repo, changesets)
2026 revs = scmutil.revrange(repo, changesets)
2027 if not revs:
2027 if not revs:
2028 raise error.Abort(_("export requires at least one changeset"))
2028 raise error.Abort(_("export requires at least one changeset"))
2029 if len(revs) > 1:
2029 if len(revs) > 1:
2030 ui.note(_('exporting patches:\n'))
2030 ui.note(_('exporting patches:\n'))
2031 else:
2031 else:
2032 ui.note(_('exporting patch:\n'))
2032 ui.note(_('exporting patch:\n'))
2033 ui.pager('export')
2033 ui.pager('export')
2034 cmdutil.export(repo, revs, template=opts.get('output'),
2034 cmdutil.export(repo, revs, template=opts.get('output'),
2035 switch_parent=opts.get('switch_parent'),
2035 switch_parent=opts.get('switch_parent'),
2036 opts=patch.diffallopts(ui, opts))
2036 opts=patch.diffallopts(ui, opts))
2037
2037
2038 @command('files',
2038 @command('files',
2039 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2039 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2040 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2040 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2041 ] + walkopts + formatteropts + subrepoopts,
2041 ] + walkopts + formatteropts + subrepoopts,
2042 _('[OPTION]... [FILE]...'))
2042 _('[OPTION]... [FILE]...'))
2043 def files(ui, repo, *pats, **opts):
2043 def files(ui, repo, *pats, **opts):
2044 """list tracked files
2044 """list tracked files
2045
2045
2046 Print files under Mercurial control in the working directory or
2046 Print files under Mercurial control in the working directory or
2047 specified revision for given files (excluding removed files).
2047 specified revision for given files (excluding removed files).
2048 Files can be specified as filenames or filesets.
2048 Files can be specified as filenames or filesets.
2049
2049
2050 If no files are given to match, this command prints the names
2050 If no files are given to match, this command prints the names
2051 of all files under Mercurial control.
2051 of all files under Mercurial control.
2052
2052
2053 .. container:: verbose
2053 .. container:: verbose
2054
2054
2055 Examples:
2055 Examples:
2056
2056
2057 - list all files under the current directory::
2057 - list all files under the current directory::
2058
2058
2059 hg files .
2059 hg files .
2060
2060
2061 - shows sizes and flags for current revision::
2061 - shows sizes and flags for current revision::
2062
2062
2063 hg files -vr .
2063 hg files -vr .
2064
2064
2065 - list all files named README::
2065 - list all files named README::
2066
2066
2067 hg files -I "**/README"
2067 hg files -I "**/README"
2068
2068
2069 - list all binary files::
2069 - list all binary files::
2070
2070
2071 hg files "set:binary()"
2071 hg files "set:binary()"
2072
2072
2073 - find files containing a regular expression::
2073 - find files containing a regular expression::
2074
2074
2075 hg files "set:grep('bob')"
2075 hg files "set:grep('bob')"
2076
2076
2077 - search tracked file contents with xargs and grep::
2077 - search tracked file contents with xargs and grep::
2078
2078
2079 hg files -0 | xargs -0 grep foo
2079 hg files -0 | xargs -0 grep foo
2080
2080
2081 See :hg:`help patterns` and :hg:`help filesets` for more information
2081 See :hg:`help patterns` and :hg:`help filesets` for more information
2082 on specifying file patterns.
2082 on specifying file patterns.
2083
2083
2084 Returns 0 if a match is found, 1 otherwise.
2084 Returns 0 if a match is found, 1 otherwise.
2085
2085
2086 """
2086 """
2087 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2087 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2088
2088
2089 end = '\n'
2089 end = '\n'
2090 if opts.get('print0'):
2090 if opts.get('print0'):
2091 end = '\0'
2091 end = '\0'
2092 fmt = '%s' + end
2092 fmt = '%s' + end
2093
2093
2094 m = scmutil.match(ctx, pats, opts)
2094 m = scmutil.match(ctx, pats, opts)
2095 ui.pager('files')
2095 ui.pager('files')
2096 with ui.formatter('files', opts) as fm:
2096 with ui.formatter('files', opts) as fm:
2097 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2097 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2098
2098
2099 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2099 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2100 def forget(ui, repo, *pats, **opts):
2100 def forget(ui, repo, *pats, **opts):
2101 """forget the specified files on the next commit
2101 """forget the specified files on the next commit
2102
2102
2103 Mark the specified files so they will no longer be tracked
2103 Mark the specified files so they will no longer be tracked
2104 after the next commit.
2104 after the next commit.
2105
2105
2106 This only removes files from the current branch, not from the
2106 This only removes files from the current branch, not from the
2107 entire project history, and it does not delete them from the
2107 entire project history, and it does not delete them from the
2108 working directory.
2108 working directory.
2109
2109
2110 To delete the file from the working directory, see :hg:`remove`.
2110 To delete the file from the working directory, see :hg:`remove`.
2111
2111
2112 To undo a forget before the next commit, see :hg:`add`.
2112 To undo a forget before the next commit, see :hg:`add`.
2113
2113
2114 .. container:: verbose
2114 .. container:: verbose
2115
2115
2116 Examples:
2116 Examples:
2117
2117
2118 - forget newly-added binary files::
2118 - forget newly-added binary files::
2119
2119
2120 hg forget "set:added() and binary()"
2120 hg forget "set:added() and binary()"
2121
2121
2122 - forget files that would be excluded by .hgignore::
2122 - forget files that would be excluded by .hgignore::
2123
2123
2124 hg forget "set:hgignore()"
2124 hg forget "set:hgignore()"
2125
2125
2126 Returns 0 on success.
2126 Returns 0 on success.
2127 """
2127 """
2128
2128
2129 if not pats:
2129 if not pats:
2130 raise error.Abort(_('no files specified'))
2130 raise error.Abort(_('no files specified'))
2131
2131
2132 m = scmutil.match(repo[None], pats, opts)
2132 m = scmutil.match(repo[None], pats, opts)
2133 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2133 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2134 return rejected and 1 or 0
2134 return rejected and 1 or 0
2135
2135
2136 @command(
2136 @command(
2137 'graft',
2137 'graft',
2138 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2138 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2139 ('c', 'continue', False, _('resume interrupted graft')),
2139 ('c', 'continue', False, _('resume interrupted graft')),
2140 ('e', 'edit', False, _('invoke editor on commit messages')),
2140 ('e', 'edit', False, _('invoke editor on commit messages')),
2141 ('', 'log', None, _('append graft info to log message')),
2141 ('', 'log', None, _('append graft info to log message')),
2142 ('f', 'force', False, _('force graft')),
2142 ('f', 'force', False, _('force graft')),
2143 ('D', 'currentdate', False,
2143 ('D', 'currentdate', False,
2144 _('record the current date as commit date')),
2144 _('record the current date as commit date')),
2145 ('U', 'currentuser', False,
2145 ('U', 'currentuser', False,
2146 _('record the current user as committer'), _('DATE'))]
2146 _('record the current user as committer'), _('DATE'))]
2147 + commitopts2 + mergetoolopts + dryrunopts,
2147 + commitopts2 + mergetoolopts + dryrunopts,
2148 _('[OPTION]... [-r REV]... REV...'))
2148 _('[OPTION]... [-r REV]... REV...'))
2149 def graft(ui, repo, *revs, **opts):
2149 def graft(ui, repo, *revs, **opts):
2150 '''copy changes from other branches onto the current branch
2150 '''copy changes from other branches onto the current branch
2151
2151
2152 This command uses Mercurial's merge logic to copy individual
2152 This command uses Mercurial's merge logic to copy individual
2153 changes from other branches without merging branches in the
2153 changes from other branches without merging branches in the
2154 history graph. This is sometimes known as 'backporting' or
2154 history graph. This is sometimes known as 'backporting' or
2155 'cherry-picking'. By default, graft will copy user, date, and
2155 'cherry-picking'. By default, graft will copy user, date, and
2156 description from the source changesets.
2156 description from the source changesets.
2157
2157
2158 Changesets that are ancestors of the current revision, that have
2158 Changesets that are ancestors of the current revision, that have
2159 already been grafted, or that are merges will be skipped.
2159 already been grafted, or that are merges will be skipped.
2160
2160
2161 If --log is specified, log messages will have a comment appended
2161 If --log is specified, log messages will have a comment appended
2162 of the form::
2162 of the form::
2163
2163
2164 (grafted from CHANGESETHASH)
2164 (grafted from CHANGESETHASH)
2165
2165
2166 If --force is specified, revisions will be grafted even if they
2166 If --force is specified, revisions will be grafted even if they
2167 are already ancestors of or have been grafted to the destination.
2167 are already ancestors of or have been grafted to the destination.
2168 This is useful when the revisions have since been backed out.
2168 This is useful when the revisions have since been backed out.
2169
2169
2170 If a graft merge results in conflicts, the graft process is
2170 If a graft merge results in conflicts, the graft process is
2171 interrupted so that the current merge can be manually resolved.
2171 interrupted so that the current merge can be manually resolved.
2172 Once all conflicts are addressed, the graft process can be
2172 Once all conflicts are addressed, the graft process can be
2173 continued with the -c/--continue option.
2173 continued with the -c/--continue option.
2174
2174
2175 .. note::
2175 .. note::
2176
2176
2177 The -c/--continue option does not reapply earlier options, except
2177 The -c/--continue option does not reapply earlier options, except
2178 for --force.
2178 for --force.
2179
2179
2180 .. container:: verbose
2180 .. container:: verbose
2181
2181
2182 Examples:
2182 Examples:
2183
2183
2184 - copy a single change to the stable branch and edit its description::
2184 - copy a single change to the stable branch and edit its description::
2185
2185
2186 hg update stable
2186 hg update stable
2187 hg graft --edit 9393
2187 hg graft --edit 9393
2188
2188
2189 - graft a range of changesets with one exception, updating dates::
2189 - graft a range of changesets with one exception, updating dates::
2190
2190
2191 hg graft -D "2085::2093 and not 2091"
2191 hg graft -D "2085::2093 and not 2091"
2192
2192
2193 - continue a graft after resolving conflicts::
2193 - continue a graft after resolving conflicts::
2194
2194
2195 hg graft -c
2195 hg graft -c
2196
2196
2197 - show the source of a grafted changeset::
2197 - show the source of a grafted changeset::
2198
2198
2199 hg log --debug -r .
2199 hg log --debug -r .
2200
2200
2201 - show revisions sorted by date::
2201 - show revisions sorted by date::
2202
2202
2203 hg log -r "sort(all(), date)"
2203 hg log -r "sort(all(), date)"
2204
2204
2205 See :hg:`help revisions` for more about specifying revisions.
2205 See :hg:`help revisions` for more about specifying revisions.
2206
2206
2207 Returns 0 on successful completion.
2207 Returns 0 on successful completion.
2208 '''
2208 '''
2209 with repo.wlock():
2209 with repo.wlock():
2210 return _dograft(ui, repo, *revs, **opts)
2210 return _dograft(ui, repo, *revs, **opts)
2211
2211
2212 def _dograft(ui, repo, *revs, **opts):
2212 def _dograft(ui, repo, *revs, **opts):
2213 if revs and opts.get('rev'):
2213 if revs and opts.get('rev'):
2214 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2214 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2215 'revision ordering!\n'))
2215 'revision ordering!\n'))
2216
2216
2217 revs = list(revs)
2217 revs = list(revs)
2218 revs.extend(opts.get('rev'))
2218 revs.extend(opts.get('rev'))
2219
2219
2220 if not opts.get('user') and opts.get('currentuser'):
2220 if not opts.get('user') and opts.get('currentuser'):
2221 opts['user'] = ui.username()
2221 opts['user'] = ui.username()
2222 if not opts.get('date') and opts.get('currentdate'):
2222 if not opts.get('date') and opts.get('currentdate'):
2223 opts['date'] = "%d %d" % util.makedate()
2223 opts['date'] = "%d %d" % util.makedate()
2224
2224
2225 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2225 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2226
2226
2227 cont = False
2227 cont = False
2228 if opts.get('continue'):
2228 if opts.get('continue'):
2229 cont = True
2229 cont = True
2230 if revs:
2230 if revs:
2231 raise error.Abort(_("can't specify --continue and revisions"))
2231 raise error.Abort(_("can't specify --continue and revisions"))
2232 # read in unfinished revisions
2232 # read in unfinished revisions
2233 try:
2233 try:
2234 nodes = repo.vfs.read('graftstate').splitlines()
2234 nodes = repo.vfs.read('graftstate').splitlines()
2235 revs = [repo[node].rev() for node in nodes]
2235 revs = [repo[node].rev() for node in nodes]
2236 except IOError as inst:
2236 except IOError as inst:
2237 if inst.errno != errno.ENOENT:
2237 if inst.errno != errno.ENOENT:
2238 raise
2238 raise
2239 cmdutil.wrongtooltocontinue(repo, _('graft'))
2239 cmdutil.wrongtooltocontinue(repo, _('graft'))
2240 else:
2240 else:
2241 cmdutil.checkunfinished(repo)
2241 cmdutil.checkunfinished(repo)
2242 cmdutil.bailifchanged(repo)
2242 cmdutil.bailifchanged(repo)
2243 if not revs:
2243 if not revs:
2244 raise error.Abort(_('no revisions specified'))
2244 raise error.Abort(_('no revisions specified'))
2245 revs = scmutil.revrange(repo, revs)
2245 revs = scmutil.revrange(repo, revs)
2246
2246
2247 skipped = set()
2247 skipped = set()
2248 # check for merges
2248 # check for merges
2249 for rev in repo.revs('%ld and merge()', revs):
2249 for rev in repo.revs('%ld and merge()', revs):
2250 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2250 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2251 skipped.add(rev)
2251 skipped.add(rev)
2252 revs = [r for r in revs if r not in skipped]
2252 revs = [r for r in revs if r not in skipped]
2253 if not revs:
2253 if not revs:
2254 return -1
2254 return -1
2255
2255
2256 # Don't check in the --continue case, in effect retaining --force across
2256 # Don't check in the --continue case, in effect retaining --force across
2257 # --continues. That's because without --force, any revisions we decided to
2257 # --continues. That's because without --force, any revisions we decided to
2258 # skip would have been filtered out here, so they wouldn't have made their
2258 # skip would have been filtered out here, so they wouldn't have made their
2259 # way to the graftstate. With --force, any revisions we would have otherwise
2259 # way to the graftstate. With --force, any revisions we would have otherwise
2260 # skipped would not have been filtered out, and if they hadn't been applied
2260 # skipped would not have been filtered out, and if they hadn't been applied
2261 # already, they'd have been in the graftstate.
2261 # already, they'd have been in the graftstate.
2262 if not (cont or opts.get('force')):
2262 if not (cont or opts.get('force')):
2263 # check for ancestors of dest branch
2263 # check for ancestors of dest branch
2264 crev = repo['.'].rev()
2264 crev = repo['.'].rev()
2265 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2265 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2266 # XXX make this lazy in the future
2266 # XXX make this lazy in the future
2267 # don't mutate while iterating, create a copy
2267 # don't mutate while iterating, create a copy
2268 for rev in list(revs):
2268 for rev in list(revs):
2269 if rev in ancestors:
2269 if rev in ancestors:
2270 ui.warn(_('skipping ancestor revision %d:%s\n') %
2270 ui.warn(_('skipping ancestor revision %d:%s\n') %
2271 (rev, repo[rev]))
2271 (rev, repo[rev]))
2272 # XXX remove on list is slow
2272 # XXX remove on list is slow
2273 revs.remove(rev)
2273 revs.remove(rev)
2274 if not revs:
2274 if not revs:
2275 return -1
2275 return -1
2276
2276
2277 # analyze revs for earlier grafts
2277 # analyze revs for earlier grafts
2278 ids = {}
2278 ids = {}
2279 for ctx in repo.set("%ld", revs):
2279 for ctx in repo.set("%ld", revs):
2280 ids[ctx.hex()] = ctx.rev()
2280 ids[ctx.hex()] = ctx.rev()
2281 n = ctx.extra().get('source')
2281 n = ctx.extra().get('source')
2282 if n:
2282 if n:
2283 ids[n] = ctx.rev()
2283 ids[n] = ctx.rev()
2284
2284
2285 # check ancestors for earlier grafts
2285 # check ancestors for earlier grafts
2286 ui.debug('scanning for duplicate grafts\n')
2286 ui.debug('scanning for duplicate grafts\n')
2287
2287
2288 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2288 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2289 ctx = repo[rev]
2289 ctx = repo[rev]
2290 n = ctx.extra().get('source')
2290 n = ctx.extra().get('source')
2291 if n in ids:
2291 if n in ids:
2292 try:
2292 try:
2293 r = repo[n].rev()
2293 r = repo[n].rev()
2294 except error.RepoLookupError:
2294 except error.RepoLookupError:
2295 r = None
2295 r = None
2296 if r in revs:
2296 if r in revs:
2297 ui.warn(_('skipping revision %d:%s '
2297 ui.warn(_('skipping revision %d:%s '
2298 '(already grafted to %d:%s)\n')
2298 '(already grafted to %d:%s)\n')
2299 % (r, repo[r], rev, ctx))
2299 % (r, repo[r], rev, ctx))
2300 revs.remove(r)
2300 revs.remove(r)
2301 elif ids[n] in revs:
2301 elif ids[n] in revs:
2302 if r is None:
2302 if r is None:
2303 ui.warn(_('skipping already grafted revision %d:%s '
2303 ui.warn(_('skipping already grafted revision %d:%s '
2304 '(%d:%s also has unknown origin %s)\n')
2304 '(%d:%s also has unknown origin %s)\n')
2305 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2305 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2306 else:
2306 else:
2307 ui.warn(_('skipping already grafted revision %d:%s '
2307 ui.warn(_('skipping already grafted revision %d:%s '
2308 '(%d:%s also has origin %d:%s)\n')
2308 '(%d:%s also has origin %d:%s)\n')
2309 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2309 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2310 revs.remove(ids[n])
2310 revs.remove(ids[n])
2311 elif ctx.hex() in ids:
2311 elif ctx.hex() in ids:
2312 r = ids[ctx.hex()]
2312 r = ids[ctx.hex()]
2313 ui.warn(_('skipping already grafted revision %d:%s '
2313 ui.warn(_('skipping already grafted revision %d:%s '
2314 '(was grafted from %d:%s)\n') %
2314 '(was grafted from %d:%s)\n') %
2315 (r, repo[r], rev, ctx))
2315 (r, repo[r], rev, ctx))
2316 revs.remove(r)
2316 revs.remove(r)
2317 if not revs:
2317 if not revs:
2318 return -1
2318 return -1
2319
2319
2320 for pos, ctx in enumerate(repo.set("%ld", revs)):
2320 for pos, ctx in enumerate(repo.set("%ld", revs)):
2321 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2321 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2322 ctx.description().split('\n', 1)[0])
2322 ctx.description().split('\n', 1)[0])
2323 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2323 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2324 if names:
2324 if names:
2325 desc += ' (%s)' % ' '.join(names)
2325 desc += ' (%s)' % ' '.join(names)
2326 ui.status(_('grafting %s\n') % desc)
2326 ui.status(_('grafting %s\n') % desc)
2327 if opts.get('dry_run'):
2327 if opts.get('dry_run'):
2328 continue
2328 continue
2329
2329
2330 source = ctx.extra().get('source')
2330 source = ctx.extra().get('source')
2331 extra = {}
2331 extra = {}
2332 if source:
2332 if source:
2333 extra['source'] = source
2333 extra['source'] = source
2334 extra['intermediate-source'] = ctx.hex()
2334 extra['intermediate-source'] = ctx.hex()
2335 else:
2335 else:
2336 extra['source'] = ctx.hex()
2336 extra['source'] = ctx.hex()
2337 user = ctx.user()
2337 user = ctx.user()
2338 if opts.get('user'):
2338 if opts.get('user'):
2339 user = opts['user']
2339 user = opts['user']
2340 date = ctx.date()
2340 date = ctx.date()
2341 if opts.get('date'):
2341 if opts.get('date'):
2342 date = opts['date']
2342 date = opts['date']
2343 message = ctx.description()
2343 message = ctx.description()
2344 if opts.get('log'):
2344 if opts.get('log'):
2345 message += '\n(grafted from %s)' % ctx.hex()
2345 message += '\n(grafted from %s)' % ctx.hex()
2346
2346
2347 # we don't merge the first commit when continuing
2347 # we don't merge the first commit when continuing
2348 if not cont:
2348 if not cont:
2349 # perform the graft merge with p1(rev) as 'ancestor'
2349 # perform the graft merge with p1(rev) as 'ancestor'
2350 try:
2350 try:
2351 # ui.forcemerge is an internal variable, do not document
2351 # ui.forcemerge is an internal variable, do not document
2352 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2352 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2353 'graft')
2353 'graft')
2354 stats = mergemod.graft(repo, ctx, ctx.p1(),
2354 stats = mergemod.graft(repo, ctx, ctx.p1(),
2355 ['local', 'graft'])
2355 ['local', 'graft'])
2356 finally:
2356 finally:
2357 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2357 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2358 # report any conflicts
2358 # report any conflicts
2359 if stats and stats[3] > 0:
2359 if stats and stats[3] > 0:
2360 # write out state for --continue
2360 # write out state for --continue
2361 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2361 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2362 repo.vfs.write('graftstate', ''.join(nodelines))
2362 repo.vfs.write('graftstate', ''.join(nodelines))
2363 extra = ''
2363 extra = ''
2364 if opts.get('user'):
2364 if opts.get('user'):
2365 extra += ' --user %s' % util.shellquote(opts['user'])
2365 extra += ' --user %s' % util.shellquote(opts['user'])
2366 if opts.get('date'):
2366 if opts.get('date'):
2367 extra += ' --date %s' % util.shellquote(opts['date'])
2367 extra += ' --date %s' % util.shellquote(opts['date'])
2368 if opts.get('log'):
2368 if opts.get('log'):
2369 extra += ' --log'
2369 extra += ' --log'
2370 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2370 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2371 raise error.Abort(
2371 raise error.Abort(
2372 _("unresolved conflicts, can't continue"),
2372 _("unresolved conflicts, can't continue"),
2373 hint=hint)
2373 hint=hint)
2374 else:
2374 else:
2375 cont = False
2375 cont = False
2376
2376
2377 # commit
2377 # commit
2378 node = repo.commit(text=message, user=user,
2378 node = repo.commit(text=message, user=user,
2379 date=date, extra=extra, editor=editor)
2379 date=date, extra=extra, editor=editor)
2380 if node is None:
2380 if node is None:
2381 ui.warn(
2381 ui.warn(
2382 _('note: graft of %d:%s created no changes to commit\n') %
2382 _('note: graft of %d:%s created no changes to commit\n') %
2383 (ctx.rev(), ctx))
2383 (ctx.rev(), ctx))
2384
2384
2385 # remove state when we complete successfully
2385 # remove state when we complete successfully
2386 if not opts.get('dry_run'):
2386 if not opts.get('dry_run'):
2387 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2387 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2388
2388
2389 return 0
2389 return 0
2390
2390
2391 @command('grep',
2391 @command('grep',
2392 [('0', 'print0', None, _('end fields with NUL')),
2392 [('0', 'print0', None, _('end fields with NUL')),
2393 ('', 'all', None, _('print all revisions that match')),
2393 ('', 'all', None, _('print all revisions that match')),
2394 ('a', 'text', None, _('treat all files as text')),
2394 ('a', 'text', None, _('treat all files as text')),
2395 ('f', 'follow', None,
2395 ('f', 'follow', None,
2396 _('follow changeset history,'
2396 _('follow changeset history,'
2397 ' or file history across copies and renames')),
2397 ' or file history across copies and renames')),
2398 ('i', 'ignore-case', None, _('ignore case when matching')),
2398 ('i', 'ignore-case', None, _('ignore case when matching')),
2399 ('l', 'files-with-matches', None,
2399 ('l', 'files-with-matches', None,
2400 _('print only filenames and revisions that match')),
2400 _('print only filenames and revisions that match')),
2401 ('n', 'line-number', None, _('print matching line numbers')),
2401 ('n', 'line-number', None, _('print matching line numbers')),
2402 ('r', 'rev', [],
2402 ('r', 'rev', [],
2403 _('only search files changed within revision range'), _('REV')),
2403 _('only search files changed within revision range'), _('REV')),
2404 ('u', 'user', None, _('list the author (long with -v)')),
2404 ('u', 'user', None, _('list the author (long with -v)')),
2405 ('d', 'date', None, _('list the date (short with -q)')),
2405 ('d', 'date', None, _('list the date (short with -q)')),
2406 ] + formatteropts + walkopts,
2406 ] + formatteropts + walkopts,
2407 _('[OPTION]... PATTERN [FILE]...'),
2407 _('[OPTION]... PATTERN [FILE]...'),
2408 inferrepo=True)
2408 inferrepo=True)
2409 def grep(ui, repo, pattern, *pats, **opts):
2409 def grep(ui, repo, pattern, *pats, **opts):
2410 """search revision history for a pattern in specified files
2410 """search revision history for a pattern in specified files
2411
2411
2412 Search revision history for a regular expression in the specified
2412 Search revision history for a regular expression in the specified
2413 files or the entire project.
2413 files or the entire project.
2414
2414
2415 By default, grep prints the most recent revision number for each
2415 By default, grep prints the most recent revision number for each
2416 file in which it finds a match. To get it to print every revision
2416 file in which it finds a match. To get it to print every revision
2417 that contains a change in match status ("-" for a match that becomes
2417 that contains a change in match status ("-" for a match that becomes
2418 a non-match, or "+" for a non-match that becomes a match), use the
2418 a non-match, or "+" for a non-match that becomes a match), use the
2419 --all flag.
2419 --all flag.
2420
2420
2421 PATTERN can be any Python (roughly Perl-compatible) regular
2421 PATTERN can be any Python (roughly Perl-compatible) regular
2422 expression.
2422 expression.
2423
2423
2424 If no FILEs are specified (and -f/--follow isn't set), all files in
2424 If no FILEs are specified (and -f/--follow isn't set), all files in
2425 the repository are searched, including those that don't exist in the
2425 the repository are searched, including those that don't exist in the
2426 current branch or have been deleted in a prior changeset.
2426 current branch or have been deleted in a prior changeset.
2427
2427
2428 Returns 0 if a match is found, 1 otherwise.
2428 Returns 0 if a match is found, 1 otherwise.
2429 """
2429 """
2430 reflags = re.M
2430 reflags = re.M
2431 if opts.get('ignore_case'):
2431 if opts.get('ignore_case'):
2432 reflags |= re.I
2432 reflags |= re.I
2433 try:
2433 try:
2434 regexp = util.re.compile(pattern, reflags)
2434 regexp = util.re.compile(pattern, reflags)
2435 except re.error as inst:
2435 except re.error as inst:
2436 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2436 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2437 return 1
2437 return 1
2438 sep, eol = ':', '\n'
2438 sep, eol = ':', '\n'
2439 if opts.get('print0'):
2439 if opts.get('print0'):
2440 sep = eol = '\0'
2440 sep = eol = '\0'
2441
2441
2442 getfile = util.lrucachefunc(repo.file)
2442 getfile = util.lrucachefunc(repo.file)
2443
2443
2444 def matchlines(body):
2444 def matchlines(body):
2445 begin = 0
2445 begin = 0
2446 linenum = 0
2446 linenum = 0
2447 while begin < len(body):
2447 while begin < len(body):
2448 match = regexp.search(body, begin)
2448 match = regexp.search(body, begin)
2449 if not match:
2449 if not match:
2450 break
2450 break
2451 mstart, mend = match.span()
2451 mstart, mend = match.span()
2452 linenum += body.count('\n', begin, mstart) + 1
2452 linenum += body.count('\n', begin, mstart) + 1
2453 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2453 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2454 begin = body.find('\n', mend) + 1 or len(body) + 1
2454 begin = body.find('\n', mend) + 1 or len(body) + 1
2455 lend = begin - 1
2455 lend = begin - 1
2456 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2456 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2457
2457
2458 class linestate(object):
2458 class linestate(object):
2459 def __init__(self, line, linenum, colstart, colend):
2459 def __init__(self, line, linenum, colstart, colend):
2460 self.line = line
2460 self.line = line
2461 self.linenum = linenum
2461 self.linenum = linenum
2462 self.colstart = colstart
2462 self.colstart = colstart
2463 self.colend = colend
2463 self.colend = colend
2464
2464
2465 def __hash__(self):
2465 def __hash__(self):
2466 return hash((self.linenum, self.line))
2466 return hash((self.linenum, self.line))
2467
2467
2468 def __eq__(self, other):
2468 def __eq__(self, other):
2469 return self.line == other.line
2469 return self.line == other.line
2470
2470
2471 def findpos(self):
2471 def findpos(self):
2472 """Iterate all (start, end) indices of matches"""
2472 """Iterate all (start, end) indices of matches"""
2473 yield self.colstart, self.colend
2473 yield self.colstart, self.colend
2474 p = self.colend
2474 p = self.colend
2475 while p < len(self.line):
2475 while p < len(self.line):
2476 m = regexp.search(self.line, p)
2476 m = regexp.search(self.line, p)
2477 if not m:
2477 if not m:
2478 break
2478 break
2479 yield m.span()
2479 yield m.span()
2480 p = m.end()
2480 p = m.end()
2481
2481
2482 matches = {}
2482 matches = {}
2483 copies = {}
2483 copies = {}
2484 def grepbody(fn, rev, body):
2484 def grepbody(fn, rev, body):
2485 matches[rev].setdefault(fn, [])
2485 matches[rev].setdefault(fn, [])
2486 m = matches[rev][fn]
2486 m = matches[rev][fn]
2487 for lnum, cstart, cend, line in matchlines(body):
2487 for lnum, cstart, cend, line in matchlines(body):
2488 s = linestate(line, lnum, cstart, cend)
2488 s = linestate(line, lnum, cstart, cend)
2489 m.append(s)
2489 m.append(s)
2490
2490
2491 def difflinestates(a, b):
2491 def difflinestates(a, b):
2492 sm = difflib.SequenceMatcher(None, a, b)
2492 sm = difflib.SequenceMatcher(None, a, b)
2493 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2493 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2494 if tag == 'insert':
2494 if tag == 'insert':
2495 for i in xrange(blo, bhi):
2495 for i in xrange(blo, bhi):
2496 yield ('+', b[i])
2496 yield ('+', b[i])
2497 elif tag == 'delete':
2497 elif tag == 'delete':
2498 for i in xrange(alo, ahi):
2498 for i in xrange(alo, ahi):
2499 yield ('-', a[i])
2499 yield ('-', a[i])
2500 elif tag == 'replace':
2500 elif tag == 'replace':
2501 for i in xrange(alo, ahi):
2501 for i in xrange(alo, ahi):
2502 yield ('-', a[i])
2502 yield ('-', a[i])
2503 for i in xrange(blo, bhi):
2503 for i in xrange(blo, bhi):
2504 yield ('+', b[i])
2504 yield ('+', b[i])
2505
2505
2506 def display(fm, fn, ctx, pstates, states):
2506 def display(fm, fn, ctx, pstates, states):
2507 rev = ctx.rev()
2507 rev = ctx.rev()
2508 if fm.isplain():
2508 if fm.isplain():
2509 formatuser = ui.shortuser
2509 formatuser = ui.shortuser
2510 else:
2510 else:
2511 formatuser = str
2511 formatuser = str
2512 if ui.quiet:
2512 if ui.quiet:
2513 datefmt = '%Y-%m-%d'
2513 datefmt = '%Y-%m-%d'
2514 else:
2514 else:
2515 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2515 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2516 found = False
2516 found = False
2517 @util.cachefunc
2517 @util.cachefunc
2518 def binary():
2518 def binary():
2519 flog = getfile(fn)
2519 flog = getfile(fn)
2520 return util.binary(flog.read(ctx.filenode(fn)))
2520 return util.binary(flog.read(ctx.filenode(fn)))
2521
2521
2522 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2522 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2523 if opts.get('all'):
2523 if opts.get('all'):
2524 iter = difflinestates(pstates, states)
2524 iter = difflinestates(pstates, states)
2525 else:
2525 else:
2526 iter = [('', l) for l in states]
2526 iter = [('', l) for l in states]
2527 for change, l in iter:
2527 for change, l in iter:
2528 fm.startitem()
2528 fm.startitem()
2529 fm.data(node=fm.hexfunc(ctx.node()))
2529 fm.data(node=fm.hexfunc(ctx.node()))
2530 cols = [
2530 cols = [
2531 ('filename', fn, True),
2531 ('filename', fn, True),
2532 ('rev', rev, True),
2532 ('rev', rev, True),
2533 ('linenumber', l.linenum, opts.get('line_number')),
2533 ('linenumber', l.linenum, opts.get('line_number')),
2534 ]
2534 ]
2535 if opts.get('all'):
2535 if opts.get('all'):
2536 cols.append(('change', change, True))
2536 cols.append(('change', change, True))
2537 cols.extend([
2537 cols.extend([
2538 ('user', formatuser(ctx.user()), opts.get('user')),
2538 ('user', formatuser(ctx.user()), opts.get('user')),
2539 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2539 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2540 ])
2540 ])
2541 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2541 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2542 for name, data, cond in cols:
2542 for name, data, cond in cols:
2543 field = fieldnamemap.get(name, name)
2543 field = fieldnamemap.get(name, name)
2544 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2544 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2545 if cond and name != lastcol:
2545 if cond and name != lastcol:
2546 fm.plain(sep, label='grep.sep')
2546 fm.plain(sep, label='grep.sep')
2547 if not opts.get('files_with_matches'):
2547 if not opts.get('files_with_matches'):
2548 fm.plain(sep, label='grep.sep')
2548 fm.plain(sep, label='grep.sep')
2549 if not opts.get('text') and binary():
2549 if not opts.get('text') and binary():
2550 fm.plain(_(" Binary file matches"))
2550 fm.plain(_(" Binary file matches"))
2551 else:
2551 else:
2552 displaymatches(fm.nested('texts'), l)
2552 displaymatches(fm.nested('texts'), l)
2553 fm.plain(eol)
2553 fm.plain(eol)
2554 found = True
2554 found = True
2555 if opts.get('files_with_matches'):
2555 if opts.get('files_with_matches'):
2556 break
2556 break
2557 return found
2557 return found
2558
2558
2559 def displaymatches(fm, l):
2559 def displaymatches(fm, l):
2560 p = 0
2560 p = 0
2561 for s, e in l.findpos():
2561 for s, e in l.findpos():
2562 if p < s:
2562 if p < s:
2563 fm.startitem()
2563 fm.startitem()
2564 fm.write('text', '%s', l.line[p:s])
2564 fm.write('text', '%s', l.line[p:s])
2565 fm.data(matched=False)
2565 fm.data(matched=False)
2566 fm.startitem()
2566 fm.startitem()
2567 fm.write('text', '%s', l.line[s:e], label='grep.match')
2567 fm.write('text', '%s', l.line[s:e], label='grep.match')
2568 fm.data(matched=True)
2568 fm.data(matched=True)
2569 p = e
2569 p = e
2570 if p < len(l.line):
2570 if p < len(l.line):
2571 fm.startitem()
2571 fm.startitem()
2572 fm.write('text', '%s', l.line[p:])
2572 fm.write('text', '%s', l.line[p:])
2573 fm.data(matched=False)
2573 fm.data(matched=False)
2574 fm.end()
2574 fm.end()
2575
2575
2576 skip = {}
2576 skip = {}
2577 revfiles = {}
2577 revfiles = {}
2578 matchfn = scmutil.match(repo[None], pats, opts)
2578 matchfn = scmutil.match(repo[None], pats, opts)
2579 found = False
2579 found = False
2580 follow = opts.get('follow')
2580 follow = opts.get('follow')
2581
2581
2582 def prep(ctx, fns):
2582 def prep(ctx, fns):
2583 rev = ctx.rev()
2583 rev = ctx.rev()
2584 pctx = ctx.p1()
2584 pctx = ctx.p1()
2585 parent = pctx.rev()
2585 parent = pctx.rev()
2586 matches.setdefault(rev, {})
2586 matches.setdefault(rev, {})
2587 matches.setdefault(parent, {})
2587 matches.setdefault(parent, {})
2588 files = revfiles.setdefault(rev, [])
2588 files = revfiles.setdefault(rev, [])
2589 for fn in fns:
2589 for fn in fns:
2590 flog = getfile(fn)
2590 flog = getfile(fn)
2591 try:
2591 try:
2592 fnode = ctx.filenode(fn)
2592 fnode = ctx.filenode(fn)
2593 except error.LookupError:
2593 except error.LookupError:
2594 continue
2594 continue
2595
2595
2596 copied = flog.renamed(fnode)
2596 copied = flog.renamed(fnode)
2597 copy = follow and copied and copied[0]
2597 copy = follow and copied and copied[0]
2598 if copy:
2598 if copy:
2599 copies.setdefault(rev, {})[fn] = copy
2599 copies.setdefault(rev, {})[fn] = copy
2600 if fn in skip:
2600 if fn in skip:
2601 if copy:
2601 if copy:
2602 skip[copy] = True
2602 skip[copy] = True
2603 continue
2603 continue
2604 files.append(fn)
2604 files.append(fn)
2605
2605
2606 if fn not in matches[rev]:
2606 if fn not in matches[rev]:
2607 grepbody(fn, rev, flog.read(fnode))
2607 grepbody(fn, rev, flog.read(fnode))
2608
2608
2609 pfn = copy or fn
2609 pfn = copy or fn
2610 if pfn not in matches[parent]:
2610 if pfn not in matches[parent]:
2611 try:
2611 try:
2612 fnode = pctx.filenode(pfn)
2612 fnode = pctx.filenode(pfn)
2613 grepbody(pfn, parent, flog.read(fnode))
2613 grepbody(pfn, parent, flog.read(fnode))
2614 except error.LookupError:
2614 except error.LookupError:
2615 pass
2615 pass
2616
2616
2617 ui.pager('grep')
2617 ui.pager('grep')
2618 fm = ui.formatter('grep', opts)
2618 fm = ui.formatter('grep', opts)
2619 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2619 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2620 rev = ctx.rev()
2620 rev = ctx.rev()
2621 parent = ctx.p1().rev()
2621 parent = ctx.p1().rev()
2622 for fn in sorted(revfiles.get(rev, [])):
2622 for fn in sorted(revfiles.get(rev, [])):
2623 states = matches[rev][fn]
2623 states = matches[rev][fn]
2624 copy = copies.get(rev, {}).get(fn)
2624 copy = copies.get(rev, {}).get(fn)
2625 if fn in skip:
2625 if fn in skip:
2626 if copy:
2626 if copy:
2627 skip[copy] = True
2627 skip[copy] = True
2628 continue
2628 continue
2629 pstates = matches.get(parent, {}).get(copy or fn, [])
2629 pstates = matches.get(parent, {}).get(copy or fn, [])
2630 if pstates or states:
2630 if pstates or states:
2631 r = display(fm, fn, ctx, pstates, states)
2631 r = display(fm, fn, ctx, pstates, states)
2632 found = found or r
2632 found = found or r
2633 if r and not opts.get('all'):
2633 if r and not opts.get('all'):
2634 skip[fn] = True
2634 skip[fn] = True
2635 if copy:
2635 if copy:
2636 skip[copy] = True
2636 skip[copy] = True
2637 del matches[rev]
2637 del matches[rev]
2638 del revfiles[rev]
2638 del revfiles[rev]
2639 fm.end()
2639 fm.end()
2640
2640
2641 return not found
2641 return not found
2642
2642
2643 @command('heads',
2643 @command('heads',
2644 [('r', 'rev', '',
2644 [('r', 'rev', '',
2645 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2645 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2646 ('t', 'topo', False, _('show topological heads only')),
2646 ('t', 'topo', False, _('show topological heads only')),
2647 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2647 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2648 ('c', 'closed', False, _('show normal and closed branch heads')),
2648 ('c', 'closed', False, _('show normal and closed branch heads')),
2649 ] + templateopts,
2649 ] + templateopts,
2650 _('[-ct] [-r STARTREV] [REV]...'))
2650 _('[-ct] [-r STARTREV] [REV]...'))
2651 def heads(ui, repo, *branchrevs, **opts):
2651 def heads(ui, repo, *branchrevs, **opts):
2652 """show branch heads
2652 """show branch heads
2653
2653
2654 With no arguments, show all open branch heads in the repository.
2654 With no arguments, show all open branch heads in the repository.
2655 Branch heads are changesets that have no descendants on the
2655 Branch heads are changesets that have no descendants on the
2656 same branch. They are where development generally takes place and
2656 same branch. They are where development generally takes place and
2657 are the usual targets for update and merge operations.
2657 are the usual targets for update and merge operations.
2658
2658
2659 If one or more REVs are given, only open branch heads on the
2659 If one or more REVs are given, only open branch heads on the
2660 branches associated with the specified changesets are shown. This
2660 branches associated with the specified changesets are shown. This
2661 means that you can use :hg:`heads .` to see the heads on the
2661 means that you can use :hg:`heads .` to see the heads on the
2662 currently checked-out branch.
2662 currently checked-out branch.
2663
2663
2664 If -c/--closed is specified, also show branch heads marked closed
2664 If -c/--closed is specified, also show branch heads marked closed
2665 (see :hg:`commit --close-branch`).
2665 (see :hg:`commit --close-branch`).
2666
2666
2667 If STARTREV is specified, only those heads that are descendants of
2667 If STARTREV is specified, only those heads that are descendants of
2668 STARTREV will be displayed.
2668 STARTREV will be displayed.
2669
2669
2670 If -t/--topo is specified, named branch mechanics will be ignored and only
2670 If -t/--topo is specified, named branch mechanics will be ignored and only
2671 topological heads (changesets with no children) will be shown.
2671 topological heads (changesets with no children) will be shown.
2672
2672
2673 Returns 0 if matching heads are found, 1 if not.
2673 Returns 0 if matching heads are found, 1 if not.
2674 """
2674 """
2675
2675
2676 start = None
2676 start = None
2677 if 'rev' in opts:
2677 if 'rev' in opts:
2678 start = scmutil.revsingle(repo, opts['rev'], None).node()
2678 start = scmutil.revsingle(repo, opts['rev'], None).node()
2679
2679
2680 if opts.get('topo'):
2680 if opts.get('topo'):
2681 heads = [repo[h] for h in repo.heads(start)]
2681 heads = [repo[h] for h in repo.heads(start)]
2682 else:
2682 else:
2683 heads = []
2683 heads = []
2684 for branch in repo.branchmap():
2684 for branch in repo.branchmap():
2685 heads += repo.branchheads(branch, start, opts.get('closed'))
2685 heads += repo.branchheads(branch, start, opts.get('closed'))
2686 heads = [repo[h] for h in heads]
2686 heads = [repo[h] for h in heads]
2687
2687
2688 if branchrevs:
2688 if branchrevs:
2689 branches = set(repo[br].branch() for br in branchrevs)
2689 branches = set(repo[br].branch() for br in branchrevs)
2690 heads = [h for h in heads if h.branch() in branches]
2690 heads = [h for h in heads if h.branch() in branches]
2691
2691
2692 if opts.get('active') and branchrevs:
2692 if opts.get('active') and branchrevs:
2693 dagheads = repo.heads(start)
2693 dagheads = repo.heads(start)
2694 heads = [h for h in heads if h.node() in dagheads]
2694 heads = [h for h in heads if h.node() in dagheads]
2695
2695
2696 if branchrevs:
2696 if branchrevs:
2697 haveheads = set(h.branch() for h in heads)
2697 haveheads = set(h.branch() for h in heads)
2698 if branches - haveheads:
2698 if branches - haveheads:
2699 headless = ', '.join(b for b in branches - haveheads)
2699 headless = ', '.join(b for b in branches - haveheads)
2700 msg = _('no open branch heads found on branches %s')
2700 msg = _('no open branch heads found on branches %s')
2701 if opts.get('rev'):
2701 if opts.get('rev'):
2702 msg += _(' (started at %s)') % opts['rev']
2702 msg += _(' (started at %s)') % opts['rev']
2703 ui.warn((msg + '\n') % headless)
2703 ui.warn((msg + '\n') % headless)
2704
2704
2705 if not heads:
2705 if not heads:
2706 return 1
2706 return 1
2707
2707
2708 ui.pager('heads')
2708 ui.pager('heads')
2709 heads = sorted(heads, key=lambda x: -x.rev())
2709 heads = sorted(heads, key=lambda x: -x.rev())
2710 displayer = cmdutil.show_changeset(ui, repo, opts)
2710 displayer = cmdutil.show_changeset(ui, repo, opts)
2711 for ctx in heads:
2711 for ctx in heads:
2712 displayer.show(ctx)
2712 displayer.show(ctx)
2713 displayer.close()
2713 displayer.close()
2714
2714
2715 @command('help',
2715 @command('help',
2716 [('e', 'extension', None, _('show only help for extensions')),
2716 [('e', 'extension', None, _('show only help for extensions')),
2717 ('c', 'command', None, _('show only help for commands')),
2717 ('c', 'command', None, _('show only help for commands')),
2718 ('k', 'keyword', None, _('show topics matching keyword')),
2718 ('k', 'keyword', None, _('show topics matching keyword')),
2719 ('s', 'system', [], _('show help for specific platform(s)')),
2719 ('s', 'system', [], _('show help for specific platform(s)')),
2720 ],
2720 ],
2721 _('[-ecks] [TOPIC]'),
2721 _('[-ecks] [TOPIC]'),
2722 norepo=True)
2722 norepo=True)
2723 def help_(ui, name=None, **opts):
2723 def help_(ui, name=None, **opts):
2724 """show help for a given topic or a help overview
2724 """show help for a given topic or a help overview
2725
2725
2726 With no arguments, print a list of commands with short help messages.
2726 With no arguments, print a list of commands with short help messages.
2727
2727
2728 Given a topic, extension, or command name, print help for that
2728 Given a topic, extension, or command name, print help for that
2729 topic.
2729 topic.
2730
2730
2731 Returns 0 if successful.
2731 Returns 0 if successful.
2732 """
2732 """
2733
2733
2734 keep = opts.get('system') or []
2734 keep = opts.get('system') or []
2735 if len(keep) == 0:
2735 if len(keep) == 0:
2736 if pycompat.sysplatform.startswith('win'):
2736 if pycompat.sysplatform.startswith('win'):
2737 keep.append('windows')
2737 keep.append('windows')
2738 elif pycompat.sysplatform == 'OpenVMS':
2738 elif pycompat.sysplatform == 'OpenVMS':
2739 keep.append('vms')
2739 keep.append('vms')
2740 elif pycompat.sysplatform == 'plan9':
2740 elif pycompat.sysplatform == 'plan9':
2741 keep.append('plan9')
2741 keep.append('plan9')
2742 else:
2742 else:
2743 keep.append('unix')
2743 keep.append('unix')
2744 keep.append(pycompat.sysplatform.lower())
2744 keep.append(pycompat.sysplatform.lower())
2745 if ui.verbose:
2745 if ui.verbose:
2746 keep.append('verbose')
2746 keep.append('verbose')
2747
2747
2748 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2748 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2749 ui.pager('help')
2749 ui.pager('help')
2750 ui.write(formatted)
2750 ui.write(formatted)
2751
2751
2752
2752
2753 @command('identify|id',
2753 @command('identify|id',
2754 [('r', 'rev', '',
2754 [('r', 'rev', '',
2755 _('identify the specified revision'), _('REV')),
2755 _('identify the specified revision'), _('REV')),
2756 ('n', 'num', None, _('show local revision number')),
2756 ('n', 'num', None, _('show local revision number')),
2757 ('i', 'id', None, _('show global revision id')),
2757 ('i', 'id', None, _('show global revision id')),
2758 ('b', 'branch', None, _('show branch')),
2758 ('b', 'branch', None, _('show branch')),
2759 ('t', 'tags', None, _('show tags')),
2759 ('t', 'tags', None, _('show tags')),
2760 ('B', 'bookmarks', None, _('show bookmarks')),
2760 ('B', 'bookmarks', None, _('show bookmarks')),
2761 ] + remoteopts,
2761 ] + remoteopts,
2762 _('[-nibtB] [-r REV] [SOURCE]'),
2762 _('[-nibtB] [-r REV] [SOURCE]'),
2763 optionalrepo=True)
2763 optionalrepo=True)
2764 def identify(ui, repo, source=None, rev=None,
2764 def identify(ui, repo, source=None, rev=None,
2765 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2765 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2766 """identify the working directory or specified revision
2766 """identify the working directory or specified revision
2767
2767
2768 Print a summary identifying the repository state at REV using one or
2768 Print a summary identifying the repository state at REV using one or
2769 two parent hash identifiers, followed by a "+" if the working
2769 two parent hash identifiers, followed by a "+" if the working
2770 directory has uncommitted changes, the branch name (if not default),
2770 directory has uncommitted changes, the branch name (if not default),
2771 a list of tags, and a list of bookmarks.
2771 a list of tags, and a list of bookmarks.
2772
2772
2773 When REV is not given, print a summary of the current state of the
2773 When REV is not given, print a summary of the current state of the
2774 repository.
2774 repository.
2775
2775
2776 Specifying a path to a repository root or Mercurial bundle will
2776 Specifying a path to a repository root or Mercurial bundle will
2777 cause lookup to operate on that repository/bundle.
2777 cause lookup to operate on that repository/bundle.
2778
2778
2779 .. container:: verbose
2779 .. container:: verbose
2780
2780
2781 Examples:
2781 Examples:
2782
2782
2783 - generate a build identifier for the working directory::
2783 - generate a build identifier for the working directory::
2784
2784
2785 hg id --id > build-id.dat
2785 hg id --id > build-id.dat
2786
2786
2787 - find the revision corresponding to a tag::
2787 - find the revision corresponding to a tag::
2788
2788
2789 hg id -n -r 1.3
2789 hg id -n -r 1.3
2790
2790
2791 - check the most recent revision of a remote repository::
2791 - check the most recent revision of a remote repository::
2792
2792
2793 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2793 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2794
2794
2795 See :hg:`log` for generating more information about specific revisions,
2795 See :hg:`log` for generating more information about specific revisions,
2796 including full hash identifiers.
2796 including full hash identifiers.
2797
2797
2798 Returns 0 if successful.
2798 Returns 0 if successful.
2799 """
2799 """
2800
2800
2801 if not repo and not source:
2801 if not repo and not source:
2802 raise error.Abort(_("there is no Mercurial repository here "
2802 raise error.Abort(_("there is no Mercurial repository here "
2803 "(.hg not found)"))
2803 "(.hg not found)"))
2804
2804
2805 if ui.debugflag:
2805 if ui.debugflag:
2806 hexfunc = hex
2806 hexfunc = hex
2807 else:
2807 else:
2808 hexfunc = short
2808 hexfunc = short
2809 default = not (num or id or branch or tags or bookmarks)
2809 default = not (num or id or branch or tags or bookmarks)
2810 output = []
2810 output = []
2811 revs = []
2811 revs = []
2812
2812
2813 if source:
2813 if source:
2814 source, branches = hg.parseurl(ui.expandpath(source))
2814 source, branches = hg.parseurl(ui.expandpath(source))
2815 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2815 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2816 repo = peer.local()
2816 repo = peer.local()
2817 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2817 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2818
2818
2819 if not repo:
2819 if not repo:
2820 if num or branch or tags:
2820 if num or branch or tags:
2821 raise error.Abort(
2821 raise error.Abort(
2822 _("can't query remote revision number, branch, or tags"))
2822 _("can't query remote revision number, branch, or tags"))
2823 if not rev and revs:
2823 if not rev and revs:
2824 rev = revs[0]
2824 rev = revs[0]
2825 if not rev:
2825 if not rev:
2826 rev = "tip"
2826 rev = "tip"
2827
2827
2828 remoterev = peer.lookup(rev)
2828 remoterev = peer.lookup(rev)
2829 if default or id:
2829 if default or id:
2830 output = [hexfunc(remoterev)]
2830 output = [hexfunc(remoterev)]
2831
2831
2832 def getbms():
2832 def getbms():
2833 bms = []
2833 bms = []
2834
2834
2835 if 'bookmarks' in peer.listkeys('namespaces'):
2835 if 'bookmarks' in peer.listkeys('namespaces'):
2836 hexremoterev = hex(remoterev)
2836 hexremoterev = hex(remoterev)
2837 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2837 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2838 if bmr == hexremoterev]
2838 if bmr == hexremoterev]
2839
2839
2840 return sorted(bms)
2840 return sorted(bms)
2841
2841
2842 if bookmarks:
2842 if bookmarks:
2843 output.extend(getbms())
2843 output.extend(getbms())
2844 elif default and not ui.quiet:
2844 elif default and not ui.quiet:
2845 # multiple bookmarks for a single parent separated by '/'
2845 # multiple bookmarks for a single parent separated by '/'
2846 bm = '/'.join(getbms())
2846 bm = '/'.join(getbms())
2847 if bm:
2847 if bm:
2848 output.append(bm)
2848 output.append(bm)
2849 else:
2849 else:
2850 ctx = scmutil.revsingle(repo, rev, None)
2850 ctx = scmutil.revsingle(repo, rev, None)
2851
2851
2852 if ctx.rev() is None:
2852 if ctx.rev() is None:
2853 ctx = repo[None]
2853 ctx = repo[None]
2854 parents = ctx.parents()
2854 parents = ctx.parents()
2855 taglist = []
2855 taglist = []
2856 for p in parents:
2856 for p in parents:
2857 taglist.extend(p.tags())
2857 taglist.extend(p.tags())
2858
2858
2859 changed = ""
2859 changed = ""
2860 if default or id or num:
2860 if default or id or num:
2861 if (any(repo.status())
2861 if (any(repo.status())
2862 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2862 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2863 changed = '+'
2863 changed = '+'
2864 if default or id:
2864 if default or id:
2865 output = ["%s%s" %
2865 output = ["%s%s" %
2866 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2866 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2867 if num:
2867 if num:
2868 output.append("%s%s" %
2868 output.append("%s%s" %
2869 ('+'.join([str(p.rev()) for p in parents]), changed))
2869 ('+'.join([str(p.rev()) for p in parents]), changed))
2870 else:
2870 else:
2871 if default or id:
2871 if default or id:
2872 output = [hexfunc(ctx.node())]
2872 output = [hexfunc(ctx.node())]
2873 if num:
2873 if num:
2874 output.append(str(ctx.rev()))
2874 output.append(str(ctx.rev()))
2875 taglist = ctx.tags()
2875 taglist = ctx.tags()
2876
2876
2877 if default and not ui.quiet:
2877 if default and not ui.quiet:
2878 b = ctx.branch()
2878 b = ctx.branch()
2879 if b != 'default':
2879 if b != 'default':
2880 output.append("(%s)" % b)
2880 output.append("(%s)" % b)
2881
2881
2882 # multiple tags for a single parent separated by '/'
2882 # multiple tags for a single parent separated by '/'
2883 t = '/'.join(taglist)
2883 t = '/'.join(taglist)
2884 if t:
2884 if t:
2885 output.append(t)
2885 output.append(t)
2886
2886
2887 # multiple bookmarks for a single parent separated by '/'
2887 # multiple bookmarks for a single parent separated by '/'
2888 bm = '/'.join(ctx.bookmarks())
2888 bm = '/'.join(ctx.bookmarks())
2889 if bm:
2889 if bm:
2890 output.append(bm)
2890 output.append(bm)
2891 else:
2891 else:
2892 if branch:
2892 if branch:
2893 output.append(ctx.branch())
2893 output.append(ctx.branch())
2894
2894
2895 if tags:
2895 if tags:
2896 output.extend(taglist)
2896 output.extend(taglist)
2897
2897
2898 if bookmarks:
2898 if bookmarks:
2899 output.extend(ctx.bookmarks())
2899 output.extend(ctx.bookmarks())
2900
2900
2901 ui.write("%s\n" % ' '.join(output))
2901 ui.write("%s\n" % ' '.join(output))
2902
2902
2903 @command('import|patch',
2903 @command('import|patch',
2904 [('p', 'strip', 1,
2904 [('p', 'strip', 1,
2905 _('directory strip option for patch. This has the same '
2905 _('directory strip option for patch. This has the same '
2906 'meaning as the corresponding patch option'), _('NUM')),
2906 'meaning as the corresponding patch option'), _('NUM')),
2907 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2907 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2908 ('e', 'edit', False, _('invoke editor on commit messages')),
2908 ('e', 'edit', False, _('invoke editor on commit messages')),
2909 ('f', 'force', None,
2909 ('f', 'force', None,
2910 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2910 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2911 ('', 'no-commit', None,
2911 ('', 'no-commit', None,
2912 _("don't commit, just update the working directory")),
2912 _("don't commit, just update the working directory")),
2913 ('', 'bypass', None,
2913 ('', 'bypass', None,
2914 _("apply patch without touching the working directory")),
2914 _("apply patch without touching the working directory")),
2915 ('', 'partial', None,
2915 ('', 'partial', None,
2916 _('commit even if some hunks fail')),
2916 _('commit even if some hunks fail')),
2917 ('', 'exact', None,
2917 ('', 'exact', None,
2918 _('abort if patch would apply lossily')),
2918 _('abort if patch would apply lossily')),
2919 ('', 'prefix', '',
2919 ('', 'prefix', '',
2920 _('apply patch to subdirectory'), _('DIR')),
2920 _('apply patch to subdirectory'), _('DIR')),
2921 ('', 'import-branch', None,
2921 ('', 'import-branch', None,
2922 _('use any branch information in patch (implied by --exact)'))] +
2922 _('use any branch information in patch (implied by --exact)'))] +
2923 commitopts + commitopts2 + similarityopts,
2923 commitopts + commitopts2 + similarityopts,
2924 _('[OPTION]... PATCH...'))
2924 _('[OPTION]... PATCH...'))
2925 def import_(ui, repo, patch1=None, *patches, **opts):
2925 def import_(ui, repo, patch1=None, *patches, **opts):
2926 """import an ordered set of patches
2926 """import an ordered set of patches
2927
2927
2928 Import a list of patches and commit them individually (unless
2928 Import a list of patches and commit them individually (unless
2929 --no-commit is specified).
2929 --no-commit is specified).
2930
2930
2931 To read a patch from standard input (stdin), use "-" as the patch
2931 To read a patch from standard input (stdin), use "-" as the patch
2932 name. If a URL is specified, the patch will be downloaded from
2932 name. If a URL is specified, the patch will be downloaded from
2933 there.
2933 there.
2934
2934
2935 Import first applies changes to the working directory (unless
2935 Import first applies changes to the working directory (unless
2936 --bypass is specified), import will abort if there are outstanding
2936 --bypass is specified), import will abort if there are outstanding
2937 changes.
2937 changes.
2938
2938
2939 Use --bypass to apply and commit patches directly to the
2939 Use --bypass to apply and commit patches directly to the
2940 repository, without affecting the working directory. Without
2940 repository, without affecting the working directory. Without
2941 --exact, patches will be applied on top of the working directory
2941 --exact, patches will be applied on top of the working directory
2942 parent revision.
2942 parent revision.
2943
2943
2944 You can import a patch straight from a mail message. Even patches
2944 You can import a patch straight from a mail message. Even patches
2945 as attachments work (to use the body part, it must have type
2945 as attachments work (to use the body part, it must have type
2946 text/plain or text/x-patch). From and Subject headers of email
2946 text/plain or text/x-patch). From and Subject headers of email
2947 message are used as default committer and commit message. All
2947 message are used as default committer and commit message. All
2948 text/plain body parts before first diff are added to the commit
2948 text/plain body parts before first diff are added to the commit
2949 message.
2949 message.
2950
2950
2951 If the imported patch was generated by :hg:`export`, user and
2951 If the imported patch was generated by :hg:`export`, user and
2952 description from patch override values from message headers and
2952 description from patch override values from message headers and
2953 body. Values given on command line with -m/--message and -u/--user
2953 body. Values given on command line with -m/--message and -u/--user
2954 override these.
2954 override these.
2955
2955
2956 If --exact is specified, import will set the working directory to
2956 If --exact is specified, import will set the working directory to
2957 the parent of each patch before applying it, and will abort if the
2957 the parent of each patch before applying it, and will abort if the
2958 resulting changeset has a different ID than the one recorded in
2958 resulting changeset has a different ID than the one recorded in
2959 the patch. This will guard against various ways that portable
2959 the patch. This will guard against various ways that portable
2960 patch formats and mail systems might fail to transfer Mercurial
2960 patch formats and mail systems might fail to transfer Mercurial
2961 data or metadata. See :hg:`bundle` for lossless transmission.
2961 data or metadata. See :hg:`bundle` for lossless transmission.
2962
2962
2963 Use --partial to ensure a changeset will be created from the patch
2963 Use --partial to ensure a changeset will be created from the patch
2964 even if some hunks fail to apply. Hunks that fail to apply will be
2964 even if some hunks fail to apply. Hunks that fail to apply will be
2965 written to a <target-file>.rej file. Conflicts can then be resolved
2965 written to a <target-file>.rej file. Conflicts can then be resolved
2966 by hand before :hg:`commit --amend` is run to update the created
2966 by hand before :hg:`commit --amend` is run to update the created
2967 changeset. This flag exists to let people import patches that
2967 changeset. This flag exists to let people import patches that
2968 partially apply without losing the associated metadata (author,
2968 partially apply without losing the associated metadata (author,
2969 date, description, ...).
2969 date, description, ...).
2970
2970
2971 .. note::
2971 .. note::
2972
2972
2973 When no hunks apply cleanly, :hg:`import --partial` will create
2973 When no hunks apply cleanly, :hg:`import --partial` will create
2974 an empty changeset, importing only the patch metadata.
2974 an empty changeset, importing only the patch metadata.
2975
2975
2976 With -s/--similarity, hg will attempt to discover renames and
2976 With -s/--similarity, hg will attempt to discover renames and
2977 copies in the patch in the same way as :hg:`addremove`.
2977 copies in the patch in the same way as :hg:`addremove`.
2978
2978
2979 It is possible to use external patch programs to perform the patch
2979 It is possible to use external patch programs to perform the patch
2980 by setting the ``ui.patch`` configuration option. For the default
2980 by setting the ``ui.patch`` configuration option. For the default
2981 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2981 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2982 See :hg:`help config` for more information about configuration
2982 See :hg:`help config` for more information about configuration
2983 files and how to use these options.
2983 files and how to use these options.
2984
2984
2985 See :hg:`help dates` for a list of formats valid for -d/--date.
2985 See :hg:`help dates` for a list of formats valid for -d/--date.
2986
2986
2987 .. container:: verbose
2987 .. container:: verbose
2988
2988
2989 Examples:
2989 Examples:
2990
2990
2991 - import a traditional patch from a website and detect renames::
2991 - import a traditional patch from a website and detect renames::
2992
2992
2993 hg import -s 80 http://example.com/bugfix.patch
2993 hg import -s 80 http://example.com/bugfix.patch
2994
2994
2995 - import a changeset from an hgweb server::
2995 - import a changeset from an hgweb server::
2996
2996
2997 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2997 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2998
2998
2999 - import all the patches in an Unix-style mbox::
2999 - import all the patches in an Unix-style mbox::
3000
3000
3001 hg import incoming-patches.mbox
3001 hg import incoming-patches.mbox
3002
3002
3003 - import patches from stdin::
3003 - import patches from stdin::
3004
3004
3005 hg import -
3005 hg import -
3006
3006
3007 - attempt to exactly restore an exported changeset (not always
3007 - attempt to exactly restore an exported changeset (not always
3008 possible)::
3008 possible)::
3009
3009
3010 hg import --exact proposed-fix.patch
3010 hg import --exact proposed-fix.patch
3011
3011
3012 - use an external tool to apply a patch which is too fuzzy for
3012 - use an external tool to apply a patch which is too fuzzy for
3013 the default internal tool.
3013 the default internal tool.
3014
3014
3015 hg import --config ui.patch="patch --merge" fuzzy.patch
3015 hg import --config ui.patch="patch --merge" fuzzy.patch
3016
3016
3017 - change the default fuzzing from 2 to a less strict 7
3017 - change the default fuzzing from 2 to a less strict 7
3018
3018
3019 hg import --config ui.fuzz=7 fuzz.patch
3019 hg import --config ui.fuzz=7 fuzz.patch
3020
3020
3021 Returns 0 on success, 1 on partial success (see --partial).
3021 Returns 0 on success, 1 on partial success (see --partial).
3022 """
3022 """
3023
3023
3024 if not patch1:
3024 if not patch1:
3025 raise error.Abort(_('need at least one patch to import'))
3025 raise error.Abort(_('need at least one patch to import'))
3026
3026
3027 patches = (patch1,) + patches
3027 patches = (patch1,) + patches
3028
3028
3029 date = opts.get('date')
3029 date = opts.get('date')
3030 if date:
3030 if date:
3031 opts['date'] = util.parsedate(date)
3031 opts['date'] = util.parsedate(date)
3032
3032
3033 exact = opts.get('exact')
3033 exact = opts.get('exact')
3034 update = not opts.get('bypass')
3034 update = not opts.get('bypass')
3035 if not update and opts.get('no_commit'):
3035 if not update and opts.get('no_commit'):
3036 raise error.Abort(_('cannot use --no-commit with --bypass'))
3036 raise error.Abort(_('cannot use --no-commit with --bypass'))
3037 try:
3037 try:
3038 sim = float(opts.get('similarity') or 0)
3038 sim = float(opts.get('similarity') or 0)
3039 except ValueError:
3039 except ValueError:
3040 raise error.Abort(_('similarity must be a number'))
3040 raise error.Abort(_('similarity must be a number'))
3041 if sim < 0 or sim > 100:
3041 if sim < 0 or sim > 100:
3042 raise error.Abort(_('similarity must be between 0 and 100'))
3042 raise error.Abort(_('similarity must be between 0 and 100'))
3043 if sim and not update:
3043 if sim and not update:
3044 raise error.Abort(_('cannot use --similarity with --bypass'))
3044 raise error.Abort(_('cannot use --similarity with --bypass'))
3045 if exact:
3045 if exact:
3046 if opts.get('edit'):
3046 if opts.get('edit'):
3047 raise error.Abort(_('cannot use --exact with --edit'))
3047 raise error.Abort(_('cannot use --exact with --edit'))
3048 if opts.get('prefix'):
3048 if opts.get('prefix'):
3049 raise error.Abort(_('cannot use --exact with --prefix'))
3049 raise error.Abort(_('cannot use --exact with --prefix'))
3050
3050
3051 base = opts["base"]
3051 base = opts["base"]
3052 wlock = dsguard = lock = tr = None
3052 wlock = dsguard = lock = tr = None
3053 msgs = []
3053 msgs = []
3054 ret = 0
3054 ret = 0
3055
3055
3056
3056
3057 try:
3057 try:
3058 wlock = repo.wlock()
3058 wlock = repo.wlock()
3059
3059
3060 if update:
3060 if update:
3061 cmdutil.checkunfinished(repo)
3061 cmdutil.checkunfinished(repo)
3062 if (exact or not opts.get('force')):
3062 if (exact or not opts.get('force')):
3063 cmdutil.bailifchanged(repo)
3063 cmdutil.bailifchanged(repo)
3064
3064
3065 if not opts.get('no_commit'):
3065 if not opts.get('no_commit'):
3066 lock = repo.lock()
3066 lock = repo.lock()
3067 tr = repo.transaction('import')
3067 tr = repo.transaction('import')
3068 else:
3068 else:
3069 dsguard = dirstateguard.dirstateguard(repo, 'import')
3069 dsguard = dirstateguard.dirstateguard(repo, 'import')
3070 parents = repo[None].parents()
3070 parents = repo[None].parents()
3071 for patchurl in patches:
3071 for patchurl in patches:
3072 if patchurl == '-':
3072 if patchurl == '-':
3073 ui.status(_('applying patch from stdin\n'))
3073 ui.status(_('applying patch from stdin\n'))
3074 patchfile = ui.fin
3074 patchfile = ui.fin
3075 patchurl = 'stdin' # for error message
3075 patchurl = 'stdin' # for error message
3076 else:
3076 else:
3077 patchurl = os.path.join(base, patchurl)
3077 patchurl = os.path.join(base, patchurl)
3078 ui.status(_('applying %s\n') % patchurl)
3078 ui.status(_('applying %s\n') % patchurl)
3079 patchfile = hg.openpath(ui, patchurl)
3079 patchfile = hg.openpath(ui, patchurl)
3080
3080
3081 haspatch = False
3081 haspatch = False
3082 for hunk in patch.split(patchfile):
3082 for hunk in patch.split(patchfile):
3083 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3083 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3084 parents, opts,
3084 parents, opts,
3085 msgs, hg.clean)
3085 msgs, hg.clean)
3086 if msg:
3086 if msg:
3087 haspatch = True
3087 haspatch = True
3088 ui.note(msg + '\n')
3088 ui.note(msg + '\n')
3089 if update or exact:
3089 if update or exact:
3090 parents = repo[None].parents()
3090 parents = repo[None].parents()
3091 else:
3091 else:
3092 parents = [repo[node]]
3092 parents = [repo[node]]
3093 if rej:
3093 if rej:
3094 ui.write_err(_("patch applied partially\n"))
3094 ui.write_err(_("patch applied partially\n"))
3095 ui.write_err(_("(fix the .rej files and run "
3095 ui.write_err(_("(fix the .rej files and run "
3096 "`hg commit --amend`)\n"))
3096 "`hg commit --amend`)\n"))
3097 ret = 1
3097 ret = 1
3098 break
3098 break
3099
3099
3100 if not haspatch:
3100 if not haspatch:
3101 raise error.Abort(_('%s: no diffs found') % patchurl)
3101 raise error.Abort(_('%s: no diffs found') % patchurl)
3102
3102
3103 if tr:
3103 if tr:
3104 tr.close()
3104 tr.close()
3105 if msgs:
3105 if msgs:
3106 repo.savecommitmessage('\n* * *\n'.join(msgs))
3106 repo.savecommitmessage('\n* * *\n'.join(msgs))
3107 if dsguard:
3107 if dsguard:
3108 dsguard.close()
3108 dsguard.close()
3109 return ret
3109 return ret
3110 finally:
3110 finally:
3111 if tr:
3111 if tr:
3112 tr.release()
3112 tr.release()
3113 release(lock, dsguard, wlock)
3113 release(lock, dsguard, wlock)
3114
3114
3115 @command('incoming|in',
3115 @command('incoming|in',
3116 [('f', 'force', None,
3116 [('f', 'force', None,
3117 _('run even if remote repository is unrelated')),
3117 _('run even if remote repository is unrelated')),
3118 ('n', 'newest-first', None, _('show newest record first')),
3118 ('n', 'newest-first', None, _('show newest record first')),
3119 ('', 'bundle', '',
3119 ('', 'bundle', '',
3120 _('file to store the bundles into'), _('FILE')),
3120 _('file to store the bundles into'), _('FILE')),
3121 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3121 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3122 ('B', 'bookmarks', False, _("compare bookmarks")),
3122 ('B', 'bookmarks', False, _("compare bookmarks")),
3123 ('b', 'branch', [],
3123 ('b', 'branch', [],
3124 _('a specific branch you would like to pull'), _('BRANCH')),
3124 _('a specific branch you would like to pull'), _('BRANCH')),
3125 ] + logopts + remoteopts + subrepoopts,
3125 ] + logopts + remoteopts + subrepoopts,
3126 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3126 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3127 def incoming(ui, repo, source="default", **opts):
3127 def incoming(ui, repo, source="default", **opts):
3128 """show new changesets found in source
3128 """show new changesets found in source
3129
3129
3130 Show new changesets found in the specified path/URL or the default
3130 Show new changesets found in the specified path/URL or the default
3131 pull location. These are the changesets that would have been pulled
3131 pull location. These are the changesets that would have been pulled
3132 if a pull at the time you issued this command.
3132 if a pull at the time you issued this command.
3133
3133
3134 See pull for valid source format details.
3134 See pull for valid source format details.
3135
3135
3136 .. container:: verbose
3136 .. container:: verbose
3137
3137
3138 With -B/--bookmarks, the result of bookmark comparison between
3138 With -B/--bookmarks, the result of bookmark comparison between
3139 local and remote repositories is displayed. With -v/--verbose,
3139 local and remote repositories is displayed. With -v/--verbose,
3140 status is also displayed for each bookmark like below::
3140 status is also displayed for each bookmark like below::
3141
3141
3142 BM1 01234567890a added
3142 BM1 01234567890a added
3143 BM2 1234567890ab advanced
3143 BM2 1234567890ab advanced
3144 BM3 234567890abc diverged
3144 BM3 234567890abc diverged
3145 BM4 34567890abcd changed
3145 BM4 34567890abcd changed
3146
3146
3147 The action taken locally when pulling depends on the
3147 The action taken locally when pulling depends on the
3148 status of each bookmark:
3148 status of each bookmark:
3149
3149
3150 :``added``: pull will create it
3150 :``added``: pull will create it
3151 :``advanced``: pull will update it
3151 :``advanced``: pull will update it
3152 :``diverged``: pull will create a divergent bookmark
3152 :``diverged``: pull will create a divergent bookmark
3153 :``changed``: result depends on remote changesets
3153 :``changed``: result depends on remote changesets
3154
3154
3155 From the point of view of pulling behavior, bookmark
3155 From the point of view of pulling behavior, bookmark
3156 existing only in the remote repository are treated as ``added``,
3156 existing only in the remote repository are treated as ``added``,
3157 even if it is in fact locally deleted.
3157 even if it is in fact locally deleted.
3158
3158
3159 .. container:: verbose
3159 .. container:: verbose
3160
3160
3161 For remote repository, using --bundle avoids downloading the
3161 For remote repository, using --bundle avoids downloading the
3162 changesets twice if the incoming is followed by a pull.
3162 changesets twice if the incoming is followed by a pull.
3163
3163
3164 Examples:
3164 Examples:
3165
3165
3166 - show incoming changes with patches and full description::
3166 - show incoming changes with patches and full description::
3167
3167
3168 hg incoming -vp
3168 hg incoming -vp
3169
3169
3170 - show incoming changes excluding merges, store a bundle::
3170 - show incoming changes excluding merges, store a bundle::
3171
3171
3172 hg in -vpM --bundle incoming.hg
3172 hg in -vpM --bundle incoming.hg
3173 hg pull incoming.hg
3173 hg pull incoming.hg
3174
3174
3175 - briefly list changes inside a bundle::
3175 - briefly list changes inside a bundle::
3176
3176
3177 hg in changes.hg -T "{desc|firstline}\\n"
3177 hg in changes.hg -T "{desc|firstline}\\n"
3178
3178
3179 Returns 0 if there are incoming changes, 1 otherwise.
3179 Returns 0 if there are incoming changes, 1 otherwise.
3180 """
3180 """
3181 if opts.get('graph'):
3181 if opts.get('graph'):
3182 cmdutil.checkunsupportedgraphflags([], opts)
3182 cmdutil.checkunsupportedgraphflags([], opts)
3183 def display(other, chlist, displayer):
3183 def display(other, chlist, displayer):
3184 revdag = cmdutil.graphrevs(other, chlist, opts)
3184 revdag = cmdutil.graphrevs(other, chlist, opts)
3185 cmdutil.displaygraph(ui, repo, revdag, displayer,
3185 cmdutil.displaygraph(ui, repo, revdag, displayer,
3186 graphmod.asciiedges)
3186 graphmod.asciiedges)
3187
3187
3188 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3188 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3189 return 0
3189 return 0
3190
3190
3191 if opts.get('bundle') and opts.get('subrepos'):
3191 if opts.get('bundle') and opts.get('subrepos'):
3192 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3192 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3193
3193
3194 if opts.get('bookmarks'):
3194 if opts.get('bookmarks'):
3195 source, branches = hg.parseurl(ui.expandpath(source),
3195 source, branches = hg.parseurl(ui.expandpath(source),
3196 opts.get('branch'))
3196 opts.get('branch'))
3197 other = hg.peer(repo, opts, source)
3197 other = hg.peer(repo, opts, source)
3198 if 'bookmarks' not in other.listkeys('namespaces'):
3198 if 'bookmarks' not in other.listkeys('namespaces'):
3199 ui.warn(_("remote doesn't support bookmarks\n"))
3199 ui.warn(_("remote doesn't support bookmarks\n"))
3200 return 0
3200 return 0
3201 ui.pager('incoming')
3201 ui.pager('incoming')
3202 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3202 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3203 return bookmarks.incoming(ui, repo, other)
3203 return bookmarks.incoming(ui, repo, other)
3204
3204
3205 repo._subtoppath = ui.expandpath(source)
3205 repo._subtoppath = ui.expandpath(source)
3206 try:
3206 try:
3207 return hg.incoming(ui, repo, source, opts)
3207 return hg.incoming(ui, repo, source, opts)
3208 finally:
3208 finally:
3209 del repo._subtoppath
3209 del repo._subtoppath
3210
3210
3211
3211
3212 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3212 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3213 norepo=True)
3213 norepo=True)
3214 def init(ui, dest=".", **opts):
3214 def init(ui, dest=".", **opts):
3215 """create a new repository in the given directory
3215 """create a new repository in the given directory
3216
3216
3217 Initialize a new repository in the given directory. If the given
3217 Initialize a new repository in the given directory. If the given
3218 directory does not exist, it will be created.
3218 directory does not exist, it will be created.
3219
3219
3220 If no directory is given, the current directory is used.
3220 If no directory is given, the current directory is used.
3221
3221
3222 It is possible to specify an ``ssh://`` URL as the destination.
3222 It is possible to specify an ``ssh://`` URL as the destination.
3223 See :hg:`help urls` for more information.
3223 See :hg:`help urls` for more information.
3224
3224
3225 Returns 0 on success.
3225 Returns 0 on success.
3226 """
3226 """
3227 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3227 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3228
3228
3229 @command('locate',
3229 @command('locate',
3230 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3230 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3231 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3231 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3232 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3232 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3233 ] + walkopts,
3233 ] + walkopts,
3234 _('[OPTION]... [PATTERN]...'))
3234 _('[OPTION]... [PATTERN]...'))
3235 def locate(ui, repo, *pats, **opts):
3235 def locate(ui, repo, *pats, **opts):
3236 """locate files matching specific patterns (DEPRECATED)
3236 """locate files matching specific patterns (DEPRECATED)
3237
3237
3238 Print files under Mercurial control in the working directory whose
3238 Print files under Mercurial control in the working directory whose
3239 names match the given patterns.
3239 names match the given patterns.
3240
3240
3241 By default, this command searches all directories in the working
3241 By default, this command searches all directories in the working
3242 directory. To search just the current directory and its
3242 directory. To search just the current directory and its
3243 subdirectories, use "--include .".
3243 subdirectories, use "--include .".
3244
3244
3245 If no patterns are given to match, this command prints the names
3245 If no patterns are given to match, this command prints the names
3246 of all files under Mercurial control in the working directory.
3246 of all files under Mercurial control in the working directory.
3247
3247
3248 If you want to feed the output of this command into the "xargs"
3248 If you want to feed the output of this command into the "xargs"
3249 command, use the -0 option to both this command and "xargs". This
3249 command, use the -0 option to both this command and "xargs". This
3250 will avoid the problem of "xargs" treating single filenames that
3250 will avoid the problem of "xargs" treating single filenames that
3251 contain whitespace as multiple filenames.
3251 contain whitespace as multiple filenames.
3252
3252
3253 See :hg:`help files` for a more versatile command.
3253 See :hg:`help files` for a more versatile command.
3254
3254
3255 Returns 0 if a match is found, 1 otherwise.
3255 Returns 0 if a match is found, 1 otherwise.
3256 """
3256 """
3257 if opts.get('print0'):
3257 if opts.get('print0'):
3258 end = '\0'
3258 end = '\0'
3259 else:
3259 else:
3260 end = '\n'
3260 end = '\n'
3261 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3261 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3262
3262
3263 ret = 1
3263 ret = 1
3264 ctx = repo[rev]
3264 ctx = repo[rev]
3265 m = scmutil.match(ctx, pats, opts, default='relglob',
3265 m = scmutil.match(ctx, pats, opts, default='relglob',
3266 badfn=lambda x, y: False)
3266 badfn=lambda x, y: False)
3267
3267
3268 ui.pager('locate')
3268 ui.pager('locate')
3269 for abs in ctx.matches(m):
3269 for abs in ctx.matches(m):
3270 if opts.get('fullpath'):
3270 if opts.get('fullpath'):
3271 ui.write(repo.wjoin(abs), end)
3271 ui.write(repo.wjoin(abs), end)
3272 else:
3272 else:
3273 ui.write(((pats and m.rel(abs)) or abs), end)
3273 ui.write(((pats and m.rel(abs)) or abs), end)
3274 ret = 0
3274 ret = 0
3275
3275
3276 return ret
3276 return ret
3277
3277
3278 @command('^log|history',
3278 @command('^log|history',
3279 [('f', 'follow', None,
3279 [('f', 'follow', None,
3280 _('follow changeset history, or file history across copies and renames')),
3280 _('follow changeset history, or file history across copies and renames')),
3281 ('', 'follow-first', None,
3281 ('', 'follow-first', None,
3282 _('only follow the first parent of merge changesets (DEPRECATED)')),
3282 _('only follow the first parent of merge changesets (DEPRECATED)')),
3283 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3283 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3284 ('C', 'copies', None, _('show copied files')),
3284 ('C', 'copies', None, _('show copied files')),
3285 ('k', 'keyword', [],
3285 ('k', 'keyword', [],
3286 _('do case-insensitive search for a given text'), _('TEXT')),
3286 _('do case-insensitive search for a given text'), _('TEXT')),
3287 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3287 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3288 ('', 'removed', None, _('include revisions where files were removed')),
3288 ('', 'removed', None, _('include revisions where files were removed')),
3289 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3289 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3290 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3290 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3291 ('', 'only-branch', [],
3291 ('', 'only-branch', [],
3292 _('show only changesets within the given named branch (DEPRECATED)'),
3292 _('show only changesets within the given named branch (DEPRECATED)'),
3293 _('BRANCH')),
3293 _('BRANCH')),
3294 ('b', 'branch', [],
3294 ('b', 'branch', [],
3295 _('show changesets within the given named branch'), _('BRANCH')),
3295 _('show changesets within the given named branch'), _('BRANCH')),
3296 ('P', 'prune', [],
3296 ('P', 'prune', [],
3297 _('do not display revision or any of its ancestors'), _('REV')),
3297 _('do not display revision or any of its ancestors'), _('REV')),
3298 ] + logopts + walkopts,
3298 ] + logopts + walkopts,
3299 _('[OPTION]... [FILE]'),
3299 _('[OPTION]... [FILE]'),
3300 inferrepo=True)
3300 inferrepo=True)
3301 def log(ui, repo, *pats, **opts):
3301 def log(ui, repo, *pats, **opts):
3302 """show revision history of entire repository or files
3302 """show revision history of entire repository or files
3303
3303
3304 Print the revision history of the specified files or the entire
3304 Print the revision history of the specified files or the entire
3305 project.
3305 project.
3306
3306
3307 If no revision range is specified, the default is ``tip:0`` unless
3307 If no revision range is specified, the default is ``tip:0`` unless
3308 --follow is set, in which case the working directory parent is
3308 --follow is set, in which case the working directory parent is
3309 used as the starting revision.
3309 used as the starting revision.
3310
3310
3311 File history is shown without following rename or copy history of
3311 File history is shown without following rename or copy history of
3312 files. Use -f/--follow with a filename to follow history across
3312 files. Use -f/--follow with a filename to follow history across
3313 renames and copies. --follow without a filename will only show
3313 renames and copies. --follow without a filename will only show
3314 ancestors or descendants of the starting revision.
3314 ancestors or descendants of the starting revision.
3315
3315
3316 By default this command prints revision number and changeset id,
3316 By default this command prints revision number and changeset id,
3317 tags, non-trivial parents, user, date and time, and a summary for
3317 tags, non-trivial parents, user, date and time, and a summary for
3318 each commit. When the -v/--verbose switch is used, the list of
3318 each commit. When the -v/--verbose switch is used, the list of
3319 changed files and full commit message are shown.
3319 changed files and full commit message are shown.
3320
3320
3321 With --graph the revisions are shown as an ASCII art DAG with the most
3321 With --graph the revisions are shown as an ASCII art DAG with the most
3322 recent changeset at the top.
3322 recent changeset at the top.
3323 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3323 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3324 and '+' represents a fork where the changeset from the lines below is a
3324 and '+' represents a fork where the changeset from the lines below is a
3325 parent of the 'o' merge on the same line.
3325 parent of the 'o' merge on the same line.
3326
3326
3327 .. note::
3327 .. note::
3328
3328
3329 :hg:`log --patch` may generate unexpected diff output for merge
3329 :hg:`log --patch` may generate unexpected diff output for merge
3330 changesets, as it will only compare the merge changeset against
3330 changesets, as it will only compare the merge changeset against
3331 its first parent. Also, only files different from BOTH parents
3331 its first parent. Also, only files different from BOTH parents
3332 will appear in files:.
3332 will appear in files:.
3333
3333
3334 .. note::
3334 .. note::
3335
3335
3336 For performance reasons, :hg:`log FILE` may omit duplicate changes
3336 For performance reasons, :hg:`log FILE` may omit duplicate changes
3337 made on branches and will not show removals or mode changes. To
3337 made on branches and will not show removals or mode changes. To
3338 see all such changes, use the --removed switch.
3338 see all such changes, use the --removed switch.
3339
3339
3340 .. container:: verbose
3340 .. container:: verbose
3341
3341
3342 Some examples:
3342 Some examples:
3343
3343
3344 - changesets with full descriptions and file lists::
3344 - changesets with full descriptions and file lists::
3345
3345
3346 hg log -v
3346 hg log -v
3347
3347
3348 - changesets ancestral to the working directory::
3348 - changesets ancestral to the working directory::
3349
3349
3350 hg log -f
3350 hg log -f
3351
3351
3352 - last 10 commits on the current branch::
3352 - last 10 commits on the current branch::
3353
3353
3354 hg log -l 10 -b .
3354 hg log -l 10 -b .
3355
3355
3356 - changesets showing all modifications of a file, including removals::
3356 - changesets showing all modifications of a file, including removals::
3357
3357
3358 hg log --removed file.c
3358 hg log --removed file.c
3359
3359
3360 - all changesets that touch a directory, with diffs, excluding merges::
3360 - all changesets that touch a directory, with diffs, excluding merges::
3361
3361
3362 hg log -Mp lib/
3362 hg log -Mp lib/
3363
3363
3364 - all revision numbers that match a keyword::
3364 - all revision numbers that match a keyword::
3365
3365
3366 hg log -k bug --template "{rev}\\n"
3366 hg log -k bug --template "{rev}\\n"
3367
3367
3368 - the full hash identifier of the working directory parent::
3368 - the full hash identifier of the working directory parent::
3369
3369
3370 hg log -r . --template "{node}\\n"
3370 hg log -r . --template "{node}\\n"
3371
3371
3372 - list available log templates::
3372 - list available log templates::
3373
3373
3374 hg log -T list
3374 hg log -T list
3375
3375
3376 - check if a given changeset is included in a tagged release::
3376 - check if a given changeset is included in a tagged release::
3377
3377
3378 hg log -r "a21ccf and ancestor(1.9)"
3378 hg log -r "a21ccf and ancestor(1.9)"
3379
3379
3380 - find all changesets by some user in a date range::
3380 - find all changesets by some user in a date range::
3381
3381
3382 hg log -k alice -d "may 2008 to jul 2008"
3382 hg log -k alice -d "may 2008 to jul 2008"
3383
3383
3384 - summary of all changesets after the last tag::
3384 - summary of all changesets after the last tag::
3385
3385
3386 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3386 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3387
3387
3388 See :hg:`help dates` for a list of formats valid for -d/--date.
3388 See :hg:`help dates` for a list of formats valid for -d/--date.
3389
3389
3390 See :hg:`help revisions` for more about specifying and ordering
3390 See :hg:`help revisions` for more about specifying and ordering
3391 revisions.
3391 revisions.
3392
3392
3393 See :hg:`help templates` for more about pre-packaged styles and
3393 See :hg:`help templates` for more about pre-packaged styles and
3394 specifying custom templates.
3394 specifying custom templates.
3395
3395
3396 Returns 0 on success.
3396 Returns 0 on success.
3397
3397
3398 """
3398 """
3399 opts = pycompat.byteskwargs(opts)
3399 opts = pycompat.byteskwargs(opts)
3400 if opts.get('follow') and opts.get('rev'):
3400 if opts.get('follow') and opts.get('rev'):
3401 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3401 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3402 del opts['follow']
3402 del opts['follow']
3403
3403
3404 if opts.get('graph'):
3404 if opts.get('graph'):
3405 return cmdutil.graphlog(ui, repo, pats, opts)
3405 return cmdutil.graphlog(ui, repo, pats, opts)
3406
3406
3407 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3407 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3408 limit = cmdutil.loglimit(opts)
3408 limit = cmdutil.loglimit(opts)
3409 count = 0
3409 count = 0
3410
3410
3411 getrenamed = None
3411 getrenamed = None
3412 if opts.get('copies'):
3412 if opts.get('copies'):
3413 endrev = None
3413 endrev = None
3414 if opts.get('rev'):
3414 if opts.get('rev'):
3415 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3415 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3416 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3416 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3417
3417
3418 ui.pager('log')
3418 ui.pager('log')
3419 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3419 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3420 for rev in revs:
3420 for rev in revs:
3421 if count == limit:
3421 if count == limit:
3422 break
3422 break
3423 ctx = repo[rev]
3423 ctx = repo[rev]
3424 copies = None
3424 copies = None
3425 if getrenamed is not None and rev:
3425 if getrenamed is not None and rev:
3426 copies = []
3426 copies = []
3427 for fn in ctx.files():
3427 for fn in ctx.files():
3428 rename = getrenamed(fn, rev)
3428 rename = getrenamed(fn, rev)
3429 if rename:
3429 if rename:
3430 copies.append((fn, rename[0]))
3430 copies.append((fn, rename[0]))
3431 if filematcher:
3431 if filematcher:
3432 revmatchfn = filematcher(ctx.rev())
3432 revmatchfn = filematcher(ctx.rev())
3433 else:
3433 else:
3434 revmatchfn = None
3434 revmatchfn = None
3435 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3435 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3436 if displayer.flush(ctx):
3436 if displayer.flush(ctx):
3437 count += 1
3437 count += 1
3438
3438
3439 displayer.close()
3439 displayer.close()
3440
3440
3441 @command('manifest',
3441 @command('manifest',
3442 [('r', 'rev', '', _('revision to display'), _('REV')),
3442 [('r', 'rev', '', _('revision to display'), _('REV')),
3443 ('', 'all', False, _("list files from all revisions"))]
3443 ('', 'all', False, _("list files from all revisions"))]
3444 + formatteropts,
3444 + formatteropts,
3445 _('[-r REV]'))
3445 _('[-r REV]'))
3446 def manifest(ui, repo, node=None, rev=None, **opts):
3446 def manifest(ui, repo, node=None, rev=None, **opts):
3447 """output the current or given revision of the project manifest
3447 """output the current or given revision of the project manifest
3448
3448
3449 Print a list of version controlled files for the given revision.
3449 Print a list of version controlled files for the given revision.
3450 If no revision is given, the first parent of the working directory
3450 If no revision is given, the first parent of the working directory
3451 is used, or the null revision if no revision is checked out.
3451 is used, or the null revision if no revision is checked out.
3452
3452
3453 With -v, print file permissions, symlink and executable bits.
3453 With -v, print file permissions, symlink and executable bits.
3454 With --debug, print file revision hashes.
3454 With --debug, print file revision hashes.
3455
3455
3456 If option --all is specified, the list of all files from all revisions
3456 If option --all is specified, the list of all files from all revisions
3457 is printed. This includes deleted and renamed files.
3457 is printed. This includes deleted and renamed files.
3458
3458
3459 Returns 0 on success.
3459 Returns 0 on success.
3460 """
3460 """
3461 fm = ui.formatter('manifest', opts)
3461 fm = ui.formatter('manifest', opts)
3462
3462
3463 if opts.get('all'):
3463 if opts.get('all'):
3464 if rev or node:
3464 if rev or node:
3465 raise error.Abort(_("can't specify a revision with --all"))
3465 raise error.Abort(_("can't specify a revision with --all"))
3466
3466
3467 res = []
3467 res = []
3468 prefix = "data/"
3468 prefix = "data/"
3469 suffix = ".i"
3469 suffix = ".i"
3470 plen = len(prefix)
3470 plen = len(prefix)
3471 slen = len(suffix)
3471 slen = len(suffix)
3472 with repo.lock():
3472 with repo.lock():
3473 for fn, b, size in repo.store.datafiles():
3473 for fn, b, size in repo.store.datafiles():
3474 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3474 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3475 res.append(fn[plen:-slen])
3475 res.append(fn[plen:-slen])
3476 ui.pager('manifest')
3476 ui.pager('manifest')
3477 for f in res:
3477 for f in res:
3478 fm.startitem()
3478 fm.startitem()
3479 fm.write("path", '%s\n', f)
3479 fm.write("path", '%s\n', f)
3480 fm.end()
3480 fm.end()
3481 return
3481 return
3482
3482
3483 if rev and node:
3483 if rev and node:
3484 raise error.Abort(_("please specify just one revision"))
3484 raise error.Abort(_("please specify just one revision"))
3485
3485
3486 if not node:
3486 if not node:
3487 node = rev
3487 node = rev
3488
3488
3489 char = {'l': '@', 'x': '*', '': ''}
3489 char = {'l': '@', 'x': '*', '': ''}
3490 mode = {'l': '644', 'x': '755', '': '644'}
3490 mode = {'l': '644', 'x': '755', '': '644'}
3491 ctx = scmutil.revsingle(repo, node)
3491 ctx = scmutil.revsingle(repo, node)
3492 mf = ctx.manifest()
3492 mf = ctx.manifest()
3493 ui.pager('manifest')
3493 ui.pager('manifest')
3494 for f in ctx:
3494 for f in ctx:
3495 fm.startitem()
3495 fm.startitem()
3496 fl = ctx[f].flags()
3496 fl = ctx[f].flags()
3497 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3497 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3498 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3498 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3499 fm.write('path', '%s\n', f)
3499 fm.write('path', '%s\n', f)
3500 fm.end()
3500 fm.end()
3501
3501
3502 @command('^merge',
3502 @command('^merge',
3503 [('f', 'force', None,
3503 [('f', 'force', None,
3504 _('force a merge including outstanding changes (DEPRECATED)')),
3504 _('force a merge including outstanding changes (DEPRECATED)')),
3505 ('r', 'rev', '', _('revision to merge'), _('REV')),
3505 ('r', 'rev', '', _('revision to merge'), _('REV')),
3506 ('P', 'preview', None,
3506 ('P', 'preview', None,
3507 _('review revisions to merge (no merge is performed)'))
3507 _('review revisions to merge (no merge is performed)'))
3508 ] + mergetoolopts,
3508 ] + mergetoolopts,
3509 _('[-P] [[-r] REV]'))
3509 _('[-P] [[-r] REV]'))
3510 def merge(ui, repo, node=None, **opts):
3510 def merge(ui, repo, node=None, **opts):
3511 """merge another revision into working directory
3511 """merge another revision into working directory
3512
3512
3513 The current working directory is updated with all changes made in
3513 The current working directory is updated with all changes made in
3514 the requested revision since the last common predecessor revision.
3514 the requested revision since the last common predecessor revision.
3515
3515
3516 Files that changed between either parent are marked as changed for
3516 Files that changed between either parent are marked as changed for
3517 the next commit and a commit must be performed before any further
3517 the next commit and a commit must be performed before any further
3518 updates to the repository are allowed. The next commit will have
3518 updates to the repository are allowed. The next commit will have
3519 two parents.
3519 two parents.
3520
3520
3521 ``--tool`` can be used to specify the merge tool used for file
3521 ``--tool`` can be used to specify the merge tool used for file
3522 merges. It overrides the HGMERGE environment variable and your
3522 merges. It overrides the HGMERGE environment variable and your
3523 configuration files. See :hg:`help merge-tools` for options.
3523 configuration files. See :hg:`help merge-tools` for options.
3524
3524
3525 If no revision is specified, the working directory's parent is a
3525 If no revision is specified, the working directory's parent is a
3526 head revision, and the current branch contains exactly one other
3526 head revision, and the current branch contains exactly one other
3527 head, the other head is merged with by default. Otherwise, an
3527 head, the other head is merged with by default. Otherwise, an
3528 explicit revision with which to merge with must be provided.
3528 explicit revision with which to merge with must be provided.
3529
3529
3530 See :hg:`help resolve` for information on handling file conflicts.
3530 See :hg:`help resolve` for information on handling file conflicts.
3531
3531
3532 To undo an uncommitted merge, use :hg:`update --clean .` which
3532 To undo an uncommitted merge, use :hg:`update --clean .` which
3533 will check out a clean copy of the original merge parent, losing
3533 will check out a clean copy of the original merge parent, losing
3534 all changes.
3534 all changes.
3535
3535
3536 Returns 0 on success, 1 if there are unresolved files.
3536 Returns 0 on success, 1 if there are unresolved files.
3537 """
3537 """
3538
3538
3539 if opts.get('rev') and node:
3539 if opts.get('rev') and node:
3540 raise error.Abort(_("please specify just one revision"))
3540 raise error.Abort(_("please specify just one revision"))
3541 if not node:
3541 if not node:
3542 node = opts.get('rev')
3542 node = opts.get('rev')
3543
3543
3544 if node:
3544 if node:
3545 node = scmutil.revsingle(repo, node).node()
3545 node = scmutil.revsingle(repo, node).node()
3546
3546
3547 if not node:
3547 if not node:
3548 node = repo[destutil.destmerge(repo)].node()
3548 node = repo[destutil.destmerge(repo)].node()
3549
3549
3550 if opts.get('preview'):
3550 if opts.get('preview'):
3551 # find nodes that are ancestors of p2 but not of p1
3551 # find nodes that are ancestors of p2 but not of p1
3552 p1 = repo.lookup('.')
3552 p1 = repo.lookup('.')
3553 p2 = repo.lookup(node)
3553 p2 = repo.lookup(node)
3554 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3554 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3555
3555
3556 displayer = cmdutil.show_changeset(ui, repo, opts)
3556 displayer = cmdutil.show_changeset(ui, repo, opts)
3557 for node in nodes:
3557 for node in nodes:
3558 displayer.show(repo[node])
3558 displayer.show(repo[node])
3559 displayer.close()
3559 displayer.close()
3560 return 0
3560 return 0
3561
3561
3562 try:
3562 try:
3563 # ui.forcemerge is an internal variable, do not document
3563 # ui.forcemerge is an internal variable, do not document
3564 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3564 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3565 force = opts.get('force')
3565 force = opts.get('force')
3566 labels = ['working copy', 'merge rev']
3566 labels = ['working copy', 'merge rev']
3567 return hg.merge(repo, node, force=force, mergeforce=force,
3567 return hg.merge(repo, node, force=force, mergeforce=force,
3568 labels=labels)
3568 labels=labels)
3569 finally:
3569 finally:
3570 ui.setconfig('ui', 'forcemerge', '', 'merge')
3570 ui.setconfig('ui', 'forcemerge', '', 'merge')
3571
3571
3572 @command('outgoing|out',
3572 @command('outgoing|out',
3573 [('f', 'force', None, _('run even when the destination is unrelated')),
3573 [('f', 'force', None, _('run even when the destination is unrelated')),
3574 ('r', 'rev', [],
3574 ('r', 'rev', [],
3575 _('a changeset intended to be included in the destination'), _('REV')),
3575 _('a changeset intended to be included in the destination'), _('REV')),
3576 ('n', 'newest-first', None, _('show newest record first')),
3576 ('n', 'newest-first', None, _('show newest record first')),
3577 ('B', 'bookmarks', False, _('compare bookmarks')),
3577 ('B', 'bookmarks', False, _('compare bookmarks')),
3578 ('b', 'branch', [], _('a specific branch you would like to push'),
3578 ('b', 'branch', [], _('a specific branch you would like to push'),
3579 _('BRANCH')),
3579 _('BRANCH')),
3580 ] + logopts + remoteopts + subrepoopts,
3580 ] + logopts + remoteopts + subrepoopts,
3581 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3581 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3582 def outgoing(ui, repo, dest=None, **opts):
3582 def outgoing(ui, repo, dest=None, **opts):
3583 """show changesets not found in the destination
3583 """show changesets not found in the destination
3584
3584
3585 Show changesets not found in the specified destination repository
3585 Show changesets not found in the specified destination repository
3586 or the default push location. These are the changesets that would
3586 or the default push location. These are the changesets that would
3587 be pushed if a push was requested.
3587 be pushed if a push was requested.
3588
3588
3589 See pull for details of valid destination formats.
3589 See pull for details of valid destination formats.
3590
3590
3591 .. container:: verbose
3591 .. container:: verbose
3592
3592
3593 With -B/--bookmarks, the result of bookmark comparison between
3593 With -B/--bookmarks, the result of bookmark comparison between
3594 local and remote repositories is displayed. With -v/--verbose,
3594 local and remote repositories is displayed. With -v/--verbose,
3595 status is also displayed for each bookmark like below::
3595 status is also displayed for each bookmark like below::
3596
3596
3597 BM1 01234567890a added
3597 BM1 01234567890a added
3598 BM2 deleted
3598 BM2 deleted
3599 BM3 234567890abc advanced
3599 BM3 234567890abc advanced
3600 BM4 34567890abcd diverged
3600 BM4 34567890abcd diverged
3601 BM5 4567890abcde changed
3601 BM5 4567890abcde changed
3602
3602
3603 The action taken when pushing depends on the
3603 The action taken when pushing depends on the
3604 status of each bookmark:
3604 status of each bookmark:
3605
3605
3606 :``added``: push with ``-B`` will create it
3606 :``added``: push with ``-B`` will create it
3607 :``deleted``: push with ``-B`` will delete it
3607 :``deleted``: push with ``-B`` will delete it
3608 :``advanced``: push will update it
3608 :``advanced``: push will update it
3609 :``diverged``: push with ``-B`` will update it
3609 :``diverged``: push with ``-B`` will update it
3610 :``changed``: push with ``-B`` will update it
3610 :``changed``: push with ``-B`` will update it
3611
3611
3612 From the point of view of pushing behavior, bookmarks
3612 From the point of view of pushing behavior, bookmarks
3613 existing only in the remote repository are treated as
3613 existing only in the remote repository are treated as
3614 ``deleted``, even if it is in fact added remotely.
3614 ``deleted``, even if it is in fact added remotely.
3615
3615
3616 Returns 0 if there are outgoing changes, 1 otherwise.
3616 Returns 0 if there are outgoing changes, 1 otherwise.
3617 """
3617 """
3618 if opts.get('graph'):
3618 if opts.get('graph'):
3619 cmdutil.checkunsupportedgraphflags([], opts)
3619 cmdutil.checkunsupportedgraphflags([], opts)
3620 o, other = hg._outgoing(ui, repo, dest, opts)
3620 o, other = hg._outgoing(ui, repo, dest, opts)
3621 if not o:
3621 if not o:
3622 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3622 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3623 return
3623 return
3624
3624
3625 revdag = cmdutil.graphrevs(repo, o, opts)
3625 revdag = cmdutil.graphrevs(repo, o, opts)
3626 ui.pager('outgoing')
3626 ui.pager('outgoing')
3627 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3627 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3628 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3628 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3629 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3629 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3630 return 0
3630 return 0
3631
3631
3632 if opts.get('bookmarks'):
3632 if opts.get('bookmarks'):
3633 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3633 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3634 dest, branches = hg.parseurl(dest, opts.get('branch'))
3634 dest, branches = hg.parseurl(dest, opts.get('branch'))
3635 other = hg.peer(repo, opts, dest)
3635 other = hg.peer(repo, opts, dest)
3636 if 'bookmarks' not in other.listkeys('namespaces'):
3636 if 'bookmarks' not in other.listkeys('namespaces'):
3637 ui.warn(_("remote doesn't support bookmarks\n"))
3637 ui.warn(_("remote doesn't support bookmarks\n"))
3638 return 0
3638 return 0
3639 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3639 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3640 ui.pager('outgoing')
3640 ui.pager('outgoing')
3641 return bookmarks.outgoing(ui, repo, other)
3641 return bookmarks.outgoing(ui, repo, other)
3642
3642
3643 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3643 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3644 try:
3644 try:
3645 return hg.outgoing(ui, repo, dest, opts)
3645 return hg.outgoing(ui, repo, dest, opts)
3646 finally:
3646 finally:
3647 del repo._subtoppath
3647 del repo._subtoppath
3648
3648
3649 @command('parents',
3649 @command('parents',
3650 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3650 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3651 ] + templateopts,
3651 ] + templateopts,
3652 _('[-r REV] [FILE]'),
3652 _('[-r REV] [FILE]'),
3653 inferrepo=True)
3653 inferrepo=True)
3654 def parents(ui, repo, file_=None, **opts):
3654 def parents(ui, repo, file_=None, **opts):
3655 """show the parents of the working directory or revision (DEPRECATED)
3655 """show the parents of the working directory or revision (DEPRECATED)
3656
3656
3657 Print the working directory's parent revisions. If a revision is
3657 Print the working directory's parent revisions. If a revision is
3658 given via -r/--rev, the parent of that revision will be printed.
3658 given via -r/--rev, the parent of that revision will be printed.
3659 If a file argument is given, the revision in which the file was
3659 If a file argument is given, the revision in which the file was
3660 last changed (before the working directory revision or the
3660 last changed (before the working directory revision or the
3661 argument to --rev if given) is printed.
3661 argument to --rev if given) is printed.
3662
3662
3663 This command is equivalent to::
3663 This command is equivalent to::
3664
3664
3665 hg log -r "p1()+p2()" or
3665 hg log -r "p1()+p2()" or
3666 hg log -r "p1(REV)+p2(REV)" or
3666 hg log -r "p1(REV)+p2(REV)" or
3667 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3667 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3668 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3668 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3669
3669
3670 See :hg:`summary` and :hg:`help revsets` for related information.
3670 See :hg:`summary` and :hg:`help revsets` for related information.
3671
3671
3672 Returns 0 on success.
3672 Returns 0 on success.
3673 """
3673 """
3674
3674
3675 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3675 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3676
3676
3677 if file_:
3677 if file_:
3678 m = scmutil.match(ctx, (file_,), opts)
3678 m = scmutil.match(ctx, (file_,), opts)
3679 if m.anypats() or len(m.files()) != 1:
3679 if m.anypats() or len(m.files()) != 1:
3680 raise error.Abort(_('can only specify an explicit filename'))
3680 raise error.Abort(_('can only specify an explicit filename'))
3681 file_ = m.files()[0]
3681 file_ = m.files()[0]
3682 filenodes = []
3682 filenodes = []
3683 for cp in ctx.parents():
3683 for cp in ctx.parents():
3684 if not cp:
3684 if not cp:
3685 continue
3685 continue
3686 try:
3686 try:
3687 filenodes.append(cp.filenode(file_))
3687 filenodes.append(cp.filenode(file_))
3688 except error.LookupError:
3688 except error.LookupError:
3689 pass
3689 pass
3690 if not filenodes:
3690 if not filenodes:
3691 raise error.Abort(_("'%s' not found in manifest!") % file_)
3691 raise error.Abort(_("'%s' not found in manifest!") % file_)
3692 p = []
3692 p = []
3693 for fn in filenodes:
3693 for fn in filenodes:
3694 fctx = repo.filectx(file_, fileid=fn)
3694 fctx = repo.filectx(file_, fileid=fn)
3695 p.append(fctx.node())
3695 p.append(fctx.node())
3696 else:
3696 else:
3697 p = [cp.node() for cp in ctx.parents()]
3697 p = [cp.node() for cp in ctx.parents()]
3698
3698
3699 displayer = cmdutil.show_changeset(ui, repo, opts)
3699 displayer = cmdutil.show_changeset(ui, repo, opts)
3700 for n in p:
3700 for n in p:
3701 if n != nullid:
3701 if n != nullid:
3702 displayer.show(repo[n])
3702 displayer.show(repo[n])
3703 displayer.close()
3703 displayer.close()
3704
3704
3705 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3705 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3706 def paths(ui, repo, search=None, **opts):
3706 def paths(ui, repo, search=None, **opts):
3707 """show aliases for remote repositories
3707 """show aliases for remote repositories
3708
3708
3709 Show definition of symbolic path name NAME. If no name is given,
3709 Show definition of symbolic path name NAME. If no name is given,
3710 show definition of all available names.
3710 show definition of all available names.
3711
3711
3712 Option -q/--quiet suppresses all output when searching for NAME
3712 Option -q/--quiet suppresses all output when searching for NAME
3713 and shows only the path names when listing all definitions.
3713 and shows only the path names when listing all definitions.
3714
3714
3715 Path names are defined in the [paths] section of your
3715 Path names are defined in the [paths] section of your
3716 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3716 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3717 repository, ``.hg/hgrc`` is used, too.
3717 repository, ``.hg/hgrc`` is used, too.
3718
3718
3719 The path names ``default`` and ``default-push`` have a special
3719 The path names ``default`` and ``default-push`` have a special
3720 meaning. When performing a push or pull operation, they are used
3720 meaning. When performing a push or pull operation, they are used
3721 as fallbacks if no location is specified on the command-line.
3721 as fallbacks if no location is specified on the command-line.
3722 When ``default-push`` is set, it will be used for push and
3722 When ``default-push`` is set, it will be used for push and
3723 ``default`` will be used for pull; otherwise ``default`` is used
3723 ``default`` will be used for pull; otherwise ``default`` is used
3724 as the fallback for both. When cloning a repository, the clone
3724 as the fallback for both. When cloning a repository, the clone
3725 source is written as ``default`` in ``.hg/hgrc``.
3725 source is written as ``default`` in ``.hg/hgrc``.
3726
3726
3727 .. note::
3727 .. note::
3728
3728
3729 ``default`` and ``default-push`` apply to all inbound (e.g.
3729 ``default`` and ``default-push`` apply to all inbound (e.g.
3730 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3730 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3731 and :hg:`bundle`) operations.
3731 and :hg:`bundle`) operations.
3732
3732
3733 See :hg:`help urls` for more information.
3733 See :hg:`help urls` for more information.
3734
3734
3735 Returns 0 on success.
3735 Returns 0 on success.
3736 """
3736 """
3737 ui.pager('paths')
3737 ui.pager('paths')
3738 if search:
3738 if search:
3739 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3739 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3740 if name == search]
3740 if name == search]
3741 else:
3741 else:
3742 pathitems = sorted(ui.paths.iteritems())
3742 pathitems = sorted(ui.paths.iteritems())
3743
3743
3744 fm = ui.formatter('paths', opts)
3744 fm = ui.formatter('paths', opts)
3745 if fm.isplain():
3745 if fm.isplain():
3746 hidepassword = util.hidepassword
3746 hidepassword = util.hidepassword
3747 else:
3747 else:
3748 hidepassword = str
3748 hidepassword = str
3749 if ui.quiet:
3749 if ui.quiet:
3750 namefmt = '%s\n'
3750 namefmt = '%s\n'
3751 else:
3751 else:
3752 namefmt = '%s = '
3752 namefmt = '%s = '
3753 showsubopts = not search and not ui.quiet
3753 showsubopts = not search and not ui.quiet
3754
3754
3755 for name, path in pathitems:
3755 for name, path in pathitems:
3756 fm.startitem()
3756 fm.startitem()
3757 fm.condwrite(not search, 'name', namefmt, name)
3757 fm.condwrite(not search, 'name', namefmt, name)
3758 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3758 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3759 for subopt, value in sorted(path.suboptions.items()):
3759 for subopt, value in sorted(path.suboptions.items()):
3760 assert subopt not in ('name', 'url')
3760 assert subopt not in ('name', 'url')
3761 if showsubopts:
3761 if showsubopts:
3762 fm.plain('%s:%s = ' % (name, subopt))
3762 fm.plain('%s:%s = ' % (name, subopt))
3763 fm.condwrite(showsubopts, subopt, '%s\n', value)
3763 fm.condwrite(showsubopts, subopt, '%s\n', value)
3764
3764
3765 fm.end()
3765 fm.end()
3766
3766
3767 if search and not pathitems:
3767 if search and not pathitems:
3768 if not ui.quiet:
3768 if not ui.quiet:
3769 ui.warn(_("not found!\n"))
3769 ui.warn(_("not found!\n"))
3770 return 1
3770 return 1
3771 else:
3771 else:
3772 return 0
3772 return 0
3773
3773
3774 @command('phase',
3774 @command('phase',
3775 [('p', 'public', False, _('set changeset phase to public')),
3775 [('p', 'public', False, _('set changeset phase to public')),
3776 ('d', 'draft', False, _('set changeset phase to draft')),
3776 ('d', 'draft', False, _('set changeset phase to draft')),
3777 ('s', 'secret', False, _('set changeset phase to secret')),
3777 ('s', 'secret', False, _('set changeset phase to secret')),
3778 ('f', 'force', False, _('allow to move boundary backward')),
3778 ('f', 'force', False, _('allow to move boundary backward')),
3779 ('r', 'rev', [], _('target revision'), _('REV')),
3779 ('r', 'rev', [], _('target revision'), _('REV')),
3780 ],
3780 ],
3781 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3781 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3782 def phase(ui, repo, *revs, **opts):
3782 def phase(ui, repo, *revs, **opts):
3783 """set or show the current phase name
3783 """set or show the current phase name
3784
3784
3785 With no argument, show the phase name of the current revision(s).
3785 With no argument, show the phase name of the current revision(s).
3786
3786
3787 With one of -p/--public, -d/--draft or -s/--secret, change the
3787 With one of -p/--public, -d/--draft or -s/--secret, change the
3788 phase value of the specified revisions.
3788 phase value of the specified revisions.
3789
3789
3790 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3790 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3791 lower phase to an higher phase. Phases are ordered as follows::
3791 lower phase to an higher phase. Phases are ordered as follows::
3792
3792
3793 public < draft < secret
3793 public < draft < secret
3794
3794
3795 Returns 0 on success, 1 if some phases could not be changed.
3795 Returns 0 on success, 1 if some phases could not be changed.
3796
3796
3797 (For more information about the phases concept, see :hg:`help phases`.)
3797 (For more information about the phases concept, see :hg:`help phases`.)
3798 """
3798 """
3799 # search for a unique phase argument
3799 # search for a unique phase argument
3800 targetphase = None
3800 targetphase = None
3801 for idx, name in enumerate(phases.phasenames):
3801 for idx, name in enumerate(phases.phasenames):
3802 if opts[name]:
3802 if opts[name]:
3803 if targetphase is not None:
3803 if targetphase is not None:
3804 raise error.Abort(_('only one phase can be specified'))
3804 raise error.Abort(_('only one phase can be specified'))
3805 targetphase = idx
3805 targetphase = idx
3806
3806
3807 # look for specified revision
3807 # look for specified revision
3808 revs = list(revs)
3808 revs = list(revs)
3809 revs.extend(opts['rev'])
3809 revs.extend(opts['rev'])
3810 if not revs:
3810 if not revs:
3811 # display both parents as the second parent phase can influence
3811 # display both parents as the second parent phase can influence
3812 # the phase of a merge commit
3812 # the phase of a merge commit
3813 revs = [c.rev() for c in repo[None].parents()]
3813 revs = [c.rev() for c in repo[None].parents()]
3814
3814
3815 revs = scmutil.revrange(repo, revs)
3815 revs = scmutil.revrange(repo, revs)
3816
3816
3817 lock = None
3817 lock = None
3818 ret = 0
3818 ret = 0
3819 if targetphase is None:
3819 if targetphase is None:
3820 # display
3820 # display
3821 for r in revs:
3821 for r in revs:
3822 ctx = repo[r]
3822 ctx = repo[r]
3823 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3823 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3824 else:
3824 else:
3825 tr = None
3825 tr = None
3826 lock = repo.lock()
3826 lock = repo.lock()
3827 try:
3827 try:
3828 tr = repo.transaction("phase")
3828 tr = repo.transaction("phase")
3829 # set phase
3829 # set phase
3830 if not revs:
3830 if not revs:
3831 raise error.Abort(_('empty revision set'))
3831 raise error.Abort(_('empty revision set'))
3832 nodes = [repo[r].node() for r in revs]
3832 nodes = [repo[r].node() for r in revs]
3833 # moving revision from public to draft may hide them
3833 # moving revision from public to draft may hide them
3834 # We have to check result on an unfiltered repository
3834 # We have to check result on an unfiltered repository
3835 unfi = repo.unfiltered()
3835 unfi = repo.unfiltered()
3836 getphase = unfi._phasecache.phase
3836 getphase = unfi._phasecache.phase
3837 olddata = [getphase(unfi, r) for r in unfi]
3837 olddata = [getphase(unfi, r) for r in unfi]
3838 phases.advanceboundary(repo, tr, targetphase, nodes)
3838 phases.advanceboundary(repo, tr, targetphase, nodes)
3839 if opts['force']:
3839 if opts['force']:
3840 phases.retractboundary(repo, tr, targetphase, nodes)
3840 phases.retractboundary(repo, tr, targetphase, nodes)
3841 tr.close()
3841 tr.close()
3842 finally:
3842 finally:
3843 if tr is not None:
3843 if tr is not None:
3844 tr.release()
3844 tr.release()
3845 lock.release()
3845 lock.release()
3846 getphase = unfi._phasecache.phase
3846 getphase = unfi._phasecache.phase
3847 newdata = [getphase(unfi, r) for r in unfi]
3847 newdata = [getphase(unfi, r) for r in unfi]
3848 changes = sum(newdata[r] != olddata[r] for r in unfi)
3848 changes = sum(newdata[r] != olddata[r] for r in unfi)
3849 cl = unfi.changelog
3849 cl = unfi.changelog
3850 rejected = [n for n in nodes
3850 rejected = [n for n in nodes
3851 if newdata[cl.rev(n)] < targetphase]
3851 if newdata[cl.rev(n)] < targetphase]
3852 if rejected:
3852 if rejected:
3853 ui.warn(_('cannot move %i changesets to a higher '
3853 ui.warn(_('cannot move %i changesets to a higher '
3854 'phase, use --force\n') % len(rejected))
3854 'phase, use --force\n') % len(rejected))
3855 ret = 1
3855 ret = 1
3856 if changes:
3856 if changes:
3857 msg = _('phase changed for %i changesets\n') % changes
3857 msg = _('phase changed for %i changesets\n') % changes
3858 if ret:
3858 if ret:
3859 ui.status(msg)
3859 ui.status(msg)
3860 else:
3860 else:
3861 ui.note(msg)
3861 ui.note(msg)
3862 else:
3862 else:
3863 ui.warn(_('no phases changed\n'))
3863 ui.warn(_('no phases changed\n'))
3864 return ret
3864 return ret
3865
3865
3866 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3866 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3867 """Run after a changegroup has been added via pull/unbundle
3867 """Run after a changegroup has been added via pull/unbundle
3868
3868
3869 This takes arguments below:
3869 This takes arguments below:
3870
3870
3871 :modheads: change of heads by pull/unbundle
3871 :modheads: change of heads by pull/unbundle
3872 :optupdate: updating working directory is needed or not
3872 :optupdate: updating working directory is needed or not
3873 :checkout: update destination revision (or None to default destination)
3873 :checkout: update destination revision (or None to default destination)
3874 :brev: a name, which might be a bookmark to be activated after updating
3874 :brev: a name, which might be a bookmark to be activated after updating
3875 """
3875 """
3876 if modheads == 0:
3876 if modheads == 0:
3877 return
3877 return
3878 if optupdate:
3878 if optupdate:
3879 try:
3879 try:
3880 return hg.updatetotally(ui, repo, checkout, brev)
3880 return hg.updatetotally(ui, repo, checkout, brev)
3881 except error.UpdateAbort as inst:
3881 except error.UpdateAbort as inst:
3882 msg = _("not updating: %s") % str(inst)
3882 msg = _("not updating: %s") % str(inst)
3883 hint = inst.hint
3883 hint = inst.hint
3884 raise error.UpdateAbort(msg, hint=hint)
3884 raise error.UpdateAbort(msg, hint=hint)
3885 if modheads > 1:
3885 if modheads > 1:
3886 currentbranchheads = len(repo.branchheads())
3886 currentbranchheads = len(repo.branchheads())
3887 if currentbranchheads == modheads:
3887 if currentbranchheads == modheads:
3888 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3888 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3889 elif currentbranchheads > 1:
3889 elif currentbranchheads > 1:
3890 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3890 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3891 "merge)\n"))
3891 "merge)\n"))
3892 else:
3892 else:
3893 ui.status(_("(run 'hg heads' to see heads)\n"))
3893 ui.status(_("(run 'hg heads' to see heads)\n"))
3894 else:
3894 else:
3895 ui.status(_("(run 'hg update' to get a working copy)\n"))
3895 ui.status(_("(run 'hg update' to get a working copy)\n"))
3896
3896
3897 @command('^pull',
3897 @command('^pull',
3898 [('u', 'update', None,
3898 [('u', 'update', None,
3899 _('update to new branch head if changesets were pulled')),
3899 _('update to new branch head if changesets were pulled')),
3900 ('f', 'force', None, _('run even when remote repository is unrelated')),
3900 ('f', 'force', None, _('run even when remote repository is unrelated')),
3901 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3901 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3902 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3902 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3903 ('b', 'branch', [], _('a specific branch you would like to pull'),
3903 ('b', 'branch', [], _('a specific branch you would like to pull'),
3904 _('BRANCH')),
3904 _('BRANCH')),
3905 ] + remoteopts,
3905 ] + remoteopts,
3906 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3906 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3907 def pull(ui, repo, source="default", **opts):
3907 def pull(ui, repo, source="default", **opts):
3908 """pull changes from the specified source
3908 """pull changes from the specified source
3909
3909
3910 Pull changes from a remote repository to a local one.
3910 Pull changes from a remote repository to a local one.
3911
3911
3912 This finds all changes from the repository at the specified path
3912 This finds all changes from the repository at the specified path
3913 or URL and adds them to a local repository (the current one unless
3913 or URL and adds them to a local repository (the current one unless
3914 -R is specified). By default, this does not update the copy of the
3914 -R is specified). By default, this does not update the copy of the
3915 project in the working directory.
3915 project in the working directory.
3916
3916
3917 Use :hg:`incoming` if you want to see what would have been added
3917 Use :hg:`incoming` if you want to see what would have been added
3918 by a pull at the time you issued this command. If you then decide
3918 by a pull at the time you issued this command. If you then decide
3919 to add those changes to the repository, you should use :hg:`pull
3919 to add those changes to the repository, you should use :hg:`pull
3920 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3920 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3921
3921
3922 If SOURCE is omitted, the 'default' path will be used.
3922 If SOURCE is omitted, the 'default' path will be used.
3923 See :hg:`help urls` for more information.
3923 See :hg:`help urls` for more information.
3924
3924
3925 Specifying bookmark as ``.`` is equivalent to specifying the active
3925 Specifying bookmark as ``.`` is equivalent to specifying the active
3926 bookmark's name.
3926 bookmark's name.
3927
3927
3928 Returns 0 on success, 1 if an update had unresolved files.
3928 Returns 0 on success, 1 if an update had unresolved files.
3929 """
3929 """
3930 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3930 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3931 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3931 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3932 other = hg.peer(repo, opts, source)
3932 other = hg.peer(repo, opts, source)
3933 try:
3933 try:
3934 revs, checkout = hg.addbranchrevs(repo, other, branches,
3934 revs, checkout = hg.addbranchrevs(repo, other, branches,
3935 opts.get('rev'))
3935 opts.get('rev'))
3936
3936
3937
3937
3938 pullopargs = {}
3938 pullopargs = {}
3939 if opts.get('bookmark'):
3939 if opts.get('bookmark'):
3940 if not revs:
3940 if not revs:
3941 revs = []
3941 revs = []
3942 # The list of bookmark used here is not the one used to actually
3942 # The list of bookmark used here is not the one used to actually
3943 # update the bookmark name. This can result in the revision pulled
3943 # update the bookmark name. This can result in the revision pulled
3944 # not ending up with the name of the bookmark because of a race
3944 # not ending up with the name of the bookmark because of a race
3945 # condition on the server. (See issue 4689 for details)
3945 # condition on the server. (See issue 4689 for details)
3946 remotebookmarks = other.listkeys('bookmarks')
3946 remotebookmarks = other.listkeys('bookmarks')
3947 pullopargs['remotebookmarks'] = remotebookmarks
3947 pullopargs['remotebookmarks'] = remotebookmarks
3948 for b in opts['bookmark']:
3948 for b in opts['bookmark']:
3949 b = repo._bookmarks.expandname(b)
3949 b = repo._bookmarks.expandname(b)
3950 if b not in remotebookmarks:
3950 if b not in remotebookmarks:
3951 raise error.Abort(_('remote bookmark %s not found!') % b)
3951 raise error.Abort(_('remote bookmark %s not found!') % b)
3952 revs.append(remotebookmarks[b])
3952 revs.append(remotebookmarks[b])
3953
3953
3954 if revs:
3954 if revs:
3955 try:
3955 try:
3956 # When 'rev' is a bookmark name, we cannot guarantee that it
3956 # When 'rev' is a bookmark name, we cannot guarantee that it
3957 # will be updated with that name because of a race condition
3957 # will be updated with that name because of a race condition
3958 # server side. (See issue 4689 for details)
3958 # server side. (See issue 4689 for details)
3959 oldrevs = revs
3959 oldrevs = revs
3960 revs = [] # actually, nodes
3960 revs = [] # actually, nodes
3961 for r in oldrevs:
3961 for r in oldrevs:
3962 node = other.lookup(r)
3962 node = other.lookup(r)
3963 revs.append(node)
3963 revs.append(node)
3964 if r == checkout:
3964 if r == checkout:
3965 checkout = node
3965 checkout = node
3966 except error.CapabilityError:
3966 except error.CapabilityError:
3967 err = _("other repository doesn't support revision lookup, "
3967 err = _("other repository doesn't support revision lookup, "
3968 "so a rev cannot be specified.")
3968 "so a rev cannot be specified.")
3969 raise error.Abort(err)
3969 raise error.Abort(err)
3970
3970
3971 pullopargs.update(opts.get('opargs', {}))
3971 pullopargs.update(opts.get('opargs', {}))
3972 modheads = exchange.pull(repo, other, heads=revs,
3972 modheads = exchange.pull(repo, other, heads=revs,
3973 force=opts.get('force'),
3973 force=opts.get('force'),
3974 bookmarks=opts.get('bookmark', ()),
3974 bookmarks=opts.get('bookmark', ()),
3975 opargs=pullopargs).cgresult
3975 opargs=pullopargs).cgresult
3976
3976
3977 # brev is a name, which might be a bookmark to be activated at
3977 # brev is a name, which might be a bookmark to be activated at
3978 # the end of the update. In other words, it is an explicit
3978 # the end of the update. In other words, it is an explicit
3979 # destination of the update
3979 # destination of the update
3980 brev = None
3980 brev = None
3981
3981
3982 if checkout:
3982 if checkout:
3983 checkout = str(repo.changelog.rev(checkout))
3983 checkout = str(repo.changelog.rev(checkout))
3984
3984
3985 # order below depends on implementation of
3985 # order below depends on implementation of
3986 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3986 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3987 # because 'checkout' is determined without it.
3987 # because 'checkout' is determined without it.
3988 if opts.get('rev'):
3988 if opts.get('rev'):
3989 brev = opts['rev'][0]
3989 brev = opts['rev'][0]
3990 elif opts.get('branch'):
3990 elif opts.get('branch'):
3991 brev = opts['branch'][0]
3991 brev = opts['branch'][0]
3992 else:
3992 else:
3993 brev = branches[0]
3993 brev = branches[0]
3994 repo._subtoppath = source
3994 repo._subtoppath = source
3995 try:
3995 try:
3996 ret = postincoming(ui, repo, modheads, opts.get('update'),
3996 ret = postincoming(ui, repo, modheads, opts.get('update'),
3997 checkout, brev)
3997 checkout, brev)
3998
3998
3999 finally:
3999 finally:
4000 del repo._subtoppath
4000 del repo._subtoppath
4001
4001
4002 finally:
4002 finally:
4003 other.close()
4003 other.close()
4004 return ret
4004 return ret
4005
4005
4006 @command('^push',
4006 @command('^push',
4007 [('f', 'force', None, _('force push')),
4007 [('f', 'force', None, _('force push')),
4008 ('r', 'rev', [],
4008 ('r', 'rev', [],
4009 _('a changeset intended to be included in the destination'),
4009 _('a changeset intended to be included in the destination'),
4010 _('REV')),
4010 _('REV')),
4011 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4011 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4012 ('b', 'branch', [],
4012 ('b', 'branch', [],
4013 _('a specific branch you would like to push'), _('BRANCH')),
4013 _('a specific branch you would like to push'), _('BRANCH')),
4014 ('', 'new-branch', False, _('allow pushing a new branch')),
4014 ('', 'new-branch', False, _('allow pushing a new branch')),
4015 ] + remoteopts,
4015 ] + remoteopts,
4016 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4016 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4017 def push(ui, repo, dest=None, **opts):
4017 def push(ui, repo, dest=None, **opts):
4018 """push changes to the specified destination
4018 """push changes to the specified destination
4019
4019
4020 Push changesets from the local repository to the specified
4020 Push changesets from the local repository to the specified
4021 destination.
4021 destination.
4022
4022
4023 This operation is symmetrical to pull: it is identical to a pull
4023 This operation is symmetrical to pull: it is identical to a pull
4024 in the destination repository from the current one.
4024 in the destination repository from the current one.
4025
4025
4026 By default, push will not allow creation of new heads at the
4026 By default, push will not allow creation of new heads at the
4027 destination, since multiple heads would make it unclear which head
4027 destination, since multiple heads would make it unclear which head
4028 to use. In this situation, it is recommended to pull and merge
4028 to use. In this situation, it is recommended to pull and merge
4029 before pushing.
4029 before pushing.
4030
4030
4031 Use --new-branch if you want to allow push to create a new named
4031 Use --new-branch if you want to allow push to create a new named
4032 branch that is not present at the destination. This allows you to
4032 branch that is not present at the destination. This allows you to
4033 only create a new branch without forcing other changes.
4033 only create a new branch without forcing other changes.
4034
4034
4035 .. note::
4035 .. note::
4036
4036
4037 Extra care should be taken with the -f/--force option,
4037 Extra care should be taken with the -f/--force option,
4038 which will push all new heads on all branches, an action which will
4038 which will push all new heads on all branches, an action which will
4039 almost always cause confusion for collaborators.
4039 almost always cause confusion for collaborators.
4040
4040
4041 If -r/--rev is used, the specified revision and all its ancestors
4041 If -r/--rev is used, the specified revision and all its ancestors
4042 will be pushed to the remote repository.
4042 will be pushed to the remote repository.
4043
4043
4044 If -B/--bookmark is used, the specified bookmarked revision, its
4044 If -B/--bookmark is used, the specified bookmarked revision, its
4045 ancestors, and the bookmark will be pushed to the remote
4045 ancestors, and the bookmark will be pushed to the remote
4046 repository. Specifying ``.`` is equivalent to specifying the active
4046 repository. Specifying ``.`` is equivalent to specifying the active
4047 bookmark's name.
4047 bookmark's name.
4048
4048
4049 Please see :hg:`help urls` for important details about ``ssh://``
4049 Please see :hg:`help urls` for important details about ``ssh://``
4050 URLs. If DESTINATION is omitted, a default path will be used.
4050 URLs. If DESTINATION is omitted, a default path will be used.
4051
4051
4052 Returns 0 if push was successful, 1 if nothing to push.
4052 Returns 0 if push was successful, 1 if nothing to push.
4053 """
4053 """
4054
4054
4055 if opts.get('bookmark'):
4055 if opts.get('bookmark'):
4056 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4056 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4057 for b in opts['bookmark']:
4057 for b in opts['bookmark']:
4058 # translate -B options to -r so changesets get pushed
4058 # translate -B options to -r so changesets get pushed
4059 b = repo._bookmarks.expandname(b)
4059 b = repo._bookmarks.expandname(b)
4060 if b in repo._bookmarks:
4060 if b in repo._bookmarks:
4061 opts.setdefault('rev', []).append(b)
4061 opts.setdefault('rev', []).append(b)
4062 else:
4062 else:
4063 # if we try to push a deleted bookmark, translate it to null
4063 # if we try to push a deleted bookmark, translate it to null
4064 # this lets simultaneous -r, -b options continue working
4064 # this lets simultaneous -r, -b options continue working
4065 opts.setdefault('rev', []).append("null")
4065 opts.setdefault('rev', []).append("null")
4066
4066
4067 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4067 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4068 if not path:
4068 if not path:
4069 raise error.Abort(_('default repository not configured!'),
4069 raise error.Abort(_('default repository not configured!'),
4070 hint=_("see 'hg help config.paths'"))
4070 hint=_("see 'hg help config.paths'"))
4071 dest = path.pushloc or path.loc
4071 dest = path.pushloc or path.loc
4072 branches = (path.branch, opts.get('branch') or [])
4072 branches = (path.branch, opts.get('branch') or [])
4073 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4073 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4074 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4074 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4075 other = hg.peer(repo, opts, dest)
4075 other = hg.peer(repo, opts, dest)
4076
4076
4077 if revs:
4077 if revs:
4078 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4078 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4079 if not revs:
4079 if not revs:
4080 raise error.Abort(_("specified revisions evaluate to an empty set"),
4080 raise error.Abort(_("specified revisions evaluate to an empty set"),
4081 hint=_("use different revision arguments"))
4081 hint=_("use different revision arguments"))
4082 elif path.pushrev:
4082 elif path.pushrev:
4083 # It doesn't make any sense to specify ancestor revisions. So limit
4083 # It doesn't make any sense to specify ancestor revisions. So limit
4084 # to DAG heads to make discovery simpler.
4084 # to DAG heads to make discovery simpler.
4085 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4085 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4086 revs = scmutil.revrange(repo, [expr])
4086 revs = scmutil.revrange(repo, [expr])
4087 revs = [repo[rev].node() for rev in revs]
4087 revs = [repo[rev].node() for rev in revs]
4088 if not revs:
4088 if not revs:
4089 raise error.Abort(_('default push revset for path evaluates to an '
4089 raise error.Abort(_('default push revset for path evaluates to an '
4090 'empty set'))
4090 'empty set'))
4091
4091
4092 repo._subtoppath = dest
4092 repo._subtoppath = dest
4093 try:
4093 try:
4094 # push subrepos depth-first for coherent ordering
4094 # push subrepos depth-first for coherent ordering
4095 c = repo['']
4095 c = repo['']
4096 subs = c.substate # only repos that are committed
4096 subs = c.substate # only repos that are committed
4097 for s in sorted(subs):
4097 for s in sorted(subs):
4098 result = c.sub(s).push(opts)
4098 result = c.sub(s).push(opts)
4099 if result == 0:
4099 if result == 0:
4100 return not result
4100 return not result
4101 finally:
4101 finally:
4102 del repo._subtoppath
4102 del repo._subtoppath
4103 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4103 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4104 newbranch=opts.get('new_branch'),
4104 newbranch=opts.get('new_branch'),
4105 bookmarks=opts.get('bookmark', ()),
4105 bookmarks=opts.get('bookmark', ()),
4106 opargs=opts.get('opargs'))
4106 opargs=opts.get('opargs'))
4107
4107
4108 result = not pushop.cgresult
4108 result = not pushop.cgresult
4109
4109
4110 if pushop.bkresult is not None:
4110 if pushop.bkresult is not None:
4111 if pushop.bkresult == 2:
4111 if pushop.bkresult == 2:
4112 result = 2
4112 result = 2
4113 elif not result and pushop.bkresult:
4113 elif not result and pushop.bkresult:
4114 result = 2
4114 result = 2
4115
4115
4116 return result
4116 return result
4117
4117
4118 @command('recover', [])
4118 @command('recover', [])
4119 def recover(ui, repo):
4119 def recover(ui, repo):
4120 """roll back an interrupted transaction
4120 """roll back an interrupted transaction
4121
4121
4122 Recover from an interrupted commit or pull.
4122 Recover from an interrupted commit or pull.
4123
4123
4124 This command tries to fix the repository status after an
4124 This command tries to fix the repository status after an
4125 interrupted operation. It should only be necessary when Mercurial
4125 interrupted operation. It should only be necessary when Mercurial
4126 suggests it.
4126 suggests it.
4127
4127
4128 Returns 0 if successful, 1 if nothing to recover or verify fails.
4128 Returns 0 if successful, 1 if nothing to recover or verify fails.
4129 """
4129 """
4130 if repo.recover():
4130 if repo.recover():
4131 return hg.verify(repo)
4131 return hg.verify(repo)
4132 return 1
4132 return 1
4133
4133
4134 @command('^remove|rm',
4134 @command('^remove|rm',
4135 [('A', 'after', None, _('record delete for missing files')),
4135 [('A', 'after', None, _('record delete for missing files')),
4136 ('f', 'force', None,
4136 ('f', 'force', None,
4137 _('forget added files, delete modified files')),
4137 _('forget added files, delete modified files')),
4138 ] + subrepoopts + walkopts,
4138 ] + subrepoopts + walkopts,
4139 _('[OPTION]... FILE...'),
4139 _('[OPTION]... FILE...'),
4140 inferrepo=True)
4140 inferrepo=True)
4141 def remove(ui, repo, *pats, **opts):
4141 def remove(ui, repo, *pats, **opts):
4142 """remove the specified files on the next commit
4142 """remove the specified files on the next commit
4143
4143
4144 Schedule the indicated files for removal from the current branch.
4144 Schedule the indicated files for removal from the current branch.
4145
4145
4146 This command schedules the files to be removed at the next commit.
4146 This command schedules the files to be removed at the next commit.
4147 To undo a remove before that, see :hg:`revert`. To undo added
4147 To undo a remove before that, see :hg:`revert`. To undo added
4148 files, see :hg:`forget`.
4148 files, see :hg:`forget`.
4149
4149
4150 .. container:: verbose
4150 .. container:: verbose
4151
4151
4152 -A/--after can be used to remove only files that have already
4152 -A/--after can be used to remove only files that have already
4153 been deleted, -f/--force can be used to force deletion, and -Af
4153 been deleted, -f/--force can be used to force deletion, and -Af
4154 can be used to remove files from the next revision without
4154 can be used to remove files from the next revision without
4155 deleting them from the working directory.
4155 deleting them from the working directory.
4156
4156
4157 The following table details the behavior of remove for different
4157 The following table details the behavior of remove for different
4158 file states (columns) and option combinations (rows). The file
4158 file states (columns) and option combinations (rows). The file
4159 states are Added [A], Clean [C], Modified [M] and Missing [!]
4159 states are Added [A], Clean [C], Modified [M] and Missing [!]
4160 (as reported by :hg:`status`). The actions are Warn, Remove
4160 (as reported by :hg:`status`). The actions are Warn, Remove
4161 (from branch) and Delete (from disk):
4161 (from branch) and Delete (from disk):
4162
4162
4163 ========= == == == ==
4163 ========= == == == ==
4164 opt/state A C M !
4164 opt/state A C M !
4165 ========= == == == ==
4165 ========= == == == ==
4166 none W RD W R
4166 none W RD W R
4167 -f R RD RD R
4167 -f R RD RD R
4168 -A W W W R
4168 -A W W W R
4169 -Af R R R R
4169 -Af R R R R
4170 ========= == == == ==
4170 ========= == == == ==
4171
4171
4172 .. note::
4172 .. note::
4173
4173
4174 :hg:`remove` never deletes files in Added [A] state from the
4174 :hg:`remove` never deletes files in Added [A] state from the
4175 working directory, not even if ``--force`` is specified.
4175 working directory, not even if ``--force`` is specified.
4176
4176
4177 Returns 0 on success, 1 if any warnings encountered.
4177 Returns 0 on success, 1 if any warnings encountered.
4178 """
4178 """
4179
4179
4180 after, force = opts.get('after'), opts.get('force')
4180 after, force = opts.get('after'), opts.get('force')
4181 if not pats and not after:
4181 if not pats and not after:
4182 raise error.Abort(_('no files specified'))
4182 raise error.Abort(_('no files specified'))
4183
4183
4184 m = scmutil.match(repo[None], pats, opts)
4184 m = scmutil.match(repo[None], pats, opts)
4185 subrepos = opts.get('subrepos')
4185 subrepos = opts.get('subrepos')
4186 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4186 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4187
4187
4188 @command('rename|move|mv',
4188 @command('rename|move|mv',
4189 [('A', 'after', None, _('record a rename that has already occurred')),
4189 [('A', 'after', None, _('record a rename that has already occurred')),
4190 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4190 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4191 ] + walkopts + dryrunopts,
4191 ] + walkopts + dryrunopts,
4192 _('[OPTION]... SOURCE... DEST'))
4192 _('[OPTION]... SOURCE... DEST'))
4193 def rename(ui, repo, *pats, **opts):
4193 def rename(ui, repo, *pats, **opts):
4194 """rename files; equivalent of copy + remove
4194 """rename files; equivalent of copy + remove
4195
4195
4196 Mark dest as copies of sources; mark sources for deletion. If dest
4196 Mark dest as copies of sources; mark sources for deletion. If dest
4197 is a directory, copies are put in that directory. If dest is a
4197 is a directory, copies are put in that directory. If dest is a
4198 file, there can only be one source.
4198 file, there can only be one source.
4199
4199
4200 By default, this command copies the contents of files as they
4200 By default, this command copies the contents of files as they
4201 exist in the working directory. If invoked with -A/--after, the
4201 exist in the working directory. If invoked with -A/--after, the
4202 operation is recorded, but no copying is performed.
4202 operation is recorded, but no copying is performed.
4203
4203
4204 This command takes effect at the next commit. To undo a rename
4204 This command takes effect at the next commit. To undo a rename
4205 before that, see :hg:`revert`.
4205 before that, see :hg:`revert`.
4206
4206
4207 Returns 0 on success, 1 if errors are encountered.
4207 Returns 0 on success, 1 if errors are encountered.
4208 """
4208 """
4209 with repo.wlock(False):
4209 with repo.wlock(False):
4210 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4210 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4211
4211
4212 @command('resolve',
4212 @command('resolve',
4213 [('a', 'all', None, _('select all unresolved files')),
4213 [('a', 'all', None, _('select all unresolved files')),
4214 ('l', 'list', None, _('list state of files needing merge')),
4214 ('l', 'list', None, _('list state of files needing merge')),
4215 ('m', 'mark', None, _('mark files as resolved')),
4215 ('m', 'mark', None, _('mark files as resolved')),
4216 ('u', 'unmark', None, _('mark files as unresolved')),
4216 ('u', 'unmark', None, _('mark files as unresolved')),
4217 ('n', 'no-status', None, _('hide status prefix'))]
4217 ('n', 'no-status', None, _('hide status prefix'))]
4218 + mergetoolopts + walkopts + formatteropts,
4218 + mergetoolopts + walkopts + formatteropts,
4219 _('[OPTION]... [FILE]...'),
4219 _('[OPTION]... [FILE]...'),
4220 inferrepo=True)
4220 inferrepo=True)
4221 def resolve(ui, repo, *pats, **opts):
4221 def resolve(ui, repo, *pats, **opts):
4222 """redo merges or set/view the merge status of files
4222 """redo merges or set/view the merge status of files
4223
4223
4224 Merges with unresolved conflicts are often the result of
4224 Merges with unresolved conflicts are often the result of
4225 non-interactive merging using the ``internal:merge`` configuration
4225 non-interactive merging using the ``internal:merge`` configuration
4226 setting, or a command-line merge tool like ``diff3``. The resolve
4226 setting, or a command-line merge tool like ``diff3``. The resolve
4227 command is used to manage the files involved in a merge, after
4227 command is used to manage the files involved in a merge, after
4228 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4228 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4229 working directory must have two parents). See :hg:`help
4229 working directory must have two parents). See :hg:`help
4230 merge-tools` for information on configuring merge tools.
4230 merge-tools` for information on configuring merge tools.
4231
4231
4232 The resolve command can be used in the following ways:
4232 The resolve command can be used in the following ways:
4233
4233
4234 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4234 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4235 files, discarding any previous merge attempts. Re-merging is not
4235 files, discarding any previous merge attempts. Re-merging is not
4236 performed for files already marked as resolved. Use ``--all/-a``
4236 performed for files already marked as resolved. Use ``--all/-a``
4237 to select all unresolved files. ``--tool`` can be used to specify
4237 to select all unresolved files. ``--tool`` can be used to specify
4238 the merge tool used for the given files. It overrides the HGMERGE
4238 the merge tool used for the given files. It overrides the HGMERGE
4239 environment variable and your configuration files. Previous file
4239 environment variable and your configuration files. Previous file
4240 contents are saved with a ``.orig`` suffix.
4240 contents are saved with a ``.orig`` suffix.
4241
4241
4242 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4242 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4243 (e.g. after having manually fixed-up the files). The default is
4243 (e.g. after having manually fixed-up the files). The default is
4244 to mark all unresolved files.
4244 to mark all unresolved files.
4245
4245
4246 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4246 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4247 default is to mark all resolved files.
4247 default is to mark all resolved files.
4248
4248
4249 - :hg:`resolve -l`: list files which had or still have conflicts.
4249 - :hg:`resolve -l`: list files which had or still have conflicts.
4250 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4250 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4251 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4251 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4252 the list. See :hg:`help filesets` for details.
4252 the list. See :hg:`help filesets` for details.
4253
4253
4254 .. note::
4254 .. note::
4255
4255
4256 Mercurial will not let you commit files with unresolved merge
4256 Mercurial will not let you commit files with unresolved merge
4257 conflicts. You must use :hg:`resolve -m ...` before you can
4257 conflicts. You must use :hg:`resolve -m ...` before you can
4258 commit after a conflicting merge.
4258 commit after a conflicting merge.
4259
4259
4260 Returns 0 on success, 1 if any files fail a resolve attempt.
4260 Returns 0 on success, 1 if any files fail a resolve attempt.
4261 """
4261 """
4262
4262
4263 flaglist = 'all mark unmark list no_status'.split()
4263 flaglist = 'all mark unmark list no_status'.split()
4264 all, mark, unmark, show, nostatus = \
4264 all, mark, unmark, show, nostatus = \
4265 [opts.get(o) for o in flaglist]
4265 [opts.get(o) for o in flaglist]
4266
4266
4267 if (show and (mark or unmark)) or (mark and unmark):
4267 if (show and (mark or unmark)) or (mark and unmark):
4268 raise error.Abort(_("too many options specified"))
4268 raise error.Abort(_("too many options specified"))
4269 if pats and all:
4269 if pats and all:
4270 raise error.Abort(_("can't specify --all and patterns"))
4270 raise error.Abort(_("can't specify --all and patterns"))
4271 if not (all or pats or show or mark or unmark):
4271 if not (all or pats or show or mark or unmark):
4272 raise error.Abort(_('no files or directories specified'),
4272 raise error.Abort(_('no files or directories specified'),
4273 hint=('use --all to re-merge all unresolved files'))
4273 hint=('use --all to re-merge all unresolved files'))
4274
4274
4275 if show:
4275 if show:
4276 ui.pager('resolve')
4276 ui.pager('resolve')
4277 fm = ui.formatter('resolve', opts)
4277 fm = ui.formatter('resolve', opts)
4278 ms = mergemod.mergestate.read(repo)
4278 ms = mergemod.mergestate.read(repo)
4279 m = scmutil.match(repo[None], pats, opts)
4279 m = scmutil.match(repo[None], pats, opts)
4280 for f in ms:
4280 for f in ms:
4281 if not m(f):
4281 if not m(f):
4282 continue
4282 continue
4283 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4283 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4284 'd': 'driverresolved'}[ms[f]]
4284 'd': 'driverresolved'}[ms[f]]
4285 fm.startitem()
4285 fm.startitem()
4286 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4286 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4287 fm.write('path', '%s\n', f, label=l)
4287 fm.write('path', '%s\n', f, label=l)
4288 fm.end()
4288 fm.end()
4289 return 0
4289 return 0
4290
4290
4291 with repo.wlock():
4291 with repo.wlock():
4292 ms = mergemod.mergestate.read(repo)
4292 ms = mergemod.mergestate.read(repo)
4293
4293
4294 if not (ms.active() or repo.dirstate.p2() != nullid):
4294 if not (ms.active() or repo.dirstate.p2() != nullid):
4295 raise error.Abort(
4295 raise error.Abort(
4296 _('resolve command not applicable when not merging'))
4296 _('resolve command not applicable when not merging'))
4297
4297
4298 wctx = repo[None]
4298 wctx = repo[None]
4299
4299
4300 if ms.mergedriver and ms.mdstate() == 'u':
4300 if ms.mergedriver and ms.mdstate() == 'u':
4301 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4301 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4302 ms.commit()
4302 ms.commit()
4303 # allow mark and unmark to go through
4303 # allow mark and unmark to go through
4304 if not mark and not unmark and not proceed:
4304 if not mark and not unmark and not proceed:
4305 return 1
4305 return 1
4306
4306
4307 m = scmutil.match(wctx, pats, opts)
4307 m = scmutil.match(wctx, pats, opts)
4308 ret = 0
4308 ret = 0
4309 didwork = False
4309 didwork = False
4310 runconclude = False
4310 runconclude = False
4311
4311
4312 tocomplete = []
4312 tocomplete = []
4313 for f in ms:
4313 for f in ms:
4314 if not m(f):
4314 if not m(f):
4315 continue
4315 continue
4316
4316
4317 didwork = True
4317 didwork = True
4318
4318
4319 # don't let driver-resolved files be marked, and run the conclude
4319 # don't let driver-resolved files be marked, and run the conclude
4320 # step if asked to resolve
4320 # step if asked to resolve
4321 if ms[f] == "d":
4321 if ms[f] == "d":
4322 exact = m.exact(f)
4322 exact = m.exact(f)
4323 if mark:
4323 if mark:
4324 if exact:
4324 if exact:
4325 ui.warn(_('not marking %s as it is driver-resolved\n')
4325 ui.warn(_('not marking %s as it is driver-resolved\n')
4326 % f)
4326 % f)
4327 elif unmark:
4327 elif unmark:
4328 if exact:
4328 if exact:
4329 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4329 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4330 % f)
4330 % f)
4331 else:
4331 else:
4332 runconclude = True
4332 runconclude = True
4333 continue
4333 continue
4334
4334
4335 if mark:
4335 if mark:
4336 ms.mark(f, "r")
4336 ms.mark(f, "r")
4337 elif unmark:
4337 elif unmark:
4338 ms.mark(f, "u")
4338 ms.mark(f, "u")
4339 else:
4339 else:
4340 # backup pre-resolve (merge uses .orig for its own purposes)
4340 # backup pre-resolve (merge uses .orig for its own purposes)
4341 a = repo.wjoin(f)
4341 a = repo.wjoin(f)
4342 try:
4342 try:
4343 util.copyfile(a, a + ".resolve")
4343 util.copyfile(a, a + ".resolve")
4344 except (IOError, OSError) as inst:
4344 except (IOError, OSError) as inst:
4345 if inst.errno != errno.ENOENT:
4345 if inst.errno != errno.ENOENT:
4346 raise
4346 raise
4347
4347
4348 try:
4348 try:
4349 # preresolve file
4349 # preresolve file
4350 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4350 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4351 'resolve')
4351 'resolve')
4352 complete, r = ms.preresolve(f, wctx)
4352 complete, r = ms.preresolve(f, wctx)
4353 if not complete:
4353 if not complete:
4354 tocomplete.append(f)
4354 tocomplete.append(f)
4355 elif r:
4355 elif r:
4356 ret = 1
4356 ret = 1
4357 finally:
4357 finally:
4358 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4358 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4359 ms.commit()
4359 ms.commit()
4360
4360
4361 # replace filemerge's .orig file with our resolve file, but only
4361 # replace filemerge's .orig file with our resolve file, but only
4362 # for merges that are complete
4362 # for merges that are complete
4363 if complete:
4363 if complete:
4364 try:
4364 try:
4365 util.rename(a + ".resolve",
4365 util.rename(a + ".resolve",
4366 scmutil.origpath(ui, repo, a))
4366 scmutil.origpath(ui, repo, a))
4367 except OSError as inst:
4367 except OSError as inst:
4368 if inst.errno != errno.ENOENT:
4368 if inst.errno != errno.ENOENT:
4369 raise
4369 raise
4370
4370
4371 for f in tocomplete:
4371 for f in tocomplete:
4372 try:
4372 try:
4373 # resolve file
4373 # resolve file
4374 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4374 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4375 'resolve')
4375 'resolve')
4376 r = ms.resolve(f, wctx)
4376 r = ms.resolve(f, wctx)
4377 if r:
4377 if r:
4378 ret = 1
4378 ret = 1
4379 finally:
4379 finally:
4380 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4380 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4381 ms.commit()
4381 ms.commit()
4382
4382
4383 # replace filemerge's .orig file with our resolve file
4383 # replace filemerge's .orig file with our resolve file
4384 a = repo.wjoin(f)
4384 a = repo.wjoin(f)
4385 try:
4385 try:
4386 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4386 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4387 except OSError as inst:
4387 except OSError as inst:
4388 if inst.errno != errno.ENOENT:
4388 if inst.errno != errno.ENOENT:
4389 raise
4389 raise
4390
4390
4391 ms.commit()
4391 ms.commit()
4392 ms.recordactions()
4392 ms.recordactions()
4393
4393
4394 if not didwork and pats:
4394 if not didwork and pats:
4395 hint = None
4395 hint = None
4396 if not any([p for p in pats if p.find(':') >= 0]):
4396 if not any([p for p in pats if p.find(':') >= 0]):
4397 pats = ['path:%s' % p for p in pats]
4397 pats = ['path:%s' % p for p in pats]
4398 m = scmutil.match(wctx, pats, opts)
4398 m = scmutil.match(wctx, pats, opts)
4399 for f in ms:
4399 for f in ms:
4400 if not m(f):
4400 if not m(f):
4401 continue
4401 continue
4402 flags = ''.join(['-%s ' % o[0] for o in flaglist
4402 flags = ''.join(['-%s ' % o[0] for o in flaglist
4403 if opts.get(o)])
4403 if opts.get(o)])
4404 hint = _("(try: hg resolve %s%s)\n") % (
4404 hint = _("(try: hg resolve %s%s)\n") % (
4405 flags,
4405 flags,
4406 ' '.join(pats))
4406 ' '.join(pats))
4407 break
4407 break
4408 ui.warn(_("arguments do not match paths that need resolving\n"))
4408 ui.warn(_("arguments do not match paths that need resolving\n"))
4409 if hint:
4409 if hint:
4410 ui.warn(hint)
4410 ui.warn(hint)
4411 elif ms.mergedriver and ms.mdstate() != 's':
4411 elif ms.mergedriver and ms.mdstate() != 's':
4412 # run conclude step when either a driver-resolved file is requested
4412 # run conclude step when either a driver-resolved file is requested
4413 # or there are no driver-resolved files
4413 # or there are no driver-resolved files
4414 # we can't use 'ret' to determine whether any files are unresolved
4414 # we can't use 'ret' to determine whether any files are unresolved
4415 # because we might not have tried to resolve some
4415 # because we might not have tried to resolve some
4416 if ((runconclude or not list(ms.driverresolved()))
4416 if ((runconclude or not list(ms.driverresolved()))
4417 and not list(ms.unresolved())):
4417 and not list(ms.unresolved())):
4418 proceed = mergemod.driverconclude(repo, ms, wctx)
4418 proceed = mergemod.driverconclude(repo, ms, wctx)
4419 ms.commit()
4419 ms.commit()
4420 if not proceed:
4420 if not proceed:
4421 return 1
4421 return 1
4422
4422
4423 # Nudge users into finishing an unfinished operation
4423 # Nudge users into finishing an unfinished operation
4424 unresolvedf = list(ms.unresolved())
4424 unresolvedf = list(ms.unresolved())
4425 driverresolvedf = list(ms.driverresolved())
4425 driverresolvedf = list(ms.driverresolved())
4426 if not unresolvedf and not driverresolvedf:
4426 if not unresolvedf and not driverresolvedf:
4427 ui.status(_('(no more unresolved files)\n'))
4427 ui.status(_('(no more unresolved files)\n'))
4428 cmdutil.checkafterresolved(repo)
4428 cmdutil.checkafterresolved(repo)
4429 elif not unresolvedf:
4429 elif not unresolvedf:
4430 ui.status(_('(no more unresolved files -- '
4430 ui.status(_('(no more unresolved files -- '
4431 'run "hg resolve --all" to conclude)\n'))
4431 'run "hg resolve --all" to conclude)\n'))
4432
4432
4433 return ret
4433 return ret
4434
4434
4435 @command('revert',
4435 @command('revert',
4436 [('a', 'all', None, _('revert all changes when no arguments given')),
4436 [('a', 'all', None, _('revert all changes when no arguments given')),
4437 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4437 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4438 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4438 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4439 ('C', 'no-backup', None, _('do not save backup copies of files')),
4439 ('C', 'no-backup', None, _('do not save backup copies of files')),
4440 ('i', 'interactive', None,
4440 ('i', 'interactive', None,
4441 _('interactively select the changes (EXPERIMENTAL)')),
4441 _('interactively select the changes (EXPERIMENTAL)')),
4442 ] + walkopts + dryrunopts,
4442 ] + walkopts + dryrunopts,
4443 _('[OPTION]... [-r REV] [NAME]...'))
4443 _('[OPTION]... [-r REV] [NAME]...'))
4444 def revert(ui, repo, *pats, **opts):
4444 def revert(ui, repo, *pats, **opts):
4445 """restore files to their checkout state
4445 """restore files to their checkout state
4446
4446
4447 .. note::
4447 .. note::
4448
4448
4449 To check out earlier revisions, you should use :hg:`update REV`.
4449 To check out earlier revisions, you should use :hg:`update REV`.
4450 To cancel an uncommitted merge (and lose your changes),
4450 To cancel an uncommitted merge (and lose your changes),
4451 use :hg:`update --clean .`.
4451 use :hg:`update --clean .`.
4452
4452
4453 With no revision specified, revert the specified files or directories
4453 With no revision specified, revert the specified files or directories
4454 to the contents they had in the parent of the working directory.
4454 to the contents they had in the parent of the working directory.
4455 This restores the contents of files to an unmodified
4455 This restores the contents of files to an unmodified
4456 state and unschedules adds, removes, copies, and renames. If the
4456 state and unschedules adds, removes, copies, and renames. If the
4457 working directory has two parents, you must explicitly specify a
4457 working directory has two parents, you must explicitly specify a
4458 revision.
4458 revision.
4459
4459
4460 Using the -r/--rev or -d/--date options, revert the given files or
4460 Using the -r/--rev or -d/--date options, revert the given files or
4461 directories to their states as of a specific revision. Because
4461 directories to their states as of a specific revision. Because
4462 revert does not change the working directory parents, this will
4462 revert does not change the working directory parents, this will
4463 cause these files to appear modified. This can be helpful to "back
4463 cause these files to appear modified. This can be helpful to "back
4464 out" some or all of an earlier change. See :hg:`backout` for a
4464 out" some or all of an earlier change. See :hg:`backout` for a
4465 related method.
4465 related method.
4466
4466
4467 Modified files are saved with a .orig suffix before reverting.
4467 Modified files are saved with a .orig suffix before reverting.
4468 To disable these backups, use --no-backup. It is possible to store
4468 To disable these backups, use --no-backup. It is possible to store
4469 the backup files in a custom directory relative to the root of the
4469 the backup files in a custom directory relative to the root of the
4470 repository by setting the ``ui.origbackuppath`` configuration
4470 repository by setting the ``ui.origbackuppath`` configuration
4471 option.
4471 option.
4472
4472
4473 See :hg:`help dates` for a list of formats valid for -d/--date.
4473 See :hg:`help dates` for a list of formats valid for -d/--date.
4474
4474
4475 See :hg:`help backout` for a way to reverse the effect of an
4475 See :hg:`help backout` for a way to reverse the effect of an
4476 earlier changeset.
4476 earlier changeset.
4477
4477
4478 Returns 0 on success.
4478 Returns 0 on success.
4479 """
4479 """
4480
4480
4481 if opts.get("date"):
4481 if opts.get("date"):
4482 if opts.get("rev"):
4482 if opts.get("rev"):
4483 raise error.Abort(_("you can't specify a revision and a date"))
4483 raise error.Abort(_("you can't specify a revision and a date"))
4484 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4484 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4485
4485
4486 parent, p2 = repo.dirstate.parents()
4486 parent, p2 = repo.dirstate.parents()
4487 if not opts.get('rev') and p2 != nullid:
4487 if not opts.get('rev') and p2 != nullid:
4488 # revert after merge is a trap for new users (issue2915)
4488 # revert after merge is a trap for new users (issue2915)
4489 raise error.Abort(_('uncommitted merge with no revision specified'),
4489 raise error.Abort(_('uncommitted merge with no revision specified'),
4490 hint=_("use 'hg update' or see 'hg help revert'"))
4490 hint=_("use 'hg update' or see 'hg help revert'"))
4491
4491
4492 ctx = scmutil.revsingle(repo, opts.get('rev'))
4492 ctx = scmutil.revsingle(repo, opts.get('rev'))
4493
4493
4494 if (not (pats or opts.get('include') or opts.get('exclude') or
4494 if (not (pats or opts.get('include') or opts.get('exclude') or
4495 opts.get('all') or opts.get('interactive'))):
4495 opts.get('all') or opts.get('interactive'))):
4496 msg = _("no files or directories specified")
4496 msg = _("no files or directories specified")
4497 if p2 != nullid:
4497 if p2 != nullid:
4498 hint = _("uncommitted merge, use --all to discard all changes,"
4498 hint = _("uncommitted merge, use --all to discard all changes,"
4499 " or 'hg update -C .' to abort the merge")
4499 " or 'hg update -C .' to abort the merge")
4500 raise error.Abort(msg, hint=hint)
4500 raise error.Abort(msg, hint=hint)
4501 dirty = any(repo.status())
4501 dirty = any(repo.status())
4502 node = ctx.node()
4502 node = ctx.node()
4503 if node != parent:
4503 if node != parent:
4504 if dirty:
4504 if dirty:
4505 hint = _("uncommitted changes, use --all to discard all"
4505 hint = _("uncommitted changes, use --all to discard all"
4506 " changes, or 'hg update %s' to update") % ctx.rev()
4506 " changes, or 'hg update %s' to update") % ctx.rev()
4507 else:
4507 else:
4508 hint = _("use --all to revert all files,"
4508 hint = _("use --all to revert all files,"
4509 " or 'hg update %s' to update") % ctx.rev()
4509 " or 'hg update %s' to update") % ctx.rev()
4510 elif dirty:
4510 elif dirty:
4511 hint = _("uncommitted changes, use --all to discard all changes")
4511 hint = _("uncommitted changes, use --all to discard all changes")
4512 else:
4512 else:
4513 hint = _("use --all to revert all files")
4513 hint = _("use --all to revert all files")
4514 raise error.Abort(msg, hint=hint)
4514 raise error.Abort(msg, hint=hint)
4515
4515
4516 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4516 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4517
4517
4518 @command('rollback', dryrunopts +
4518 @command('rollback', dryrunopts +
4519 [('f', 'force', False, _('ignore safety measures'))])
4519 [('f', 'force', False, _('ignore safety measures'))])
4520 def rollback(ui, repo, **opts):
4520 def rollback(ui, repo, **opts):
4521 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4521 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4522
4522
4523 Please use :hg:`commit --amend` instead of rollback to correct
4523 Please use :hg:`commit --amend` instead of rollback to correct
4524 mistakes in the last commit.
4524 mistakes in the last commit.
4525
4525
4526 This command should be used with care. There is only one level of
4526 This command should be used with care. There is only one level of
4527 rollback, and there is no way to undo a rollback. It will also
4527 rollback, and there is no way to undo a rollback. It will also
4528 restore the dirstate at the time of the last transaction, losing
4528 restore the dirstate at the time of the last transaction, losing
4529 any dirstate changes since that time. This command does not alter
4529 any dirstate changes since that time. This command does not alter
4530 the working directory.
4530 the working directory.
4531
4531
4532 Transactions are used to encapsulate the effects of all commands
4532 Transactions are used to encapsulate the effects of all commands
4533 that create new changesets or propagate existing changesets into a
4533 that create new changesets or propagate existing changesets into a
4534 repository.
4534 repository.
4535
4535
4536 .. container:: verbose
4536 .. container:: verbose
4537
4537
4538 For example, the following commands are transactional, and their
4538 For example, the following commands are transactional, and their
4539 effects can be rolled back:
4539 effects can be rolled back:
4540
4540
4541 - commit
4541 - commit
4542 - import
4542 - import
4543 - pull
4543 - pull
4544 - push (with this repository as the destination)
4544 - push (with this repository as the destination)
4545 - unbundle
4545 - unbundle
4546
4546
4547 To avoid permanent data loss, rollback will refuse to rollback a
4547 To avoid permanent data loss, rollback will refuse to rollback a
4548 commit transaction if it isn't checked out. Use --force to
4548 commit transaction if it isn't checked out. Use --force to
4549 override this protection.
4549 override this protection.
4550
4550
4551 The rollback command can be entirely disabled by setting the
4551 The rollback command can be entirely disabled by setting the
4552 ``ui.rollback`` configuration setting to false. If you're here
4552 ``ui.rollback`` configuration setting to false. If you're here
4553 because you want to use rollback and it's disabled, you can
4553 because you want to use rollback and it's disabled, you can
4554 re-enable the command by setting ``ui.rollback`` to true.
4554 re-enable the command by setting ``ui.rollback`` to true.
4555
4555
4556 This command is not intended for use on public repositories. Once
4556 This command is not intended for use on public repositories. Once
4557 changes are visible for pull by other users, rolling a transaction
4557 changes are visible for pull by other users, rolling a transaction
4558 back locally is ineffective (someone else may already have pulled
4558 back locally is ineffective (someone else may already have pulled
4559 the changes). Furthermore, a race is possible with readers of the
4559 the changes). Furthermore, a race is possible with readers of the
4560 repository; for example an in-progress pull from the repository
4560 repository; for example an in-progress pull from the repository
4561 may fail if a rollback is performed.
4561 may fail if a rollback is performed.
4562
4562
4563 Returns 0 on success, 1 if no rollback data is available.
4563 Returns 0 on success, 1 if no rollback data is available.
4564 """
4564 """
4565 if not ui.configbool('ui', 'rollback', True):
4565 if not ui.configbool('ui', 'rollback', True):
4566 raise error.Abort(_('rollback is disabled because it is unsafe'),
4566 raise error.Abort(_('rollback is disabled because it is unsafe'),
4567 hint=('see `hg help -v rollback` for information'))
4567 hint=('see `hg help -v rollback` for information'))
4568 return repo.rollback(dryrun=opts.get('dry_run'),
4568 return repo.rollback(dryrun=opts.get('dry_run'),
4569 force=opts.get('force'))
4569 force=opts.get('force'))
4570
4570
4571 @command('root', [])
4571 @command('root', [])
4572 def root(ui, repo):
4572 def root(ui, repo):
4573 """print the root (top) of the current working directory
4573 """print the root (top) of the current working directory
4574
4574
4575 Print the root directory of the current repository.
4575 Print the root directory of the current repository.
4576
4576
4577 Returns 0 on success.
4577 Returns 0 on success.
4578 """
4578 """
4579 ui.write(repo.root + "\n")
4579 ui.write(repo.root + "\n")
4580
4580
4581 @command('^serve',
4581 @command('^serve',
4582 [('A', 'accesslog', '', _('name of access log file to write to'),
4582 [('A', 'accesslog', '', _('name of access log file to write to'),
4583 _('FILE')),
4583 _('FILE')),
4584 ('d', 'daemon', None, _('run server in background')),
4584 ('d', 'daemon', None, _('run server in background')),
4585 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4585 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4586 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4586 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4587 # use string type, then we can check if something was passed
4587 # use string type, then we can check if something was passed
4588 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4588 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4589 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4589 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4590 _('ADDR')),
4590 _('ADDR')),
4591 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4591 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4592 _('PREFIX')),
4592 _('PREFIX')),
4593 ('n', 'name', '',
4593 ('n', 'name', '',
4594 _('name to show in web pages (default: working directory)'), _('NAME')),
4594 _('name to show in web pages (default: working directory)'), _('NAME')),
4595 ('', 'web-conf', '',
4595 ('', 'web-conf', '',
4596 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4596 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4597 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4597 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4598 _('FILE')),
4598 _('FILE')),
4599 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4599 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4600 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4600 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4601 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4601 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4602 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4602 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4603 ('', 'style', '', _('template style to use'), _('STYLE')),
4603 ('', 'style', '', _('template style to use'), _('STYLE')),
4604 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4604 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4605 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4605 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4606 _('[OPTION]...'),
4606 _('[OPTION]...'),
4607 optionalrepo=True)
4607 optionalrepo=True)
4608 def serve(ui, repo, **opts):
4608 def serve(ui, repo, **opts):
4609 """start stand-alone webserver
4609 """start stand-alone webserver
4610
4610
4611 Start a local HTTP repository browser and pull server. You can use
4611 Start a local HTTP repository browser and pull server. You can use
4612 this for ad-hoc sharing and browsing of repositories. It is
4612 this for ad-hoc sharing and browsing of repositories. It is
4613 recommended to use a real web server to serve a repository for
4613 recommended to use a real web server to serve a repository for
4614 longer periods of time.
4614 longer periods of time.
4615
4615
4616 Please note that the server does not implement access control.
4616 Please note that the server does not implement access control.
4617 This means that, by default, anybody can read from the server and
4617 This means that, by default, anybody can read from the server and
4618 nobody can write to it by default. Set the ``web.allow_push``
4618 nobody can write to it by default. Set the ``web.allow_push``
4619 option to ``*`` to allow everybody to push to the server. You
4619 option to ``*`` to allow everybody to push to the server. You
4620 should use a real web server if you need to authenticate users.
4620 should use a real web server if you need to authenticate users.
4621
4621
4622 By default, the server logs accesses to stdout and errors to
4622 By default, the server logs accesses to stdout and errors to
4623 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4623 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4624 files.
4624 files.
4625
4625
4626 To have the server choose a free port number to listen on, specify
4626 To have the server choose a free port number to listen on, specify
4627 a port number of 0; in this case, the server will print the port
4627 a port number of 0; in this case, the server will print the port
4628 number it uses.
4628 number it uses.
4629
4629
4630 Returns 0 on success.
4630 Returns 0 on success.
4631 """
4631 """
4632
4632
4633 if opts["stdio"] and opts["cmdserver"]:
4633 if opts["stdio"] and opts["cmdserver"]:
4634 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4634 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4635
4635
4636 if opts["stdio"]:
4636 if opts["stdio"]:
4637 if repo is None:
4637 if repo is None:
4638 raise error.RepoError(_("there is no Mercurial repository here"
4638 raise error.RepoError(_("there is no Mercurial repository here"
4639 " (.hg not found)"))
4639 " (.hg not found)"))
4640 s = sshserver.sshserver(ui, repo)
4640 s = sshserver.sshserver(ui, repo)
4641 s.serve_forever()
4641 s.serve_forever()
4642
4642
4643 service = server.createservice(ui, repo, opts)
4643 service = server.createservice(ui, repo, opts)
4644 return server.runservice(opts, initfn=service.init, runfn=service.run)
4644 return server.runservice(opts, initfn=service.init, runfn=service.run)
4645
4645
4646 @command('^status|st',
4646 @command('^status|st',
4647 [('A', 'all', None, _('show status of all files')),
4647 [('A', 'all', None, _('show status of all files')),
4648 ('m', 'modified', None, _('show only modified files')),
4648 ('m', 'modified', None, _('show only modified files')),
4649 ('a', 'added', None, _('show only added files')),
4649 ('a', 'added', None, _('show only added files')),
4650 ('r', 'removed', None, _('show only removed files')),
4650 ('r', 'removed', None, _('show only removed files')),
4651 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4651 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4652 ('c', 'clean', None, _('show only files without changes')),
4652 ('c', 'clean', None, _('show only files without changes')),
4653 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4653 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4654 ('i', 'ignored', None, _('show only ignored files')),
4654 ('i', 'ignored', None, _('show only ignored files')),
4655 ('n', 'no-status', None, _('hide status prefix')),
4655 ('n', 'no-status', None, _('hide status prefix')),
4656 ('C', 'copies', None, _('show source of copied files')),
4656 ('C', 'copies', None, _('show source of copied files')),
4657 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4657 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4658 ('', 'rev', [], _('show difference from revision'), _('REV')),
4658 ('', 'rev', [], _('show difference from revision'), _('REV')),
4659 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4659 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4660 ] + walkopts + subrepoopts + formatteropts,
4660 ] + walkopts + subrepoopts + formatteropts,
4661 _('[OPTION]... [FILE]...'),
4661 _('[OPTION]... [FILE]...'),
4662 inferrepo=True)
4662 inferrepo=True)
4663 def status(ui, repo, *pats, **opts):
4663 def status(ui, repo, *pats, **opts):
4664 """show changed files in the working directory
4664 """show changed files in the working directory
4665
4665
4666 Show status of files in the repository. If names are given, only
4666 Show status of files in the repository. If names are given, only
4667 files that match are shown. Files that are clean or ignored or
4667 files that match are shown. Files that are clean or ignored or
4668 the source of a copy/move operation, are not listed unless
4668 the source of a copy/move operation, are not listed unless
4669 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4669 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4670 Unless options described with "show only ..." are given, the
4670 Unless options described with "show only ..." are given, the
4671 options -mardu are used.
4671 options -mardu are used.
4672
4672
4673 Option -q/--quiet hides untracked (unknown and ignored) files
4673 Option -q/--quiet hides untracked (unknown and ignored) files
4674 unless explicitly requested with -u/--unknown or -i/--ignored.
4674 unless explicitly requested with -u/--unknown or -i/--ignored.
4675
4675
4676 .. note::
4676 .. note::
4677
4677
4678 :hg:`status` may appear to disagree with diff if permissions have
4678 :hg:`status` may appear to disagree with diff if permissions have
4679 changed or a merge has occurred. The standard diff format does
4679 changed or a merge has occurred. The standard diff format does
4680 not report permission changes and diff only reports changes
4680 not report permission changes and diff only reports changes
4681 relative to one merge parent.
4681 relative to one merge parent.
4682
4682
4683 If one revision is given, it is used as the base revision.
4683 If one revision is given, it is used as the base revision.
4684 If two revisions are given, the differences between them are
4684 If two revisions are given, the differences between them are
4685 shown. The --change option can also be used as a shortcut to list
4685 shown. The --change option can also be used as a shortcut to list
4686 the changed files of a revision from its first parent.
4686 the changed files of a revision from its first parent.
4687
4687
4688 The codes used to show the status of files are::
4688 The codes used to show the status of files are::
4689
4689
4690 M = modified
4690 M = modified
4691 A = added
4691 A = added
4692 R = removed
4692 R = removed
4693 C = clean
4693 C = clean
4694 ! = missing (deleted by non-hg command, but still tracked)
4694 ! = missing (deleted by non-hg command, but still tracked)
4695 ? = not tracked
4695 ? = not tracked
4696 I = ignored
4696 I = ignored
4697 = origin of the previous file (with --copies)
4697 = origin of the previous file (with --copies)
4698
4698
4699 .. container:: verbose
4699 .. container:: verbose
4700
4700
4701 Examples:
4701 Examples:
4702
4702
4703 - show changes in the working directory relative to a
4703 - show changes in the working directory relative to a
4704 changeset::
4704 changeset::
4705
4705
4706 hg status --rev 9353
4706 hg status --rev 9353
4707
4707
4708 - show changes in the working directory relative to the
4708 - show changes in the working directory relative to the
4709 current directory (see :hg:`help patterns` for more information)::
4709 current directory (see :hg:`help patterns` for more information)::
4710
4710
4711 hg status re:
4711 hg status re:
4712
4712
4713 - show all changes including copies in an existing changeset::
4713 - show all changes including copies in an existing changeset::
4714
4714
4715 hg status --copies --change 9353
4715 hg status --copies --change 9353
4716
4716
4717 - get a NUL separated list of added files, suitable for xargs::
4717 - get a NUL separated list of added files, suitable for xargs::
4718
4718
4719 hg status -an0
4719 hg status -an0
4720
4720
4721 Returns 0 on success.
4721 Returns 0 on success.
4722 """
4722 """
4723
4723
4724 opts = pycompat.byteskwargs(opts)
4724 opts = pycompat.byteskwargs(opts)
4725 revs = opts.get('rev')
4725 revs = opts.get('rev')
4726 change = opts.get('change')
4726 change = opts.get('change')
4727
4727
4728 if revs and change:
4728 if revs and change:
4729 msg = _('cannot specify --rev and --change at the same time')
4729 msg = _('cannot specify --rev and --change at the same time')
4730 raise error.Abort(msg)
4730 raise error.Abort(msg)
4731 elif change:
4731 elif change:
4732 node2 = scmutil.revsingle(repo, change, None).node()
4732 node2 = scmutil.revsingle(repo, change, None).node()
4733 node1 = repo[node2].p1().node()
4733 node1 = repo[node2].p1().node()
4734 else:
4734 else:
4735 node1, node2 = scmutil.revpair(repo, revs)
4735 node1, node2 = scmutil.revpair(repo, revs)
4736
4736
4737 if pats:
4737 if pats:
4738 cwd = repo.getcwd()
4738 cwd = repo.getcwd()
4739 else:
4739 else:
4740 cwd = ''
4740 cwd = ''
4741
4741
4742 if opts.get('print0'):
4742 if opts.get('print0'):
4743 end = '\0'
4743 end = '\0'
4744 else:
4744 else:
4745 end = '\n'
4745 end = '\n'
4746 copy = {}
4746 copy = {}
4747 states = 'modified added removed deleted unknown ignored clean'.split()
4747 states = 'modified added removed deleted unknown ignored clean'.split()
4748 show = [k for k in states if opts.get(k)]
4748 show = [k for k in states if opts.get(k)]
4749 if opts.get('all'):
4749 if opts.get('all'):
4750 show += ui.quiet and (states[:4] + ['clean']) or states
4750 show += ui.quiet and (states[:4] + ['clean']) or states
4751 if not show:
4751 if not show:
4752 if ui.quiet:
4752 if ui.quiet:
4753 show = states[:4]
4753 show = states[:4]
4754 else:
4754 else:
4755 show = states[:5]
4755 show = states[:5]
4756
4756
4757 m = scmutil.match(repo[node2], pats, opts)
4757 m = scmutil.match(repo[node2], pats, opts)
4758 stat = repo.status(node1, node2, m,
4758 stat = repo.status(node1, node2, m,
4759 'ignored' in show, 'clean' in show, 'unknown' in show,
4759 'ignored' in show, 'clean' in show, 'unknown' in show,
4760 opts.get('subrepos'))
4760 opts.get('subrepos'))
4761 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4761 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4762
4762
4763 if (opts.get('all') or opts.get('copies')
4763 if (opts.get('all') or opts.get('copies')
4764 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4764 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4765 copy = copies.pathcopies(repo[node1], repo[node2], m)
4765 copy = copies.pathcopies(repo[node1], repo[node2], m)
4766
4766
4767 ui.pager('status')
4767 ui.pager('status')
4768 fm = ui.formatter('status', opts)
4768 fm = ui.formatter('status', opts)
4769 fmt = '%s' + end
4769 fmt = '%s' + end
4770 showchar = not opts.get('no_status')
4770 showchar = not opts.get('no_status')
4771
4771
4772 for state, char, files in changestates:
4772 for state, char, files in changestates:
4773 if state in show:
4773 if state in show:
4774 label = 'status.' + state
4774 label = 'status.' + state
4775 for f in files:
4775 for f in files:
4776 fm.startitem()
4776 fm.startitem()
4777 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4777 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4778 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4778 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4779 if f in copy:
4779 if f in copy:
4780 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4780 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4781 label='status.copied')
4781 label='status.copied')
4782 fm.end()
4782 fm.end()
4783
4783
4784 @command('^summary|sum',
4784 @command('^summary|sum',
4785 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4785 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4786 def summary(ui, repo, **opts):
4786 def summary(ui, repo, **opts):
4787 """summarize working directory state
4787 """summarize working directory state
4788
4788
4789 This generates a brief summary of the working directory state,
4789 This generates a brief summary of the working directory state,
4790 including parents, branch, commit status, phase and available updates.
4790 including parents, branch, commit status, phase and available updates.
4791
4791
4792 With the --remote option, this will check the default paths for
4792 With the --remote option, this will check the default paths for
4793 incoming and outgoing changes. This can be time-consuming.
4793 incoming and outgoing changes. This can be time-consuming.
4794
4794
4795 Returns 0 on success.
4795 Returns 0 on success.
4796 """
4796 """
4797
4797
4798 ui.pager('summary')
4798 ui.pager('summary')
4799 ctx = repo[None]
4799 ctx = repo[None]
4800 parents = ctx.parents()
4800 parents = ctx.parents()
4801 pnode = parents[0].node()
4801 pnode = parents[0].node()
4802 marks = []
4802 marks = []
4803
4803
4804 ms = None
4804 ms = None
4805 try:
4805 try:
4806 ms = mergemod.mergestate.read(repo)
4806 ms = mergemod.mergestate.read(repo)
4807 except error.UnsupportedMergeRecords as e:
4807 except error.UnsupportedMergeRecords as e:
4808 s = ' '.join(e.recordtypes)
4808 s = ' '.join(e.recordtypes)
4809 ui.warn(
4809 ui.warn(
4810 _('warning: merge state has unsupported record types: %s\n') % s)
4810 _('warning: merge state has unsupported record types: %s\n') % s)
4811 unresolved = 0
4811 unresolved = 0
4812 else:
4812 else:
4813 unresolved = [f for f in ms if ms[f] == 'u']
4813 unresolved = [f for f in ms if ms[f] == 'u']
4814
4814
4815 for p in parents:
4815 for p in parents:
4816 # label with log.changeset (instead of log.parent) since this
4816 # label with log.changeset (instead of log.parent) since this
4817 # shows a working directory parent *changeset*:
4817 # shows a working directory parent *changeset*:
4818 # i18n: column positioning for "hg summary"
4818 # i18n: column positioning for "hg summary"
4819 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4819 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4820 label=cmdutil._changesetlabels(p))
4820 label=cmdutil._changesetlabels(p))
4821 ui.write(' '.join(p.tags()), label='log.tag')
4821 ui.write(' '.join(p.tags()), label='log.tag')
4822 if p.bookmarks():
4822 if p.bookmarks():
4823 marks.extend(p.bookmarks())
4823 marks.extend(p.bookmarks())
4824 if p.rev() == -1:
4824 if p.rev() == -1:
4825 if not len(repo):
4825 if not len(repo):
4826 ui.write(_(' (empty repository)'))
4826 ui.write(_(' (empty repository)'))
4827 else:
4827 else:
4828 ui.write(_(' (no revision checked out)'))
4828 ui.write(_(' (no revision checked out)'))
4829 if p.troubled():
4829 if p.troubled():
4830 ui.write(' ('
4830 ui.write(' ('
4831 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4831 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4832 for trouble in p.troubles())
4832 for trouble in p.troubles())
4833 + ')')
4833 + ')')
4834 ui.write('\n')
4834 ui.write('\n')
4835 if p.description():
4835 if p.description():
4836 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4836 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4837 label='log.summary')
4837 label='log.summary')
4838
4838
4839 branch = ctx.branch()
4839 branch = ctx.branch()
4840 bheads = repo.branchheads(branch)
4840 bheads = repo.branchheads(branch)
4841 # i18n: column positioning for "hg summary"
4841 # i18n: column positioning for "hg summary"
4842 m = _('branch: %s\n') % branch
4842 m = _('branch: %s\n') % branch
4843 if branch != 'default':
4843 if branch != 'default':
4844 ui.write(m, label='log.branch')
4844 ui.write(m, label='log.branch')
4845 else:
4845 else:
4846 ui.status(m, label='log.branch')
4846 ui.status(m, label='log.branch')
4847
4847
4848 if marks:
4848 if marks:
4849 active = repo._activebookmark
4849 active = repo._activebookmark
4850 # i18n: column positioning for "hg summary"
4850 # i18n: column positioning for "hg summary"
4851 ui.write(_('bookmarks:'), label='log.bookmark')
4851 ui.write(_('bookmarks:'), label='log.bookmark')
4852 if active is not None:
4852 if active is not None:
4853 if active in marks:
4853 if active in marks:
4854 ui.write(' *' + active, label=activebookmarklabel)
4854 ui.write(' *' + active, label=activebookmarklabel)
4855 marks.remove(active)
4855 marks.remove(active)
4856 else:
4856 else:
4857 ui.write(' [%s]' % active, label=activebookmarklabel)
4857 ui.write(' [%s]' % active, label=activebookmarklabel)
4858 for m in marks:
4858 for m in marks:
4859 ui.write(' ' + m, label='log.bookmark')
4859 ui.write(' ' + m, label='log.bookmark')
4860 ui.write('\n', label='log.bookmark')
4860 ui.write('\n', label='log.bookmark')
4861
4861
4862 status = repo.status(unknown=True)
4862 status = repo.status(unknown=True)
4863
4863
4864 c = repo.dirstate.copies()
4864 c = repo.dirstate.copies()
4865 copied, renamed = [], []
4865 copied, renamed = [], []
4866 for d, s in c.iteritems():
4866 for d, s in c.iteritems():
4867 if s in status.removed:
4867 if s in status.removed:
4868 status.removed.remove(s)
4868 status.removed.remove(s)
4869 renamed.append(d)
4869 renamed.append(d)
4870 else:
4870 else:
4871 copied.append(d)
4871 copied.append(d)
4872 if d in status.added:
4872 if d in status.added:
4873 status.added.remove(d)
4873 status.added.remove(d)
4874
4874
4875 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4875 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4876
4876
4877 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4877 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4878 (ui.label(_('%d added'), 'status.added'), status.added),
4878 (ui.label(_('%d added'), 'status.added'), status.added),
4879 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4879 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4880 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4880 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4881 (ui.label(_('%d copied'), 'status.copied'), copied),
4881 (ui.label(_('%d copied'), 'status.copied'), copied),
4882 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4882 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4883 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4883 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4884 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4884 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4885 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4885 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4886 t = []
4886 t = []
4887 for l, s in labels:
4887 for l, s in labels:
4888 if s:
4888 if s:
4889 t.append(l % len(s))
4889 t.append(l % len(s))
4890
4890
4891 t = ', '.join(t)
4891 t = ', '.join(t)
4892 cleanworkdir = False
4892 cleanworkdir = False
4893
4893
4894 if repo.vfs.exists('graftstate'):
4894 if repo.vfs.exists('graftstate'):
4895 t += _(' (graft in progress)')
4895 t += _(' (graft in progress)')
4896 if repo.vfs.exists('updatestate'):
4896 if repo.vfs.exists('updatestate'):
4897 t += _(' (interrupted update)')
4897 t += _(' (interrupted update)')
4898 elif len(parents) > 1:
4898 elif len(parents) > 1:
4899 t += _(' (merge)')
4899 t += _(' (merge)')
4900 elif branch != parents[0].branch():
4900 elif branch != parents[0].branch():
4901 t += _(' (new branch)')
4901 t += _(' (new branch)')
4902 elif (parents[0].closesbranch() and
4902 elif (parents[0].closesbranch() and
4903 pnode in repo.branchheads(branch, closed=True)):
4903 pnode in repo.branchheads(branch, closed=True)):
4904 t += _(' (head closed)')
4904 t += _(' (head closed)')
4905 elif not (status.modified or status.added or status.removed or renamed or
4905 elif not (status.modified or status.added or status.removed or renamed or
4906 copied or subs):
4906 copied or subs):
4907 t += _(' (clean)')
4907 t += _(' (clean)')
4908 cleanworkdir = True
4908 cleanworkdir = True
4909 elif pnode not in bheads:
4909 elif pnode not in bheads:
4910 t += _(' (new branch head)')
4910 t += _(' (new branch head)')
4911
4911
4912 if parents:
4912 if parents:
4913 pendingphase = max(p.phase() for p in parents)
4913 pendingphase = max(p.phase() for p in parents)
4914 else:
4914 else:
4915 pendingphase = phases.public
4915 pendingphase = phases.public
4916
4916
4917 if pendingphase > phases.newcommitphase(ui):
4917 if pendingphase > phases.newcommitphase(ui):
4918 t += ' (%s)' % phases.phasenames[pendingphase]
4918 t += ' (%s)' % phases.phasenames[pendingphase]
4919
4919
4920 if cleanworkdir:
4920 if cleanworkdir:
4921 # i18n: column positioning for "hg summary"
4921 # i18n: column positioning for "hg summary"
4922 ui.status(_('commit: %s\n') % t.strip())
4922 ui.status(_('commit: %s\n') % t.strip())
4923 else:
4923 else:
4924 # i18n: column positioning for "hg summary"
4924 # i18n: column positioning for "hg summary"
4925 ui.write(_('commit: %s\n') % t.strip())
4925 ui.write(_('commit: %s\n') % t.strip())
4926
4926
4927 # all ancestors of branch heads - all ancestors of parent = new csets
4927 # all ancestors of branch heads - all ancestors of parent = new csets
4928 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4928 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4929 bheads))
4929 bheads))
4930
4930
4931 if new == 0:
4931 if new == 0:
4932 # i18n: column positioning for "hg summary"
4932 # i18n: column positioning for "hg summary"
4933 ui.status(_('update: (current)\n'))
4933 ui.status(_('update: (current)\n'))
4934 elif pnode not in bheads:
4934 elif pnode not in bheads:
4935 # i18n: column positioning for "hg summary"
4935 # i18n: column positioning for "hg summary"
4936 ui.write(_('update: %d new changesets (update)\n') % new)
4936 ui.write(_('update: %d new changesets (update)\n') % new)
4937 else:
4937 else:
4938 # i18n: column positioning for "hg summary"
4938 # i18n: column positioning for "hg summary"
4939 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4939 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4940 (new, len(bheads)))
4940 (new, len(bheads)))
4941
4941
4942 t = []
4942 t = []
4943 draft = len(repo.revs('draft()'))
4943 draft = len(repo.revs('draft()'))
4944 if draft:
4944 if draft:
4945 t.append(_('%d draft') % draft)
4945 t.append(_('%d draft') % draft)
4946 secret = len(repo.revs('secret()'))
4946 secret = len(repo.revs('secret()'))
4947 if secret:
4947 if secret:
4948 t.append(_('%d secret') % secret)
4948 t.append(_('%d secret') % secret)
4949
4949
4950 if draft or secret:
4950 if draft or secret:
4951 ui.status(_('phases: %s\n') % ', '.join(t))
4951 ui.status(_('phases: %s\n') % ', '.join(t))
4952
4952
4953 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4953 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4954 for trouble in ("unstable", "divergent", "bumped"):
4954 for trouble in ("unstable", "divergent", "bumped"):
4955 numtrouble = len(repo.revs(trouble + "()"))
4955 numtrouble = len(repo.revs(trouble + "()"))
4956 # We write all the possibilities to ease translation
4956 # We write all the possibilities to ease translation
4957 troublemsg = {
4957 troublemsg = {
4958 "unstable": _("unstable: %d changesets"),
4958 "unstable": _("unstable: %d changesets"),
4959 "divergent": _("divergent: %d changesets"),
4959 "divergent": _("divergent: %d changesets"),
4960 "bumped": _("bumped: %d changesets"),
4960 "bumped": _("bumped: %d changesets"),
4961 }
4961 }
4962 if numtrouble > 0:
4962 if numtrouble > 0:
4963 ui.status(troublemsg[trouble] % numtrouble + "\n")
4963 ui.status(troublemsg[trouble] % numtrouble + "\n")
4964
4964
4965 cmdutil.summaryhooks(ui, repo)
4965 cmdutil.summaryhooks(ui, repo)
4966
4966
4967 if opts.get('remote'):
4967 if opts.get('remote'):
4968 needsincoming, needsoutgoing = True, True
4968 needsincoming, needsoutgoing = True, True
4969 else:
4969 else:
4970 needsincoming, needsoutgoing = False, False
4970 needsincoming, needsoutgoing = False, False
4971 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4971 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4972 if i:
4972 if i:
4973 needsincoming = True
4973 needsincoming = True
4974 if o:
4974 if o:
4975 needsoutgoing = True
4975 needsoutgoing = True
4976 if not needsincoming and not needsoutgoing:
4976 if not needsincoming and not needsoutgoing:
4977 return
4977 return
4978
4978
4979 def getincoming():
4979 def getincoming():
4980 source, branches = hg.parseurl(ui.expandpath('default'))
4980 source, branches = hg.parseurl(ui.expandpath('default'))
4981 sbranch = branches[0]
4981 sbranch = branches[0]
4982 try:
4982 try:
4983 other = hg.peer(repo, {}, source)
4983 other = hg.peer(repo, {}, source)
4984 except error.RepoError:
4984 except error.RepoError:
4985 if opts.get('remote'):
4985 if opts.get('remote'):
4986 raise
4986 raise
4987 return source, sbranch, None, None, None
4987 return source, sbranch, None, None, None
4988 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4988 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4989 if revs:
4989 if revs:
4990 revs = [other.lookup(rev) for rev in revs]
4990 revs = [other.lookup(rev) for rev in revs]
4991 ui.debug('comparing with %s\n' % util.hidepassword(source))
4991 ui.debug('comparing with %s\n' % util.hidepassword(source))
4992 repo.ui.pushbuffer()
4992 repo.ui.pushbuffer()
4993 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4993 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4994 repo.ui.popbuffer()
4994 repo.ui.popbuffer()
4995 return source, sbranch, other, commoninc, commoninc[1]
4995 return source, sbranch, other, commoninc, commoninc[1]
4996
4996
4997 if needsincoming:
4997 if needsincoming:
4998 source, sbranch, sother, commoninc, incoming = getincoming()
4998 source, sbranch, sother, commoninc, incoming = getincoming()
4999 else:
4999 else:
5000 source = sbranch = sother = commoninc = incoming = None
5000 source = sbranch = sother = commoninc = incoming = None
5001
5001
5002 def getoutgoing():
5002 def getoutgoing():
5003 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5003 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5004 dbranch = branches[0]
5004 dbranch = branches[0]
5005 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5005 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5006 if source != dest:
5006 if source != dest:
5007 try:
5007 try:
5008 dother = hg.peer(repo, {}, dest)
5008 dother = hg.peer(repo, {}, dest)
5009 except error.RepoError:
5009 except error.RepoError:
5010 if opts.get('remote'):
5010 if opts.get('remote'):
5011 raise
5011 raise
5012 return dest, dbranch, None, None
5012 return dest, dbranch, None, None
5013 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5013 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5014 elif sother is None:
5014 elif sother is None:
5015 # there is no explicit destination peer, but source one is invalid
5015 # there is no explicit destination peer, but source one is invalid
5016 return dest, dbranch, None, None
5016 return dest, dbranch, None, None
5017 else:
5017 else:
5018 dother = sother
5018 dother = sother
5019 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5019 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5020 common = None
5020 common = None
5021 else:
5021 else:
5022 common = commoninc
5022 common = commoninc
5023 if revs:
5023 if revs:
5024 revs = [repo.lookup(rev) for rev in revs]
5024 revs = [repo.lookup(rev) for rev in revs]
5025 repo.ui.pushbuffer()
5025 repo.ui.pushbuffer()
5026 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5026 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5027 commoninc=common)
5027 commoninc=common)
5028 repo.ui.popbuffer()
5028 repo.ui.popbuffer()
5029 return dest, dbranch, dother, outgoing
5029 return dest, dbranch, dother, outgoing
5030
5030
5031 if needsoutgoing:
5031 if needsoutgoing:
5032 dest, dbranch, dother, outgoing = getoutgoing()
5032 dest, dbranch, dother, outgoing = getoutgoing()
5033 else:
5033 else:
5034 dest = dbranch = dother = outgoing = None
5034 dest = dbranch = dother = outgoing = None
5035
5035
5036 if opts.get('remote'):
5036 if opts.get('remote'):
5037 t = []
5037 t = []
5038 if incoming:
5038 if incoming:
5039 t.append(_('1 or more incoming'))
5039 t.append(_('1 or more incoming'))
5040 o = outgoing.missing
5040 o = outgoing.missing
5041 if o:
5041 if o:
5042 t.append(_('%d outgoing') % len(o))
5042 t.append(_('%d outgoing') % len(o))
5043 other = dother or sother
5043 other = dother or sother
5044 if 'bookmarks' in other.listkeys('namespaces'):
5044 if 'bookmarks' in other.listkeys('namespaces'):
5045 counts = bookmarks.summary(repo, other)
5045 counts = bookmarks.summary(repo, other)
5046 if counts[0] > 0:
5046 if counts[0] > 0:
5047 t.append(_('%d incoming bookmarks') % counts[0])
5047 t.append(_('%d incoming bookmarks') % counts[0])
5048 if counts[1] > 0:
5048 if counts[1] > 0:
5049 t.append(_('%d outgoing bookmarks') % counts[1])
5049 t.append(_('%d outgoing bookmarks') % counts[1])
5050
5050
5051 if t:
5051 if t:
5052 # i18n: column positioning for "hg summary"
5052 # i18n: column positioning for "hg summary"
5053 ui.write(_('remote: %s\n') % (', '.join(t)))
5053 ui.write(_('remote: %s\n') % (', '.join(t)))
5054 else:
5054 else:
5055 # i18n: column positioning for "hg summary"
5055 # i18n: column positioning for "hg summary"
5056 ui.status(_('remote: (synced)\n'))
5056 ui.status(_('remote: (synced)\n'))
5057
5057
5058 cmdutil.summaryremotehooks(ui, repo, opts,
5058 cmdutil.summaryremotehooks(ui, repo, opts,
5059 ((source, sbranch, sother, commoninc),
5059 ((source, sbranch, sother, commoninc),
5060 (dest, dbranch, dother, outgoing)))
5060 (dest, dbranch, dother, outgoing)))
5061
5061
5062 @command('tag',
5062 @command('tag',
5063 [('f', 'force', None, _('force tag')),
5063 [('f', 'force', None, _('force tag')),
5064 ('l', 'local', None, _('make the tag local')),
5064 ('l', 'local', None, _('make the tag local')),
5065 ('r', 'rev', '', _('revision to tag'), _('REV')),
5065 ('r', 'rev', '', _('revision to tag'), _('REV')),
5066 ('', 'remove', None, _('remove a tag')),
5066 ('', 'remove', None, _('remove a tag')),
5067 # -l/--local is already there, commitopts cannot be used
5067 # -l/--local is already there, commitopts cannot be used
5068 ('e', 'edit', None, _('invoke editor on commit messages')),
5068 ('e', 'edit', None, _('invoke editor on commit messages')),
5069 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5069 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5070 ] + commitopts2,
5070 ] + commitopts2,
5071 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5071 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5072 def tag(ui, repo, name1, *names, **opts):
5072 def tag(ui, repo, name1, *names, **opts):
5073 """add one or more tags for the current or given revision
5073 """add one or more tags for the current or given revision
5074
5074
5075 Name a particular revision using <name>.
5075 Name a particular revision using <name>.
5076
5076
5077 Tags are used to name particular revisions of the repository and are
5077 Tags are used to name particular revisions of the repository and are
5078 very useful to compare different revisions, to go back to significant
5078 very useful to compare different revisions, to go back to significant
5079 earlier versions or to mark branch points as releases, etc. Changing
5079 earlier versions or to mark branch points as releases, etc. Changing
5080 an existing tag is normally disallowed; use -f/--force to override.
5080 an existing tag is normally disallowed; use -f/--force to override.
5081
5081
5082 If no revision is given, the parent of the working directory is
5082 If no revision is given, the parent of the working directory is
5083 used.
5083 used.
5084
5084
5085 To facilitate version control, distribution, and merging of tags,
5085 To facilitate version control, distribution, and merging of tags,
5086 they are stored as a file named ".hgtags" which is managed similarly
5086 they are stored as a file named ".hgtags" which is managed similarly
5087 to other project files and can be hand-edited if necessary. This
5087 to other project files and can be hand-edited if necessary. This
5088 also means that tagging creates a new commit. The file
5088 also means that tagging creates a new commit. The file
5089 ".hg/localtags" is used for local tags (not shared among
5089 ".hg/localtags" is used for local tags (not shared among
5090 repositories).
5090 repositories).
5091
5091
5092 Tag commits are usually made at the head of a branch. If the parent
5092 Tag commits are usually made at the head of a branch. If the parent
5093 of the working directory is not a branch head, :hg:`tag` aborts; use
5093 of the working directory is not a branch head, :hg:`tag` aborts; use
5094 -f/--force to force the tag commit to be based on a non-head
5094 -f/--force to force the tag commit to be based on a non-head
5095 changeset.
5095 changeset.
5096
5096
5097 See :hg:`help dates` for a list of formats valid for -d/--date.
5097 See :hg:`help dates` for a list of formats valid for -d/--date.
5098
5098
5099 Since tag names have priority over branch names during revision
5099 Since tag names have priority over branch names during revision
5100 lookup, using an existing branch name as a tag name is discouraged.
5100 lookup, using an existing branch name as a tag name is discouraged.
5101
5101
5102 Returns 0 on success.
5102 Returns 0 on success.
5103 """
5103 """
5104 wlock = lock = None
5104 wlock = lock = None
5105 try:
5105 try:
5106 wlock = repo.wlock()
5106 wlock = repo.wlock()
5107 lock = repo.lock()
5107 lock = repo.lock()
5108 rev_ = "."
5108 rev_ = "."
5109 names = [t.strip() for t in (name1,) + names]
5109 names = [t.strip() for t in (name1,) + names]
5110 if len(names) != len(set(names)):
5110 if len(names) != len(set(names)):
5111 raise error.Abort(_('tag names must be unique'))
5111 raise error.Abort(_('tag names must be unique'))
5112 for n in names:
5112 for n in names:
5113 scmutil.checknewlabel(repo, n, 'tag')
5113 scmutil.checknewlabel(repo, n, 'tag')
5114 if not n:
5114 if not n:
5115 raise error.Abort(_('tag names cannot consist entirely of '
5115 raise error.Abort(_('tag names cannot consist entirely of '
5116 'whitespace'))
5116 'whitespace'))
5117 if opts.get('rev') and opts.get('remove'):
5117 if opts.get('rev') and opts.get('remove'):
5118 raise error.Abort(_("--rev and --remove are incompatible"))
5118 raise error.Abort(_("--rev and --remove are incompatible"))
5119 if opts.get('rev'):
5119 if opts.get('rev'):
5120 rev_ = opts['rev']
5120 rev_ = opts['rev']
5121 message = opts.get('message')
5121 message = opts.get('message')
5122 if opts.get('remove'):
5122 if opts.get('remove'):
5123 if opts.get('local'):
5123 if opts.get('local'):
5124 expectedtype = 'local'
5124 expectedtype = 'local'
5125 else:
5125 else:
5126 expectedtype = 'global'
5126 expectedtype = 'global'
5127
5127
5128 for n in names:
5128 for n in names:
5129 if not repo.tagtype(n):
5129 if not repo.tagtype(n):
5130 raise error.Abort(_("tag '%s' does not exist") % n)
5130 raise error.Abort(_("tag '%s' does not exist") % n)
5131 if repo.tagtype(n) != expectedtype:
5131 if repo.tagtype(n) != expectedtype:
5132 if expectedtype == 'global':
5132 if expectedtype == 'global':
5133 raise error.Abort(_("tag '%s' is not a global tag") % n)
5133 raise error.Abort(_("tag '%s' is not a global tag") % n)
5134 else:
5134 else:
5135 raise error.Abort(_("tag '%s' is not a local tag") % n)
5135 raise error.Abort(_("tag '%s' is not a local tag") % n)
5136 rev_ = 'null'
5136 rev_ = 'null'
5137 if not message:
5137 if not message:
5138 # we don't translate commit messages
5138 # we don't translate commit messages
5139 message = 'Removed tag %s' % ', '.join(names)
5139 message = 'Removed tag %s' % ', '.join(names)
5140 elif not opts.get('force'):
5140 elif not opts.get('force'):
5141 for n in names:
5141 for n in names:
5142 if n in repo.tags():
5142 if n in repo.tags():
5143 raise error.Abort(_("tag '%s' already exists "
5143 raise error.Abort(_("tag '%s' already exists "
5144 "(use -f to force)") % n)
5144 "(use -f to force)") % n)
5145 if not opts.get('local'):
5145 if not opts.get('local'):
5146 p1, p2 = repo.dirstate.parents()
5146 p1, p2 = repo.dirstate.parents()
5147 if p2 != nullid:
5147 if p2 != nullid:
5148 raise error.Abort(_('uncommitted merge'))
5148 raise error.Abort(_('uncommitted merge'))
5149 bheads = repo.branchheads()
5149 bheads = repo.branchheads()
5150 if not opts.get('force') and bheads and p1 not in bheads:
5150 if not opts.get('force') and bheads and p1 not in bheads:
5151 raise error.Abort(_('working directory is not at a branch head '
5151 raise error.Abort(_('working directory is not at a branch head '
5152 '(use -f to force)'))
5152 '(use -f to force)'))
5153 r = scmutil.revsingle(repo, rev_).node()
5153 r = scmutil.revsingle(repo, rev_).node()
5154
5154
5155 if not message:
5155 if not message:
5156 # we don't translate commit messages
5156 # we don't translate commit messages
5157 message = ('Added tag %s for changeset %s' %
5157 message = ('Added tag %s for changeset %s' %
5158 (', '.join(names), short(r)))
5158 (', '.join(names), short(r)))
5159
5159
5160 date = opts.get('date')
5160 date = opts.get('date')
5161 if date:
5161 if date:
5162 date = util.parsedate(date)
5162 date = util.parsedate(date)
5163
5163
5164 if opts.get('remove'):
5164 if opts.get('remove'):
5165 editform = 'tag.remove'
5165 editform = 'tag.remove'
5166 else:
5166 else:
5167 editform = 'tag.add'
5167 editform = 'tag.add'
5168 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5168 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5169
5169
5170 # don't allow tagging the null rev
5170 # don't allow tagging the null rev
5171 if (not opts.get('remove') and
5171 if (not opts.get('remove') and
5172 scmutil.revsingle(repo, rev_).rev() == nullrev):
5172 scmutil.revsingle(repo, rev_).rev() == nullrev):
5173 raise error.Abort(_("cannot tag null revision"))
5173 raise error.Abort(_("cannot tag null revision"))
5174
5174
5175 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5175 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5176 editor=editor)
5176 editor=editor)
5177 finally:
5177 finally:
5178 release(lock, wlock)
5178 release(lock, wlock)
5179
5179
5180 @command('tags', formatteropts, '')
5180 @command('tags', formatteropts, '')
5181 def tags(ui, repo, **opts):
5181 def tags(ui, repo, **opts):
5182 """list repository tags
5182 """list repository tags
5183
5183
5184 This lists both regular and local tags. When the -v/--verbose
5184 This lists both regular and local tags. When the -v/--verbose
5185 switch is used, a third column "local" is printed for local tags.
5185 switch is used, a third column "local" is printed for local tags.
5186 When the -q/--quiet switch is used, only the tag name is printed.
5186 When the -q/--quiet switch is used, only the tag name is printed.
5187
5187
5188 Returns 0 on success.
5188 Returns 0 on success.
5189 """
5189 """
5190
5190
5191 ui.pager('tags')
5191 ui.pager('tags')
5192 fm = ui.formatter('tags', opts)
5192 fm = ui.formatter('tags', opts)
5193 hexfunc = fm.hexfunc
5193 hexfunc = fm.hexfunc
5194 tagtype = ""
5194 tagtype = ""
5195
5195
5196 for t, n in reversed(repo.tagslist()):
5196 for t, n in reversed(repo.tagslist()):
5197 hn = hexfunc(n)
5197 hn = hexfunc(n)
5198 label = 'tags.normal'
5198 label = 'tags.normal'
5199 tagtype = ''
5199 tagtype = ''
5200 if repo.tagtype(t) == 'local':
5200 if repo.tagtype(t) == 'local':
5201 label = 'tags.local'
5201 label = 'tags.local'
5202 tagtype = 'local'
5202 tagtype = 'local'
5203
5203
5204 fm.startitem()
5204 fm.startitem()
5205 fm.write('tag', '%s', t, label=label)
5205 fm.write('tag', '%s', t, label=label)
5206 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5206 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5207 fm.condwrite(not ui.quiet, 'rev node', fmt,
5207 fm.condwrite(not ui.quiet, 'rev node', fmt,
5208 repo.changelog.rev(n), hn, label=label)
5208 repo.changelog.rev(n), hn, label=label)
5209 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5209 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5210 tagtype, label=label)
5210 tagtype, label=label)
5211 fm.plain('\n')
5211 fm.plain('\n')
5212 fm.end()
5212 fm.end()
5213
5213
5214 @command('tip',
5214 @command('tip',
5215 [('p', 'patch', None, _('show patch')),
5215 [('p', 'patch', None, _('show patch')),
5216 ('g', 'git', None, _('use git extended diff format')),
5216 ('g', 'git', None, _('use git extended diff format')),
5217 ] + templateopts,
5217 ] + templateopts,
5218 _('[-p] [-g]'))
5218 _('[-p] [-g]'))
5219 def tip(ui, repo, **opts):
5219 def tip(ui, repo, **opts):
5220 """show the tip revision (DEPRECATED)
5220 """show the tip revision (DEPRECATED)
5221
5221
5222 The tip revision (usually just called the tip) is the changeset
5222 The tip revision (usually just called the tip) is the changeset
5223 most recently added to the repository (and therefore the most
5223 most recently added to the repository (and therefore the most
5224 recently changed head).
5224 recently changed head).
5225
5225
5226 If you have just made a commit, that commit will be the tip. If
5226 If you have just made a commit, that commit will be the tip. If
5227 you have just pulled changes from another repository, the tip of
5227 you have just pulled changes from another repository, the tip of
5228 that repository becomes the current tip. The "tip" tag is special
5228 that repository becomes the current tip. The "tip" tag is special
5229 and cannot be renamed or assigned to a different changeset.
5229 and cannot be renamed or assigned to a different changeset.
5230
5230
5231 This command is deprecated, please use :hg:`heads` instead.
5231 This command is deprecated, please use :hg:`heads` instead.
5232
5232
5233 Returns 0 on success.
5233 Returns 0 on success.
5234 """
5234 """
5235 displayer = cmdutil.show_changeset(ui, repo, opts)
5235 displayer = cmdutil.show_changeset(ui, repo, opts)
5236 displayer.show(repo['tip'])
5236 displayer.show(repo['tip'])
5237 displayer.close()
5237 displayer.close()
5238
5238
5239 @command('unbundle',
5239 @command('unbundle',
5240 [('u', 'update', None,
5240 [('u', 'update', None,
5241 _('update to new branch head if changesets were unbundled'))],
5241 _('update to new branch head if changesets were unbundled'))],
5242 _('[-u] FILE...'))
5242 _('[-u] FILE...'))
5243 def unbundle(ui, repo, fname1, *fnames, **opts):
5243 def unbundle(ui, repo, fname1, *fnames, **opts):
5244 """apply one or more changegroup files
5244 """apply one or more changegroup files
5245
5245
5246 Apply one or more compressed changegroup files generated by the
5246 Apply one or more compressed changegroup files generated by the
5247 bundle command.
5247 bundle command.
5248
5248
5249 Returns 0 on success, 1 if an update has unresolved files.
5249 Returns 0 on success, 1 if an update has unresolved files.
5250 """
5250 """
5251 fnames = (fname1,) + fnames
5251 fnames = (fname1,) + fnames
5252
5252
5253 with repo.lock():
5253 with repo.lock():
5254 for fname in fnames:
5254 for fname in fnames:
5255 f = hg.openpath(ui, fname)
5255 f = hg.openpath(ui, fname)
5256 gen = exchange.readbundle(ui, f, fname)
5256 gen = exchange.readbundle(ui, f, fname)
5257 if isinstance(gen, bundle2.unbundle20):
5257 if isinstance(gen, bundle2.unbundle20):
5258 tr = repo.transaction('unbundle')
5258 tr = repo.transaction('unbundle')
5259 try:
5259 try:
5260 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5260 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5261 url='bundle:' + fname)
5261 url='bundle:' + fname)
5262 tr.close()
5262 tr.close()
5263 except error.BundleUnknownFeatureError as exc:
5263 except error.BundleUnknownFeatureError as exc:
5264 raise error.Abort(_('%s: unknown bundle feature, %s')
5264 raise error.Abort(_('%s: unknown bundle feature, %s')
5265 % (fname, exc),
5265 % (fname, exc),
5266 hint=_("see https://mercurial-scm.org/"
5266 hint=_("see https://mercurial-scm.org/"
5267 "wiki/BundleFeature for more "
5267 "wiki/BundleFeature for more "
5268 "information"))
5268 "information"))
5269 finally:
5269 finally:
5270 if tr:
5270 if tr:
5271 tr.release()
5271 tr.release()
5272 changes = [r.get('return', 0)
5272 changes = [r.get('return', 0)
5273 for r in op.records['changegroup']]
5273 for r in op.records['changegroup']]
5274 modheads = changegroup.combineresults(changes)
5274 modheads = changegroup.combineresults(changes)
5275 elif isinstance(gen, streamclone.streamcloneapplier):
5275 elif isinstance(gen, streamclone.streamcloneapplier):
5276 raise error.Abort(
5276 raise error.Abort(
5277 _('packed bundles cannot be applied with '
5277 _('packed bundles cannot be applied with '
5278 '"hg unbundle"'),
5278 '"hg unbundle"'),
5279 hint=_('use "hg debugapplystreamclonebundle"'))
5279 hint=_('use "hg debugapplystreamclonebundle"'))
5280 else:
5280 else:
5281 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5281 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5282
5282
5283 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5283 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5284
5284
5285 @command('^update|up|checkout|co',
5285 @command('^update|up|checkout|co',
5286 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5286 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5287 ('c', 'check', None, _('require clean working directory')),
5287 ('c', 'check', None, _('require clean working directory')),
5288 ('m', 'merge', None, _('merge uncommitted changes')),
5288 ('m', 'merge', None, _('merge uncommitted changes')),
5289 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5289 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5290 ('r', 'rev', '', _('revision'), _('REV'))
5290 ('r', 'rev', '', _('revision'), _('REV'))
5291 ] + mergetoolopts,
5291 ] + mergetoolopts,
5292 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5292 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5293 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5293 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5294 merge=None, tool=None):
5294 merge=None, tool=None):
5295 """update working directory (or switch revisions)
5295 """update working directory (or switch revisions)
5296
5296
5297 Update the repository's working directory to the specified
5297 Update the repository's working directory to the specified
5298 changeset. If no changeset is specified, update to the tip of the
5298 changeset. If no changeset is specified, update to the tip of the
5299 current named branch and move the active bookmark (see :hg:`help
5299 current named branch and move the active bookmark (see :hg:`help
5300 bookmarks`).
5300 bookmarks`).
5301
5301
5302 Update sets the working directory's parent revision to the specified
5302 Update sets the working directory's parent revision to the specified
5303 changeset (see :hg:`help parents`).
5303 changeset (see :hg:`help parents`).
5304
5304
5305 If the changeset is not a descendant or ancestor of the working
5305 If the changeset is not a descendant or ancestor of the working
5306 directory's parent and there are uncommitted changes, the update is
5306 directory's parent and there are uncommitted changes, the update is
5307 aborted. With the -c/--check option, the working directory is checked
5307 aborted. With the -c/--check option, the working directory is checked
5308 for uncommitted changes; if none are found, the working directory is
5308 for uncommitted changes; if none are found, the working directory is
5309 updated to the specified changeset.
5309 updated to the specified changeset.
5310
5310
5311 .. container:: verbose
5311 .. container:: verbose
5312
5312
5313 The -C/--clean, -c/--check, and -m/--merge options control what
5313 The -C/--clean, -c/--check, and -m/--merge options control what
5314 happens if the working directory contains uncommitted changes.
5314 happens if the working directory contains uncommitted changes.
5315 At most of one of them can be specified.
5315 At most of one of them can be specified.
5316
5316
5317 1. If no option is specified, and if
5317 1. If no option is specified, and if
5318 the requested changeset is an ancestor or descendant of
5318 the requested changeset is an ancestor or descendant of
5319 the working directory's parent, the uncommitted changes
5319 the working directory's parent, the uncommitted changes
5320 are merged into the requested changeset and the merged
5320 are merged into the requested changeset and the merged
5321 result is left uncommitted. If the requested changeset is
5321 result is left uncommitted. If the requested changeset is
5322 not an ancestor or descendant (that is, it is on another
5322 not an ancestor or descendant (that is, it is on another
5323 branch), the update is aborted and the uncommitted changes
5323 branch), the update is aborted and the uncommitted changes
5324 are preserved.
5324 are preserved.
5325
5325
5326 2. With the -m/--merge option, the update is allowed even if the
5326 2. With the -m/--merge option, the update is allowed even if the
5327 requested changeset is not an ancestor or descendant of
5327 requested changeset is not an ancestor or descendant of
5328 the working directory's parent.
5328 the working directory's parent.
5329
5329
5330 3. With the -c/--check option, the update is aborted and the
5330 3. With the -c/--check option, the update is aborted and the
5331 uncommitted changes are preserved.
5331 uncommitted changes are preserved.
5332
5332
5333 4. With the -C/--clean option, uncommitted changes are discarded and
5333 4. With the -C/--clean option, uncommitted changes are discarded and
5334 the working directory is updated to the requested changeset.
5334 the working directory is updated to the requested changeset.
5335
5335
5336 To cancel an uncommitted merge (and lose your changes), use
5336 To cancel an uncommitted merge (and lose your changes), use
5337 :hg:`update --clean .`.
5337 :hg:`update --clean .`.
5338
5338
5339 Use null as the changeset to remove the working directory (like
5339 Use null as the changeset to remove the working directory (like
5340 :hg:`clone -U`).
5340 :hg:`clone -U`).
5341
5341
5342 If you want to revert just one file to an older revision, use
5342 If you want to revert just one file to an older revision, use
5343 :hg:`revert [-r REV] NAME`.
5343 :hg:`revert [-r REV] NAME`.
5344
5344
5345 See :hg:`help dates` for a list of formats valid for -d/--date.
5345 See :hg:`help dates` for a list of formats valid for -d/--date.
5346
5346
5347 Returns 0 on success, 1 if there are unresolved files.
5347 Returns 0 on success, 1 if there are unresolved files.
5348 """
5348 """
5349 if rev and node:
5349 if rev and node:
5350 raise error.Abort(_("please specify just one revision"))
5350 raise error.Abort(_("please specify just one revision"))
5351
5351
5352 if ui.configbool('commands', 'update.requiredest', False):
5353 if not node and not rev and not date:
5354 raise error.Abort(_('you must specify a destination'),
5355 hint=_('for example: hg update ".::"'))
5356
5352 if rev is None or rev == '':
5357 if rev is None or rev == '':
5353 rev = node
5358 rev = node
5354
5359
5355 if date and rev is not None:
5360 if date and rev is not None:
5356 raise error.Abort(_("you can't specify a revision and a date"))
5361 raise error.Abort(_("you can't specify a revision and a date"))
5357
5362
5358 if len([x for x in (clean, check, merge) if x]) > 1:
5363 if len([x for x in (clean, check, merge) if x]) > 1:
5359 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5364 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5360 "or -m/merge"))
5365 "or -m/merge"))
5361
5366
5362 updatecheck = None
5367 updatecheck = None
5363 if check:
5368 if check:
5364 updatecheck = 'abort'
5369 updatecheck = 'abort'
5365 elif merge:
5370 elif merge:
5366 updatecheck = 'none'
5371 updatecheck = 'none'
5367
5372
5368 with repo.wlock():
5373 with repo.wlock():
5369 cmdutil.clearunfinished(repo)
5374 cmdutil.clearunfinished(repo)
5370
5375
5371 if date:
5376 if date:
5372 rev = cmdutil.finddate(ui, repo, date)
5377 rev = cmdutil.finddate(ui, repo, date)
5373
5378
5374 # if we defined a bookmark, we have to remember the original name
5379 # if we defined a bookmark, we have to remember the original name
5375 brev = rev
5380 brev = rev
5376 rev = scmutil.revsingle(repo, rev, rev).rev()
5381 rev = scmutil.revsingle(repo, rev, rev).rev()
5377
5382
5378 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5383 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5379
5384
5380 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5385 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5381 updatecheck=updatecheck)
5386 updatecheck=updatecheck)
5382
5387
5383 @command('verify', [])
5388 @command('verify', [])
5384 def verify(ui, repo):
5389 def verify(ui, repo):
5385 """verify the integrity of the repository
5390 """verify the integrity of the repository
5386
5391
5387 Verify the integrity of the current repository.
5392 Verify the integrity of the current repository.
5388
5393
5389 This will perform an extensive check of the repository's
5394 This will perform an extensive check of the repository's
5390 integrity, validating the hashes and checksums of each entry in
5395 integrity, validating the hashes and checksums of each entry in
5391 the changelog, manifest, and tracked files, as well as the
5396 the changelog, manifest, and tracked files, as well as the
5392 integrity of their crosslinks and indices.
5397 integrity of their crosslinks and indices.
5393
5398
5394 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5399 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5395 for more information about recovery from corruption of the
5400 for more information about recovery from corruption of the
5396 repository.
5401 repository.
5397
5402
5398 Returns 0 on success, 1 if errors are encountered.
5403 Returns 0 on success, 1 if errors are encountered.
5399 """
5404 """
5400 return hg.verify(repo)
5405 return hg.verify(repo)
5401
5406
5402 @command('version', [] + formatteropts, norepo=True)
5407 @command('version', [] + formatteropts, norepo=True)
5403 def version_(ui, **opts):
5408 def version_(ui, **opts):
5404 """output version and copyright information"""
5409 """output version and copyright information"""
5405 if ui.verbose:
5410 if ui.verbose:
5406 ui.pager('version')
5411 ui.pager('version')
5407 fm = ui.formatter("version", opts)
5412 fm = ui.formatter("version", opts)
5408 fm.startitem()
5413 fm.startitem()
5409 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5414 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5410 util.version())
5415 util.version())
5411 license = _(
5416 license = _(
5412 "(see https://mercurial-scm.org for more information)\n"
5417 "(see https://mercurial-scm.org for more information)\n"
5413 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5418 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5414 "This is free software; see the source for copying conditions. "
5419 "This is free software; see the source for copying conditions. "
5415 "There is NO\nwarranty; "
5420 "There is NO\nwarranty; "
5416 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5421 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5417 )
5422 )
5418 if not ui.quiet:
5423 if not ui.quiet:
5419 fm.plain(license)
5424 fm.plain(license)
5420
5425
5421 if ui.verbose:
5426 if ui.verbose:
5422 fm.plain(_("\nEnabled extensions:\n\n"))
5427 fm.plain(_("\nEnabled extensions:\n\n"))
5423 # format names and versions into columns
5428 # format names and versions into columns
5424 names = []
5429 names = []
5425 vers = []
5430 vers = []
5426 isinternals = []
5431 isinternals = []
5427 for name, module in extensions.extensions():
5432 for name, module in extensions.extensions():
5428 names.append(name)
5433 names.append(name)
5429 vers.append(extensions.moduleversion(module) or None)
5434 vers.append(extensions.moduleversion(module) or None)
5430 isinternals.append(extensions.ismoduleinternal(module))
5435 isinternals.append(extensions.ismoduleinternal(module))
5431 fn = fm.nested("extensions")
5436 fn = fm.nested("extensions")
5432 if names:
5437 if names:
5433 namefmt = " %%-%ds " % max(len(n) for n in names)
5438 namefmt = " %%-%ds " % max(len(n) for n in names)
5434 places = [_("external"), _("internal")]
5439 places = [_("external"), _("internal")]
5435 for n, v, p in zip(names, vers, isinternals):
5440 for n, v, p in zip(names, vers, isinternals):
5436 fn.startitem()
5441 fn.startitem()
5437 fn.condwrite(ui.verbose, "name", namefmt, n)
5442 fn.condwrite(ui.verbose, "name", namefmt, n)
5438 if ui.verbose:
5443 if ui.verbose:
5439 fn.plain("%s " % places[p])
5444 fn.plain("%s " % places[p])
5440 fn.data(bundled=p)
5445 fn.data(bundled=p)
5441 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5446 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5442 if ui.verbose:
5447 if ui.verbose:
5443 fn.plain("\n")
5448 fn.plain("\n")
5444 fn.end()
5449 fn.end()
5445 fm.end()
5450 fm.end()
5446
5451
5447 def loadcmdtable(ui, name, cmdtable):
5452 def loadcmdtable(ui, name, cmdtable):
5448 """Load command functions from specified cmdtable
5453 """Load command functions from specified cmdtable
5449 """
5454 """
5450 overrides = [cmd for cmd in cmdtable if cmd in table]
5455 overrides = [cmd for cmd in cmdtable if cmd in table]
5451 if overrides:
5456 if overrides:
5452 ui.warn(_("extension '%s' overrides commands: %s\n")
5457 ui.warn(_("extension '%s' overrides commands: %s\n")
5453 % (name, " ".join(overrides)))
5458 % (name, " ".join(overrides)))
5454 table.update(cmdtable)
5459 table.update(cmdtable)
@@ -1,2352 +1,2361 b''
1 The Mercurial system uses a set of configuration files to control
1 The Mercurial system uses a set of configuration files to control
2 aspects of its behavior.
2 aspects of its behavior.
3
3
4 Troubleshooting
4 Troubleshooting
5 ===============
5 ===============
6
6
7 If you're having problems with your configuration,
7 If you're having problems with your configuration,
8 :hg:`config --debug` can help you understand what is introducing
8 :hg:`config --debug` can help you understand what is introducing
9 a setting into your environment.
9 a setting into your environment.
10
10
11 See :hg:`help config.syntax` and :hg:`help config.files`
11 See :hg:`help config.syntax` and :hg:`help config.files`
12 for information about how and where to override things.
12 for information about how and where to override things.
13
13
14 Structure
14 Structure
15 =========
15 =========
16
16
17 The configuration files use a simple ini-file format. A configuration
17 The configuration files use a simple ini-file format. A configuration
18 file consists of sections, led by a ``[section]`` header and followed
18 file consists of sections, led by a ``[section]`` header and followed
19 by ``name = value`` entries::
19 by ``name = value`` entries::
20
20
21 [ui]
21 [ui]
22 username = Firstname Lastname <firstname.lastname@example.net>
22 username = Firstname Lastname <firstname.lastname@example.net>
23 verbose = True
23 verbose = True
24
24
25 The above entries will be referred to as ``ui.username`` and
25 The above entries will be referred to as ``ui.username`` and
26 ``ui.verbose``, respectively. See :hg:`help config.syntax`.
26 ``ui.verbose``, respectively. See :hg:`help config.syntax`.
27
27
28 Files
28 Files
29 =====
29 =====
30
30
31 Mercurial reads configuration data from several files, if they exist.
31 Mercurial reads configuration data from several files, if they exist.
32 These files do not exist by default and you will have to create the
32 These files do not exist by default and you will have to create the
33 appropriate configuration files yourself:
33 appropriate configuration files yourself:
34
34
35 Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
35 Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
36
36
37 Global configuration like the username setting is typically put into:
37 Global configuration like the username setting is typically put into:
38
38
39 .. container:: windows
39 .. container:: windows
40
40
41 - ``%USERPROFILE%\mercurial.ini`` (on Windows)
41 - ``%USERPROFILE%\mercurial.ini`` (on Windows)
42
42
43 .. container:: unix.plan9
43 .. container:: unix.plan9
44
44
45 - ``$HOME/.hgrc`` (on Unix, Plan9)
45 - ``$HOME/.hgrc`` (on Unix, Plan9)
46
46
47 The names of these files depend on the system on which Mercurial is
47 The names of these files depend on the system on which Mercurial is
48 installed. ``*.rc`` files from a single directory are read in
48 installed. ``*.rc`` files from a single directory are read in
49 alphabetical order, later ones overriding earlier ones. Where multiple
49 alphabetical order, later ones overriding earlier ones. Where multiple
50 paths are given below, settings from earlier paths override later
50 paths are given below, settings from earlier paths override later
51 ones.
51 ones.
52
52
53 .. container:: verbose.unix
53 .. container:: verbose.unix
54
54
55 On Unix, the following files are consulted:
55 On Unix, the following files are consulted:
56
56
57 - ``<repo>/.hg/hgrc`` (per-repository)
57 - ``<repo>/.hg/hgrc`` (per-repository)
58 - ``$HOME/.hgrc`` (per-user)
58 - ``$HOME/.hgrc`` (per-user)
59 - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user)
59 - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user)
60 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
60 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
61 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
61 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
62 - ``/etc/mercurial/hgrc`` (per-system)
62 - ``/etc/mercurial/hgrc`` (per-system)
63 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
63 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
64 - ``<internal>/default.d/*.rc`` (defaults)
64 - ``<internal>/default.d/*.rc`` (defaults)
65
65
66 .. container:: verbose.windows
66 .. container:: verbose.windows
67
67
68 On Windows, the following files are consulted:
68 On Windows, the following files are consulted:
69
69
70 - ``<repo>/.hg/hgrc`` (per-repository)
70 - ``<repo>/.hg/hgrc`` (per-repository)
71 - ``%USERPROFILE%\.hgrc`` (per-user)
71 - ``%USERPROFILE%\.hgrc`` (per-user)
72 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
72 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
73 - ``%HOME%\.hgrc`` (per-user)
73 - ``%HOME%\.hgrc`` (per-user)
74 - ``%HOME%\Mercurial.ini`` (per-user)
74 - ``%HOME%\Mercurial.ini`` (per-user)
75 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
75 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
76 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
76 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
77 - ``<install-dir>\Mercurial.ini`` (per-installation)
77 - ``<install-dir>\Mercurial.ini`` (per-installation)
78 - ``<internal>/default.d/*.rc`` (defaults)
78 - ``<internal>/default.d/*.rc`` (defaults)
79
79
80 .. note::
80 .. note::
81
81
82 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
82 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
83 is used when running 32-bit Python on 64-bit Windows.
83 is used when running 32-bit Python on 64-bit Windows.
84
84
85 .. container:: windows
85 .. container:: windows
86
86
87 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
87 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
88
88
89 .. container:: verbose.plan9
89 .. container:: verbose.plan9
90
90
91 On Plan9, the following files are consulted:
91 On Plan9, the following files are consulted:
92
92
93 - ``<repo>/.hg/hgrc`` (per-repository)
93 - ``<repo>/.hg/hgrc`` (per-repository)
94 - ``$home/lib/hgrc`` (per-user)
94 - ``$home/lib/hgrc`` (per-user)
95 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
95 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
96 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
96 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
97 - ``/lib/mercurial/hgrc`` (per-system)
97 - ``/lib/mercurial/hgrc`` (per-system)
98 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
98 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
99 - ``<internal>/default.d/*.rc`` (defaults)
99 - ``<internal>/default.d/*.rc`` (defaults)
100
100
101 Per-repository configuration options only apply in a
101 Per-repository configuration options only apply in a
102 particular repository. This file is not version-controlled, and
102 particular repository. This file is not version-controlled, and
103 will not get transferred during a "clone" operation. Options in
103 will not get transferred during a "clone" operation. Options in
104 this file override options in all other configuration files.
104 this file override options in all other configuration files.
105
105
106 .. container:: unix.plan9
106 .. container:: unix.plan9
107
107
108 On Plan 9 and Unix, most of this file will be ignored if it doesn't
108 On Plan 9 and Unix, most of this file will be ignored if it doesn't
109 belong to a trusted user or to a trusted group. See
109 belong to a trusted user or to a trusted group. See
110 :hg:`help config.trusted` for more details.
110 :hg:`help config.trusted` for more details.
111
111
112 Per-user configuration file(s) are for the user running Mercurial. Options
112 Per-user configuration file(s) are for the user running Mercurial. Options
113 in these files apply to all Mercurial commands executed by this user in any
113 in these files apply to all Mercurial commands executed by this user in any
114 directory. Options in these files override per-system and per-installation
114 directory. Options in these files override per-system and per-installation
115 options.
115 options.
116
116
117 Per-installation configuration files are searched for in the
117 Per-installation configuration files are searched for in the
118 directory where Mercurial is installed. ``<install-root>`` is the
118 directory where Mercurial is installed. ``<install-root>`` is the
119 parent directory of the **hg** executable (or symlink) being run.
119 parent directory of the **hg** executable (or symlink) being run.
120
120
121 .. container:: unix.plan9
121 .. container:: unix.plan9
122
122
123 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
123 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
124 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
124 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
125 files apply to all Mercurial commands executed by any user in any
125 files apply to all Mercurial commands executed by any user in any
126 directory.
126 directory.
127
127
128 Per-installation configuration files are for the system on
128 Per-installation configuration files are for the system on
129 which Mercurial is running. Options in these files apply to all
129 which Mercurial is running. Options in these files apply to all
130 Mercurial commands executed by any user in any directory. Registry
130 Mercurial commands executed by any user in any directory. Registry
131 keys contain PATH-like strings, every part of which must reference
131 keys contain PATH-like strings, every part of which must reference
132 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
132 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
133 be read. Mercurial checks each of these locations in the specified
133 be read. Mercurial checks each of these locations in the specified
134 order until one or more configuration files are detected.
134 order until one or more configuration files are detected.
135
135
136 Per-system configuration files are for the system on which Mercurial
136 Per-system configuration files are for the system on which Mercurial
137 is running. Options in these files apply to all Mercurial commands
137 is running. Options in these files apply to all Mercurial commands
138 executed by any user in any directory. Options in these files
138 executed by any user in any directory. Options in these files
139 override per-installation options.
139 override per-installation options.
140
140
141 Mercurial comes with some default configuration. The default configuration
141 Mercurial comes with some default configuration. The default configuration
142 files are installed with Mercurial and will be overwritten on upgrades. Default
142 files are installed with Mercurial and will be overwritten on upgrades. Default
143 configuration files should never be edited by users or administrators but can
143 configuration files should never be edited by users or administrators but can
144 be overridden in other configuration files. So far the directory only contains
144 be overridden in other configuration files. So far the directory only contains
145 merge tool configuration but packagers can also put other default configuration
145 merge tool configuration but packagers can also put other default configuration
146 there.
146 there.
147
147
148 Syntax
148 Syntax
149 ======
149 ======
150
150
151 A configuration file consists of sections, led by a ``[section]`` header
151 A configuration file consists of sections, led by a ``[section]`` header
152 and followed by ``name = value`` entries (sometimes called
152 and followed by ``name = value`` entries (sometimes called
153 ``configuration keys``)::
153 ``configuration keys``)::
154
154
155 [spam]
155 [spam]
156 eggs=ham
156 eggs=ham
157 green=
157 green=
158 eggs
158 eggs
159
159
160 Each line contains one entry. If the lines that follow are indented,
160 Each line contains one entry. If the lines that follow are indented,
161 they are treated as continuations of that entry. Leading whitespace is
161 they are treated as continuations of that entry. Leading whitespace is
162 removed from values. Empty lines are skipped. Lines beginning with
162 removed from values. Empty lines are skipped. Lines beginning with
163 ``#`` or ``;`` are ignored and may be used to provide comments.
163 ``#`` or ``;`` are ignored and may be used to provide comments.
164
164
165 Configuration keys can be set multiple times, in which case Mercurial
165 Configuration keys can be set multiple times, in which case Mercurial
166 will use the value that was configured last. As an example::
166 will use the value that was configured last. As an example::
167
167
168 [spam]
168 [spam]
169 eggs=large
169 eggs=large
170 ham=serrano
170 ham=serrano
171 eggs=small
171 eggs=small
172
172
173 This would set the configuration key named ``eggs`` to ``small``.
173 This would set the configuration key named ``eggs`` to ``small``.
174
174
175 It is also possible to define a section multiple times. A section can
175 It is also possible to define a section multiple times. A section can
176 be redefined on the same and/or on different configuration files. For
176 be redefined on the same and/or on different configuration files. For
177 example::
177 example::
178
178
179 [foo]
179 [foo]
180 eggs=large
180 eggs=large
181 ham=serrano
181 ham=serrano
182 eggs=small
182 eggs=small
183
183
184 [bar]
184 [bar]
185 eggs=ham
185 eggs=ham
186 green=
186 green=
187 eggs
187 eggs
188
188
189 [foo]
189 [foo]
190 ham=prosciutto
190 ham=prosciutto
191 eggs=medium
191 eggs=medium
192 bread=toasted
192 bread=toasted
193
193
194 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
194 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
195 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
195 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
196 respectively. As you can see there only thing that matters is the last
196 respectively. As you can see there only thing that matters is the last
197 value that was set for each of the configuration keys.
197 value that was set for each of the configuration keys.
198
198
199 If a configuration key is set multiple times in different
199 If a configuration key is set multiple times in different
200 configuration files the final value will depend on the order in which
200 configuration files the final value will depend on the order in which
201 the different configuration files are read, with settings from earlier
201 the different configuration files are read, with settings from earlier
202 paths overriding later ones as described on the ``Files`` section
202 paths overriding later ones as described on the ``Files`` section
203 above.
203 above.
204
204
205 A line of the form ``%include file`` will include ``file`` into the
205 A line of the form ``%include file`` will include ``file`` into the
206 current configuration file. The inclusion is recursive, which means
206 current configuration file. The inclusion is recursive, which means
207 that included files can include other files. Filenames are relative to
207 that included files can include other files. Filenames are relative to
208 the configuration file in which the ``%include`` directive is found.
208 the configuration file in which the ``%include`` directive is found.
209 Environment variables and ``~user`` constructs are expanded in
209 Environment variables and ``~user`` constructs are expanded in
210 ``file``. This lets you do something like::
210 ``file``. This lets you do something like::
211
211
212 %include ~/.hgrc.d/$HOST.rc
212 %include ~/.hgrc.d/$HOST.rc
213
213
214 to include a different configuration file on each computer you use.
214 to include a different configuration file on each computer you use.
215
215
216 A line with ``%unset name`` will remove ``name`` from the current
216 A line with ``%unset name`` will remove ``name`` from the current
217 section, if it has been set previously.
217 section, if it has been set previously.
218
218
219 The values are either free-form text strings, lists of text strings,
219 The values are either free-form text strings, lists of text strings,
220 or Boolean values. Boolean values can be set to true using any of "1",
220 or Boolean values. Boolean values can be set to true using any of "1",
221 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
221 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
222 (all case insensitive).
222 (all case insensitive).
223
223
224 List values are separated by whitespace or comma, except when values are
224 List values are separated by whitespace or comma, except when values are
225 placed in double quotation marks::
225 placed in double quotation marks::
226
226
227 allow_read = "John Doe, PhD", brian, betty
227 allow_read = "John Doe, PhD", brian, betty
228
228
229 Quotation marks can be escaped by prefixing them with a backslash. Only
229 Quotation marks can be escaped by prefixing them with a backslash. Only
230 quotation marks at the beginning of a word is counted as a quotation
230 quotation marks at the beginning of a word is counted as a quotation
231 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
231 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
232
232
233 Sections
233 Sections
234 ========
234 ========
235
235
236 This section describes the different sections that may appear in a
236 This section describes the different sections that may appear in a
237 Mercurial configuration file, the purpose of each section, its possible
237 Mercurial configuration file, the purpose of each section, its possible
238 keys, and their possible values.
238 keys, and their possible values.
239
239
240 ``alias``
240 ``alias``
241 ---------
241 ---------
242
242
243 Defines command aliases.
243 Defines command aliases.
244
244
245 Aliases allow you to define your own commands in terms of other
245 Aliases allow you to define your own commands in terms of other
246 commands (or aliases), optionally including arguments. Positional
246 commands (or aliases), optionally including arguments. Positional
247 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
247 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
248 are expanded by Mercurial before execution. Positional arguments not
248 are expanded by Mercurial before execution. Positional arguments not
249 already used by ``$N`` in the definition are put at the end of the
249 already used by ``$N`` in the definition are put at the end of the
250 command to be executed.
250 command to be executed.
251
251
252 Alias definitions consist of lines of the form::
252 Alias definitions consist of lines of the form::
253
253
254 <alias> = <command> [<argument>]...
254 <alias> = <command> [<argument>]...
255
255
256 For example, this definition::
256 For example, this definition::
257
257
258 latest = log --limit 5
258 latest = log --limit 5
259
259
260 creates a new command ``latest`` that shows only the five most recent
260 creates a new command ``latest`` that shows only the five most recent
261 changesets. You can define subsequent aliases using earlier ones::
261 changesets. You can define subsequent aliases using earlier ones::
262
262
263 stable5 = latest -b stable
263 stable5 = latest -b stable
264
264
265 .. note::
265 .. note::
266
266
267 It is possible to create aliases with the same names as
267 It is possible to create aliases with the same names as
268 existing commands, which will then override the original
268 existing commands, which will then override the original
269 definitions. This is almost always a bad idea!
269 definitions. This is almost always a bad idea!
270
270
271 An alias can start with an exclamation point (``!``) to make it a
271 An alias can start with an exclamation point (``!``) to make it a
272 shell alias. A shell alias is executed with the shell and will let you
272 shell alias. A shell alias is executed with the shell and will let you
273 run arbitrary commands. As an example, ::
273 run arbitrary commands. As an example, ::
274
274
275 echo = !echo $@
275 echo = !echo $@
276
276
277 will let you do ``hg echo foo`` to have ``foo`` printed in your
277 will let you do ``hg echo foo`` to have ``foo`` printed in your
278 terminal. A better example might be::
278 terminal. A better example might be::
279
279
280 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f
280 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f
281
281
282 which will make ``hg purge`` delete all unknown files in the
282 which will make ``hg purge`` delete all unknown files in the
283 repository in the same manner as the purge extension.
283 repository in the same manner as the purge extension.
284
284
285 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
285 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
286 expand to the command arguments. Unmatched arguments are
286 expand to the command arguments. Unmatched arguments are
287 removed. ``$0`` expands to the alias name and ``$@`` expands to all
287 removed. ``$0`` expands to the alias name and ``$@`` expands to all
288 arguments separated by a space. ``"$@"`` (with quotes) expands to all
288 arguments separated by a space. ``"$@"`` (with quotes) expands to all
289 arguments quoted individually and separated by a space. These expansions
289 arguments quoted individually and separated by a space. These expansions
290 happen before the command is passed to the shell.
290 happen before the command is passed to the shell.
291
291
292 Shell aliases are executed in an environment where ``$HG`` expands to
292 Shell aliases are executed in an environment where ``$HG`` expands to
293 the path of the Mercurial that was used to execute the alias. This is
293 the path of the Mercurial that was used to execute the alias. This is
294 useful when you want to call further Mercurial commands in a shell
294 useful when you want to call further Mercurial commands in a shell
295 alias, as was done above for the purge alias. In addition,
295 alias, as was done above for the purge alias. In addition,
296 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
296 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
297 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
297 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
298
298
299 .. note::
299 .. note::
300
300
301 Some global configuration options such as ``-R`` are
301 Some global configuration options such as ``-R`` are
302 processed before shell aliases and will thus not be passed to
302 processed before shell aliases and will thus not be passed to
303 aliases.
303 aliases.
304
304
305
305
306 ``annotate``
306 ``annotate``
307 ------------
307 ------------
308
308
309 Settings used when displaying file annotations. All values are
309 Settings used when displaying file annotations. All values are
310 Booleans and default to False. See :hg:`help config.diff` for
310 Booleans and default to False. See :hg:`help config.diff` for
311 related options for the diff command.
311 related options for the diff command.
312
312
313 ``ignorews``
313 ``ignorews``
314 Ignore white space when comparing lines.
314 Ignore white space when comparing lines.
315
315
316 ``ignorewsamount``
316 ``ignorewsamount``
317 Ignore changes in the amount of white space.
317 Ignore changes in the amount of white space.
318
318
319 ``ignoreblanklines``
319 ``ignoreblanklines``
320 Ignore changes whose lines are all blank.
320 Ignore changes whose lines are all blank.
321
321
322
322
323 ``auth``
323 ``auth``
324 --------
324 --------
325
325
326 Authentication credentials for HTTP authentication. This section
326 Authentication credentials for HTTP authentication. This section
327 allows you to store usernames and passwords for use when logging
327 allows you to store usernames and passwords for use when logging
328 *into* HTTP servers. See :hg:`help config.web` if
328 *into* HTTP servers. See :hg:`help config.web` if
329 you want to configure *who* can login to your HTTP server.
329 you want to configure *who* can login to your HTTP server.
330
330
331 Each line has the following format::
331 Each line has the following format::
332
332
333 <name>.<argument> = <value>
333 <name>.<argument> = <value>
334
334
335 where ``<name>`` is used to group arguments into authentication
335 where ``<name>`` is used to group arguments into authentication
336 entries. Example::
336 entries. Example::
337
337
338 foo.prefix = hg.intevation.de/mercurial
338 foo.prefix = hg.intevation.de/mercurial
339 foo.username = foo
339 foo.username = foo
340 foo.password = bar
340 foo.password = bar
341 foo.schemes = http https
341 foo.schemes = http https
342
342
343 bar.prefix = secure.example.org
343 bar.prefix = secure.example.org
344 bar.key = path/to/file.key
344 bar.key = path/to/file.key
345 bar.cert = path/to/file.cert
345 bar.cert = path/to/file.cert
346 bar.schemes = https
346 bar.schemes = https
347
347
348 Supported arguments:
348 Supported arguments:
349
349
350 ``prefix``
350 ``prefix``
351 Either ``*`` or a URI prefix with or without the scheme part.
351 Either ``*`` or a URI prefix with or without the scheme part.
352 The authentication entry with the longest matching prefix is used
352 The authentication entry with the longest matching prefix is used
353 (where ``*`` matches everything and counts as a match of length
353 (where ``*`` matches everything and counts as a match of length
354 1). If the prefix doesn't include a scheme, the match is performed
354 1). If the prefix doesn't include a scheme, the match is performed
355 against the URI with its scheme stripped as well, and the schemes
355 against the URI with its scheme stripped as well, and the schemes
356 argument, q.v., is then subsequently consulted.
356 argument, q.v., is then subsequently consulted.
357
357
358 ``username``
358 ``username``
359 Optional. Username to authenticate with. If not given, and the
359 Optional. Username to authenticate with. If not given, and the
360 remote site requires basic or digest authentication, the user will
360 remote site requires basic or digest authentication, the user will
361 be prompted for it. Environment variables are expanded in the
361 be prompted for it. Environment variables are expanded in the
362 username letting you do ``foo.username = $USER``. If the URI
362 username letting you do ``foo.username = $USER``. If the URI
363 includes a username, only ``[auth]`` entries with a matching
363 includes a username, only ``[auth]`` entries with a matching
364 username or without a username will be considered.
364 username or without a username will be considered.
365
365
366 ``password``
366 ``password``
367 Optional. Password to authenticate with. If not given, and the
367 Optional. Password to authenticate with. If not given, and the
368 remote site requires basic or digest authentication, the user
368 remote site requires basic or digest authentication, the user
369 will be prompted for it.
369 will be prompted for it.
370
370
371 ``key``
371 ``key``
372 Optional. PEM encoded client certificate key file. Environment
372 Optional. PEM encoded client certificate key file. Environment
373 variables are expanded in the filename.
373 variables are expanded in the filename.
374
374
375 ``cert``
375 ``cert``
376 Optional. PEM encoded client certificate chain file. Environment
376 Optional. PEM encoded client certificate chain file. Environment
377 variables are expanded in the filename.
377 variables are expanded in the filename.
378
378
379 ``schemes``
379 ``schemes``
380 Optional. Space separated list of URI schemes to use this
380 Optional. Space separated list of URI schemes to use this
381 authentication entry with. Only used if the prefix doesn't include
381 authentication entry with. Only used if the prefix doesn't include
382 a scheme. Supported schemes are http and https. They will match
382 a scheme. Supported schemes are http and https. They will match
383 static-http and static-https respectively, as well.
383 static-http and static-https respectively, as well.
384 (default: https)
384 (default: https)
385
385
386 If no suitable authentication entry is found, the user is prompted
386 If no suitable authentication entry is found, the user is prompted
387 for credentials as usual if required by the remote.
387 for credentials as usual if required by the remote.
388
388
389 ``color``
389 ``color``
390 ---------
390 ---------
391
391
392 Configure the Mercurial color mode. For details about how to define your custom
392 Configure the Mercurial color mode. For details about how to define your custom
393 effect and style see :hg:`help color`.
393 effect and style see :hg:`help color`.
394
394
395 ``mode``
395 ``mode``
396 String: control the method used to output color. One of ``auto``, ``ansi``,
396 String: control the method used to output color. One of ``auto``, ``ansi``,
397 ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension will
397 ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension will
398 use ANSI mode by default (or win32 mode on Windows) if it detects a
398 use ANSI mode by default (or win32 mode on Windows) if it detects a
399 terminal. Any invalid value will disable color.
399 terminal. Any invalid value will disable color.
400
400
401 ``pagermode``
401 ``pagermode``
402 String: optinal override of ``color.mode`` used with pager (from the pager
402 String: optinal override of ``color.mode`` used with pager (from the pager
403 extensions).
403 extensions).
404
404
405 On some systems, terminfo mode may cause problems when using
405 On some systems, terminfo mode may cause problems when using
406 color with the pager extension and less -R. less with the -R option
406 color with the pager extension and less -R. less with the -R option
407 will only display ECMA-48 color codes, and terminfo mode may sometimes
407 will only display ECMA-48 color codes, and terminfo mode may sometimes
408 emit codes that less doesn't understand. You can work around this by
408 emit codes that less doesn't understand. You can work around this by
409 either using ansi mode (or auto mode), or by using less -r (which will
409 either using ansi mode (or auto mode), or by using less -r (which will
410 pass through all terminal control codes, not just color control
410 pass through all terminal control codes, not just color control
411 codes).
411 codes).
412
412
413 On some systems (such as MSYS in Windows), the terminal may support
413 On some systems (such as MSYS in Windows), the terminal may support
414 a different color mode than the pager (activated via the "pager"
414 a different color mode than the pager (activated via the "pager"
415 extension).
415 extension).
416
416
417 ``commands``
418 ----------
419
420 ``update.requiredest``
421 Require that the user pass a destination when running ``hg update``.
422 For example, ``hg update .::`` will be allowed, but a plain ``hg update``
423 will be disallowed.
424 (default: False)
425
417 ``committemplate``
426 ``committemplate``
418 ------------------
427 ------------------
419
428
420 ``changeset``
429 ``changeset``
421 String: configuration in this section is used as the template to
430 String: configuration in this section is used as the template to
422 customize the text shown in the editor when committing.
431 customize the text shown in the editor when committing.
423
432
424 In addition to pre-defined template keywords, commit log specific one
433 In addition to pre-defined template keywords, commit log specific one
425 below can be used for customization:
434 below can be used for customization:
426
435
427 ``extramsg``
436 ``extramsg``
428 String: Extra message (typically 'Leave message empty to abort
437 String: Extra message (typically 'Leave message empty to abort
429 commit.'). This may be changed by some commands or extensions.
438 commit.'). This may be changed by some commands or extensions.
430
439
431 For example, the template configuration below shows as same text as
440 For example, the template configuration below shows as same text as
432 one shown by default::
441 one shown by default::
433
442
434 [committemplate]
443 [committemplate]
435 changeset = {desc}\n\n
444 changeset = {desc}\n\n
436 HG: Enter commit message. Lines beginning with 'HG:' are removed.
445 HG: Enter commit message. Lines beginning with 'HG:' are removed.
437 HG: {extramsg}
446 HG: {extramsg}
438 HG: --
447 HG: --
439 HG: user: {author}\n{ifeq(p2rev, "-1", "",
448 HG: user: {author}\n{ifeq(p2rev, "-1", "",
440 "HG: branch merge\n")
449 "HG: branch merge\n")
441 }HG: branch '{branch}'\n{if(activebookmark,
450 }HG: branch '{branch}'\n{if(activebookmark,
442 "HG: bookmark '{activebookmark}'\n") }{subrepos %
451 "HG: bookmark '{activebookmark}'\n") }{subrepos %
443 "HG: subrepo {subrepo}\n" }{file_adds %
452 "HG: subrepo {subrepo}\n" }{file_adds %
444 "HG: added {file}\n" }{file_mods %
453 "HG: added {file}\n" }{file_mods %
445 "HG: changed {file}\n" }{file_dels %
454 "HG: changed {file}\n" }{file_dels %
446 "HG: removed {file}\n" }{if(files, "",
455 "HG: removed {file}\n" }{if(files, "",
447 "HG: no files changed\n")}
456 "HG: no files changed\n")}
448
457
449 ``diff()``
458 ``diff()``
450 String: show the diff (see :hg:`help templates` for detail)
459 String: show the diff (see :hg:`help templates` for detail)
451
460
452 Sometimes it is helpful to show the diff of the changeset in the editor without
461 Sometimes it is helpful to show the diff of the changeset in the editor without
453 having to prefix 'HG: ' to each line so that highlighting works correctly. For
462 having to prefix 'HG: ' to each line so that highlighting works correctly. For
454 this, Mercurial provides a special string which will ignore everything below
463 this, Mercurial provides a special string which will ignore everything below
455 it::
464 it::
456
465
457 HG: ------------------------ >8 ------------------------
466 HG: ------------------------ >8 ------------------------
458
467
459 For example, the template configuration below will show the diff below the
468 For example, the template configuration below will show the diff below the
460 extra message::
469 extra message::
461
470
462 [committemplate]
471 [committemplate]
463 changeset = {desc}\n\n
472 changeset = {desc}\n\n
464 HG: Enter commit message. Lines beginning with 'HG:' are removed.
473 HG: Enter commit message. Lines beginning with 'HG:' are removed.
465 HG: {extramsg}
474 HG: {extramsg}
466 HG: ------------------------ >8 ------------------------
475 HG: ------------------------ >8 ------------------------
467 HG: Do not touch the line above.
476 HG: Do not touch the line above.
468 HG: Everything below will be removed.
477 HG: Everything below will be removed.
469 {diff()}
478 {diff()}
470
479
471 .. note::
480 .. note::
472
481
473 For some problematic encodings (see :hg:`help win32mbcs` for
482 For some problematic encodings (see :hg:`help win32mbcs` for
474 detail), this customization should be configured carefully, to
483 detail), this customization should be configured carefully, to
475 avoid showing broken characters.
484 avoid showing broken characters.
476
485
477 For example, if a multibyte character ending with backslash (0x5c) is
486 For example, if a multibyte character ending with backslash (0x5c) is
478 followed by the ASCII character 'n' in the customized template,
487 followed by the ASCII character 'n' in the customized template,
479 the sequence of backslash and 'n' is treated as line-feed unexpectedly
488 the sequence of backslash and 'n' is treated as line-feed unexpectedly
480 (and the multibyte character is broken, too).
489 (and the multibyte character is broken, too).
481
490
482 Customized template is used for commands below (``--edit`` may be
491 Customized template is used for commands below (``--edit`` may be
483 required):
492 required):
484
493
485 - :hg:`backout`
494 - :hg:`backout`
486 - :hg:`commit`
495 - :hg:`commit`
487 - :hg:`fetch` (for merge commit only)
496 - :hg:`fetch` (for merge commit only)
488 - :hg:`graft`
497 - :hg:`graft`
489 - :hg:`histedit`
498 - :hg:`histedit`
490 - :hg:`import`
499 - :hg:`import`
491 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
500 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
492 - :hg:`rebase`
501 - :hg:`rebase`
493 - :hg:`shelve`
502 - :hg:`shelve`
494 - :hg:`sign`
503 - :hg:`sign`
495 - :hg:`tag`
504 - :hg:`tag`
496 - :hg:`transplant`
505 - :hg:`transplant`
497
506
498 Configuring items below instead of ``changeset`` allows showing
507 Configuring items below instead of ``changeset`` allows showing
499 customized message only for specific actions, or showing different
508 customized message only for specific actions, or showing different
500 messages for each action.
509 messages for each action.
501
510
502 - ``changeset.backout`` for :hg:`backout`
511 - ``changeset.backout`` for :hg:`backout`
503 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
512 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
504 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
513 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
505 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
514 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
506 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
515 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
507 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
516 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
508 - ``changeset.gpg.sign`` for :hg:`sign`
517 - ``changeset.gpg.sign`` for :hg:`sign`
509 - ``changeset.graft`` for :hg:`graft`
518 - ``changeset.graft`` for :hg:`graft`
510 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
519 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
511 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
520 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
512 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
521 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
513 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
522 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
514 - ``changeset.import.bypass`` for :hg:`import --bypass`
523 - ``changeset.import.bypass`` for :hg:`import --bypass`
515 - ``changeset.import.normal.merge`` for :hg:`import` on merges
524 - ``changeset.import.normal.merge`` for :hg:`import` on merges
516 - ``changeset.import.normal.normal`` for :hg:`import` on other
525 - ``changeset.import.normal.normal`` for :hg:`import` on other
517 - ``changeset.mq.qnew`` for :hg:`qnew`
526 - ``changeset.mq.qnew`` for :hg:`qnew`
518 - ``changeset.mq.qfold`` for :hg:`qfold`
527 - ``changeset.mq.qfold`` for :hg:`qfold`
519 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
528 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
520 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
529 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
521 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
530 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
522 - ``changeset.rebase.normal`` for :hg:`rebase` on other
531 - ``changeset.rebase.normal`` for :hg:`rebase` on other
523 - ``changeset.shelve.shelve`` for :hg:`shelve`
532 - ``changeset.shelve.shelve`` for :hg:`shelve`
524 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
533 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
525 - ``changeset.tag.remove`` for :hg:`tag --remove`
534 - ``changeset.tag.remove`` for :hg:`tag --remove`
526 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
535 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
527 - ``changeset.transplant.normal`` for :hg:`transplant` on other
536 - ``changeset.transplant.normal`` for :hg:`transplant` on other
528
537
529 These dot-separated lists of names are treated as hierarchical ones.
538 These dot-separated lists of names are treated as hierarchical ones.
530 For example, ``changeset.tag.remove`` customizes the commit message
539 For example, ``changeset.tag.remove`` customizes the commit message
531 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
540 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
532 commit message for :hg:`tag` regardless of ``--remove`` option.
541 commit message for :hg:`tag` regardless of ``--remove`` option.
533
542
534 When the external editor is invoked for a commit, the corresponding
543 When the external editor is invoked for a commit, the corresponding
535 dot-separated list of names without the ``changeset.`` prefix
544 dot-separated list of names without the ``changeset.`` prefix
536 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
545 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
537 variable.
546 variable.
538
547
539 In this section, items other than ``changeset`` can be referred from
548 In this section, items other than ``changeset`` can be referred from
540 others. For example, the configuration to list committed files up
549 others. For example, the configuration to list committed files up
541 below can be referred as ``{listupfiles}``::
550 below can be referred as ``{listupfiles}``::
542
551
543 [committemplate]
552 [committemplate]
544 listupfiles = {file_adds %
553 listupfiles = {file_adds %
545 "HG: added {file}\n" }{file_mods %
554 "HG: added {file}\n" }{file_mods %
546 "HG: changed {file}\n" }{file_dels %
555 "HG: changed {file}\n" }{file_dels %
547 "HG: removed {file}\n" }{if(files, "",
556 "HG: removed {file}\n" }{if(files, "",
548 "HG: no files changed\n")}
557 "HG: no files changed\n")}
549
558
550 ``decode/encode``
559 ``decode/encode``
551 -----------------
560 -----------------
552
561
553 Filters for transforming files on checkout/checkin. This would
562 Filters for transforming files on checkout/checkin. This would
554 typically be used for newline processing or other
563 typically be used for newline processing or other
555 localization/canonicalization of files.
564 localization/canonicalization of files.
556
565
557 Filters consist of a filter pattern followed by a filter command.
566 Filters consist of a filter pattern followed by a filter command.
558 Filter patterns are globs by default, rooted at the repository root.
567 Filter patterns are globs by default, rooted at the repository root.
559 For example, to match any file ending in ``.txt`` in the root
568 For example, to match any file ending in ``.txt`` in the root
560 directory only, use the pattern ``*.txt``. To match any file ending
569 directory only, use the pattern ``*.txt``. To match any file ending
561 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
570 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
562 For each file only the first matching filter applies.
571 For each file only the first matching filter applies.
563
572
564 The filter command can start with a specifier, either ``pipe:`` or
573 The filter command can start with a specifier, either ``pipe:`` or
565 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
574 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
566
575
567 A ``pipe:`` command must accept data on stdin and return the transformed
576 A ``pipe:`` command must accept data on stdin and return the transformed
568 data on stdout.
577 data on stdout.
569
578
570 Pipe example::
579 Pipe example::
571
580
572 [encode]
581 [encode]
573 # uncompress gzip files on checkin to improve delta compression
582 # uncompress gzip files on checkin to improve delta compression
574 # note: not necessarily a good idea, just an example
583 # note: not necessarily a good idea, just an example
575 *.gz = pipe: gunzip
584 *.gz = pipe: gunzip
576
585
577 [decode]
586 [decode]
578 # recompress gzip files when writing them to the working dir (we
587 # recompress gzip files when writing them to the working dir (we
579 # can safely omit "pipe:", because it's the default)
588 # can safely omit "pipe:", because it's the default)
580 *.gz = gzip
589 *.gz = gzip
581
590
582 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
591 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
583 with the name of a temporary file that contains the data to be
592 with the name of a temporary file that contains the data to be
584 filtered by the command. The string ``OUTFILE`` is replaced with the name
593 filtered by the command. The string ``OUTFILE`` is replaced with the name
585 of an empty temporary file, where the filtered data must be written by
594 of an empty temporary file, where the filtered data must be written by
586 the command.
595 the command.
587
596
588 .. container:: windows
597 .. container:: windows
589
598
590 .. note::
599 .. note::
591
600
592 The tempfile mechanism is recommended for Windows systems,
601 The tempfile mechanism is recommended for Windows systems,
593 where the standard shell I/O redirection operators often have
602 where the standard shell I/O redirection operators often have
594 strange effects and may corrupt the contents of your files.
603 strange effects and may corrupt the contents of your files.
595
604
596 This filter mechanism is used internally by the ``eol`` extension to
605 This filter mechanism is used internally by the ``eol`` extension to
597 translate line ending characters between Windows (CRLF) and Unix (LF)
606 translate line ending characters between Windows (CRLF) and Unix (LF)
598 format. We suggest you use the ``eol`` extension for convenience.
607 format. We suggest you use the ``eol`` extension for convenience.
599
608
600
609
601 ``defaults``
610 ``defaults``
602 ------------
611 ------------
603
612
604 (defaults are deprecated. Don't use them. Use aliases instead.)
613 (defaults are deprecated. Don't use them. Use aliases instead.)
605
614
606 Use the ``[defaults]`` section to define command defaults, i.e. the
615 Use the ``[defaults]`` section to define command defaults, i.e. the
607 default options/arguments to pass to the specified commands.
616 default options/arguments to pass to the specified commands.
608
617
609 The following example makes :hg:`log` run in verbose mode, and
618 The following example makes :hg:`log` run in verbose mode, and
610 :hg:`status` show only the modified files, by default::
619 :hg:`status` show only the modified files, by default::
611
620
612 [defaults]
621 [defaults]
613 log = -v
622 log = -v
614 status = -m
623 status = -m
615
624
616 The actual commands, instead of their aliases, must be used when
625 The actual commands, instead of their aliases, must be used when
617 defining command defaults. The command defaults will also be applied
626 defining command defaults. The command defaults will also be applied
618 to the aliases of the commands defined.
627 to the aliases of the commands defined.
619
628
620
629
621 ``diff``
630 ``diff``
622 --------
631 --------
623
632
624 Settings used when displaying diffs. Everything except for ``unified``
633 Settings used when displaying diffs. Everything except for ``unified``
625 is a Boolean and defaults to False. See :hg:`help config.annotate`
634 is a Boolean and defaults to False. See :hg:`help config.annotate`
626 for related options for the annotate command.
635 for related options for the annotate command.
627
636
628 ``git``
637 ``git``
629 Use git extended diff format.
638 Use git extended diff format.
630
639
631 ``nobinary``
640 ``nobinary``
632 Omit git binary patches.
641 Omit git binary patches.
633
642
634 ``nodates``
643 ``nodates``
635 Don't include dates in diff headers.
644 Don't include dates in diff headers.
636
645
637 ``noprefix``
646 ``noprefix``
638 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
647 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
639
648
640 ``showfunc``
649 ``showfunc``
641 Show which function each change is in.
650 Show which function each change is in.
642
651
643 ``ignorews``
652 ``ignorews``
644 Ignore white space when comparing lines.
653 Ignore white space when comparing lines.
645
654
646 ``ignorewsamount``
655 ``ignorewsamount``
647 Ignore changes in the amount of white space.
656 Ignore changes in the amount of white space.
648
657
649 ``ignoreblanklines``
658 ``ignoreblanklines``
650 Ignore changes whose lines are all blank.
659 Ignore changes whose lines are all blank.
651
660
652 ``unified``
661 ``unified``
653 Number of lines of context to show.
662 Number of lines of context to show.
654
663
655 ``email``
664 ``email``
656 ---------
665 ---------
657
666
658 Settings for extensions that send email messages.
667 Settings for extensions that send email messages.
659
668
660 ``from``
669 ``from``
661 Optional. Email address to use in "From" header and SMTP envelope
670 Optional. Email address to use in "From" header and SMTP envelope
662 of outgoing messages.
671 of outgoing messages.
663
672
664 ``to``
673 ``to``
665 Optional. Comma-separated list of recipients' email addresses.
674 Optional. Comma-separated list of recipients' email addresses.
666
675
667 ``cc``
676 ``cc``
668 Optional. Comma-separated list of carbon copy recipients'
677 Optional. Comma-separated list of carbon copy recipients'
669 email addresses.
678 email addresses.
670
679
671 ``bcc``
680 ``bcc``
672 Optional. Comma-separated list of blind carbon copy recipients'
681 Optional. Comma-separated list of blind carbon copy recipients'
673 email addresses.
682 email addresses.
674
683
675 ``method``
684 ``method``
676 Optional. Method to use to send email messages. If value is ``smtp``
685 Optional. Method to use to send email messages. If value is ``smtp``
677 (default), use SMTP (see the ``[smtp]`` section for configuration).
686 (default), use SMTP (see the ``[smtp]`` section for configuration).
678 Otherwise, use as name of program to run that acts like sendmail
687 Otherwise, use as name of program to run that acts like sendmail
679 (takes ``-f`` option for sender, list of recipients on command line,
688 (takes ``-f`` option for sender, list of recipients on command line,
680 message on stdin). Normally, setting this to ``sendmail`` or
689 message on stdin). Normally, setting this to ``sendmail`` or
681 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
690 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
682
691
683 ``charsets``
692 ``charsets``
684 Optional. Comma-separated list of character sets considered
693 Optional. Comma-separated list of character sets considered
685 convenient for recipients. Addresses, headers, and parts not
694 convenient for recipients. Addresses, headers, and parts not
686 containing patches of outgoing messages will be encoded in the
695 containing patches of outgoing messages will be encoded in the
687 first character set to which conversion from local encoding
696 first character set to which conversion from local encoding
688 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
697 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
689 conversion fails, the text in question is sent as is.
698 conversion fails, the text in question is sent as is.
690 (default: '')
699 (default: '')
691
700
692 Order of outgoing email character sets:
701 Order of outgoing email character sets:
693
702
694 1. ``us-ascii``: always first, regardless of settings
703 1. ``us-ascii``: always first, regardless of settings
695 2. ``email.charsets``: in order given by user
704 2. ``email.charsets``: in order given by user
696 3. ``ui.fallbackencoding``: if not in email.charsets
705 3. ``ui.fallbackencoding``: if not in email.charsets
697 4. ``$HGENCODING``: if not in email.charsets
706 4. ``$HGENCODING``: if not in email.charsets
698 5. ``utf-8``: always last, regardless of settings
707 5. ``utf-8``: always last, regardless of settings
699
708
700 Email example::
709 Email example::
701
710
702 [email]
711 [email]
703 from = Joseph User <joe.user@example.com>
712 from = Joseph User <joe.user@example.com>
704 method = /usr/sbin/sendmail
713 method = /usr/sbin/sendmail
705 # charsets for western Europeans
714 # charsets for western Europeans
706 # us-ascii, utf-8 omitted, as they are tried first and last
715 # us-ascii, utf-8 omitted, as they are tried first and last
707 charsets = iso-8859-1, iso-8859-15, windows-1252
716 charsets = iso-8859-1, iso-8859-15, windows-1252
708
717
709
718
710 ``extensions``
719 ``extensions``
711 --------------
720 --------------
712
721
713 Mercurial has an extension mechanism for adding new features. To
722 Mercurial has an extension mechanism for adding new features. To
714 enable an extension, create an entry for it in this section.
723 enable an extension, create an entry for it in this section.
715
724
716 If you know that the extension is already in Python's search path,
725 If you know that the extension is already in Python's search path,
717 you can give the name of the module, followed by ``=``, with nothing
726 you can give the name of the module, followed by ``=``, with nothing
718 after the ``=``.
727 after the ``=``.
719
728
720 Otherwise, give a name that you choose, followed by ``=``, followed by
729 Otherwise, give a name that you choose, followed by ``=``, followed by
721 the path to the ``.py`` file (including the file name extension) that
730 the path to the ``.py`` file (including the file name extension) that
722 defines the extension.
731 defines the extension.
723
732
724 To explicitly disable an extension that is enabled in an hgrc of
733 To explicitly disable an extension that is enabled in an hgrc of
725 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
734 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
726 or ``foo = !`` when path is not supplied.
735 or ``foo = !`` when path is not supplied.
727
736
728 Example for ``~/.hgrc``::
737 Example for ``~/.hgrc``::
729
738
730 [extensions]
739 [extensions]
731 # (the churn extension will get loaded from Mercurial's path)
740 # (the churn extension will get loaded from Mercurial's path)
732 churn =
741 churn =
733 # (this extension will get loaded from the file specified)
742 # (this extension will get loaded from the file specified)
734 myfeature = ~/.hgext/myfeature.py
743 myfeature = ~/.hgext/myfeature.py
735
744
736
745
737 ``format``
746 ``format``
738 ----------
747 ----------
739
748
740 ``usegeneraldelta``
749 ``usegeneraldelta``
741 Enable or disable the "generaldelta" repository format which improves
750 Enable or disable the "generaldelta" repository format which improves
742 repository compression by allowing "revlog" to store delta against arbitrary
751 repository compression by allowing "revlog" to store delta against arbitrary
743 revision instead of the previous stored one. This provides significant
752 revision instead of the previous stored one. This provides significant
744 improvement for repositories with branches.
753 improvement for repositories with branches.
745
754
746 Repositories with this on-disk format require Mercurial version 1.9.
755 Repositories with this on-disk format require Mercurial version 1.9.
747
756
748 Enabled by default.
757 Enabled by default.
749
758
750 ``dotencode``
759 ``dotencode``
751 Enable or disable the "dotencode" repository format which enhances
760 Enable or disable the "dotencode" repository format which enhances
752 the "fncache" repository format (which has to be enabled to use
761 the "fncache" repository format (which has to be enabled to use
753 dotencode) to avoid issues with filenames starting with ._ on
762 dotencode) to avoid issues with filenames starting with ._ on
754 Mac OS X and spaces on Windows.
763 Mac OS X and spaces on Windows.
755
764
756 Repositories with this on-disk format require Mercurial version 1.7.
765 Repositories with this on-disk format require Mercurial version 1.7.
757
766
758 Enabled by default.
767 Enabled by default.
759
768
760 ``usefncache``
769 ``usefncache``
761 Enable or disable the "fncache" repository format which enhances
770 Enable or disable the "fncache" repository format which enhances
762 the "store" repository format (which has to be enabled to use
771 the "store" repository format (which has to be enabled to use
763 fncache) to allow longer filenames and avoids using Windows
772 fncache) to allow longer filenames and avoids using Windows
764 reserved names, e.g. "nul".
773 reserved names, e.g. "nul".
765
774
766 Repositories with this on-disk format require Mercurial version 1.1.
775 Repositories with this on-disk format require Mercurial version 1.1.
767
776
768 Enabled by default.
777 Enabled by default.
769
778
770 ``usestore``
779 ``usestore``
771 Enable or disable the "store" repository format which improves
780 Enable or disable the "store" repository format which improves
772 compatibility with systems that fold case or otherwise mangle
781 compatibility with systems that fold case or otherwise mangle
773 filenames. Disabling this option will allow you to store longer filenames
782 filenames. Disabling this option will allow you to store longer filenames
774 in some situations at the expense of compatibility.
783 in some situations at the expense of compatibility.
775
784
776 Repositories with this on-disk format require Mercurial version 0.9.4.
785 Repositories with this on-disk format require Mercurial version 0.9.4.
777
786
778 Enabled by default.
787 Enabled by default.
779
788
780 ``graph``
789 ``graph``
781 ---------
790 ---------
782
791
783 Web graph view configuration. This section let you change graph
792 Web graph view configuration. This section let you change graph
784 elements display properties by branches, for instance to make the
793 elements display properties by branches, for instance to make the
785 ``default`` branch stand out.
794 ``default`` branch stand out.
786
795
787 Each line has the following format::
796 Each line has the following format::
788
797
789 <branch>.<argument> = <value>
798 <branch>.<argument> = <value>
790
799
791 where ``<branch>`` is the name of the branch being
800 where ``<branch>`` is the name of the branch being
792 customized. Example::
801 customized. Example::
793
802
794 [graph]
803 [graph]
795 # 2px width
804 # 2px width
796 default.width = 2
805 default.width = 2
797 # red color
806 # red color
798 default.color = FF0000
807 default.color = FF0000
799
808
800 Supported arguments:
809 Supported arguments:
801
810
802 ``width``
811 ``width``
803 Set branch edges width in pixels.
812 Set branch edges width in pixels.
804
813
805 ``color``
814 ``color``
806 Set branch edges color in hexadecimal RGB notation.
815 Set branch edges color in hexadecimal RGB notation.
807
816
808 ``hooks``
817 ``hooks``
809 ---------
818 ---------
810
819
811 Commands or Python functions that get automatically executed by
820 Commands or Python functions that get automatically executed by
812 various actions such as starting or finishing a commit. Multiple
821 various actions such as starting or finishing a commit. Multiple
813 hooks can be run for the same action by appending a suffix to the
822 hooks can be run for the same action by appending a suffix to the
814 action. Overriding a site-wide hook can be done by changing its
823 action. Overriding a site-wide hook can be done by changing its
815 value or setting it to an empty string. Hooks can be prioritized
824 value or setting it to an empty string. Hooks can be prioritized
816 by adding a prefix of ``priority.`` to the hook name on a new line
825 by adding a prefix of ``priority.`` to the hook name on a new line
817 and setting the priority. The default priority is 0.
826 and setting the priority. The default priority is 0.
818
827
819 Example ``.hg/hgrc``::
828 Example ``.hg/hgrc``::
820
829
821 [hooks]
830 [hooks]
822 # update working directory after adding changesets
831 # update working directory after adding changesets
823 changegroup.update = hg update
832 changegroup.update = hg update
824 # do not use the site-wide hook
833 # do not use the site-wide hook
825 incoming =
834 incoming =
826 incoming.email = /my/email/hook
835 incoming.email = /my/email/hook
827 incoming.autobuild = /my/build/hook
836 incoming.autobuild = /my/build/hook
828 # force autobuild hook to run before other incoming hooks
837 # force autobuild hook to run before other incoming hooks
829 priority.incoming.autobuild = 1
838 priority.incoming.autobuild = 1
830
839
831 Most hooks are run with environment variables set that give useful
840 Most hooks are run with environment variables set that give useful
832 additional information. For each hook below, the environment
841 additional information. For each hook below, the environment
833 variables it is passed are listed with names of the form ``$HG_foo``.
842 variables it is passed are listed with names of the form ``$HG_foo``.
834
843
835 ``changegroup``
844 ``changegroup``
836 Run after a changegroup has been added via push, pull or unbundle. ID of the
845 Run after a changegroup has been added via push, pull or unbundle. ID of the
837 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
846 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
838 from which changes came is in ``$HG_URL``.
847 from which changes came is in ``$HG_URL``.
839
848
840 ``commit``
849 ``commit``
841 Run after a changeset has been created in the local repository. ID
850 Run after a changeset has been created in the local repository. ID
842 of the newly created changeset is in ``$HG_NODE``. Parent changeset
851 of the newly created changeset is in ``$HG_NODE``. Parent changeset
843 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
852 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
844
853
845 ``incoming``
854 ``incoming``
846 Run after a changeset has been pulled, pushed, or unbundled into
855 Run after a changeset has been pulled, pushed, or unbundled into
847 the local repository. The ID of the newly arrived changeset is in
856 the local repository. The ID of the newly arrived changeset is in
848 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
857 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
849
858
850 ``outgoing``
859 ``outgoing``
851 Run after sending changes from local repository to another. ID of
860 Run after sending changes from local repository to another. ID of
852 first changeset sent is in ``$HG_NODE``. Source of operation is in
861 first changeset sent is in ``$HG_NODE``. Source of operation is in
853 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
862 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
854
863
855 ``post-<command>``
864 ``post-<command>``
856 Run after successful invocations of the associated command. The
865 Run after successful invocations of the associated command. The
857 contents of the command line are passed as ``$HG_ARGS`` and the result
866 contents of the command line are passed as ``$HG_ARGS`` and the result
858 code in ``$HG_RESULT``. Parsed command line arguments are passed as
867 code in ``$HG_RESULT``. Parsed command line arguments are passed as
859 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
868 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
860 the python data internally passed to <command>. ``$HG_OPTS`` is a
869 the python data internally passed to <command>. ``$HG_OPTS`` is a
861 dictionary of options (with unspecified options set to their defaults).
870 dictionary of options (with unspecified options set to their defaults).
862 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
871 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
863
872
864 ``fail-<command>``
873 ``fail-<command>``
865 Run after a failed invocation of an associated command. The contents
874 Run after a failed invocation of an associated command. The contents
866 of the command line are passed as ``$HG_ARGS``. Parsed command line
875 of the command line are passed as ``$HG_ARGS``. Parsed command line
867 arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain
876 arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain
868 string representations of the python data internally passed to
877 string representations of the python data internally passed to
869 <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified
878 <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified
870 options set to their defaults). ``$HG_PATS`` is a list of arguments.
879 options set to their defaults). ``$HG_PATS`` is a list of arguments.
871 Hook failure is ignored.
880 Hook failure is ignored.
872
881
873 ``pre-<command>``
882 ``pre-<command>``
874 Run before executing the associated command. The contents of the
883 Run before executing the associated command. The contents of the
875 command line are passed as ``$HG_ARGS``. Parsed command line arguments
884 command line are passed as ``$HG_ARGS``. Parsed command line arguments
876 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
885 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
877 representations of the data internally passed to <command>. ``$HG_OPTS``
886 representations of the data internally passed to <command>. ``$HG_OPTS``
878 is a dictionary of options (with unspecified options set to their
887 is a dictionary of options (with unspecified options set to their
879 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
888 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
880 failure, the command doesn't execute and Mercurial returns the failure
889 failure, the command doesn't execute and Mercurial returns the failure
881 code.
890 code.
882
891
883 ``prechangegroup``
892 ``prechangegroup``
884 Run before a changegroup is added via push, pull or unbundle. Exit
893 Run before a changegroup is added via push, pull or unbundle. Exit
885 status 0 allows the changegroup to proceed. Non-zero status will
894 status 0 allows the changegroup to proceed. Non-zero status will
886 cause the push, pull or unbundle to fail. URL from which changes
895 cause the push, pull or unbundle to fail. URL from which changes
887 will come is in ``$HG_URL``.
896 will come is in ``$HG_URL``.
888
897
889 ``precommit``
898 ``precommit``
890 Run before starting a local commit. Exit status 0 allows the
899 Run before starting a local commit. Exit status 0 allows the
891 commit to proceed. Non-zero status will cause the commit to fail.
900 commit to proceed. Non-zero status will cause the commit to fail.
892 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
901 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
893
902
894 ``prelistkeys``
903 ``prelistkeys``
895 Run before listing pushkeys (like bookmarks) in the
904 Run before listing pushkeys (like bookmarks) in the
896 repository. Non-zero status will cause failure. The key namespace is
905 repository. Non-zero status will cause failure. The key namespace is
897 in ``$HG_NAMESPACE``.
906 in ``$HG_NAMESPACE``.
898
907
899 ``preoutgoing``
908 ``preoutgoing``
900 Run before collecting changes to send from the local repository to
909 Run before collecting changes to send from the local repository to
901 another. Non-zero status will cause failure. This lets you prevent
910 another. Non-zero status will cause failure. This lets you prevent
902 pull over HTTP or SSH. Also prevents against local pull, push
911 pull over HTTP or SSH. Also prevents against local pull, push
903 (outbound) or bundle commands, but not effective, since you can
912 (outbound) or bundle commands, but not effective, since you can
904 just copy files instead then. Source of operation is in
913 just copy files instead then. Source of operation is in
905 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
914 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
906 SSH or HTTP repository. If "push", "pull" or "bundle", operation
915 SSH or HTTP repository. If "push", "pull" or "bundle", operation
907 is happening on behalf of repository on same system.
916 is happening on behalf of repository on same system.
908
917
909 ``prepushkey``
918 ``prepushkey``
910 Run before a pushkey (like a bookmark) is added to the
919 Run before a pushkey (like a bookmark) is added to the
911 repository. Non-zero status will cause the key to be rejected. The
920 repository. Non-zero status will cause the key to be rejected. The
912 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
921 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
913 the old value (if any) is in ``$HG_OLD``, and the new value is in
922 the old value (if any) is in ``$HG_OLD``, and the new value is in
914 ``$HG_NEW``.
923 ``$HG_NEW``.
915
924
916 ``pretag``
925 ``pretag``
917 Run before creating a tag. Exit status 0 allows the tag to be
926 Run before creating a tag. Exit status 0 allows the tag to be
918 created. Non-zero status will cause the tag to fail. ID of
927 created. Non-zero status will cause the tag to fail. ID of
919 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
928 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
920 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
929 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
921
930
922 ``pretxnopen``
931 ``pretxnopen``
923 Run before any new repository transaction is open. The reason for the
932 Run before any new repository transaction is open. The reason for the
924 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
933 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
925 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
934 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
926 transaction from being opened.
935 transaction from being opened.
927
936
928 ``pretxnclose``
937 ``pretxnclose``
929 Run right before the transaction is actually finalized. Any repository change
938 Run right before the transaction is actually finalized. Any repository change
930 will be visible to the hook program. This lets you validate the transaction
939 will be visible to the hook program. This lets you validate the transaction
931 content or change it. Exit status 0 allows the commit to proceed. Non-zero
940 content or change it. Exit status 0 allows the commit to proceed. Non-zero
932 status will cause the transaction to be rolled back. The reason for the
941 status will cause the transaction to be rolled back. The reason for the
933 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
942 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
934 the transaction will be in ``HG_TXNID``. The rest of the available data will
943 the transaction will be in ``HG_TXNID``. The rest of the available data will
935 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
944 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
936 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
945 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
937 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
946 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
938 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
947 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
939
948
940 ``txnclose``
949 ``txnclose``
941 Run after any repository transaction has been committed. At this
950 Run after any repository transaction has been committed. At this
942 point, the transaction can no longer be rolled back. The hook will run
951 point, the transaction can no longer be rolled back. The hook will run
943 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
952 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
944 details about available variables.
953 details about available variables.
945
954
946 ``txnabort``
955 ``txnabort``
947 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
956 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
948 docs for details about available variables.
957 docs for details about available variables.
949
958
950 ``pretxnchangegroup``
959 ``pretxnchangegroup``
951 Run after a changegroup has been added via push, pull or unbundle, but before
960 Run after a changegroup has been added via push, pull or unbundle, but before
952 the transaction has been committed. Changegroup is visible to hook program.
961 the transaction has been committed. Changegroup is visible to hook program.
953 This lets you validate incoming changes before accepting them. Passed the ID
962 This lets you validate incoming changes before accepting them. Passed the ID
954 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
963 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
955 Exit status 0 allows the transaction to commit. Non-zero status will cause
964 Exit status 0 allows the transaction to commit. Non-zero status will cause
956 the transaction to be rolled back and the push, pull or unbundle will fail.
965 the transaction to be rolled back and the push, pull or unbundle will fail.
957 URL that was source of changes is in ``$HG_URL``.
966 URL that was source of changes is in ``$HG_URL``.
958
967
959 ``pretxncommit``
968 ``pretxncommit``
960 Run after a changeset has been created but the transaction not yet
969 Run after a changeset has been created but the transaction not yet
961 committed. Changeset is visible to hook program. This lets you
970 committed. Changeset is visible to hook program. This lets you
962 validate commit message and changes. Exit status 0 allows the
971 validate commit message and changes. Exit status 0 allows the
963 commit to proceed. Non-zero status will cause the transaction to
972 commit to proceed. Non-zero status will cause the transaction to
964 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
973 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
965 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
974 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
966
975
967 ``preupdate``
976 ``preupdate``
968 Run before updating the working directory. Exit status 0 allows
977 Run before updating the working directory. Exit status 0 allows
969 the update to proceed. Non-zero status will prevent the update.
978 the update to proceed. Non-zero status will prevent the update.
970 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
979 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
971 of second new parent is in ``$HG_PARENT2``.
980 of second new parent is in ``$HG_PARENT2``.
972
981
973 ``listkeys``
982 ``listkeys``
974 Run after listing pushkeys (like bookmarks) in the repository. The
983 Run after listing pushkeys (like bookmarks) in the repository. The
975 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
984 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
976 dictionary containing the keys and values.
985 dictionary containing the keys and values.
977
986
978 ``pushkey``
987 ``pushkey``
979 Run after a pushkey (like a bookmark) is added to the
988 Run after a pushkey (like a bookmark) is added to the
980 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
989 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
981 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
990 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
982 value is in ``$HG_NEW``.
991 value is in ``$HG_NEW``.
983
992
984 ``tag``
993 ``tag``
985 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
994 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
986 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
995 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
987 repository if ``$HG_LOCAL=0``.
996 repository if ``$HG_LOCAL=0``.
988
997
989 ``update``
998 ``update``
990 Run after updating the working directory. Changeset ID of first
999 Run after updating the working directory. Changeset ID of first
991 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
1000 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
992 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
1001 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
993 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
1002 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
994
1003
995 .. note::
1004 .. note::
996
1005
997 It is generally better to use standard hooks rather than the
1006 It is generally better to use standard hooks rather than the
998 generic pre- and post- command hooks as they are guaranteed to be
1007 generic pre- and post- command hooks as they are guaranteed to be
999 called in the appropriate contexts for influencing transactions.
1008 called in the appropriate contexts for influencing transactions.
1000 Also, hooks like "commit" will be called in all contexts that
1009 Also, hooks like "commit" will be called in all contexts that
1001 generate a commit (e.g. tag) and not just the commit command.
1010 generate a commit (e.g. tag) and not just the commit command.
1002
1011
1003 .. note::
1012 .. note::
1004
1013
1005 Environment variables with empty values may not be passed to
1014 Environment variables with empty values may not be passed to
1006 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
1015 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
1007 will have an empty value under Unix-like platforms for non-merge
1016 will have an empty value under Unix-like platforms for non-merge
1008 changesets, while it will not be available at all under Windows.
1017 changesets, while it will not be available at all under Windows.
1009
1018
1010 The syntax for Python hooks is as follows::
1019 The syntax for Python hooks is as follows::
1011
1020
1012 hookname = python:modulename.submodule.callable
1021 hookname = python:modulename.submodule.callable
1013 hookname = python:/path/to/python/module.py:callable
1022 hookname = python:/path/to/python/module.py:callable
1014
1023
1015 Python hooks are run within the Mercurial process. Each hook is
1024 Python hooks are run within the Mercurial process. Each hook is
1016 called with at least three keyword arguments: a ui object (keyword
1025 called with at least three keyword arguments: a ui object (keyword
1017 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
1026 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
1018 keyword that tells what kind of hook is used. Arguments listed as
1027 keyword that tells what kind of hook is used. Arguments listed as
1019 environment variables above are passed as keyword arguments, with no
1028 environment variables above are passed as keyword arguments, with no
1020 ``HG_`` prefix, and names in lower case.
1029 ``HG_`` prefix, and names in lower case.
1021
1030
1022 If a Python hook returns a "true" value or raises an exception, this
1031 If a Python hook returns a "true" value or raises an exception, this
1023 is treated as a failure.
1032 is treated as a failure.
1024
1033
1025
1034
1026 ``hostfingerprints``
1035 ``hostfingerprints``
1027 --------------------
1036 --------------------
1028
1037
1029 (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.)
1038 (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.)
1030
1039
1031 Fingerprints of the certificates of known HTTPS servers.
1040 Fingerprints of the certificates of known HTTPS servers.
1032
1041
1033 A HTTPS connection to a server with a fingerprint configured here will
1042 A HTTPS connection to a server with a fingerprint configured here will
1034 only succeed if the servers certificate matches the fingerprint.
1043 only succeed if the servers certificate matches the fingerprint.
1035 This is very similar to how ssh known hosts works.
1044 This is very similar to how ssh known hosts works.
1036
1045
1037 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
1046 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
1038 Multiple values can be specified (separated by spaces or commas). This can
1047 Multiple values can be specified (separated by spaces or commas). This can
1039 be used to define both old and new fingerprints while a host transitions
1048 be used to define both old and new fingerprints while a host transitions
1040 to a new certificate.
1049 to a new certificate.
1041
1050
1042 The CA chain and web.cacerts is not used for servers with a fingerprint.
1051 The CA chain and web.cacerts is not used for servers with a fingerprint.
1043
1052
1044 For example::
1053 For example::
1045
1054
1046 [hostfingerprints]
1055 [hostfingerprints]
1047 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1056 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1048 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1057 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1049
1058
1050 ``hostsecurity``
1059 ``hostsecurity``
1051 ----------------
1060 ----------------
1052
1061
1053 Used to specify global and per-host security settings for connecting to
1062 Used to specify global and per-host security settings for connecting to
1054 other machines.
1063 other machines.
1055
1064
1056 The following options control default behavior for all hosts.
1065 The following options control default behavior for all hosts.
1057
1066
1058 ``ciphers``
1067 ``ciphers``
1059 Defines the cryptographic ciphers to use for connections.
1068 Defines the cryptographic ciphers to use for connections.
1060
1069
1061 Value must be a valid OpenSSL Cipher List Format as documented at
1070 Value must be a valid OpenSSL Cipher List Format as documented at
1062 https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
1071 https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
1063
1072
1064 This setting is for advanced users only. Setting to incorrect values
1073 This setting is for advanced users only. Setting to incorrect values
1065 can significantly lower connection security or decrease performance.
1074 can significantly lower connection security or decrease performance.
1066 You have been warned.
1075 You have been warned.
1067
1076
1068 This option requires Python 2.7.
1077 This option requires Python 2.7.
1069
1078
1070 ``minimumprotocol``
1079 ``minimumprotocol``
1071 Defines the minimum channel encryption protocol to use.
1080 Defines the minimum channel encryption protocol to use.
1072
1081
1073 By default, the highest version of TLS supported by both client and server
1082 By default, the highest version of TLS supported by both client and server
1074 is used.
1083 is used.
1075
1084
1076 Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``.
1085 Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``.
1077
1086
1078 When running on an old Python version, only ``tls1.0`` is allowed since
1087 When running on an old Python version, only ``tls1.0`` is allowed since
1079 old versions of Python only support up to TLS 1.0.
1088 old versions of Python only support up to TLS 1.0.
1080
1089
1081 When running a Python that supports modern TLS versions, the default is
1090 When running a Python that supports modern TLS versions, the default is
1082 ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this
1091 ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this
1083 weakens security and should only be used as a feature of last resort if
1092 weakens security and should only be used as a feature of last resort if
1084 a server does not support TLS 1.1+.
1093 a server does not support TLS 1.1+.
1085
1094
1086 Options in the ``[hostsecurity]`` section can have the form
1095 Options in the ``[hostsecurity]`` section can have the form
1087 ``hostname``:``setting``. This allows multiple settings to be defined on a
1096 ``hostname``:``setting``. This allows multiple settings to be defined on a
1088 per-host basis.
1097 per-host basis.
1089
1098
1090 The following per-host settings can be defined.
1099 The following per-host settings can be defined.
1091
1100
1092 ``ciphers``
1101 ``ciphers``
1093 This behaves like ``ciphers`` as described above except it only applies
1102 This behaves like ``ciphers`` as described above except it only applies
1094 to the host on which it is defined.
1103 to the host on which it is defined.
1095
1104
1096 ``fingerprints``
1105 ``fingerprints``
1097 A list of hashes of the DER encoded peer/remote certificate. Values have
1106 A list of hashes of the DER encoded peer/remote certificate. Values have
1098 the form ``algorithm``:``fingerprint``. e.g.
1107 the form ``algorithm``:``fingerprint``. e.g.
1099 ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.
1108 ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.
1100
1109
1101 The following algorithms/prefixes are supported: ``sha1``, ``sha256``,
1110 The following algorithms/prefixes are supported: ``sha1``, ``sha256``,
1102 ``sha512``.
1111 ``sha512``.
1103
1112
1104 Use of ``sha256`` or ``sha512`` is preferred.
1113 Use of ``sha256`` or ``sha512`` is preferred.
1105
1114
1106 If a fingerprint is specified, the CA chain is not validated for this
1115 If a fingerprint is specified, the CA chain is not validated for this
1107 host and Mercurial will require the remote certificate to match one
1116 host and Mercurial will require the remote certificate to match one
1108 of the fingerprints specified. This means if the server updates its
1117 of the fingerprints specified. This means if the server updates its
1109 certificate, Mercurial will abort until a new fingerprint is defined.
1118 certificate, Mercurial will abort until a new fingerprint is defined.
1110 This can provide stronger security than traditional CA-based validation
1119 This can provide stronger security than traditional CA-based validation
1111 at the expense of convenience.
1120 at the expense of convenience.
1112
1121
1113 This option takes precedence over ``verifycertsfile``.
1122 This option takes precedence over ``verifycertsfile``.
1114
1123
1115 ``minimumprotocol``
1124 ``minimumprotocol``
1116 This behaves like ``minimumprotocol`` as described above except it
1125 This behaves like ``minimumprotocol`` as described above except it
1117 only applies to the host on which it is defined.
1126 only applies to the host on which it is defined.
1118
1127
1119 ``verifycertsfile``
1128 ``verifycertsfile``
1120 Path to file a containing a list of PEM encoded certificates used to
1129 Path to file a containing a list of PEM encoded certificates used to
1121 verify the server certificate. Environment variables and ``~user``
1130 verify the server certificate. Environment variables and ``~user``
1122 constructs are expanded in the filename.
1131 constructs are expanded in the filename.
1123
1132
1124 The server certificate or the certificate's certificate authority (CA)
1133 The server certificate or the certificate's certificate authority (CA)
1125 must match a certificate from this file or certificate verification
1134 must match a certificate from this file or certificate verification
1126 will fail and connections to the server will be refused.
1135 will fail and connections to the server will be refused.
1127
1136
1128 If defined, only certificates provided by this file will be used:
1137 If defined, only certificates provided by this file will be used:
1129 ``web.cacerts`` and any system/default certificates will not be
1138 ``web.cacerts`` and any system/default certificates will not be
1130 used.
1139 used.
1131
1140
1132 This option has no effect if the per-host ``fingerprints`` option
1141 This option has no effect if the per-host ``fingerprints`` option
1133 is set.
1142 is set.
1134
1143
1135 The format of the file is as follows::
1144 The format of the file is as follows::
1136
1145
1137 -----BEGIN CERTIFICATE-----
1146 -----BEGIN CERTIFICATE-----
1138 ... (certificate in base64 PEM encoding) ...
1147 ... (certificate in base64 PEM encoding) ...
1139 -----END CERTIFICATE-----
1148 -----END CERTIFICATE-----
1140 -----BEGIN CERTIFICATE-----
1149 -----BEGIN CERTIFICATE-----
1141 ... (certificate in base64 PEM encoding) ...
1150 ... (certificate in base64 PEM encoding) ...
1142 -----END CERTIFICATE-----
1151 -----END CERTIFICATE-----
1143
1152
1144 For example::
1153 For example::
1145
1154
1146 [hostsecurity]
1155 [hostsecurity]
1147 hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
1156 hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
1148 hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1157 hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1149 foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem
1158 foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem
1150
1159
1151 To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
1160 To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
1152 when connecting to ``hg.example.com``::
1161 when connecting to ``hg.example.com``::
1153
1162
1154 [hostsecurity]
1163 [hostsecurity]
1155 minimumprotocol = tls1.2
1164 minimumprotocol = tls1.2
1156 hg.example.com:minimumprotocol = tls1.1
1165 hg.example.com:minimumprotocol = tls1.1
1157
1166
1158 ``http_proxy``
1167 ``http_proxy``
1159 --------------
1168 --------------
1160
1169
1161 Used to access web-based Mercurial repositories through a HTTP
1170 Used to access web-based Mercurial repositories through a HTTP
1162 proxy.
1171 proxy.
1163
1172
1164 ``host``
1173 ``host``
1165 Host name and (optional) port of the proxy server, for example
1174 Host name and (optional) port of the proxy server, for example
1166 "myproxy:8000".
1175 "myproxy:8000".
1167
1176
1168 ``no``
1177 ``no``
1169 Optional. Comma-separated list of host names that should bypass
1178 Optional. Comma-separated list of host names that should bypass
1170 the proxy.
1179 the proxy.
1171
1180
1172 ``passwd``
1181 ``passwd``
1173 Optional. Password to authenticate with at the proxy server.
1182 Optional. Password to authenticate with at the proxy server.
1174
1183
1175 ``user``
1184 ``user``
1176 Optional. User name to authenticate with at the proxy server.
1185 Optional. User name to authenticate with at the proxy server.
1177
1186
1178 ``always``
1187 ``always``
1179 Optional. Always use the proxy, even for localhost and any entries
1188 Optional. Always use the proxy, even for localhost and any entries
1180 in ``http_proxy.no``. (default: False)
1189 in ``http_proxy.no``. (default: False)
1181
1190
1182 ``merge``
1191 ``merge``
1183 ---------
1192 ---------
1184
1193
1185 This section specifies behavior during merges and updates.
1194 This section specifies behavior during merges and updates.
1186
1195
1187 ``checkignored``
1196 ``checkignored``
1188 Controls behavior when an ignored file on disk has the same name as a tracked
1197 Controls behavior when an ignored file on disk has the same name as a tracked
1189 file in the changeset being merged or updated to, and has different
1198 file in the changeset being merged or updated to, and has different
1190 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1199 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1191 abort on such files. With ``warn``, warn on such files and back them up as
1200 abort on such files. With ``warn``, warn on such files and back them up as
1192 ``.orig``. With ``ignore``, don't print a warning and back them up as
1201 ``.orig``. With ``ignore``, don't print a warning and back them up as
1193 ``.orig``. (default: ``abort``)
1202 ``.orig``. (default: ``abort``)
1194
1203
1195 ``checkunknown``
1204 ``checkunknown``
1196 Controls behavior when an unknown file that isn't ignored has the same name
1205 Controls behavior when an unknown file that isn't ignored has the same name
1197 as a tracked file in the changeset being merged or updated to, and has
1206 as a tracked file in the changeset being merged or updated to, and has
1198 different contents. Similar to ``merge.checkignored``, except for files that
1207 different contents. Similar to ``merge.checkignored``, except for files that
1199 are not ignored. (default: ``abort``)
1208 are not ignored. (default: ``abort``)
1200
1209
1201 ``merge-patterns``
1210 ``merge-patterns``
1202 ------------------
1211 ------------------
1203
1212
1204 This section specifies merge tools to associate with particular file
1213 This section specifies merge tools to associate with particular file
1205 patterns. Tools matched here will take precedence over the default
1214 patterns. Tools matched here will take precedence over the default
1206 merge tool. Patterns are globs by default, rooted at the repository
1215 merge tool. Patterns are globs by default, rooted at the repository
1207 root.
1216 root.
1208
1217
1209 Example::
1218 Example::
1210
1219
1211 [merge-patterns]
1220 [merge-patterns]
1212 **.c = kdiff3
1221 **.c = kdiff3
1213 **.jpg = myimgmerge
1222 **.jpg = myimgmerge
1214
1223
1215 ``merge-tools``
1224 ``merge-tools``
1216 ---------------
1225 ---------------
1217
1226
1218 This section configures external merge tools to use for file-level
1227 This section configures external merge tools to use for file-level
1219 merges. This section has likely been preconfigured at install time.
1228 merges. This section has likely been preconfigured at install time.
1220 Use :hg:`config merge-tools` to check the existing configuration.
1229 Use :hg:`config merge-tools` to check the existing configuration.
1221 Also see :hg:`help merge-tools` for more details.
1230 Also see :hg:`help merge-tools` for more details.
1222
1231
1223 Example ``~/.hgrc``::
1232 Example ``~/.hgrc``::
1224
1233
1225 [merge-tools]
1234 [merge-tools]
1226 # Override stock tool location
1235 # Override stock tool location
1227 kdiff3.executable = ~/bin/kdiff3
1236 kdiff3.executable = ~/bin/kdiff3
1228 # Specify command line
1237 # Specify command line
1229 kdiff3.args = $base $local $other -o $output
1238 kdiff3.args = $base $local $other -o $output
1230 # Give higher priority
1239 # Give higher priority
1231 kdiff3.priority = 1
1240 kdiff3.priority = 1
1232
1241
1233 # Changing the priority of preconfigured tool
1242 # Changing the priority of preconfigured tool
1234 meld.priority = 0
1243 meld.priority = 0
1235
1244
1236 # Disable a preconfigured tool
1245 # Disable a preconfigured tool
1237 vimdiff.disabled = yes
1246 vimdiff.disabled = yes
1238
1247
1239 # Define new tool
1248 # Define new tool
1240 myHtmlTool.args = -m $local $other $base $output
1249 myHtmlTool.args = -m $local $other $base $output
1241 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1250 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1242 myHtmlTool.priority = 1
1251 myHtmlTool.priority = 1
1243
1252
1244 Supported arguments:
1253 Supported arguments:
1245
1254
1246 ``priority``
1255 ``priority``
1247 The priority in which to evaluate this tool.
1256 The priority in which to evaluate this tool.
1248 (default: 0)
1257 (default: 0)
1249
1258
1250 ``executable``
1259 ``executable``
1251 Either just the name of the executable or its pathname.
1260 Either just the name of the executable or its pathname.
1252
1261
1253 .. container:: windows
1262 .. container:: windows
1254
1263
1255 On Windows, the path can use environment variables with ${ProgramFiles}
1264 On Windows, the path can use environment variables with ${ProgramFiles}
1256 syntax.
1265 syntax.
1257
1266
1258 (default: the tool name)
1267 (default: the tool name)
1259
1268
1260 ``args``
1269 ``args``
1261 The arguments to pass to the tool executable. You can refer to the
1270 The arguments to pass to the tool executable. You can refer to the
1262 files being merged as well as the output file through these
1271 files being merged as well as the output file through these
1263 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1272 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1264 of ``$local`` and ``$other`` can vary depending on which action is being
1273 of ``$local`` and ``$other`` can vary depending on which action is being
1265 performed. During and update or merge, ``$local`` represents the original
1274 performed. During and update or merge, ``$local`` represents the original
1266 state of the file, while ``$other`` represents the commit you are updating
1275 state of the file, while ``$other`` represents the commit you are updating
1267 to or the commit you are merging with. During a rebase ``$local``
1276 to or the commit you are merging with. During a rebase ``$local``
1268 represents the destination of the rebase, and ``$other`` represents the
1277 represents the destination of the rebase, and ``$other`` represents the
1269 commit being rebased.
1278 commit being rebased.
1270 (default: ``$local $base $other``)
1279 (default: ``$local $base $other``)
1271
1280
1272 ``premerge``
1281 ``premerge``
1273 Attempt to run internal non-interactive 3-way merge tool before
1282 Attempt to run internal non-interactive 3-way merge tool before
1274 launching external tool. Options are ``true``, ``false``, ``keep`` or
1283 launching external tool. Options are ``true``, ``false``, ``keep`` or
1275 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1284 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1276 premerge fails. The ``keep-merge3`` will do the same but include information
1285 premerge fails. The ``keep-merge3`` will do the same but include information
1277 about the base of the merge in the marker (see internal :merge3 in
1286 about the base of the merge in the marker (see internal :merge3 in
1278 :hg:`help merge-tools`).
1287 :hg:`help merge-tools`).
1279 (default: True)
1288 (default: True)
1280
1289
1281 ``binary``
1290 ``binary``
1282 This tool can merge binary files. (default: False, unless tool
1291 This tool can merge binary files. (default: False, unless tool
1283 was selected by file pattern match)
1292 was selected by file pattern match)
1284
1293
1285 ``symlink``
1294 ``symlink``
1286 This tool can merge symlinks. (default: False)
1295 This tool can merge symlinks. (default: False)
1287
1296
1288 ``check``
1297 ``check``
1289 A list of merge success-checking options:
1298 A list of merge success-checking options:
1290
1299
1291 ``changed``
1300 ``changed``
1292 Ask whether merge was successful when the merged file shows no changes.
1301 Ask whether merge was successful when the merged file shows no changes.
1293 ``conflicts``
1302 ``conflicts``
1294 Check whether there are conflicts even though the tool reported success.
1303 Check whether there are conflicts even though the tool reported success.
1295 ``prompt``
1304 ``prompt``
1296 Always prompt for merge success, regardless of success reported by tool.
1305 Always prompt for merge success, regardless of success reported by tool.
1297
1306
1298 ``fixeol``
1307 ``fixeol``
1299 Attempt to fix up EOL changes caused by the merge tool.
1308 Attempt to fix up EOL changes caused by the merge tool.
1300 (default: False)
1309 (default: False)
1301
1310
1302 ``gui``
1311 ``gui``
1303 This tool requires a graphical interface to run. (default: False)
1312 This tool requires a graphical interface to run. (default: False)
1304
1313
1305 .. container:: windows
1314 .. container:: windows
1306
1315
1307 ``regkey``
1316 ``regkey``
1308 Windows registry key which describes install location of this
1317 Windows registry key which describes install location of this
1309 tool. Mercurial will search for this key first under
1318 tool. Mercurial will search for this key first under
1310 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1319 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1311 (default: None)
1320 (default: None)
1312
1321
1313 ``regkeyalt``
1322 ``regkeyalt``
1314 An alternate Windows registry key to try if the first key is not
1323 An alternate Windows registry key to try if the first key is not
1315 found. The alternate key uses the same ``regname`` and ``regappend``
1324 found. The alternate key uses the same ``regname`` and ``regappend``
1316 semantics of the primary key. The most common use for this key
1325 semantics of the primary key. The most common use for this key
1317 is to search for 32bit applications on 64bit operating systems.
1326 is to search for 32bit applications on 64bit operating systems.
1318 (default: None)
1327 (default: None)
1319
1328
1320 ``regname``
1329 ``regname``
1321 Name of value to read from specified registry key.
1330 Name of value to read from specified registry key.
1322 (default: the unnamed (default) value)
1331 (default: the unnamed (default) value)
1323
1332
1324 ``regappend``
1333 ``regappend``
1325 String to append to the value read from the registry, typically
1334 String to append to the value read from the registry, typically
1326 the executable name of the tool.
1335 the executable name of the tool.
1327 (default: None)
1336 (default: None)
1328
1337
1329
1338
1330 ``patch``
1339 ``patch``
1331 ---------
1340 ---------
1332
1341
1333 Settings used when applying patches, for instance through the 'import'
1342 Settings used when applying patches, for instance through the 'import'
1334 command or with Mercurial Queues extension.
1343 command or with Mercurial Queues extension.
1335
1344
1336 ``eol``
1345 ``eol``
1337 When set to 'strict' patch content and patched files end of lines
1346 When set to 'strict' patch content and patched files end of lines
1338 are preserved. When set to ``lf`` or ``crlf``, both files end of
1347 are preserved. When set to ``lf`` or ``crlf``, both files end of
1339 lines are ignored when patching and the result line endings are
1348 lines are ignored when patching and the result line endings are
1340 normalized to either LF (Unix) or CRLF (Windows). When set to
1349 normalized to either LF (Unix) or CRLF (Windows). When set to
1341 ``auto``, end of lines are again ignored while patching but line
1350 ``auto``, end of lines are again ignored while patching but line
1342 endings in patched files are normalized to their original setting
1351 endings in patched files are normalized to their original setting
1343 on a per-file basis. If target file does not exist or has no end
1352 on a per-file basis. If target file does not exist or has no end
1344 of line, patch line endings are preserved.
1353 of line, patch line endings are preserved.
1345 (default: strict)
1354 (default: strict)
1346
1355
1347 ``fuzz``
1356 ``fuzz``
1348 The number of lines of 'fuzz' to allow when applying patches. This
1357 The number of lines of 'fuzz' to allow when applying patches. This
1349 controls how much context the patcher is allowed to ignore when
1358 controls how much context the patcher is allowed to ignore when
1350 trying to apply a patch.
1359 trying to apply a patch.
1351 (default: 2)
1360 (default: 2)
1352
1361
1353 ``paths``
1362 ``paths``
1354 ---------
1363 ---------
1355
1364
1356 Assigns symbolic names and behavior to repositories.
1365 Assigns symbolic names and behavior to repositories.
1357
1366
1358 Options are symbolic names defining the URL or directory that is the
1367 Options are symbolic names defining the URL or directory that is the
1359 location of the repository. Example::
1368 location of the repository. Example::
1360
1369
1361 [paths]
1370 [paths]
1362 my_server = https://example.com/my_repo
1371 my_server = https://example.com/my_repo
1363 local_path = /home/me/repo
1372 local_path = /home/me/repo
1364
1373
1365 These symbolic names can be used from the command line. To pull
1374 These symbolic names can be used from the command line. To pull
1366 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1375 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1367 :hg:`push local_path`.
1376 :hg:`push local_path`.
1368
1377
1369 Options containing colons (``:``) denote sub-options that can influence
1378 Options containing colons (``:``) denote sub-options that can influence
1370 behavior for that specific path. Example::
1379 behavior for that specific path. Example::
1371
1380
1372 [paths]
1381 [paths]
1373 my_server = https://example.com/my_path
1382 my_server = https://example.com/my_path
1374 my_server:pushurl = ssh://example.com/my_path
1383 my_server:pushurl = ssh://example.com/my_path
1375
1384
1376 The following sub-options can be defined:
1385 The following sub-options can be defined:
1377
1386
1378 ``pushurl``
1387 ``pushurl``
1379 The URL to use for push operations. If not defined, the location
1388 The URL to use for push operations. If not defined, the location
1380 defined by the path's main entry is used.
1389 defined by the path's main entry is used.
1381
1390
1382 ``pushrev``
1391 ``pushrev``
1383 A revset defining which revisions to push by default.
1392 A revset defining which revisions to push by default.
1384
1393
1385 When :hg:`push` is executed without a ``-r`` argument, the revset
1394 When :hg:`push` is executed without a ``-r`` argument, the revset
1386 defined by this sub-option is evaluated to determine what to push.
1395 defined by this sub-option is evaluated to determine what to push.
1387
1396
1388 For example, a value of ``.`` will push the working directory's
1397 For example, a value of ``.`` will push the working directory's
1389 revision by default.
1398 revision by default.
1390
1399
1391 Revsets specifying bookmarks will not result in the bookmark being
1400 Revsets specifying bookmarks will not result in the bookmark being
1392 pushed.
1401 pushed.
1393
1402
1394 The following special named paths exist:
1403 The following special named paths exist:
1395
1404
1396 ``default``
1405 ``default``
1397 The URL or directory to use when no source or remote is specified.
1406 The URL or directory to use when no source or remote is specified.
1398
1407
1399 :hg:`clone` will automatically define this path to the location the
1408 :hg:`clone` will automatically define this path to the location the
1400 repository was cloned from.
1409 repository was cloned from.
1401
1410
1402 ``default-push``
1411 ``default-push``
1403 (deprecated) The URL or directory for the default :hg:`push` location.
1412 (deprecated) The URL or directory for the default :hg:`push` location.
1404 ``default:pushurl`` should be used instead.
1413 ``default:pushurl`` should be used instead.
1405
1414
1406 ``phases``
1415 ``phases``
1407 ----------
1416 ----------
1408
1417
1409 Specifies default handling of phases. See :hg:`help phases` for more
1418 Specifies default handling of phases. See :hg:`help phases` for more
1410 information about working with phases.
1419 information about working with phases.
1411
1420
1412 ``publish``
1421 ``publish``
1413 Controls draft phase behavior when working as a server. When true,
1422 Controls draft phase behavior when working as a server. When true,
1414 pushed changesets are set to public in both client and server and
1423 pushed changesets are set to public in both client and server and
1415 pulled or cloned changesets are set to public in the client.
1424 pulled or cloned changesets are set to public in the client.
1416 (default: True)
1425 (default: True)
1417
1426
1418 ``new-commit``
1427 ``new-commit``
1419 Phase of newly-created commits.
1428 Phase of newly-created commits.
1420 (default: draft)
1429 (default: draft)
1421
1430
1422 ``checksubrepos``
1431 ``checksubrepos``
1423 Check the phase of the current revision of each subrepository. Allowed
1432 Check the phase of the current revision of each subrepository. Allowed
1424 values are "ignore", "follow" and "abort". For settings other than
1433 values are "ignore", "follow" and "abort". For settings other than
1425 "ignore", the phase of the current revision of each subrepository is
1434 "ignore", the phase of the current revision of each subrepository is
1426 checked before committing the parent repository. If any of those phases is
1435 checked before committing the parent repository. If any of those phases is
1427 greater than the phase of the parent repository (e.g. if a subrepo is in a
1436 greater than the phase of the parent repository (e.g. if a subrepo is in a
1428 "secret" phase while the parent repo is in "draft" phase), the commit is
1437 "secret" phase while the parent repo is in "draft" phase), the commit is
1429 either aborted (if checksubrepos is set to "abort") or the higher phase is
1438 either aborted (if checksubrepos is set to "abort") or the higher phase is
1430 used for the parent repository commit (if set to "follow").
1439 used for the parent repository commit (if set to "follow").
1431 (default: follow)
1440 (default: follow)
1432
1441
1433
1442
1434 ``profiling``
1443 ``profiling``
1435 -------------
1444 -------------
1436
1445
1437 Specifies profiling type, format, and file output. Two profilers are
1446 Specifies profiling type, format, and file output. Two profilers are
1438 supported: an instrumenting profiler (named ``ls``), and a sampling
1447 supported: an instrumenting profiler (named ``ls``), and a sampling
1439 profiler (named ``stat``).
1448 profiler (named ``stat``).
1440
1449
1441 In this section description, 'profiling data' stands for the raw data
1450 In this section description, 'profiling data' stands for the raw data
1442 collected during profiling, while 'profiling report' stands for a
1451 collected during profiling, while 'profiling report' stands for a
1443 statistical text report generated from the profiling data. The
1452 statistical text report generated from the profiling data. The
1444 profiling is done using lsprof.
1453 profiling is done using lsprof.
1445
1454
1446 ``enabled``
1455 ``enabled``
1447 Enable the profiler.
1456 Enable the profiler.
1448 (default: false)
1457 (default: false)
1449
1458
1450 This is equivalent to passing ``--profile`` on the command line.
1459 This is equivalent to passing ``--profile`` on the command line.
1451
1460
1452 ``type``
1461 ``type``
1453 The type of profiler to use.
1462 The type of profiler to use.
1454 (default: stat)
1463 (default: stat)
1455
1464
1456 ``ls``
1465 ``ls``
1457 Use Python's built-in instrumenting profiler. This profiler
1466 Use Python's built-in instrumenting profiler. This profiler
1458 works on all platforms, but each line number it reports is the
1467 works on all platforms, but each line number it reports is the
1459 first line of a function. This restriction makes it difficult to
1468 first line of a function. This restriction makes it difficult to
1460 identify the expensive parts of a non-trivial function.
1469 identify the expensive parts of a non-trivial function.
1461 ``stat``
1470 ``stat``
1462 Use a statistical profiler, statprof. This profiler is most
1471 Use a statistical profiler, statprof. This profiler is most
1463 useful for profiling commands that run for longer than about 0.1
1472 useful for profiling commands that run for longer than about 0.1
1464 seconds.
1473 seconds.
1465
1474
1466 ``format``
1475 ``format``
1467 Profiling format. Specific to the ``ls`` instrumenting profiler.
1476 Profiling format. Specific to the ``ls`` instrumenting profiler.
1468 (default: text)
1477 (default: text)
1469
1478
1470 ``text``
1479 ``text``
1471 Generate a profiling report. When saving to a file, it should be
1480 Generate a profiling report. When saving to a file, it should be
1472 noted that only the report is saved, and the profiling data is
1481 noted that only the report is saved, and the profiling data is
1473 not kept.
1482 not kept.
1474 ``kcachegrind``
1483 ``kcachegrind``
1475 Format profiling data for kcachegrind use: when saving to a
1484 Format profiling data for kcachegrind use: when saving to a
1476 file, the generated file can directly be loaded into
1485 file, the generated file can directly be loaded into
1477 kcachegrind.
1486 kcachegrind.
1478
1487
1479 ``statformat``
1488 ``statformat``
1480 Profiling format for the ``stat`` profiler.
1489 Profiling format for the ``stat`` profiler.
1481 (default: hotpath)
1490 (default: hotpath)
1482
1491
1483 ``hotpath``
1492 ``hotpath``
1484 Show a tree-based display containing the hot path of execution (where
1493 Show a tree-based display containing the hot path of execution (where
1485 most time was spent).
1494 most time was spent).
1486 ``bymethod``
1495 ``bymethod``
1487 Show a table of methods ordered by how frequently they are active.
1496 Show a table of methods ordered by how frequently they are active.
1488 ``byline``
1497 ``byline``
1489 Show a table of lines in files ordered by how frequently they are active.
1498 Show a table of lines in files ordered by how frequently they are active.
1490 ``json``
1499 ``json``
1491 Render profiling data as JSON.
1500 Render profiling data as JSON.
1492
1501
1493 ``frequency``
1502 ``frequency``
1494 Sampling frequency. Specific to the ``stat`` sampling profiler.
1503 Sampling frequency. Specific to the ``stat`` sampling profiler.
1495 (default: 1000)
1504 (default: 1000)
1496
1505
1497 ``output``
1506 ``output``
1498 File path where profiling data or report should be saved. If the
1507 File path where profiling data or report should be saved. If the
1499 file exists, it is replaced. (default: None, data is printed on
1508 file exists, it is replaced. (default: None, data is printed on
1500 stderr)
1509 stderr)
1501
1510
1502 ``sort``
1511 ``sort``
1503 Sort field. Specific to the ``ls`` instrumenting profiler.
1512 Sort field. Specific to the ``ls`` instrumenting profiler.
1504 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1513 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1505 ``inlinetime``.
1514 ``inlinetime``.
1506 (default: inlinetime)
1515 (default: inlinetime)
1507
1516
1508 ``limit``
1517 ``limit``
1509 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1518 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1510 (default: 30)
1519 (default: 30)
1511
1520
1512 ``nested``
1521 ``nested``
1513 Show at most this number of lines of drill-down info after each main entry.
1522 Show at most this number of lines of drill-down info after each main entry.
1514 This can help explain the difference between Total and Inline.
1523 This can help explain the difference between Total and Inline.
1515 Specific to the ``ls`` instrumenting profiler.
1524 Specific to the ``ls`` instrumenting profiler.
1516 (default: 5)
1525 (default: 5)
1517
1526
1518 ``progress``
1527 ``progress``
1519 ------------
1528 ------------
1520
1529
1521 Mercurial commands can draw progress bars that are as informative as
1530 Mercurial commands can draw progress bars that are as informative as
1522 possible. Some progress bars only offer indeterminate information, while others
1531 possible. Some progress bars only offer indeterminate information, while others
1523 have a definite end point.
1532 have a definite end point.
1524
1533
1525 ``delay``
1534 ``delay``
1526 Number of seconds (float) before showing the progress bar. (default: 3)
1535 Number of seconds (float) before showing the progress bar. (default: 3)
1527
1536
1528 ``changedelay``
1537 ``changedelay``
1529 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1538 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1530 that value will be used instead. (default: 1)
1539 that value will be used instead. (default: 1)
1531
1540
1532 ``refresh``
1541 ``refresh``
1533 Time in seconds between refreshes of the progress bar. (default: 0.1)
1542 Time in seconds between refreshes of the progress bar. (default: 0.1)
1534
1543
1535 ``format``
1544 ``format``
1536 Format of the progress bar.
1545 Format of the progress bar.
1537
1546
1538 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1547 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1539 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1548 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1540 last 20 characters of the item, but this can be changed by adding either
1549 last 20 characters of the item, but this can be changed by adding either
1541 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1550 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1542 first num characters.
1551 first num characters.
1543
1552
1544 (default: topic bar number estimate)
1553 (default: topic bar number estimate)
1545
1554
1546 ``width``
1555 ``width``
1547 If set, the maximum width of the progress information (that is, min(width,
1556 If set, the maximum width of the progress information (that is, min(width,
1548 term width) will be used).
1557 term width) will be used).
1549
1558
1550 ``clear-complete``
1559 ``clear-complete``
1551 Clear the progress bar after it's done. (default: True)
1560 Clear the progress bar after it's done. (default: True)
1552
1561
1553 ``disable``
1562 ``disable``
1554 If true, don't show a progress bar.
1563 If true, don't show a progress bar.
1555
1564
1556 ``assume-tty``
1565 ``assume-tty``
1557 If true, ALWAYS show a progress bar, unless disable is given.
1566 If true, ALWAYS show a progress bar, unless disable is given.
1558
1567
1559 ``rebase``
1568 ``rebase``
1560 ----------
1569 ----------
1561
1570
1562 ``allowdivergence``
1571 ``allowdivergence``
1563 Default to False, when True allow creating divergence when performing
1572 Default to False, when True allow creating divergence when performing
1564 rebase of obsolete changesets.
1573 rebase of obsolete changesets.
1565
1574
1566 ``revsetalias``
1575 ``revsetalias``
1567 ---------------
1576 ---------------
1568
1577
1569 Alias definitions for revsets. See :hg:`help revsets` for details.
1578 Alias definitions for revsets. See :hg:`help revsets` for details.
1570
1579
1571 ``server``
1580 ``server``
1572 ----------
1581 ----------
1573
1582
1574 Controls generic server settings.
1583 Controls generic server settings.
1575
1584
1576 ``compressionengines``
1585 ``compressionengines``
1577 List of compression engines and their relative priority to advertise
1586 List of compression engines and their relative priority to advertise
1578 to clients.
1587 to clients.
1579
1588
1580 The order of compression engines determines their priority, the first
1589 The order of compression engines determines their priority, the first
1581 having the highest priority. If a compression engine is not listed
1590 having the highest priority. If a compression engine is not listed
1582 here, it won't be advertised to clients.
1591 here, it won't be advertised to clients.
1583
1592
1584 If not set (the default), built-in defaults are used. Run
1593 If not set (the default), built-in defaults are used. Run
1585 :hg:`debuginstall` to list available compression engines and their
1594 :hg:`debuginstall` to list available compression engines and their
1586 default wire protocol priority.
1595 default wire protocol priority.
1587
1596
1588 Older Mercurial clients only support zlib compression and this setting
1597 Older Mercurial clients only support zlib compression and this setting
1589 has no effect for legacy clients.
1598 has no effect for legacy clients.
1590
1599
1591 ``uncompressed``
1600 ``uncompressed``
1592 Whether to allow clients to clone a repository using the
1601 Whether to allow clients to clone a repository using the
1593 uncompressed streaming protocol. This transfers about 40% more
1602 uncompressed streaming protocol. This transfers about 40% more
1594 data than a regular clone, but uses less memory and CPU on both
1603 data than a regular clone, but uses less memory and CPU on both
1595 server and client. Over a LAN (100 Mbps or better) or a very fast
1604 server and client. Over a LAN (100 Mbps or better) or a very fast
1596 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1605 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1597 regular clone. Over most WAN connections (anything slower than
1606 regular clone. Over most WAN connections (anything slower than
1598 about 6 Mbps), uncompressed streaming is slower, because of the
1607 about 6 Mbps), uncompressed streaming is slower, because of the
1599 extra data transfer overhead. This mode will also temporarily hold
1608 extra data transfer overhead. This mode will also temporarily hold
1600 the write lock while determining what data to transfer.
1609 the write lock while determining what data to transfer.
1601 (default: True)
1610 (default: True)
1602
1611
1603 ``preferuncompressed``
1612 ``preferuncompressed``
1604 When set, clients will try to use the uncompressed streaming
1613 When set, clients will try to use the uncompressed streaming
1605 protocol. (default: False)
1614 protocol. (default: False)
1606
1615
1607 ``validate``
1616 ``validate``
1608 Whether to validate the completeness of pushed changesets by
1617 Whether to validate the completeness of pushed changesets by
1609 checking that all new file revisions specified in manifests are
1618 checking that all new file revisions specified in manifests are
1610 present. (default: False)
1619 present. (default: False)
1611
1620
1612 ``maxhttpheaderlen``
1621 ``maxhttpheaderlen``
1613 Instruct HTTP clients not to send request headers longer than this
1622 Instruct HTTP clients not to send request headers longer than this
1614 many bytes. (default: 1024)
1623 many bytes. (default: 1024)
1615
1624
1616 ``bundle1``
1625 ``bundle1``
1617 Whether to allow clients to push and pull using the legacy bundle1
1626 Whether to allow clients to push and pull using the legacy bundle1
1618 exchange format. (default: True)
1627 exchange format. (default: True)
1619
1628
1620 ``bundle1gd``
1629 ``bundle1gd``
1621 Like ``bundle1`` but only used if the repository is using the
1630 Like ``bundle1`` but only used if the repository is using the
1622 *generaldelta* storage format. (default: True)
1631 *generaldelta* storage format. (default: True)
1623
1632
1624 ``bundle1.push``
1633 ``bundle1.push``
1625 Whether to allow clients to push using the legacy bundle1 exchange
1634 Whether to allow clients to push using the legacy bundle1 exchange
1626 format. (default: True)
1635 format. (default: True)
1627
1636
1628 ``bundle1gd.push``
1637 ``bundle1gd.push``
1629 Like ``bundle1.push`` but only used if the repository is using the
1638 Like ``bundle1.push`` but only used if the repository is using the
1630 *generaldelta* storage format. (default: True)
1639 *generaldelta* storage format. (default: True)
1631
1640
1632 ``bundle1.pull``
1641 ``bundle1.pull``
1633 Whether to allow clients to pull using the legacy bundle1 exchange
1642 Whether to allow clients to pull using the legacy bundle1 exchange
1634 format. (default: True)
1643 format. (default: True)
1635
1644
1636 ``bundle1gd.pull``
1645 ``bundle1gd.pull``
1637 Like ``bundle1.pull`` but only used if the repository is using the
1646 Like ``bundle1.pull`` but only used if the repository is using the
1638 *generaldelta* storage format. (default: True)
1647 *generaldelta* storage format. (default: True)
1639
1648
1640 Large repositories using the *generaldelta* storage format should
1649 Large repositories using the *generaldelta* storage format should
1641 consider setting this option because converting *generaldelta*
1650 consider setting this option because converting *generaldelta*
1642 repositories to the exchange format required by the bundle1 data
1651 repositories to the exchange format required by the bundle1 data
1643 format can consume a lot of CPU.
1652 format can consume a lot of CPU.
1644
1653
1645 ``zliblevel``
1654 ``zliblevel``
1646 Integer between ``-1`` and ``9`` that controls the zlib compression level
1655 Integer between ``-1`` and ``9`` that controls the zlib compression level
1647 for wire protocol commands that send zlib compressed output (notably the
1656 for wire protocol commands that send zlib compressed output (notably the
1648 commands that send repository history data).
1657 commands that send repository history data).
1649
1658
1650 The default (``-1``) uses the default zlib compression level, which is
1659 The default (``-1``) uses the default zlib compression level, which is
1651 likely equivalent to ``6``. ``0`` means no compression. ``9`` means
1660 likely equivalent to ``6``. ``0`` means no compression. ``9`` means
1652 maximum compression.
1661 maximum compression.
1653
1662
1654 Setting this option allows server operators to make trade-offs between
1663 Setting this option allows server operators to make trade-offs between
1655 bandwidth and CPU used. Lowering the compression lowers CPU utilization
1664 bandwidth and CPU used. Lowering the compression lowers CPU utilization
1656 but sends more bytes to clients.
1665 but sends more bytes to clients.
1657
1666
1658 This option only impacts the HTTP server.
1667 This option only impacts the HTTP server.
1659
1668
1660 ``zstdlevel``
1669 ``zstdlevel``
1661 Integer between ``1`` and ``22`` that controls the zstd compression level
1670 Integer between ``1`` and ``22`` that controls the zstd compression level
1662 for wire protocol commands. ``1`` is the minimal amount of compression and
1671 for wire protocol commands. ``1`` is the minimal amount of compression and
1663 ``22`` is the highest amount of compression.
1672 ``22`` is the highest amount of compression.
1664
1673
1665 The default (``3``) should be significantly faster than zlib while likely
1674 The default (``3``) should be significantly faster than zlib while likely
1666 delivering better compression ratios.
1675 delivering better compression ratios.
1667
1676
1668 This option only impacts the HTTP server.
1677 This option only impacts the HTTP server.
1669
1678
1670 See also ``server.zliblevel``.
1679 See also ``server.zliblevel``.
1671
1680
1672 ``smtp``
1681 ``smtp``
1673 --------
1682 --------
1674
1683
1675 Configuration for extensions that need to send email messages.
1684 Configuration for extensions that need to send email messages.
1676
1685
1677 ``host``
1686 ``host``
1678 Host name of mail server, e.g. "mail.example.com".
1687 Host name of mail server, e.g. "mail.example.com".
1679
1688
1680 ``port``
1689 ``port``
1681 Optional. Port to connect to on mail server. (default: 465 if
1690 Optional. Port to connect to on mail server. (default: 465 if
1682 ``tls`` is smtps; 25 otherwise)
1691 ``tls`` is smtps; 25 otherwise)
1683
1692
1684 ``tls``
1693 ``tls``
1685 Optional. Method to enable TLS when connecting to mail server: starttls,
1694 Optional. Method to enable TLS when connecting to mail server: starttls,
1686 smtps or none. (default: none)
1695 smtps or none. (default: none)
1687
1696
1688 ``username``
1697 ``username``
1689 Optional. User name for authenticating with the SMTP server.
1698 Optional. User name for authenticating with the SMTP server.
1690 (default: None)
1699 (default: None)
1691
1700
1692 ``password``
1701 ``password``
1693 Optional. Password for authenticating with the SMTP server. If not
1702 Optional. Password for authenticating with the SMTP server. If not
1694 specified, interactive sessions will prompt the user for a
1703 specified, interactive sessions will prompt the user for a
1695 password; non-interactive sessions will fail. (default: None)
1704 password; non-interactive sessions will fail. (default: None)
1696
1705
1697 ``local_hostname``
1706 ``local_hostname``
1698 Optional. The hostname that the sender can use to identify
1707 Optional. The hostname that the sender can use to identify
1699 itself to the MTA.
1708 itself to the MTA.
1700
1709
1701
1710
1702 ``subpaths``
1711 ``subpaths``
1703 ------------
1712 ------------
1704
1713
1705 Subrepository source URLs can go stale if a remote server changes name
1714 Subrepository source URLs can go stale if a remote server changes name
1706 or becomes temporarily unavailable. This section lets you define
1715 or becomes temporarily unavailable. This section lets you define
1707 rewrite rules of the form::
1716 rewrite rules of the form::
1708
1717
1709 <pattern> = <replacement>
1718 <pattern> = <replacement>
1710
1719
1711 where ``pattern`` is a regular expression matching a subrepository
1720 where ``pattern`` is a regular expression matching a subrepository
1712 source URL and ``replacement`` is the replacement string used to
1721 source URL and ``replacement`` is the replacement string used to
1713 rewrite it. Groups can be matched in ``pattern`` and referenced in
1722 rewrite it. Groups can be matched in ``pattern`` and referenced in
1714 ``replacements``. For instance::
1723 ``replacements``. For instance::
1715
1724
1716 http://server/(.*)-hg/ = http://hg.server/\1/
1725 http://server/(.*)-hg/ = http://hg.server/\1/
1717
1726
1718 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1727 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1719
1728
1720 Relative subrepository paths are first made absolute, and the
1729 Relative subrepository paths are first made absolute, and the
1721 rewrite rules are then applied on the full (absolute) path. If ``pattern``
1730 rewrite rules are then applied on the full (absolute) path. If ``pattern``
1722 doesn't match the full path, an attempt is made to apply it on the
1731 doesn't match the full path, an attempt is made to apply it on the
1723 relative path alone. The rules are applied in definition order.
1732 relative path alone. The rules are applied in definition order.
1724
1733
1725 ``templatealias``
1734 ``templatealias``
1726 -----------------
1735 -----------------
1727
1736
1728 Alias definitions for templates. See :hg:`help templates` for details.
1737 Alias definitions for templates. See :hg:`help templates` for details.
1729
1738
1730 ``templates``
1739 ``templates``
1731 -------------
1740 -------------
1732
1741
1733 Use the ``[templates]`` section to define template strings.
1742 Use the ``[templates]`` section to define template strings.
1734 See :hg:`help templates` for details.
1743 See :hg:`help templates` for details.
1735
1744
1736 ``trusted``
1745 ``trusted``
1737 -----------
1746 -----------
1738
1747
1739 Mercurial will not use the settings in the
1748 Mercurial will not use the settings in the
1740 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1749 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1741 user or to a trusted group, as various hgrc features allow arbitrary
1750 user or to a trusted group, as various hgrc features allow arbitrary
1742 commands to be run. This issue is often encountered when configuring
1751 commands to be run. This issue is often encountered when configuring
1743 hooks or extensions for shared repositories or servers. However,
1752 hooks or extensions for shared repositories or servers. However,
1744 the web interface will use some safe settings from the ``[web]``
1753 the web interface will use some safe settings from the ``[web]``
1745 section.
1754 section.
1746
1755
1747 This section specifies what users and groups are trusted. The
1756 This section specifies what users and groups are trusted. The
1748 current user is always trusted. To trust everybody, list a user or a
1757 current user is always trusted. To trust everybody, list a user or a
1749 group with name ``*``. These settings must be placed in an
1758 group with name ``*``. These settings must be placed in an
1750 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1759 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1751 user or service running Mercurial.
1760 user or service running Mercurial.
1752
1761
1753 ``users``
1762 ``users``
1754 Comma-separated list of trusted users.
1763 Comma-separated list of trusted users.
1755
1764
1756 ``groups``
1765 ``groups``
1757 Comma-separated list of trusted groups.
1766 Comma-separated list of trusted groups.
1758
1767
1759
1768
1760 ``ui``
1769 ``ui``
1761 ------
1770 ------
1762
1771
1763 User interface controls.
1772 User interface controls.
1764
1773
1765 ``archivemeta``
1774 ``archivemeta``
1766 Whether to include the .hg_archival.txt file containing meta data
1775 Whether to include the .hg_archival.txt file containing meta data
1767 (hashes for the repository base and for tip) in archives created
1776 (hashes for the repository base and for tip) in archives created
1768 by the :hg:`archive` command or downloaded via hgweb.
1777 by the :hg:`archive` command or downloaded via hgweb.
1769 (default: True)
1778 (default: True)
1770
1779
1771 ``askusername``
1780 ``askusername``
1772 Whether to prompt for a username when committing. If True, and
1781 Whether to prompt for a username when committing. If True, and
1773 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1782 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1774 be prompted to enter a username. If no username is entered, the
1783 be prompted to enter a username. If no username is entered, the
1775 default ``USER@HOST`` is used instead.
1784 default ``USER@HOST`` is used instead.
1776 (default: False)
1785 (default: False)
1777
1786
1778 ``clonebundles``
1787 ``clonebundles``
1779 Whether the "clone bundles" feature is enabled.
1788 Whether the "clone bundles" feature is enabled.
1780
1789
1781 When enabled, :hg:`clone` may download and apply a server-advertised
1790 When enabled, :hg:`clone` may download and apply a server-advertised
1782 bundle file from a URL instead of using the normal exchange mechanism.
1791 bundle file from a URL instead of using the normal exchange mechanism.
1783
1792
1784 This can likely result in faster and more reliable clones.
1793 This can likely result in faster and more reliable clones.
1785
1794
1786 (default: True)
1795 (default: True)
1787
1796
1788 ``clonebundlefallback``
1797 ``clonebundlefallback``
1789 Whether failure to apply an advertised "clone bundle" from a server
1798 Whether failure to apply an advertised "clone bundle" from a server
1790 should result in fallback to a regular clone.
1799 should result in fallback to a regular clone.
1791
1800
1792 This is disabled by default because servers advertising "clone
1801 This is disabled by default because servers advertising "clone
1793 bundles" often do so to reduce server load. If advertised bundles
1802 bundles" often do so to reduce server load. If advertised bundles
1794 start mass failing and clients automatically fall back to a regular
1803 start mass failing and clients automatically fall back to a regular
1795 clone, this would add significant and unexpected load to the server
1804 clone, this would add significant and unexpected load to the server
1796 since the server is expecting clone operations to be offloaded to
1805 since the server is expecting clone operations to be offloaded to
1797 pre-generated bundles. Failing fast (the default behavior) ensures
1806 pre-generated bundles. Failing fast (the default behavior) ensures
1798 clients don't overwhelm the server when "clone bundle" application
1807 clients don't overwhelm the server when "clone bundle" application
1799 fails.
1808 fails.
1800
1809
1801 (default: False)
1810 (default: False)
1802
1811
1803 ``clonebundleprefers``
1812 ``clonebundleprefers``
1804 Defines preferences for which "clone bundles" to use.
1813 Defines preferences for which "clone bundles" to use.
1805
1814
1806 Servers advertising "clone bundles" may advertise multiple available
1815 Servers advertising "clone bundles" may advertise multiple available
1807 bundles. Each bundle may have different attributes, such as the bundle
1816 bundles. Each bundle may have different attributes, such as the bundle
1808 type and compression format. This option is used to prefer a particular
1817 type and compression format. This option is used to prefer a particular
1809 bundle over another.
1818 bundle over another.
1810
1819
1811 The following keys are defined by Mercurial:
1820 The following keys are defined by Mercurial:
1812
1821
1813 BUNDLESPEC
1822 BUNDLESPEC
1814 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1823 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1815 e.g. ``gzip-v2`` or ``bzip2-v1``.
1824 e.g. ``gzip-v2`` or ``bzip2-v1``.
1816
1825
1817 COMPRESSION
1826 COMPRESSION
1818 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1827 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1819
1828
1820 Server operators may define custom keys.
1829 Server operators may define custom keys.
1821
1830
1822 Example values: ``COMPRESSION=bzip2``,
1831 Example values: ``COMPRESSION=bzip2``,
1823 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1832 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1824
1833
1825 By default, the first bundle advertised by the server is used.
1834 By default, the first bundle advertised by the server is used.
1826
1835
1827 ``color``
1836 ``color``
1828 String: when to use to colorize output. possible value are auto, always,
1837 String: when to use to colorize output. possible value are auto, always,
1829 never, or debug (default: never). 'auto' will use color whenever it seems
1838 never, or debug (default: never). 'auto' will use color whenever it seems
1830 possible. See :hg:`help color` for details.
1839 possible. See :hg:`help color` for details.
1831
1840
1832 (in addition a boolean can be used in place always/never)
1841 (in addition a boolean can be used in place always/never)
1833
1842
1834 ``commitsubrepos``
1843 ``commitsubrepos``
1835 Whether to commit modified subrepositories when committing the
1844 Whether to commit modified subrepositories when committing the
1836 parent repository. If False and one subrepository has uncommitted
1845 parent repository. If False and one subrepository has uncommitted
1837 changes, abort the commit.
1846 changes, abort the commit.
1838 (default: False)
1847 (default: False)
1839
1848
1840 ``debug``
1849 ``debug``
1841 Print debugging information. (default: False)
1850 Print debugging information. (default: False)
1842
1851
1843 ``editor``
1852 ``editor``
1844 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1853 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1845
1854
1846 ``fallbackencoding``
1855 ``fallbackencoding``
1847 Encoding to try if it's not possible to decode the changelog using
1856 Encoding to try if it's not possible to decode the changelog using
1848 UTF-8. (default: ISO-8859-1)
1857 UTF-8. (default: ISO-8859-1)
1849
1858
1850 ``graphnodetemplate``
1859 ``graphnodetemplate``
1851 The template used to print changeset nodes in an ASCII revision graph.
1860 The template used to print changeset nodes in an ASCII revision graph.
1852 (default: ``{graphnode}``)
1861 (default: ``{graphnode}``)
1853
1862
1854 ``ignore``
1863 ``ignore``
1855 A file to read per-user ignore patterns from. This file should be
1864 A file to read per-user ignore patterns from. This file should be
1856 in the same format as a repository-wide .hgignore file. Filenames
1865 in the same format as a repository-wide .hgignore file. Filenames
1857 are relative to the repository root. This option supports hook syntax,
1866 are relative to the repository root. This option supports hook syntax,
1858 so if you want to specify multiple ignore files, you can do so by
1867 so if you want to specify multiple ignore files, you can do so by
1859 setting something like ``ignore.other = ~/.hgignore2``. For details
1868 setting something like ``ignore.other = ~/.hgignore2``. For details
1860 of the ignore file format, see the ``hgignore(5)`` man page.
1869 of the ignore file format, see the ``hgignore(5)`` man page.
1861
1870
1862 ``interactive``
1871 ``interactive``
1863 Allow to prompt the user. (default: True)
1872 Allow to prompt the user. (default: True)
1864
1873
1865 ``interface``
1874 ``interface``
1866 Select the default interface for interactive features (default: text).
1875 Select the default interface for interactive features (default: text).
1867 Possible values are 'text' and 'curses'.
1876 Possible values are 'text' and 'curses'.
1868
1877
1869 ``interface.chunkselector``
1878 ``interface.chunkselector``
1870 Select the interface for change recording (e.g. :hg:`commit -i`).
1879 Select the interface for change recording (e.g. :hg:`commit -i`).
1871 Possible values are 'text' and 'curses'.
1880 Possible values are 'text' and 'curses'.
1872 This config overrides the interface specified by ui.interface.
1881 This config overrides the interface specified by ui.interface.
1873
1882
1874 ``logtemplate``
1883 ``logtemplate``
1875 Template string for commands that print changesets.
1884 Template string for commands that print changesets.
1876
1885
1877 ``merge``
1886 ``merge``
1878 The conflict resolution program to use during a manual merge.
1887 The conflict resolution program to use during a manual merge.
1879 For more information on merge tools see :hg:`help merge-tools`.
1888 For more information on merge tools see :hg:`help merge-tools`.
1880 For configuring merge tools see the ``[merge-tools]`` section.
1889 For configuring merge tools see the ``[merge-tools]`` section.
1881
1890
1882 ``mergemarkers``
1891 ``mergemarkers``
1883 Sets the merge conflict marker label styling. The ``detailed``
1892 Sets the merge conflict marker label styling. The ``detailed``
1884 style uses the ``mergemarkertemplate`` setting to style the labels.
1893 style uses the ``mergemarkertemplate`` setting to style the labels.
1885 The ``basic`` style just uses 'local' and 'other' as the marker label.
1894 The ``basic`` style just uses 'local' and 'other' as the marker label.
1886 One of ``basic`` or ``detailed``.
1895 One of ``basic`` or ``detailed``.
1887 (default: ``basic``)
1896 (default: ``basic``)
1888
1897
1889 ``mergemarkertemplate``
1898 ``mergemarkertemplate``
1890 The template used to print the commit description next to each conflict
1899 The template used to print the commit description next to each conflict
1891 marker during merge conflicts. See :hg:`help templates` for the template
1900 marker during merge conflicts. See :hg:`help templates` for the template
1892 format.
1901 format.
1893
1902
1894 Defaults to showing the hash, tags, branches, bookmarks, author, and
1903 Defaults to showing the hash, tags, branches, bookmarks, author, and
1895 the first line of the commit description.
1904 the first line of the commit description.
1896
1905
1897 If you use non-ASCII characters in names for tags, branches, bookmarks,
1906 If you use non-ASCII characters in names for tags, branches, bookmarks,
1898 authors, and/or commit descriptions, you must pay attention to encodings of
1907 authors, and/or commit descriptions, you must pay attention to encodings of
1899 managed files. At template expansion, non-ASCII characters use the encoding
1908 managed files. At template expansion, non-ASCII characters use the encoding
1900 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1909 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1901 environment variables that govern your locale. If the encoding of the merge
1910 environment variables that govern your locale. If the encoding of the merge
1902 markers is different from the encoding of the merged files,
1911 markers is different from the encoding of the merged files,
1903 serious problems may occur.
1912 serious problems may occur.
1904
1913
1905 ``origbackuppath``
1914 ``origbackuppath``
1906 The path to a directory used to store generated .orig files. If the path is
1915 The path to a directory used to store generated .orig files. If the path is
1907 not a directory, one will be created.
1916 not a directory, one will be created.
1908
1917
1909 ``patch``
1918 ``patch``
1910 An optional external tool that ``hg import`` and some extensions
1919 An optional external tool that ``hg import`` and some extensions
1911 will use for applying patches. By default Mercurial uses an
1920 will use for applying patches. By default Mercurial uses an
1912 internal patch utility. The external tool must work as the common
1921 internal patch utility. The external tool must work as the common
1913 Unix ``patch`` program. In particular, it must accept a ``-p``
1922 Unix ``patch`` program. In particular, it must accept a ``-p``
1914 argument to strip patch headers, a ``-d`` argument to specify the
1923 argument to strip patch headers, a ``-d`` argument to specify the
1915 current directory, a file name to patch, and a patch file to take
1924 current directory, a file name to patch, and a patch file to take
1916 from stdin.
1925 from stdin.
1917
1926
1918 It is possible to specify a patch tool together with extra
1927 It is possible to specify a patch tool together with extra
1919 arguments. For example, setting this option to ``patch --merge``
1928 arguments. For example, setting this option to ``patch --merge``
1920 will use the ``patch`` program with its 2-way merge option.
1929 will use the ``patch`` program with its 2-way merge option.
1921
1930
1922 ``portablefilenames``
1931 ``portablefilenames``
1923 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1932 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1924 (default: ``warn``)
1933 (default: ``warn``)
1925
1934
1926 ``warn``
1935 ``warn``
1927 Print a warning message on POSIX platforms, if a file with a non-portable
1936 Print a warning message on POSIX platforms, if a file with a non-portable
1928 filename is added (e.g. a file with a name that can't be created on
1937 filename is added (e.g. a file with a name that can't be created on
1929 Windows because it contains reserved parts like ``AUX``, reserved
1938 Windows because it contains reserved parts like ``AUX``, reserved
1930 characters like ``:``, or would cause a case collision with an existing
1939 characters like ``:``, or would cause a case collision with an existing
1931 file).
1940 file).
1932
1941
1933 ``ignore``
1942 ``ignore``
1934 Don't print a warning.
1943 Don't print a warning.
1935
1944
1936 ``abort``
1945 ``abort``
1937 The command is aborted.
1946 The command is aborted.
1938
1947
1939 ``true``
1948 ``true``
1940 Alias for ``warn``.
1949 Alias for ``warn``.
1941
1950
1942 ``false``
1951 ``false``
1943 Alias for ``ignore``.
1952 Alias for ``ignore``.
1944
1953
1945 .. container:: windows
1954 .. container:: windows
1946
1955
1947 On Windows, this configuration option is ignored and the command aborted.
1956 On Windows, this configuration option is ignored and the command aborted.
1948
1957
1949 ``quiet``
1958 ``quiet``
1950 Reduce the amount of output printed.
1959 Reduce the amount of output printed.
1951 (default: False)
1960 (default: False)
1952
1961
1953 ``remotecmd``
1962 ``remotecmd``
1954 Remote command to use for clone/push/pull operations.
1963 Remote command to use for clone/push/pull operations.
1955 (default: ``hg``)
1964 (default: ``hg``)
1956
1965
1957 ``report_untrusted``
1966 ``report_untrusted``
1958 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1967 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1959 trusted user or group.
1968 trusted user or group.
1960 (default: True)
1969 (default: True)
1961
1970
1962 ``slash``
1971 ``slash``
1963 Display paths using a slash (``/``) as the path separator. This
1972 Display paths using a slash (``/``) as the path separator. This
1964 only makes a difference on systems where the default path
1973 only makes a difference on systems where the default path
1965 separator is not the slash character (e.g. Windows uses the
1974 separator is not the slash character (e.g. Windows uses the
1966 backslash character (``\``)).
1975 backslash character (``\``)).
1967 (default: False)
1976 (default: False)
1968
1977
1969 ``statuscopies``
1978 ``statuscopies``
1970 Display copies in the status command.
1979 Display copies in the status command.
1971
1980
1972 ``ssh``
1981 ``ssh``
1973 Command to use for SSH connections. (default: ``ssh``)
1982 Command to use for SSH connections. (default: ``ssh``)
1974
1983
1975 ``strict``
1984 ``strict``
1976 Require exact command names, instead of allowing unambiguous
1985 Require exact command names, instead of allowing unambiguous
1977 abbreviations. (default: False)
1986 abbreviations. (default: False)
1978
1987
1979 ``style``
1988 ``style``
1980 Name of style to use for command output.
1989 Name of style to use for command output.
1981
1990
1982 ``supportcontact``
1991 ``supportcontact``
1983 A URL where users should report a Mercurial traceback. Use this if you are a
1992 A URL where users should report a Mercurial traceback. Use this if you are a
1984 large organisation with its own Mercurial deployment process and crash
1993 large organisation with its own Mercurial deployment process and crash
1985 reports should be addressed to your internal support.
1994 reports should be addressed to your internal support.
1986
1995
1987 ``textwidth``
1996 ``textwidth``
1988 Maximum width of help text. A longer line generated by ``hg help`` or
1997 Maximum width of help text. A longer line generated by ``hg help`` or
1989 ``hg subcommand --help`` will be broken after white space to get this
1998 ``hg subcommand --help`` will be broken after white space to get this
1990 width or the terminal width, whichever comes first.
1999 width or the terminal width, whichever comes first.
1991 A non-positive value will disable this and the terminal width will be
2000 A non-positive value will disable this and the terminal width will be
1992 used. (default: 78)
2001 used. (default: 78)
1993
2002
1994 ``timeout``
2003 ``timeout``
1995 The timeout used when a lock is held (in seconds), a negative value
2004 The timeout used when a lock is held (in seconds), a negative value
1996 means no timeout. (default: 600)
2005 means no timeout. (default: 600)
1997
2006
1998 ``traceback``
2007 ``traceback``
1999 Mercurial always prints a traceback when an unknown exception
2008 Mercurial always prints a traceback when an unknown exception
2000 occurs. Setting this to True will make Mercurial print a traceback
2009 occurs. Setting this to True will make Mercurial print a traceback
2001 on all exceptions, even those recognized by Mercurial (such as
2010 on all exceptions, even those recognized by Mercurial (such as
2002 IOError or MemoryError). (default: False)
2011 IOError or MemoryError). (default: False)
2003
2012
2004 ``username``
2013 ``username``
2005 The committer of a changeset created when running "commit".
2014 The committer of a changeset created when running "commit".
2006 Typically a person's name and email address, e.g. ``Fred Widget
2015 Typically a person's name and email address, e.g. ``Fred Widget
2007 <fred@example.com>``. Environment variables in the
2016 <fred@example.com>``. Environment variables in the
2008 username are expanded.
2017 username are expanded.
2009
2018
2010 (default: ``$EMAIL`` or ``username@hostname``. If the username in
2019 (default: ``$EMAIL`` or ``username@hostname``. If the username in
2011 hgrc is empty, e.g. if the system admin set ``username =`` in the
2020 hgrc is empty, e.g. if the system admin set ``username =`` in the
2012 system hgrc, it has to be specified manually or in a different
2021 system hgrc, it has to be specified manually or in a different
2013 hgrc file)
2022 hgrc file)
2014
2023
2015 ``verbose``
2024 ``verbose``
2016 Increase the amount of output printed. (default: False)
2025 Increase the amount of output printed. (default: False)
2017
2026
2018
2027
2019 ``web``
2028 ``web``
2020 -------
2029 -------
2021
2030
2022 Web interface configuration. The settings in this section apply to
2031 Web interface configuration. The settings in this section apply to
2023 both the builtin webserver (started by :hg:`serve`) and the script you
2032 both the builtin webserver (started by :hg:`serve`) and the script you
2024 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
2033 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
2025 and WSGI).
2034 and WSGI).
2026
2035
2027 The Mercurial webserver does no authentication (it does not prompt for
2036 The Mercurial webserver does no authentication (it does not prompt for
2028 usernames and passwords to validate *who* users are), but it does do
2037 usernames and passwords to validate *who* users are), but it does do
2029 authorization (it grants or denies access for *authenticated users*
2038 authorization (it grants or denies access for *authenticated users*
2030 based on settings in this section). You must either configure your
2039 based on settings in this section). You must either configure your
2031 webserver to do authentication for you, or disable the authorization
2040 webserver to do authentication for you, or disable the authorization
2032 checks.
2041 checks.
2033
2042
2034 For a quick setup in a trusted environment, e.g., a private LAN, where
2043 For a quick setup in a trusted environment, e.g., a private LAN, where
2035 you want it to accept pushes from anybody, you can use the following
2044 you want it to accept pushes from anybody, you can use the following
2036 command line::
2045 command line::
2037
2046
2038 $ hg --config web.allow_push=* --config web.push_ssl=False serve
2047 $ hg --config web.allow_push=* --config web.push_ssl=False serve
2039
2048
2040 Note that this will allow anybody to push anything to the server and
2049 Note that this will allow anybody to push anything to the server and
2041 that this should not be used for public servers.
2050 that this should not be used for public servers.
2042
2051
2043 The full set of options is:
2052 The full set of options is:
2044
2053
2045 ``accesslog``
2054 ``accesslog``
2046 Where to output the access log. (default: stdout)
2055 Where to output the access log. (default: stdout)
2047
2056
2048 ``address``
2057 ``address``
2049 Interface address to bind to. (default: all)
2058 Interface address to bind to. (default: all)
2050
2059
2051 ``allow_archive``
2060 ``allow_archive``
2052 List of archive format (bz2, gz, zip) allowed for downloading.
2061 List of archive format (bz2, gz, zip) allowed for downloading.
2053 (default: empty)
2062 (default: empty)
2054
2063
2055 ``allowbz2``
2064 ``allowbz2``
2056 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
2065 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
2057 revisions.
2066 revisions.
2058 (default: False)
2067 (default: False)
2059
2068
2060 ``allowgz``
2069 ``allowgz``
2061 (DEPRECATED) Whether to allow .tar.gz downloading of repository
2070 (DEPRECATED) Whether to allow .tar.gz downloading of repository
2062 revisions.
2071 revisions.
2063 (default: False)
2072 (default: False)
2064
2073
2065 ``allowpull``
2074 ``allowpull``
2066 Whether to allow pulling from the repository. (default: True)
2075 Whether to allow pulling from the repository. (default: True)
2067
2076
2068 ``allow_push``
2077 ``allow_push``
2069 Whether to allow pushing to the repository. If empty or not set,
2078 Whether to allow pushing to the repository. If empty or not set,
2070 pushing is not allowed. If the special value ``*``, any remote
2079 pushing is not allowed. If the special value ``*``, any remote
2071 user can push, including unauthenticated users. Otherwise, the
2080 user can push, including unauthenticated users. Otherwise, the
2072 remote user must have been authenticated, and the authenticated
2081 remote user must have been authenticated, and the authenticated
2073 user name must be present in this list. The contents of the
2082 user name must be present in this list. The contents of the
2074 allow_push list are examined after the deny_push list.
2083 allow_push list are examined after the deny_push list.
2075
2084
2076 ``allow_read``
2085 ``allow_read``
2077 If the user has not already been denied repository access due to
2086 If the user has not already been denied repository access due to
2078 the contents of deny_read, this list determines whether to grant
2087 the contents of deny_read, this list determines whether to grant
2079 repository access to the user. If this list is not empty, and the
2088 repository access to the user. If this list is not empty, and the
2080 user is unauthenticated or not present in the list, then access is
2089 user is unauthenticated or not present in the list, then access is
2081 denied for the user. If the list is empty or not set, then access
2090 denied for the user. If the list is empty or not set, then access
2082 is permitted to all users by default. Setting allow_read to the
2091 is permitted to all users by default. Setting allow_read to the
2083 special value ``*`` is equivalent to it not being set (i.e. access
2092 special value ``*`` is equivalent to it not being set (i.e. access
2084 is permitted to all users). The contents of the allow_read list are
2093 is permitted to all users). The contents of the allow_read list are
2085 examined after the deny_read list.
2094 examined after the deny_read list.
2086
2095
2087 ``allowzip``
2096 ``allowzip``
2088 (DEPRECATED) Whether to allow .zip downloading of repository
2097 (DEPRECATED) Whether to allow .zip downloading of repository
2089 revisions. This feature creates temporary files.
2098 revisions. This feature creates temporary files.
2090 (default: False)
2099 (default: False)
2091
2100
2092 ``archivesubrepos``
2101 ``archivesubrepos``
2093 Whether to recurse into subrepositories when archiving.
2102 Whether to recurse into subrepositories when archiving.
2094 (default: False)
2103 (default: False)
2095
2104
2096 ``baseurl``
2105 ``baseurl``
2097 Base URL to use when publishing URLs in other locations, so
2106 Base URL to use when publishing URLs in other locations, so
2098 third-party tools like email notification hooks can construct
2107 third-party tools like email notification hooks can construct
2099 URLs. Example: ``http://hgserver/repos/``.
2108 URLs. Example: ``http://hgserver/repos/``.
2100
2109
2101 ``cacerts``
2110 ``cacerts``
2102 Path to file containing a list of PEM encoded certificate
2111 Path to file containing a list of PEM encoded certificate
2103 authority certificates. Environment variables and ``~user``
2112 authority certificates. Environment variables and ``~user``
2104 constructs are expanded in the filename. If specified on the
2113 constructs are expanded in the filename. If specified on the
2105 client, then it will verify the identity of remote HTTPS servers
2114 client, then it will verify the identity of remote HTTPS servers
2106 with these certificates.
2115 with these certificates.
2107
2116
2108 To disable SSL verification temporarily, specify ``--insecure`` from
2117 To disable SSL verification temporarily, specify ``--insecure`` from
2109 command line.
2118 command line.
2110
2119
2111 You can use OpenSSL's CA certificate file if your platform has
2120 You can use OpenSSL's CA certificate file if your platform has
2112 one. On most Linux systems this will be
2121 one. On most Linux systems this will be
2113 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
2122 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
2114 generate this file manually. The form must be as follows::
2123 generate this file manually. The form must be as follows::
2115
2124
2116 -----BEGIN CERTIFICATE-----
2125 -----BEGIN CERTIFICATE-----
2117 ... (certificate in base64 PEM encoding) ...
2126 ... (certificate in base64 PEM encoding) ...
2118 -----END CERTIFICATE-----
2127 -----END CERTIFICATE-----
2119 -----BEGIN CERTIFICATE-----
2128 -----BEGIN CERTIFICATE-----
2120 ... (certificate in base64 PEM encoding) ...
2129 ... (certificate in base64 PEM encoding) ...
2121 -----END CERTIFICATE-----
2130 -----END CERTIFICATE-----
2122
2131
2123 ``cache``
2132 ``cache``
2124 Whether to support caching in hgweb. (default: True)
2133 Whether to support caching in hgweb. (default: True)
2125
2134
2126 ``certificate``
2135 ``certificate``
2127 Certificate to use when running :hg:`serve`.
2136 Certificate to use when running :hg:`serve`.
2128
2137
2129 ``collapse``
2138 ``collapse``
2130 With ``descend`` enabled, repositories in subdirectories are shown at
2139 With ``descend`` enabled, repositories in subdirectories are shown at
2131 a single level alongside repositories in the current path. With
2140 a single level alongside repositories in the current path. With
2132 ``collapse`` also enabled, repositories residing at a deeper level than
2141 ``collapse`` also enabled, repositories residing at a deeper level than
2133 the current path are grouped behind navigable directory entries that
2142 the current path are grouped behind navigable directory entries that
2134 lead to the locations of these repositories. In effect, this setting
2143 lead to the locations of these repositories. In effect, this setting
2135 collapses each collection of repositories found within a subdirectory
2144 collapses each collection of repositories found within a subdirectory
2136 into a single entry for that subdirectory. (default: False)
2145 into a single entry for that subdirectory. (default: False)
2137
2146
2138 ``comparisoncontext``
2147 ``comparisoncontext``
2139 Number of lines of context to show in side-by-side file comparison. If
2148 Number of lines of context to show in side-by-side file comparison. If
2140 negative or the value ``full``, whole files are shown. (default: 5)
2149 negative or the value ``full``, whole files are shown. (default: 5)
2141
2150
2142 This setting can be overridden by a ``context`` request parameter to the
2151 This setting can be overridden by a ``context`` request parameter to the
2143 ``comparison`` command, taking the same values.
2152 ``comparison`` command, taking the same values.
2144
2153
2145 ``contact``
2154 ``contact``
2146 Name or email address of the person in charge of the repository.
2155 Name or email address of the person in charge of the repository.
2147 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
2156 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
2148
2157
2149 ``csp``
2158 ``csp``
2150 Send a ``Content-Security-Policy`` HTTP header with this value.
2159 Send a ``Content-Security-Policy`` HTTP header with this value.
2151
2160
2152 The value may contain a special string ``%nonce%``, which will be replaced
2161 The value may contain a special string ``%nonce%``, which will be replaced
2153 by a randomly-generated one-time use value. If the value contains
2162 by a randomly-generated one-time use value. If the value contains
2154 ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the
2163 ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the
2155 one-time property of the nonce. This nonce will also be inserted into
2164 one-time property of the nonce. This nonce will also be inserted into
2156 ``<script>`` elements containing inline JavaScript.
2165 ``<script>`` elements containing inline JavaScript.
2157
2166
2158 Note: lots of HTML content sent by the server is derived from repository
2167 Note: lots of HTML content sent by the server is derived from repository
2159 data. Please consider the potential for malicious repository data to
2168 data. Please consider the potential for malicious repository data to
2160 "inject" itself into generated HTML content as part of your security
2169 "inject" itself into generated HTML content as part of your security
2161 threat model.
2170 threat model.
2162
2171
2163 ``deny_push``
2172 ``deny_push``
2164 Whether to deny pushing to the repository. If empty or not set,
2173 Whether to deny pushing to the repository. If empty or not set,
2165 push is not denied. If the special value ``*``, all remote users are
2174 push is not denied. If the special value ``*``, all remote users are
2166 denied push. Otherwise, unauthenticated users are all denied, and
2175 denied push. Otherwise, unauthenticated users are all denied, and
2167 any authenticated user name present in this list is also denied. The
2176 any authenticated user name present in this list is also denied. The
2168 contents of the deny_push list are examined before the allow_push list.
2177 contents of the deny_push list are examined before the allow_push list.
2169
2178
2170 ``deny_read``
2179 ``deny_read``
2171 Whether to deny reading/viewing of the repository. If this list is
2180 Whether to deny reading/viewing of the repository. If this list is
2172 not empty, unauthenticated users are all denied, and any
2181 not empty, unauthenticated users are all denied, and any
2173 authenticated user name present in this list is also denied access to
2182 authenticated user name present in this list is also denied access to
2174 the repository. If set to the special value ``*``, all remote users
2183 the repository. If set to the special value ``*``, all remote users
2175 are denied access (rarely needed ;). If deny_read is empty or not set,
2184 are denied access (rarely needed ;). If deny_read is empty or not set,
2176 the determination of repository access depends on the presence and
2185 the determination of repository access depends on the presence and
2177 content of the allow_read list (see description). If both
2186 content of the allow_read list (see description). If both
2178 deny_read and allow_read are empty or not set, then access is
2187 deny_read and allow_read are empty or not set, then access is
2179 permitted to all users by default. If the repository is being
2188 permitted to all users by default. If the repository is being
2180 served via hgwebdir, denied users will not be able to see it in
2189 served via hgwebdir, denied users will not be able to see it in
2181 the list of repositories. The contents of the deny_read list have
2190 the list of repositories. The contents of the deny_read list have
2182 priority over (are examined before) the contents of the allow_read
2191 priority over (are examined before) the contents of the allow_read
2183 list.
2192 list.
2184
2193
2185 ``descend``
2194 ``descend``
2186 hgwebdir indexes will not descend into subdirectories. Only repositories
2195 hgwebdir indexes will not descend into subdirectories. Only repositories
2187 directly in the current path will be shown (other repositories are still
2196 directly in the current path will be shown (other repositories are still
2188 available from the index corresponding to their containing path).
2197 available from the index corresponding to their containing path).
2189
2198
2190 ``description``
2199 ``description``
2191 Textual description of the repository's purpose or contents.
2200 Textual description of the repository's purpose or contents.
2192 (default: "unknown")
2201 (default: "unknown")
2193
2202
2194 ``encoding``
2203 ``encoding``
2195 Character encoding name. (default: the current locale charset)
2204 Character encoding name. (default: the current locale charset)
2196 Example: "UTF-8".
2205 Example: "UTF-8".
2197
2206
2198 ``errorlog``
2207 ``errorlog``
2199 Where to output the error log. (default: stderr)
2208 Where to output the error log. (default: stderr)
2200
2209
2201 ``guessmime``
2210 ``guessmime``
2202 Control MIME types for raw download of file content.
2211 Control MIME types for raw download of file content.
2203 Set to True to let hgweb guess the content type from the file
2212 Set to True to let hgweb guess the content type from the file
2204 extension. This will serve HTML files as ``text/html`` and might
2213 extension. This will serve HTML files as ``text/html`` and might
2205 allow cross-site scripting attacks when serving untrusted
2214 allow cross-site scripting attacks when serving untrusted
2206 repositories. (default: False)
2215 repositories. (default: False)
2207
2216
2208 ``hidden``
2217 ``hidden``
2209 Whether to hide the repository in the hgwebdir index.
2218 Whether to hide the repository in the hgwebdir index.
2210 (default: False)
2219 (default: False)
2211
2220
2212 ``ipv6``
2221 ``ipv6``
2213 Whether to use IPv6. (default: False)
2222 Whether to use IPv6. (default: False)
2214
2223
2215 ``labels``
2224 ``labels``
2216 List of string *labels* associated with the repository.
2225 List of string *labels* associated with the repository.
2217
2226
2218 Labels are exposed as a template keyword and can be used to customize
2227 Labels are exposed as a template keyword and can be used to customize
2219 output. e.g. the ``index`` template can group or filter repositories
2228 output. e.g. the ``index`` template can group or filter repositories
2220 by labels and the ``summary`` template can display additional content
2229 by labels and the ``summary`` template can display additional content
2221 if a specific label is present.
2230 if a specific label is present.
2222
2231
2223 ``logoimg``
2232 ``logoimg``
2224 File name of the logo image that some templates display on each page.
2233 File name of the logo image that some templates display on each page.
2225 The file name is relative to ``staticurl``. That is, the full path to
2234 The file name is relative to ``staticurl``. That is, the full path to
2226 the logo image is "staticurl/logoimg".
2235 the logo image is "staticurl/logoimg".
2227 If unset, ``hglogo.png`` will be used.
2236 If unset, ``hglogo.png`` will be used.
2228
2237
2229 ``logourl``
2238 ``logourl``
2230 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
2239 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
2231 will be used.
2240 will be used.
2232
2241
2233 ``maxchanges``
2242 ``maxchanges``
2234 Maximum number of changes to list on the changelog. (default: 10)
2243 Maximum number of changes to list on the changelog. (default: 10)
2235
2244
2236 ``maxfiles``
2245 ``maxfiles``
2237 Maximum number of files to list per changeset. (default: 10)
2246 Maximum number of files to list per changeset. (default: 10)
2238
2247
2239 ``maxshortchanges``
2248 ``maxshortchanges``
2240 Maximum number of changes to list on the shortlog, graph or filelog
2249 Maximum number of changes to list on the shortlog, graph or filelog
2241 pages. (default: 60)
2250 pages. (default: 60)
2242
2251
2243 ``name``
2252 ``name``
2244 Repository name to use in the web interface.
2253 Repository name to use in the web interface.
2245 (default: current working directory)
2254 (default: current working directory)
2246
2255
2247 ``port``
2256 ``port``
2248 Port to listen on. (default: 8000)
2257 Port to listen on. (default: 8000)
2249
2258
2250 ``prefix``
2259 ``prefix``
2251 Prefix path to serve from. (default: '' (server root))
2260 Prefix path to serve from. (default: '' (server root))
2252
2261
2253 ``push_ssl``
2262 ``push_ssl``
2254 Whether to require that inbound pushes be transported over SSL to
2263 Whether to require that inbound pushes be transported over SSL to
2255 prevent password sniffing. (default: True)
2264 prevent password sniffing. (default: True)
2256
2265
2257 ``refreshinterval``
2266 ``refreshinterval``
2258 How frequently directory listings re-scan the filesystem for new
2267 How frequently directory listings re-scan the filesystem for new
2259 repositories, in seconds. This is relevant when wildcards are used
2268 repositories, in seconds. This is relevant when wildcards are used
2260 to define paths. Depending on how much filesystem traversal is
2269 to define paths. Depending on how much filesystem traversal is
2261 required, refreshing may negatively impact performance.
2270 required, refreshing may negatively impact performance.
2262
2271
2263 Values less than or equal to 0 always refresh.
2272 Values less than or equal to 0 always refresh.
2264 (default: 20)
2273 (default: 20)
2265
2274
2266 ``staticurl``
2275 ``staticurl``
2267 Base URL to use for static files. If unset, static files (e.g. the
2276 Base URL to use for static files. If unset, static files (e.g. the
2268 hgicon.png favicon) will be served by the CGI script itself. Use
2277 hgicon.png favicon) will be served by the CGI script itself. Use
2269 this setting to serve them directly with the HTTP server.
2278 this setting to serve them directly with the HTTP server.
2270 Example: ``http://hgserver/static/``.
2279 Example: ``http://hgserver/static/``.
2271
2280
2272 ``stripes``
2281 ``stripes``
2273 How many lines a "zebra stripe" should span in multi-line output.
2282 How many lines a "zebra stripe" should span in multi-line output.
2274 Set to 0 to disable. (default: 1)
2283 Set to 0 to disable. (default: 1)
2275
2284
2276 ``style``
2285 ``style``
2277 Which template map style to use. The available options are the names of
2286 Which template map style to use. The available options are the names of
2278 subdirectories in the HTML templates path. (default: ``paper``)
2287 subdirectories in the HTML templates path. (default: ``paper``)
2279 Example: ``monoblue``.
2288 Example: ``monoblue``.
2280
2289
2281 ``templates``
2290 ``templates``
2282 Where to find the HTML templates. The default path to the HTML templates
2291 Where to find the HTML templates. The default path to the HTML templates
2283 can be obtained from ``hg debuginstall``.
2292 can be obtained from ``hg debuginstall``.
2284
2293
2285 ``websub``
2294 ``websub``
2286 ----------
2295 ----------
2287
2296
2288 Web substitution filter definition. You can use this section to
2297 Web substitution filter definition. You can use this section to
2289 define a set of regular expression substitution patterns which
2298 define a set of regular expression substitution patterns which
2290 let you automatically modify the hgweb server output.
2299 let you automatically modify the hgweb server output.
2291
2300
2292 The default hgweb templates only apply these substitution patterns
2301 The default hgweb templates only apply these substitution patterns
2293 on the revision description fields. You can apply them anywhere
2302 on the revision description fields. You can apply them anywhere
2294 you want when you create your own templates by adding calls to the
2303 you want when you create your own templates by adding calls to the
2295 "websub" filter (usually after calling the "escape" filter).
2304 "websub" filter (usually after calling the "escape" filter).
2296
2305
2297 This can be used, for example, to convert issue references to links
2306 This can be used, for example, to convert issue references to links
2298 to your issue tracker, or to convert "markdown-like" syntax into
2307 to your issue tracker, or to convert "markdown-like" syntax into
2299 HTML (see the examples below).
2308 HTML (see the examples below).
2300
2309
2301 Each entry in this section names a substitution filter.
2310 Each entry in this section names a substitution filter.
2302 The value of each entry defines the substitution expression itself.
2311 The value of each entry defines the substitution expression itself.
2303 The websub expressions follow the old interhg extension syntax,
2312 The websub expressions follow the old interhg extension syntax,
2304 which in turn imitates the Unix sed replacement syntax::
2313 which in turn imitates the Unix sed replacement syntax::
2305
2314
2306 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2315 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2307
2316
2308 You can use any separator other than "/". The final "i" is optional
2317 You can use any separator other than "/". The final "i" is optional
2309 and indicates that the search must be case insensitive.
2318 and indicates that the search must be case insensitive.
2310
2319
2311 Examples::
2320 Examples::
2312
2321
2313 [websub]
2322 [websub]
2314 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2323 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2315 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2324 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2316 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2325 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2317
2326
2318 ``worker``
2327 ``worker``
2319 ----------
2328 ----------
2320
2329
2321 Parallel master/worker configuration. We currently perform working
2330 Parallel master/worker configuration. We currently perform working
2322 directory updates in parallel on Unix-like systems, which greatly
2331 directory updates in parallel on Unix-like systems, which greatly
2323 helps performance.
2332 helps performance.
2324
2333
2325 ``numcpus``
2334 ``numcpus``
2326 Number of CPUs to use for parallel operations. A zero or
2335 Number of CPUs to use for parallel operations. A zero or
2327 negative value is treated as ``use the default``.
2336 negative value is treated as ``use the default``.
2328 (default: 4 or the number of CPUs on the system, whichever is larger)
2337 (default: 4 or the number of CPUs on the system, whichever is larger)
2329
2338
2330 ``backgroundclose``
2339 ``backgroundclose``
2331 Whether to enable closing file handles on background threads during certain
2340 Whether to enable closing file handles on background threads during certain
2332 operations. Some platforms aren't very efficient at closing file
2341 operations. Some platforms aren't very efficient at closing file
2333 handles that have been written or appended to. By performing file closing
2342 handles that have been written or appended to. By performing file closing
2334 on background threads, file write rate can increase substantially.
2343 on background threads, file write rate can increase substantially.
2335 (default: true on Windows, false elsewhere)
2344 (default: true on Windows, false elsewhere)
2336
2345
2337 ``backgroundcloseminfilecount``
2346 ``backgroundcloseminfilecount``
2338 Minimum number of files required to trigger background file closing.
2347 Minimum number of files required to trigger background file closing.
2339 Operations not writing this many files won't start background close
2348 Operations not writing this many files won't start background close
2340 threads.
2349 threads.
2341 (default: 2048)
2350 (default: 2048)
2342
2351
2343 ``backgroundclosemaxqueue``
2352 ``backgroundclosemaxqueue``
2344 The maximum number of opened file handles waiting to be closed in the
2353 The maximum number of opened file handles waiting to be closed in the
2345 background. This option only has an effect if ``backgroundclose`` is
2354 background. This option only has an effect if ``backgroundclose`` is
2346 enabled.
2355 enabled.
2347 (default: 384)
2356 (default: 384)
2348
2357
2349 ``backgroundclosethreadcount``
2358 ``backgroundclosethreadcount``
2350 Number of threads to process background file closes. Only relevant if
2359 Number of threads to process background file closes. Only relevant if
2351 ``backgroundclose`` is enabled.
2360 ``backgroundclose`` is enabled.
2352 (default: 4)
2361 (default: 4)
@@ -1,90 +1,106 b''
1 Test update logic when there are renames or weird same-name cases between dirs
1 Test update logic when there are renames or weird same-name cases between dirs
2 and files
2 and files
3
3
4 Update with local changes across a file rename
4 Update with local changes across a file rename
5
5
6 $ hg init r1 && cd r1
6 $ hg init r1 && cd r1
7
7
8 $ echo a > a
8 $ echo a > a
9 $ hg add a
9 $ hg add a
10 $ hg ci -m a
10 $ hg ci -m a
11
11
12 $ hg mv a b
12 $ hg mv a b
13 $ hg ci -m rename
13 $ hg ci -m rename
14
14
15 $ echo b > b
15 $ echo b > b
16 $ hg ci -m change
16 $ hg ci -m change
17
17
18 $ hg up -q 0
18 $ hg up -q 0
19
19
20 $ echo c > a
20 $ echo c > a
21
21
22 $ hg up
22 $ hg up
23 merging a and b to b
23 merging a and b to b
24 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
24 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
26 use 'hg resolve' to retry unresolved file merges
26 use 'hg resolve' to retry unresolved file merges
27 [1]
27 [1]
28
28
29 Test update when local untracked directory exists with the same name as a
29 Test update when local untracked directory exists with the same name as a
30 tracked file in a commit we are updating to
30 tracked file in a commit we are updating to
31 $ hg init r2 && cd r2
31 $ hg init r2 && cd r2
32 $ echo root > root && hg ci -Am root # rev 0
32 $ echo root > root && hg ci -Am root # rev 0
33 adding root
33 adding root
34 $ echo text > name && hg ci -Am "name is a file" # rev 1
34 $ echo text > name && hg ci -Am "name is a file" # rev 1
35 adding name
35 adding name
36 $ hg up 0
36 $ hg up 0
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ mkdir name
38 $ mkdir name
39 $ hg up 1
39 $ hg up 1
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
41
41
42 Test update when local untracked directory exists with some files in it and has
42 Test update when local untracked directory exists with some files in it and has
43 the same name a tracked file in a commit we are updating to. In future this
43 the same name a tracked file in a commit we are updating to. In future this
44 should be updated to give an friendlier error message, but now we should just
44 should be updated to give an friendlier error message, but now we should just
45 make sure that this does not erase untracked data
45 make sure that this does not erase untracked data
46 $ hg up 0
46 $ hg up 0
47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
48 $ mkdir name
48 $ mkdir name
49 $ echo text > name/file
49 $ echo text > name/file
50 $ hg st
50 $ hg st
51 ? name/file
51 ? name/file
52 $ hg up 1
52 $ hg up 1
53 abort: *: '$TESTTMP/r1/r2/name' (glob)
53 abort: *: '$TESTTMP/r1/r2/name' (glob)
54 [255]
54 [255]
55 $ cd ..
55 $ cd ..
56
56
57 #if symlink
57 #if symlink
58
58
59 Test update when two commits have symlinks that point to different folders
59 Test update when two commits have symlinks that point to different folders
60 $ hg init r3 && cd r3
60 $ hg init r3 && cd r3
61 $ echo root > root && hg ci -Am root
61 $ echo root > root && hg ci -Am root
62 adding root
62 adding root
63 $ mkdir folder1 && mkdir folder2
63 $ mkdir folder1 && mkdir folder2
64 $ ln -s folder1 folder
64 $ ln -s folder1 folder
65 $ hg ci -Am "symlink to folder1"
65 $ hg ci -Am "symlink to folder1"
66 adding folder
66 adding folder
67 $ rm folder
67 $ rm folder
68 $ ln -s folder2 folder
68 $ ln -s folder2 folder
69 $ hg ci -Am "symlink to folder2"
69 $ hg ci -Am "symlink to folder2"
70 $ hg up 1
70 $ hg up 1
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 $ cd ..
72 $ cd ..
73
73
74 #endif
74 #endif
75
75
76 #if rmcwd
76 #if rmcwd
77
77
78 Test that warning is printed if cwd is deleted during update
78 Test that warning is printed if cwd is deleted during update
79 $ hg init r4 && cd r4
79 $ hg init r4 && cd r4
80 $ mkdir dir
80 $ mkdir dir
81 $ cd dir
81 $ cd dir
82 $ echo a > a
82 $ echo a > a
83 $ echo b > b
83 $ echo b > b
84 $ hg add a b
84 $ hg add a b
85 $ hg ci -m "file and dir"
85 $ hg ci -m "file and dir"
86 $ hg up -q null
86 $ hg up -q null
87 current directory was removed
87 current directory was removed
88 (consider changing to repo root: $TESTTMP/r1/r4)
88 (consider changing to repo root: $TESTTMP/r1/r4)
89
89
90 #endif
90 #endif
91
92 $ cd $TESTTMP
93 $ cat >> $HGRCPATH <<EOF
94 > [commands]
95 > update.requiredest = True
96 > EOF
97 $ hg init dest
98 $ cd dest
99 $ echo a >> a
100 $ hg commit -qAm aa
101 $ hg up
102 abort: you must specify a destination
103 (for example: hg update ".::")
104 [255]
105 $ hg up .
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now