##// END OF EJS Templates
ui: add new config option for help text width...
Jun Wu -
r29070:29a7d591 default
parent child Browse files
Show More
@@ -1,7247 +1,7250
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 operator
12 import operator
13 import os
13 import os
14 import random
14 import random
15 import re
15 import re
16 import shlex
16 import shlex
17 import socket
17 import socket
18 import sys
18 import sys
19 import tempfile
19 import tempfile
20 import time
20 import time
21
21
22 from .i18n import _
22 from .i18n import _
23 from .node import (
23 from .node import (
24 bin,
24 bin,
25 hex,
25 hex,
26 nullhex,
26 nullhex,
27 nullid,
27 nullid,
28 nullrev,
28 nullrev,
29 short,
29 short,
30 )
30 )
31 from . import (
31 from . import (
32 archival,
32 archival,
33 bookmarks,
33 bookmarks,
34 bundle2,
34 bundle2,
35 changegroup,
35 changegroup,
36 cmdutil,
36 cmdutil,
37 commandserver,
37 commandserver,
38 context,
38 context,
39 copies,
39 copies,
40 dagparser,
40 dagparser,
41 dagutil,
41 dagutil,
42 destutil,
42 destutil,
43 discovery,
43 discovery,
44 encoding,
44 encoding,
45 error,
45 error,
46 exchange,
46 exchange,
47 extensions,
47 extensions,
48 fileset,
48 fileset,
49 formatter,
49 formatter,
50 graphmod,
50 graphmod,
51 hbisect,
51 hbisect,
52 help,
52 help,
53 hg,
53 hg,
54 hgweb,
54 hgweb,
55 localrepo,
55 localrepo,
56 lock as lockmod,
56 lock as lockmod,
57 merge as mergemod,
57 merge as mergemod,
58 minirst,
58 minirst,
59 obsolete,
59 obsolete,
60 patch,
60 patch,
61 phases,
61 phases,
62 pvec,
62 pvec,
63 repair,
63 repair,
64 revlog,
64 revlog,
65 revset,
65 revset,
66 scmutil,
66 scmutil,
67 setdiscovery,
67 setdiscovery,
68 simplemerge,
68 simplemerge,
69 sshserver,
69 sshserver,
70 streamclone,
70 streamclone,
71 templatekw,
71 templatekw,
72 templater,
72 templater,
73 treediscovery,
73 treediscovery,
74 ui as uimod,
74 ui as uimod,
75 util,
75 util,
76 )
76 )
77
77
78 release = lockmod.release
78 release = lockmod.release
79
79
80 table = {}
80 table = {}
81
81
82 command = cmdutil.command(table)
82 command = cmdutil.command(table)
83
83
84 # label constants
84 # label constants
85 # until 3.5, bookmarks.current was the advertised name, not
85 # until 3.5, bookmarks.current was the advertised name, not
86 # bookmarks.active, so we must use both to avoid breaking old
86 # bookmarks.active, so we must use both to avoid breaking old
87 # custom styles
87 # custom styles
88 activebookmarklabel = 'bookmarks.active bookmarks.current'
88 activebookmarklabel = 'bookmarks.active bookmarks.current'
89
89
90 # common command options
90 # common command options
91
91
92 globalopts = [
92 globalopts = [
93 ('R', 'repository', '',
93 ('R', 'repository', '',
94 _('repository root directory or name of overlay bundle file'),
94 _('repository root directory or name of overlay bundle file'),
95 _('REPO')),
95 _('REPO')),
96 ('', 'cwd', '',
96 ('', 'cwd', '',
97 _('change working directory'), _('DIR')),
97 _('change working directory'), _('DIR')),
98 ('y', 'noninteractive', None,
98 ('y', 'noninteractive', None,
99 _('do not prompt, automatically pick the first choice for all prompts')),
99 _('do not prompt, automatically pick the first choice for all prompts')),
100 ('q', 'quiet', None, _('suppress output')),
100 ('q', 'quiet', None, _('suppress output')),
101 ('v', 'verbose', None, _('enable additional output')),
101 ('v', 'verbose', None, _('enable additional output')),
102 ('', 'config', [],
102 ('', 'config', [],
103 _('set/override config option (use \'section.name=value\')'),
103 _('set/override config option (use \'section.name=value\')'),
104 _('CONFIG')),
104 _('CONFIG')),
105 ('', 'debug', None, _('enable debugging output')),
105 ('', 'debug', None, _('enable debugging output')),
106 ('', 'debugger', None, _('start debugger')),
106 ('', 'debugger', None, _('start debugger')),
107 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
107 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
108 _('ENCODE')),
108 _('ENCODE')),
109 ('', 'encodingmode', encoding.encodingmode,
109 ('', 'encodingmode', encoding.encodingmode,
110 _('set the charset encoding mode'), _('MODE')),
110 _('set the charset encoding mode'), _('MODE')),
111 ('', 'traceback', None, _('always print a traceback on exception')),
111 ('', 'traceback', None, _('always print a traceback on exception')),
112 ('', 'time', None, _('time how long the command takes')),
112 ('', 'time', None, _('time how long the command takes')),
113 ('', 'profile', None, _('print command execution profile')),
113 ('', 'profile', None, _('print command execution profile')),
114 ('', 'version', None, _('output version information and exit')),
114 ('', 'version', None, _('output version information and exit')),
115 ('h', 'help', None, _('display help and exit')),
115 ('h', 'help', None, _('display help and exit')),
116 ('', 'hidden', False, _('consider hidden changesets')),
116 ('', 'hidden', False, _('consider hidden changesets')),
117 ]
117 ]
118
118
119 dryrunopts = [('n', 'dry-run', None,
119 dryrunopts = [('n', 'dry-run', None,
120 _('do not perform actions, just print output'))]
120 _('do not perform actions, just print output'))]
121
121
122 remoteopts = [
122 remoteopts = [
123 ('e', 'ssh', '',
123 ('e', 'ssh', '',
124 _('specify ssh command to use'), _('CMD')),
124 _('specify ssh command to use'), _('CMD')),
125 ('', 'remotecmd', '',
125 ('', 'remotecmd', '',
126 _('specify hg command to run on the remote side'), _('CMD')),
126 _('specify hg command to run on the remote side'), _('CMD')),
127 ('', 'insecure', None,
127 ('', 'insecure', None,
128 _('do not verify server certificate (ignoring web.cacerts config)')),
128 _('do not verify server certificate (ignoring web.cacerts config)')),
129 ]
129 ]
130
130
131 walkopts = [
131 walkopts = [
132 ('I', 'include', [],
132 ('I', 'include', [],
133 _('include names matching the given patterns'), _('PATTERN')),
133 _('include names matching the given patterns'), _('PATTERN')),
134 ('X', 'exclude', [],
134 ('X', 'exclude', [],
135 _('exclude names matching the given patterns'), _('PATTERN')),
135 _('exclude names matching the given patterns'), _('PATTERN')),
136 ]
136 ]
137
137
138 commitopts = [
138 commitopts = [
139 ('m', 'message', '',
139 ('m', 'message', '',
140 _('use text as commit message'), _('TEXT')),
140 _('use text as commit message'), _('TEXT')),
141 ('l', 'logfile', '',
141 ('l', 'logfile', '',
142 _('read commit message from file'), _('FILE')),
142 _('read commit message from file'), _('FILE')),
143 ]
143 ]
144
144
145 commitopts2 = [
145 commitopts2 = [
146 ('d', 'date', '',
146 ('d', 'date', '',
147 _('record the specified date as commit date'), _('DATE')),
147 _('record the specified date as commit date'), _('DATE')),
148 ('u', 'user', '',
148 ('u', 'user', '',
149 _('record the specified user as committer'), _('USER')),
149 _('record the specified user as committer'), _('USER')),
150 ]
150 ]
151
151
152 # hidden for now
152 # hidden for now
153 formatteropts = [
153 formatteropts = [
154 ('T', 'template', '',
154 ('T', 'template', '',
155 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
155 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
156 ]
156 ]
157
157
158 templateopts = [
158 templateopts = [
159 ('', 'style', '',
159 ('', 'style', '',
160 _('display using template map file (DEPRECATED)'), _('STYLE')),
160 _('display using template map file (DEPRECATED)'), _('STYLE')),
161 ('T', 'template', '',
161 ('T', 'template', '',
162 _('display with template'), _('TEMPLATE')),
162 _('display with template'), _('TEMPLATE')),
163 ]
163 ]
164
164
165 logopts = [
165 logopts = [
166 ('p', 'patch', None, _('show patch')),
166 ('p', 'patch', None, _('show patch')),
167 ('g', 'git', None, _('use git extended diff format')),
167 ('g', 'git', None, _('use git extended diff format')),
168 ('l', 'limit', '',
168 ('l', 'limit', '',
169 _('limit number of changes displayed'), _('NUM')),
169 _('limit number of changes displayed'), _('NUM')),
170 ('M', 'no-merges', None, _('do not show merges')),
170 ('M', 'no-merges', None, _('do not show merges')),
171 ('', 'stat', None, _('output diffstat-style summary of changes')),
171 ('', 'stat', None, _('output diffstat-style summary of changes')),
172 ('G', 'graph', None, _("show the revision DAG")),
172 ('G', 'graph', None, _("show the revision DAG")),
173 ] + templateopts
173 ] + templateopts
174
174
175 diffopts = [
175 diffopts = [
176 ('a', 'text', None, _('treat all files as text')),
176 ('a', 'text', None, _('treat all files as text')),
177 ('g', 'git', None, _('use git extended diff format')),
177 ('g', 'git', None, _('use git extended diff format')),
178 ('', 'nodates', None, _('omit dates from diff headers'))
178 ('', 'nodates', None, _('omit dates from diff headers'))
179 ]
179 ]
180
180
181 diffwsopts = [
181 diffwsopts = [
182 ('w', 'ignore-all-space', None,
182 ('w', 'ignore-all-space', None,
183 _('ignore white space when comparing lines')),
183 _('ignore white space when comparing lines')),
184 ('b', 'ignore-space-change', None,
184 ('b', 'ignore-space-change', None,
185 _('ignore changes in the amount of white space')),
185 _('ignore changes in the amount of white space')),
186 ('B', 'ignore-blank-lines', None,
186 ('B', 'ignore-blank-lines', None,
187 _('ignore changes whose lines are all blank')),
187 _('ignore changes whose lines are all blank')),
188 ]
188 ]
189
189
190 diffopts2 = [
190 diffopts2 = [
191 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
191 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
192 ('p', 'show-function', None, _('show which function each change is in')),
192 ('p', 'show-function', None, _('show which function each change is in')),
193 ('', 'reverse', None, _('produce a diff that undoes the changes')),
193 ('', 'reverse', None, _('produce a diff that undoes the changes')),
194 ] + diffwsopts + [
194 ] + diffwsopts + [
195 ('U', 'unified', '',
195 ('U', 'unified', '',
196 _('number of lines of context to show'), _('NUM')),
196 _('number of lines of context to show'), _('NUM')),
197 ('', 'stat', None, _('output diffstat-style summary of changes')),
197 ('', 'stat', None, _('output diffstat-style summary of changes')),
198 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
198 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
199 ]
199 ]
200
200
201 mergetoolopts = [
201 mergetoolopts = [
202 ('t', 'tool', '', _('specify merge tool')),
202 ('t', 'tool', '', _('specify merge tool')),
203 ]
203 ]
204
204
205 similarityopts = [
205 similarityopts = [
206 ('s', 'similarity', '',
206 ('s', 'similarity', '',
207 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
207 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
208 ]
208 ]
209
209
210 subrepoopts = [
210 subrepoopts = [
211 ('S', 'subrepos', None,
211 ('S', 'subrepos', None,
212 _('recurse into subrepositories'))
212 _('recurse into subrepositories'))
213 ]
213 ]
214
214
215 debugrevlogopts = [
215 debugrevlogopts = [
216 ('c', 'changelog', False, _('open changelog')),
216 ('c', 'changelog', False, _('open changelog')),
217 ('m', 'manifest', False, _('open manifest')),
217 ('m', 'manifest', False, _('open manifest')),
218 ('', 'dir', False, _('open directory manifest')),
218 ('', 'dir', False, _('open directory manifest')),
219 ]
219 ]
220
220
221 # Commands start here, listed alphabetically
221 # Commands start here, listed alphabetically
222
222
223 @command('^add',
223 @command('^add',
224 walkopts + subrepoopts + dryrunopts,
224 walkopts + subrepoopts + dryrunopts,
225 _('[OPTION]... [FILE]...'),
225 _('[OPTION]... [FILE]...'),
226 inferrepo=True)
226 inferrepo=True)
227 def add(ui, repo, *pats, **opts):
227 def add(ui, repo, *pats, **opts):
228 """add the specified files on the next commit
228 """add the specified files on the next commit
229
229
230 Schedule files to be version controlled and added to the
230 Schedule files to be version controlled and added to the
231 repository.
231 repository.
232
232
233 The files will be added to the repository at the next commit. To
233 The files will be added to the repository at the next commit. To
234 undo an add before that, see :hg:`forget`.
234 undo an add before that, see :hg:`forget`.
235
235
236 If no names are given, add all files to the repository (except
236 If no names are given, add all files to the repository (except
237 files matching ``.hgignore``).
237 files matching ``.hgignore``).
238
238
239 .. container:: verbose
239 .. container:: verbose
240
240
241 Examples:
241 Examples:
242
242
243 - New (unknown) files are added
243 - New (unknown) files are added
244 automatically by :hg:`add`::
244 automatically by :hg:`add`::
245
245
246 $ ls
246 $ ls
247 foo.c
247 foo.c
248 $ hg status
248 $ hg status
249 ? foo.c
249 ? foo.c
250 $ hg add
250 $ hg add
251 adding foo.c
251 adding foo.c
252 $ hg status
252 $ hg status
253 A foo.c
253 A foo.c
254
254
255 - Specific files to be added can be specified::
255 - Specific files to be added can be specified::
256
256
257 $ ls
257 $ ls
258 bar.c foo.c
258 bar.c foo.c
259 $ hg status
259 $ hg status
260 ? bar.c
260 ? bar.c
261 ? foo.c
261 ? foo.c
262 $ hg add bar.c
262 $ hg add bar.c
263 $ hg status
263 $ hg status
264 A bar.c
264 A bar.c
265 ? foo.c
265 ? foo.c
266
266
267 Returns 0 if all files are successfully added.
267 Returns 0 if all files are successfully added.
268 """
268 """
269
269
270 m = scmutil.match(repo[None], pats, opts)
270 m = scmutil.match(repo[None], pats, opts)
271 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
271 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
272 return rejected and 1 or 0
272 return rejected and 1 or 0
273
273
274 @command('addremove',
274 @command('addremove',
275 similarityopts + subrepoopts + walkopts + dryrunopts,
275 similarityopts + subrepoopts + walkopts + dryrunopts,
276 _('[OPTION]... [FILE]...'),
276 _('[OPTION]... [FILE]...'),
277 inferrepo=True)
277 inferrepo=True)
278 def addremove(ui, repo, *pats, **opts):
278 def addremove(ui, repo, *pats, **opts):
279 """add all new files, delete all missing files
279 """add all new files, delete all missing files
280
280
281 Add all new files and remove all missing files from the
281 Add all new files and remove all missing files from the
282 repository.
282 repository.
283
283
284 Unless names are given, new files are ignored if they match any of
284 Unless names are given, new files are ignored if they match any of
285 the patterns in ``.hgignore``. As with add, these changes take
285 the patterns in ``.hgignore``. As with add, these changes take
286 effect at the next commit.
286 effect at the next commit.
287
287
288 Use the -s/--similarity option to detect renamed files. This
288 Use the -s/--similarity option to detect renamed files. This
289 option takes a percentage between 0 (disabled) and 100 (files must
289 option takes a percentage between 0 (disabled) and 100 (files must
290 be identical) as its parameter. With a parameter greater than 0,
290 be identical) as its parameter. With a parameter greater than 0,
291 this compares every removed file with every added file and records
291 this compares every removed file with every added file and records
292 those similar enough as renames. Detecting renamed files this way
292 those similar enough as renames. Detecting renamed files this way
293 can be expensive. After using this option, :hg:`status -C` can be
293 can be expensive. After using this option, :hg:`status -C` can be
294 used to check which files were identified as moved or renamed. If
294 used to check which files were identified as moved or renamed. If
295 not specified, -s/--similarity defaults to 100 and only renames of
295 not specified, -s/--similarity defaults to 100 and only renames of
296 identical files are detected.
296 identical files are detected.
297
297
298 .. container:: verbose
298 .. container:: verbose
299
299
300 Examples:
300 Examples:
301
301
302 - A number of files (bar.c and foo.c) are new,
302 - A number of files (bar.c and foo.c) are new,
303 while foobar.c has been removed (without using :hg:`remove`)
303 while foobar.c has been removed (without using :hg:`remove`)
304 from the repository::
304 from the repository::
305
305
306 $ ls
306 $ ls
307 bar.c foo.c
307 bar.c foo.c
308 $ hg status
308 $ hg status
309 ! foobar.c
309 ! foobar.c
310 ? bar.c
310 ? bar.c
311 ? foo.c
311 ? foo.c
312 $ hg addremove
312 $ hg addremove
313 adding bar.c
313 adding bar.c
314 adding foo.c
314 adding foo.c
315 removing foobar.c
315 removing foobar.c
316 $ hg status
316 $ hg status
317 A bar.c
317 A bar.c
318 A foo.c
318 A foo.c
319 R foobar.c
319 R foobar.c
320
320
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 Afterwards, it was edited slightly::
322 Afterwards, it was edited slightly::
323
323
324 $ ls
324 $ ls
325 foo.c
325 foo.c
326 $ hg status
326 $ hg status
327 ! foobar.c
327 ! foobar.c
328 ? foo.c
328 ? foo.c
329 $ hg addremove --similarity 90
329 $ hg addremove --similarity 90
330 removing foobar.c
330 removing foobar.c
331 adding foo.c
331 adding foo.c
332 recording removal of foobar.c as rename to foo.c (94% similar)
332 recording removal of foobar.c as rename to foo.c (94% similar)
333 $ hg status -C
333 $ hg status -C
334 A foo.c
334 A foo.c
335 foobar.c
335 foobar.c
336 R foobar.c
336 R foobar.c
337
337
338 Returns 0 if all files are successfully added.
338 Returns 0 if all files are successfully added.
339 """
339 """
340 try:
340 try:
341 sim = float(opts.get('similarity') or 100)
341 sim = float(opts.get('similarity') or 100)
342 except ValueError:
342 except ValueError:
343 raise error.Abort(_('similarity must be a number'))
343 raise error.Abort(_('similarity must be a number'))
344 if sim < 0 or sim > 100:
344 if sim < 0 or sim > 100:
345 raise error.Abort(_('similarity must be between 0 and 100'))
345 raise error.Abort(_('similarity must be between 0 and 100'))
346 matcher = scmutil.match(repo[None], pats, opts)
346 matcher = scmutil.match(repo[None], pats, opts)
347 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
347 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
348
348
349 @command('^annotate|blame',
349 @command('^annotate|blame',
350 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
350 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
351 ('', 'follow', None,
351 ('', 'follow', None,
352 _('follow copies/renames and list the filename (DEPRECATED)')),
352 _('follow copies/renames and list the filename (DEPRECATED)')),
353 ('', 'no-follow', None, _("don't follow copies and renames")),
353 ('', 'no-follow', None, _("don't follow copies and renames")),
354 ('a', 'text', None, _('treat all files as text')),
354 ('a', 'text', None, _('treat all files as text')),
355 ('u', 'user', None, _('list the author (long with -v)')),
355 ('u', 'user', None, _('list the author (long with -v)')),
356 ('f', 'file', None, _('list the filename')),
356 ('f', 'file', None, _('list the filename')),
357 ('d', 'date', None, _('list the date (short with -q)')),
357 ('d', 'date', None, _('list the date (short with -q)')),
358 ('n', 'number', None, _('list the revision number (default)')),
358 ('n', 'number', None, _('list the revision number (default)')),
359 ('c', 'changeset', None, _('list the changeset')),
359 ('c', 'changeset', None, _('list the changeset')),
360 ('l', 'line-number', None, _('show line number at the first appearance'))
360 ('l', 'line-number', None, _('show line number at the first appearance'))
361 ] + diffwsopts + walkopts + formatteropts,
361 ] + diffwsopts + walkopts + formatteropts,
362 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
362 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
363 inferrepo=True)
363 inferrepo=True)
364 def annotate(ui, repo, *pats, **opts):
364 def annotate(ui, repo, *pats, **opts):
365 """show changeset information by line for each file
365 """show changeset information by line for each file
366
366
367 List changes in files, showing the revision id responsible for
367 List changes in files, showing the revision id responsible for
368 each line.
368 each line.
369
369
370 This command is useful for discovering when a change was made and
370 This command is useful for discovering when a change was made and
371 by whom.
371 by whom.
372
372
373 If you include --file, --user, or --date, the revision number is
373 If you include --file, --user, or --date, the revision number is
374 suppressed unless you also include --number.
374 suppressed unless you also include --number.
375
375
376 Without the -a/--text option, annotate will avoid processing files
376 Without the -a/--text option, annotate will avoid processing files
377 it detects as binary. With -a, annotate will annotate the file
377 it detects as binary. With -a, annotate will annotate the file
378 anyway, although the results will probably be neither useful
378 anyway, although the results will probably be neither useful
379 nor desirable.
379 nor desirable.
380
380
381 Returns 0 on success.
381 Returns 0 on success.
382 """
382 """
383 if not pats:
383 if not pats:
384 raise error.Abort(_('at least one filename or pattern is required'))
384 raise error.Abort(_('at least one filename or pattern is required'))
385
385
386 if opts.get('follow'):
386 if opts.get('follow'):
387 # --follow is deprecated and now just an alias for -f/--file
387 # --follow is deprecated and now just an alias for -f/--file
388 # to mimic the behavior of Mercurial before version 1.5
388 # to mimic the behavior of Mercurial before version 1.5
389 opts['file'] = True
389 opts['file'] = True
390
390
391 ctx = scmutil.revsingle(repo, opts.get('rev'))
391 ctx = scmutil.revsingle(repo, opts.get('rev'))
392
392
393 fm = ui.formatter('annotate', opts)
393 fm = ui.formatter('annotate', opts)
394 if ui.quiet:
394 if ui.quiet:
395 datefunc = util.shortdate
395 datefunc = util.shortdate
396 else:
396 else:
397 datefunc = util.datestr
397 datefunc = util.datestr
398 if ctx.rev() is None:
398 if ctx.rev() is None:
399 def hexfn(node):
399 def hexfn(node):
400 if node is None:
400 if node is None:
401 return None
401 return None
402 else:
402 else:
403 return fm.hexfunc(node)
403 return fm.hexfunc(node)
404 if opts.get('changeset'):
404 if opts.get('changeset'):
405 # omit "+" suffix which is appended to node hex
405 # omit "+" suffix which is appended to node hex
406 def formatrev(rev):
406 def formatrev(rev):
407 if rev is None:
407 if rev is None:
408 return '%d' % ctx.p1().rev()
408 return '%d' % ctx.p1().rev()
409 else:
409 else:
410 return '%d' % rev
410 return '%d' % rev
411 else:
411 else:
412 def formatrev(rev):
412 def formatrev(rev):
413 if rev is None:
413 if rev is None:
414 return '%d+' % ctx.p1().rev()
414 return '%d+' % ctx.p1().rev()
415 else:
415 else:
416 return '%d ' % rev
416 return '%d ' % rev
417 def formathex(hex):
417 def formathex(hex):
418 if hex is None:
418 if hex is None:
419 return '%s+' % fm.hexfunc(ctx.p1().node())
419 return '%s+' % fm.hexfunc(ctx.p1().node())
420 else:
420 else:
421 return '%s ' % hex
421 return '%s ' % hex
422 else:
422 else:
423 hexfn = fm.hexfunc
423 hexfn = fm.hexfunc
424 formatrev = formathex = str
424 formatrev = formathex = str
425
425
426 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
426 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
427 ('number', ' ', lambda x: x[0].rev(), formatrev),
427 ('number', ' ', lambda x: x[0].rev(), formatrev),
428 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
428 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
429 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
429 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
430 ('file', ' ', lambda x: x[0].path(), str),
430 ('file', ' ', lambda x: x[0].path(), str),
431 ('line_number', ':', lambda x: x[1], str),
431 ('line_number', ':', lambda x: x[1], str),
432 ]
432 ]
433 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
433 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
434
434
435 if (not opts.get('user') and not opts.get('changeset')
435 if (not opts.get('user') and not opts.get('changeset')
436 and not opts.get('date') and not opts.get('file')):
436 and not opts.get('date') and not opts.get('file')):
437 opts['number'] = True
437 opts['number'] = True
438
438
439 linenumber = opts.get('line_number') is not None
439 linenumber = opts.get('line_number') is not None
440 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
440 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
441 raise error.Abort(_('at least one of -n/-c is required for -l'))
441 raise error.Abort(_('at least one of -n/-c is required for -l'))
442
442
443 if fm:
443 if fm:
444 def makefunc(get, fmt):
444 def makefunc(get, fmt):
445 return get
445 return get
446 else:
446 else:
447 def makefunc(get, fmt):
447 def makefunc(get, fmt):
448 return lambda x: fmt(get(x))
448 return lambda x: fmt(get(x))
449 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
449 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
450 if opts.get(op)]
450 if opts.get(op)]
451 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
451 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
452 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
452 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
453 if opts.get(op))
453 if opts.get(op))
454
454
455 def bad(x, y):
455 def bad(x, y):
456 raise error.Abort("%s: %s" % (x, y))
456 raise error.Abort("%s: %s" % (x, y))
457
457
458 m = scmutil.match(ctx, pats, opts, badfn=bad)
458 m = scmutil.match(ctx, pats, opts, badfn=bad)
459
459
460 follow = not opts.get('no_follow')
460 follow = not opts.get('no_follow')
461 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
461 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
462 whitespace=True)
462 whitespace=True)
463 for abs in ctx.walk(m):
463 for abs in ctx.walk(m):
464 fctx = ctx[abs]
464 fctx = ctx[abs]
465 if not opts.get('text') and util.binary(fctx.data()):
465 if not opts.get('text') and util.binary(fctx.data()):
466 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
466 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
467 continue
467 continue
468
468
469 lines = fctx.annotate(follow=follow, linenumber=linenumber,
469 lines = fctx.annotate(follow=follow, linenumber=linenumber,
470 diffopts=diffopts)
470 diffopts=diffopts)
471 formats = []
471 formats = []
472 pieces = []
472 pieces = []
473
473
474 for f, sep in funcmap:
474 for f, sep in funcmap:
475 l = [f(n) for n, dummy in lines]
475 l = [f(n) for n, dummy in lines]
476 if l:
476 if l:
477 if fm:
477 if fm:
478 formats.append(['%s' for x in l])
478 formats.append(['%s' for x in l])
479 else:
479 else:
480 sizes = [encoding.colwidth(x) for x in l]
480 sizes = [encoding.colwidth(x) for x in l]
481 ml = max(sizes)
481 ml = max(sizes)
482 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
482 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
483 pieces.append(l)
483 pieces.append(l)
484
484
485 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
485 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
486 fm.startitem()
486 fm.startitem()
487 fm.write(fields, "".join(f), *p)
487 fm.write(fields, "".join(f), *p)
488 fm.write('line', ": %s", l[1])
488 fm.write('line', ": %s", l[1])
489
489
490 if lines and not lines[-1][1].endswith('\n'):
490 if lines and not lines[-1][1].endswith('\n'):
491 fm.plain('\n')
491 fm.plain('\n')
492
492
493 fm.end()
493 fm.end()
494
494
495 @command('archive',
495 @command('archive',
496 [('', 'no-decode', None, _('do not pass files through decoders')),
496 [('', 'no-decode', None, _('do not pass files through decoders')),
497 ('p', 'prefix', '', _('directory prefix for files in archive'),
497 ('p', 'prefix', '', _('directory prefix for files in archive'),
498 _('PREFIX')),
498 _('PREFIX')),
499 ('r', 'rev', '', _('revision to distribute'), _('REV')),
499 ('r', 'rev', '', _('revision to distribute'), _('REV')),
500 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
500 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
501 ] + subrepoopts + walkopts,
501 ] + subrepoopts + walkopts,
502 _('[OPTION]... DEST'))
502 _('[OPTION]... DEST'))
503 def archive(ui, repo, dest, **opts):
503 def archive(ui, repo, dest, **opts):
504 '''create an unversioned archive of a repository revision
504 '''create an unversioned archive of a repository revision
505
505
506 By default, the revision used is the parent of the working
506 By default, the revision used is the parent of the working
507 directory; use -r/--rev to specify a different revision.
507 directory; use -r/--rev to specify a different revision.
508
508
509 The archive type is automatically detected based on file
509 The archive type is automatically detected based on file
510 extension (to override, use -t/--type).
510 extension (to override, use -t/--type).
511
511
512 .. container:: verbose
512 .. container:: verbose
513
513
514 Examples:
514 Examples:
515
515
516 - create a zip file containing the 1.0 release::
516 - create a zip file containing the 1.0 release::
517
517
518 hg archive -r 1.0 project-1.0.zip
518 hg archive -r 1.0 project-1.0.zip
519
519
520 - create a tarball excluding .hg files::
520 - create a tarball excluding .hg files::
521
521
522 hg archive project.tar.gz -X ".hg*"
522 hg archive project.tar.gz -X ".hg*"
523
523
524 Valid types are:
524 Valid types are:
525
525
526 :``files``: a directory full of files (default)
526 :``files``: a directory full of files (default)
527 :``tar``: tar archive, uncompressed
527 :``tar``: tar archive, uncompressed
528 :``tbz2``: tar archive, compressed using bzip2
528 :``tbz2``: tar archive, compressed using bzip2
529 :``tgz``: tar archive, compressed using gzip
529 :``tgz``: tar archive, compressed using gzip
530 :``uzip``: zip archive, uncompressed
530 :``uzip``: zip archive, uncompressed
531 :``zip``: zip archive, compressed using deflate
531 :``zip``: zip archive, compressed using deflate
532
532
533 The exact name of the destination archive or directory is given
533 The exact name of the destination archive or directory is given
534 using a format string; see :hg:`help export` for details.
534 using a format string; see :hg:`help export` for details.
535
535
536 Each member added to an archive file has a directory prefix
536 Each member added to an archive file has a directory prefix
537 prepended. Use -p/--prefix to specify a format string for the
537 prepended. Use -p/--prefix to specify a format string for the
538 prefix. The default is the basename of the archive, with suffixes
538 prefix. The default is the basename of the archive, with suffixes
539 removed.
539 removed.
540
540
541 Returns 0 on success.
541 Returns 0 on success.
542 '''
542 '''
543
543
544 ctx = scmutil.revsingle(repo, opts.get('rev'))
544 ctx = scmutil.revsingle(repo, opts.get('rev'))
545 if not ctx:
545 if not ctx:
546 raise error.Abort(_('no working directory: please specify a revision'))
546 raise error.Abort(_('no working directory: please specify a revision'))
547 node = ctx.node()
547 node = ctx.node()
548 dest = cmdutil.makefilename(repo, dest, node)
548 dest = cmdutil.makefilename(repo, dest, node)
549 if os.path.realpath(dest) == repo.root:
549 if os.path.realpath(dest) == repo.root:
550 raise error.Abort(_('repository root cannot be destination'))
550 raise error.Abort(_('repository root cannot be destination'))
551
551
552 kind = opts.get('type') or archival.guesskind(dest) or 'files'
552 kind = opts.get('type') or archival.guesskind(dest) or 'files'
553 prefix = opts.get('prefix')
553 prefix = opts.get('prefix')
554
554
555 if dest == '-':
555 if dest == '-':
556 if kind == 'files':
556 if kind == 'files':
557 raise error.Abort(_('cannot archive plain files to stdout'))
557 raise error.Abort(_('cannot archive plain files to stdout'))
558 dest = cmdutil.makefileobj(repo, dest)
558 dest = cmdutil.makefileobj(repo, dest)
559 if not prefix:
559 if not prefix:
560 prefix = os.path.basename(repo.root) + '-%h'
560 prefix = os.path.basename(repo.root) + '-%h'
561
561
562 prefix = cmdutil.makefilename(repo, prefix, node)
562 prefix = cmdutil.makefilename(repo, prefix, node)
563 matchfn = scmutil.match(ctx, [], opts)
563 matchfn = scmutil.match(ctx, [], opts)
564 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
564 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
565 matchfn, prefix, subrepos=opts.get('subrepos'))
565 matchfn, prefix, subrepos=opts.get('subrepos'))
566
566
567 @command('backout',
567 @command('backout',
568 [('', 'merge', None, _('merge with old dirstate parent after backout')),
568 [('', 'merge', None, _('merge with old dirstate parent after backout')),
569 ('', 'commit', None,
569 ('', 'commit', None,
570 _('commit if no conflicts were encountered (DEPRECATED)')),
570 _('commit if no conflicts were encountered (DEPRECATED)')),
571 ('', 'no-commit', None, _('do not commit')),
571 ('', 'no-commit', None, _('do not commit')),
572 ('', 'parent', '',
572 ('', 'parent', '',
573 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
573 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
574 ('r', 'rev', '', _('revision to backout'), _('REV')),
574 ('r', 'rev', '', _('revision to backout'), _('REV')),
575 ('e', 'edit', False, _('invoke editor on commit messages')),
575 ('e', 'edit', False, _('invoke editor on commit messages')),
576 ] + mergetoolopts + walkopts + commitopts + commitopts2,
576 ] + mergetoolopts + walkopts + commitopts + commitopts2,
577 _('[OPTION]... [-r] REV'))
577 _('[OPTION]... [-r] REV'))
578 def backout(ui, repo, node=None, rev=None, **opts):
578 def backout(ui, repo, node=None, rev=None, **opts):
579 '''reverse effect of earlier changeset
579 '''reverse effect of earlier changeset
580
580
581 Prepare a new changeset with the effect of REV undone in the
581 Prepare a new changeset with the effect of REV undone in the
582 current working directory. If no conflicts were encountered,
582 current working directory. If no conflicts were encountered,
583 it will be committed immediately.
583 it will be committed immediately.
584
584
585 If REV is the parent of the working directory, then this new changeset
585 If REV is the parent of the working directory, then this new changeset
586 is committed automatically (unless --no-commit is specified).
586 is committed automatically (unless --no-commit is specified).
587
587
588 .. note::
588 .. note::
589
589
590 :hg:`backout` cannot be used to fix either an unwanted or
590 :hg:`backout` cannot be used to fix either an unwanted or
591 incorrect merge.
591 incorrect merge.
592
592
593 .. container:: verbose
593 .. container:: verbose
594
594
595 Examples:
595 Examples:
596
596
597 - Reverse the effect of the parent of the working directory.
597 - Reverse the effect of the parent of the working directory.
598 This backout will be committed immediately::
598 This backout will be committed immediately::
599
599
600 hg backout -r .
600 hg backout -r .
601
601
602 - Reverse the effect of previous bad revision 23::
602 - Reverse the effect of previous bad revision 23::
603
603
604 hg backout -r 23
604 hg backout -r 23
605
605
606 - Reverse the effect of previous bad revision 23 and
606 - Reverse the effect of previous bad revision 23 and
607 leave changes uncommitted::
607 leave changes uncommitted::
608
608
609 hg backout -r 23 --no-commit
609 hg backout -r 23 --no-commit
610 hg commit -m "Backout revision 23"
610 hg commit -m "Backout revision 23"
611
611
612 By default, the pending changeset will have one parent,
612 By default, the pending changeset will have one parent,
613 maintaining a linear history. With --merge, the pending
613 maintaining a linear history. With --merge, the pending
614 changeset will instead have two parents: the old parent of the
614 changeset will instead have two parents: the old parent of the
615 working directory and a new child of REV that simply undoes REV.
615 working directory and a new child of REV that simply undoes REV.
616
616
617 Before version 1.7, the behavior without --merge was equivalent
617 Before version 1.7, the behavior without --merge was equivalent
618 to specifying --merge followed by :hg:`update --clean .` to
618 to specifying --merge followed by :hg:`update --clean .` to
619 cancel the merge and leave the child of REV as a head to be
619 cancel the merge and leave the child of REV as a head to be
620 merged separately.
620 merged separately.
621
621
622 See :hg:`help dates` for a list of formats valid for -d/--date.
622 See :hg:`help dates` for a list of formats valid for -d/--date.
623
623
624 See :hg:`help revert` for a way to restore files to the state
624 See :hg:`help revert` for a way to restore files to the state
625 of another revision.
625 of another revision.
626
626
627 Returns 0 on success, 1 if nothing to backout or there are unresolved
627 Returns 0 on success, 1 if nothing to backout or there are unresolved
628 files.
628 files.
629 '''
629 '''
630 wlock = lock = None
630 wlock = lock = None
631 try:
631 try:
632 wlock = repo.wlock()
632 wlock = repo.wlock()
633 lock = repo.lock()
633 lock = repo.lock()
634 return _dobackout(ui, repo, node, rev, **opts)
634 return _dobackout(ui, repo, node, rev, **opts)
635 finally:
635 finally:
636 release(lock, wlock)
636 release(lock, wlock)
637
637
638 def _dobackout(ui, repo, node=None, rev=None, **opts):
638 def _dobackout(ui, repo, node=None, rev=None, **opts):
639 if opts.get('commit') and opts.get('no_commit'):
639 if opts.get('commit') and opts.get('no_commit'):
640 raise error.Abort(_("cannot use --commit with --no-commit"))
640 raise error.Abort(_("cannot use --commit with --no-commit"))
641 if opts.get('merge') and opts.get('no_commit'):
641 if opts.get('merge') and opts.get('no_commit'):
642 raise error.Abort(_("cannot use --merge with --no-commit"))
642 raise error.Abort(_("cannot use --merge with --no-commit"))
643
643
644 if rev and node:
644 if rev and node:
645 raise error.Abort(_("please specify just one revision"))
645 raise error.Abort(_("please specify just one revision"))
646
646
647 if not rev:
647 if not rev:
648 rev = node
648 rev = node
649
649
650 if not rev:
650 if not rev:
651 raise error.Abort(_("please specify a revision to backout"))
651 raise error.Abort(_("please specify a revision to backout"))
652
652
653 date = opts.get('date')
653 date = opts.get('date')
654 if date:
654 if date:
655 opts['date'] = util.parsedate(date)
655 opts['date'] = util.parsedate(date)
656
656
657 cmdutil.checkunfinished(repo)
657 cmdutil.checkunfinished(repo)
658 cmdutil.bailifchanged(repo)
658 cmdutil.bailifchanged(repo)
659 node = scmutil.revsingle(repo, rev).node()
659 node = scmutil.revsingle(repo, rev).node()
660
660
661 op1, op2 = repo.dirstate.parents()
661 op1, op2 = repo.dirstate.parents()
662 if not repo.changelog.isancestor(node, op1):
662 if not repo.changelog.isancestor(node, op1):
663 raise error.Abort(_('cannot backout change that is not an ancestor'))
663 raise error.Abort(_('cannot backout change that is not an ancestor'))
664
664
665 p1, p2 = repo.changelog.parents(node)
665 p1, p2 = repo.changelog.parents(node)
666 if p1 == nullid:
666 if p1 == nullid:
667 raise error.Abort(_('cannot backout a change with no parents'))
667 raise error.Abort(_('cannot backout a change with no parents'))
668 if p2 != nullid:
668 if p2 != nullid:
669 if not opts.get('parent'):
669 if not opts.get('parent'):
670 raise error.Abort(_('cannot backout a merge changeset'))
670 raise error.Abort(_('cannot backout a merge changeset'))
671 p = repo.lookup(opts['parent'])
671 p = repo.lookup(opts['parent'])
672 if p not in (p1, p2):
672 if p not in (p1, p2):
673 raise error.Abort(_('%s is not a parent of %s') %
673 raise error.Abort(_('%s is not a parent of %s') %
674 (short(p), short(node)))
674 (short(p), short(node)))
675 parent = p
675 parent = p
676 else:
676 else:
677 if opts.get('parent'):
677 if opts.get('parent'):
678 raise error.Abort(_('cannot use --parent on non-merge changeset'))
678 raise error.Abort(_('cannot use --parent on non-merge changeset'))
679 parent = p1
679 parent = p1
680
680
681 # the backout should appear on the same branch
681 # the backout should appear on the same branch
682 branch = repo.dirstate.branch()
682 branch = repo.dirstate.branch()
683 bheads = repo.branchheads(branch)
683 bheads = repo.branchheads(branch)
684 rctx = scmutil.revsingle(repo, hex(parent))
684 rctx = scmutil.revsingle(repo, hex(parent))
685 if not opts.get('merge') and op1 != node:
685 if not opts.get('merge') and op1 != node:
686 dsguard = cmdutil.dirstateguard(repo, 'backout')
686 dsguard = cmdutil.dirstateguard(repo, 'backout')
687 try:
687 try:
688 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
688 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
689 'backout')
689 'backout')
690 stats = mergemod.update(repo, parent, True, True, node, False)
690 stats = mergemod.update(repo, parent, True, True, node, False)
691 repo.setparents(op1, op2)
691 repo.setparents(op1, op2)
692 dsguard.close()
692 dsguard.close()
693 hg._showstats(repo, stats)
693 hg._showstats(repo, stats)
694 if stats[3]:
694 if stats[3]:
695 repo.ui.status(_("use 'hg resolve' to retry unresolved "
695 repo.ui.status(_("use 'hg resolve' to retry unresolved "
696 "file merges\n"))
696 "file merges\n"))
697 return 1
697 return 1
698 finally:
698 finally:
699 ui.setconfig('ui', 'forcemerge', '', '')
699 ui.setconfig('ui', 'forcemerge', '', '')
700 lockmod.release(dsguard)
700 lockmod.release(dsguard)
701 else:
701 else:
702 hg.clean(repo, node, show_stats=False)
702 hg.clean(repo, node, show_stats=False)
703 repo.dirstate.setbranch(branch)
703 repo.dirstate.setbranch(branch)
704 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
704 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
705
705
706 if opts.get('no_commit'):
706 if opts.get('no_commit'):
707 msg = _("changeset %s backed out, "
707 msg = _("changeset %s backed out, "
708 "don't forget to commit.\n")
708 "don't forget to commit.\n")
709 ui.status(msg % short(node))
709 ui.status(msg % short(node))
710 return 0
710 return 0
711
711
712 def commitfunc(ui, repo, message, match, opts):
712 def commitfunc(ui, repo, message, match, opts):
713 editform = 'backout'
713 editform = 'backout'
714 e = cmdutil.getcommiteditor(editform=editform, **opts)
714 e = cmdutil.getcommiteditor(editform=editform, **opts)
715 if not message:
715 if not message:
716 # we don't translate commit messages
716 # we don't translate commit messages
717 message = "Backed out changeset %s" % short(node)
717 message = "Backed out changeset %s" % short(node)
718 e = cmdutil.getcommiteditor(edit=True, editform=editform)
718 e = cmdutil.getcommiteditor(edit=True, editform=editform)
719 return repo.commit(message, opts.get('user'), opts.get('date'),
719 return repo.commit(message, opts.get('user'), opts.get('date'),
720 match, editor=e)
720 match, editor=e)
721 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
721 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
722 if not newnode:
722 if not newnode:
723 ui.status(_("nothing changed\n"))
723 ui.status(_("nothing changed\n"))
724 return 1
724 return 1
725 cmdutil.commitstatus(repo, newnode, branch, bheads)
725 cmdutil.commitstatus(repo, newnode, branch, bheads)
726
726
727 def nice(node):
727 def nice(node):
728 return '%d:%s' % (repo.changelog.rev(node), short(node))
728 return '%d:%s' % (repo.changelog.rev(node), short(node))
729 ui.status(_('changeset %s backs out changeset %s\n') %
729 ui.status(_('changeset %s backs out changeset %s\n') %
730 (nice(repo.changelog.tip()), nice(node)))
730 (nice(repo.changelog.tip()), nice(node)))
731 if opts.get('merge') and op1 != node:
731 if opts.get('merge') and op1 != node:
732 hg.clean(repo, op1, show_stats=False)
732 hg.clean(repo, op1, show_stats=False)
733 ui.status(_('merging with changeset %s\n')
733 ui.status(_('merging with changeset %s\n')
734 % nice(repo.changelog.tip()))
734 % nice(repo.changelog.tip()))
735 try:
735 try:
736 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
736 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
737 'backout')
737 'backout')
738 return hg.merge(repo, hex(repo.changelog.tip()))
738 return hg.merge(repo, hex(repo.changelog.tip()))
739 finally:
739 finally:
740 ui.setconfig('ui', 'forcemerge', '', '')
740 ui.setconfig('ui', 'forcemerge', '', '')
741 return 0
741 return 0
742
742
743 @command('bisect',
743 @command('bisect',
744 [('r', 'reset', False, _('reset bisect state')),
744 [('r', 'reset', False, _('reset bisect state')),
745 ('g', 'good', False, _('mark changeset good')),
745 ('g', 'good', False, _('mark changeset good')),
746 ('b', 'bad', False, _('mark changeset bad')),
746 ('b', 'bad', False, _('mark changeset bad')),
747 ('s', 'skip', False, _('skip testing changeset')),
747 ('s', 'skip', False, _('skip testing changeset')),
748 ('e', 'extend', False, _('extend the bisect range')),
748 ('e', 'extend', False, _('extend the bisect range')),
749 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
749 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
750 ('U', 'noupdate', False, _('do not update to target'))],
750 ('U', 'noupdate', False, _('do not update to target'))],
751 _("[-gbsr] [-U] [-c CMD] [REV]"))
751 _("[-gbsr] [-U] [-c CMD] [REV]"))
752 def bisect(ui, repo, rev=None, extra=None, command=None,
752 def bisect(ui, repo, rev=None, extra=None, command=None,
753 reset=None, good=None, bad=None, skip=None, extend=None,
753 reset=None, good=None, bad=None, skip=None, extend=None,
754 noupdate=None):
754 noupdate=None):
755 """subdivision search of changesets
755 """subdivision search of changesets
756
756
757 This command helps to find changesets which introduce problems. To
757 This command helps to find changesets which introduce problems. To
758 use, mark the earliest changeset you know exhibits the problem as
758 use, mark the earliest changeset you know exhibits the problem as
759 bad, then mark the latest changeset which is free from the problem
759 bad, then mark the latest changeset which is free from the problem
760 as good. Bisect will update your working directory to a revision
760 as good. Bisect will update your working directory to a revision
761 for testing (unless the -U/--noupdate option is specified). Once
761 for testing (unless the -U/--noupdate option is specified). Once
762 you have performed tests, mark the working directory as good or
762 you have performed tests, mark the working directory as good or
763 bad, and bisect will either update to another candidate changeset
763 bad, and bisect will either update to another candidate changeset
764 or announce that it has found the bad revision.
764 or announce that it has found the bad revision.
765
765
766 As a shortcut, you can also use the revision argument to mark a
766 As a shortcut, you can also use the revision argument to mark a
767 revision as good or bad without checking it out first.
767 revision as good or bad without checking it out first.
768
768
769 If you supply a command, it will be used for automatic bisection.
769 If you supply a command, it will be used for automatic bisection.
770 The environment variable HG_NODE will contain the ID of the
770 The environment variable HG_NODE will contain the ID of the
771 changeset being tested. The exit status of the command will be
771 changeset being tested. The exit status of the command will be
772 used to mark revisions as good or bad: status 0 means good, 125
772 used to mark revisions as good or bad: status 0 means good, 125
773 means to skip the revision, 127 (command not found) will abort the
773 means to skip the revision, 127 (command not found) will abort the
774 bisection, and any other non-zero exit status means the revision
774 bisection, and any other non-zero exit status means the revision
775 is bad.
775 is bad.
776
776
777 .. container:: verbose
777 .. container:: verbose
778
778
779 Some examples:
779 Some examples:
780
780
781 - start a bisection with known bad revision 34, and good revision 12::
781 - start a bisection with known bad revision 34, and good revision 12::
782
782
783 hg bisect --bad 34
783 hg bisect --bad 34
784 hg bisect --good 12
784 hg bisect --good 12
785
785
786 - advance the current bisection by marking current revision as good or
786 - advance the current bisection by marking current revision as good or
787 bad::
787 bad::
788
788
789 hg bisect --good
789 hg bisect --good
790 hg bisect --bad
790 hg bisect --bad
791
791
792 - mark the current revision, or a known revision, to be skipped (e.g. if
792 - mark the current revision, or a known revision, to be skipped (e.g. if
793 that revision is not usable because of another issue)::
793 that revision is not usable because of another issue)::
794
794
795 hg bisect --skip
795 hg bisect --skip
796 hg bisect --skip 23
796 hg bisect --skip 23
797
797
798 - skip all revisions that do not touch directories ``foo`` or ``bar``::
798 - skip all revisions that do not touch directories ``foo`` or ``bar``::
799
799
800 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
800 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
801
801
802 - forget the current bisection::
802 - forget the current bisection::
803
803
804 hg bisect --reset
804 hg bisect --reset
805
805
806 - use 'make && make tests' to automatically find the first broken
806 - use 'make && make tests' to automatically find the first broken
807 revision::
807 revision::
808
808
809 hg bisect --reset
809 hg bisect --reset
810 hg bisect --bad 34
810 hg bisect --bad 34
811 hg bisect --good 12
811 hg bisect --good 12
812 hg bisect --command "make && make tests"
812 hg bisect --command "make && make tests"
813
813
814 - see all changesets whose states are already known in the current
814 - see all changesets whose states are already known in the current
815 bisection::
815 bisection::
816
816
817 hg log -r "bisect(pruned)"
817 hg log -r "bisect(pruned)"
818
818
819 - see the changeset currently being bisected (especially useful
819 - see the changeset currently being bisected (especially useful
820 if running with -U/--noupdate)::
820 if running with -U/--noupdate)::
821
821
822 hg log -r "bisect(current)"
822 hg log -r "bisect(current)"
823
823
824 - see all changesets that took part in the current bisection::
824 - see all changesets that took part in the current bisection::
825
825
826 hg log -r "bisect(range)"
826 hg log -r "bisect(range)"
827
827
828 - you can even get a nice graph::
828 - you can even get a nice graph::
829
829
830 hg log --graph -r "bisect(range)"
830 hg log --graph -r "bisect(range)"
831
831
832 See :hg:`help revsets` for more about the `bisect()` keyword.
832 See :hg:`help revsets` for more about the `bisect()` keyword.
833
833
834 Returns 0 on success.
834 Returns 0 on success.
835 """
835 """
836 def extendbisectrange(nodes, good):
836 def extendbisectrange(nodes, good):
837 # bisect is incomplete when it ends on a merge node and
837 # bisect is incomplete when it ends on a merge node and
838 # one of the parent was not checked.
838 # one of the parent was not checked.
839 parents = repo[nodes[0]].parents()
839 parents = repo[nodes[0]].parents()
840 if len(parents) > 1:
840 if len(parents) > 1:
841 if good:
841 if good:
842 side = state['bad']
842 side = state['bad']
843 else:
843 else:
844 side = state['good']
844 side = state['good']
845 num = len(set(i.node() for i in parents) & set(side))
845 num = len(set(i.node() for i in parents) & set(side))
846 if num == 1:
846 if num == 1:
847 return parents[0].ancestor(parents[1])
847 return parents[0].ancestor(parents[1])
848 return None
848 return None
849
849
850 def print_result(nodes, good):
850 def print_result(nodes, good):
851 displayer = cmdutil.show_changeset(ui, repo, {})
851 displayer = cmdutil.show_changeset(ui, repo, {})
852 if len(nodes) == 1:
852 if len(nodes) == 1:
853 # narrowed it down to a single revision
853 # narrowed it down to a single revision
854 if good:
854 if good:
855 ui.write(_("The first good revision is:\n"))
855 ui.write(_("The first good revision is:\n"))
856 else:
856 else:
857 ui.write(_("The first bad revision is:\n"))
857 ui.write(_("The first bad revision is:\n"))
858 displayer.show(repo[nodes[0]])
858 displayer.show(repo[nodes[0]])
859 extendnode = extendbisectrange(nodes, good)
859 extendnode = extendbisectrange(nodes, good)
860 if extendnode is not None:
860 if extendnode is not None:
861 ui.write(_('Not all ancestors of this changeset have been'
861 ui.write(_('Not all ancestors of this changeset have been'
862 ' checked.\nUse bisect --extend to continue the '
862 ' checked.\nUse bisect --extend to continue the '
863 'bisection from\nthe common ancestor, %s.\n')
863 'bisection from\nthe common ancestor, %s.\n')
864 % extendnode)
864 % extendnode)
865 else:
865 else:
866 # multiple possible revisions
866 # multiple possible revisions
867 if good:
867 if good:
868 ui.write(_("Due to skipped revisions, the first "
868 ui.write(_("Due to skipped revisions, the first "
869 "good revision could be any of:\n"))
869 "good revision could be any of:\n"))
870 else:
870 else:
871 ui.write(_("Due to skipped revisions, the first "
871 ui.write(_("Due to skipped revisions, the first "
872 "bad revision could be any of:\n"))
872 "bad revision could be any of:\n"))
873 for n in nodes:
873 for n in nodes:
874 displayer.show(repo[n])
874 displayer.show(repo[n])
875 displayer.close()
875 displayer.close()
876
876
877 def check_state(state, interactive=True):
877 def check_state(state, interactive=True):
878 if not state['good'] or not state['bad']:
878 if not state['good'] or not state['bad']:
879 if (good or bad or skip or reset) and interactive:
879 if (good or bad or skip or reset) and interactive:
880 return
880 return
881 if not state['good']:
881 if not state['good']:
882 raise error.Abort(_('cannot bisect (no known good revisions)'))
882 raise error.Abort(_('cannot bisect (no known good revisions)'))
883 else:
883 else:
884 raise error.Abort(_('cannot bisect (no known bad revisions)'))
884 raise error.Abort(_('cannot bisect (no known bad revisions)'))
885 return True
885 return True
886
886
887 # backward compatibility
887 # backward compatibility
888 if rev in "good bad reset init".split():
888 if rev in "good bad reset init".split():
889 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
889 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
890 cmd, rev, extra = rev, extra, None
890 cmd, rev, extra = rev, extra, None
891 if cmd == "good":
891 if cmd == "good":
892 good = True
892 good = True
893 elif cmd == "bad":
893 elif cmd == "bad":
894 bad = True
894 bad = True
895 else:
895 else:
896 reset = True
896 reset = True
897 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
897 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
898 raise error.Abort(_('incompatible arguments'))
898 raise error.Abort(_('incompatible arguments'))
899
899
900 cmdutil.checkunfinished(repo)
900 cmdutil.checkunfinished(repo)
901
901
902 if reset:
902 if reset:
903 p = repo.join("bisect.state")
903 p = repo.join("bisect.state")
904 if os.path.exists(p):
904 if os.path.exists(p):
905 os.unlink(p)
905 os.unlink(p)
906 return
906 return
907
907
908 state = hbisect.load_state(repo)
908 state = hbisect.load_state(repo)
909
909
910 if command:
910 if command:
911 changesets = 1
911 changesets = 1
912 if noupdate:
912 if noupdate:
913 try:
913 try:
914 node = state['current'][0]
914 node = state['current'][0]
915 except LookupError:
915 except LookupError:
916 raise error.Abort(_('current bisect revision is unknown - '
916 raise error.Abort(_('current bisect revision is unknown - '
917 'start a new bisect to fix'))
917 'start a new bisect to fix'))
918 else:
918 else:
919 node, p2 = repo.dirstate.parents()
919 node, p2 = repo.dirstate.parents()
920 if p2 != nullid:
920 if p2 != nullid:
921 raise error.Abort(_('current bisect revision is a merge'))
921 raise error.Abort(_('current bisect revision is a merge'))
922 try:
922 try:
923 while changesets:
923 while changesets:
924 # update state
924 # update state
925 state['current'] = [node]
925 state['current'] = [node]
926 hbisect.save_state(repo, state)
926 hbisect.save_state(repo, state)
927 status = ui.system(command, environ={'HG_NODE': hex(node)})
927 status = ui.system(command, environ={'HG_NODE': hex(node)})
928 if status == 125:
928 if status == 125:
929 transition = "skip"
929 transition = "skip"
930 elif status == 0:
930 elif status == 0:
931 transition = "good"
931 transition = "good"
932 # status < 0 means process was killed
932 # status < 0 means process was killed
933 elif status == 127:
933 elif status == 127:
934 raise error.Abort(_("failed to execute %s") % command)
934 raise error.Abort(_("failed to execute %s") % command)
935 elif status < 0:
935 elif status < 0:
936 raise error.Abort(_("%s killed") % command)
936 raise error.Abort(_("%s killed") % command)
937 else:
937 else:
938 transition = "bad"
938 transition = "bad"
939 ctx = scmutil.revsingle(repo, rev, node)
939 ctx = scmutil.revsingle(repo, rev, node)
940 rev = None # clear for future iterations
940 rev = None # clear for future iterations
941 state[transition].append(ctx.node())
941 state[transition].append(ctx.node())
942 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
942 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
943 check_state(state, interactive=False)
943 check_state(state, interactive=False)
944 # bisect
944 # bisect
945 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
945 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
946 # update to next check
946 # update to next check
947 node = nodes[0]
947 node = nodes[0]
948 if not noupdate:
948 if not noupdate:
949 cmdutil.bailifchanged(repo)
949 cmdutil.bailifchanged(repo)
950 hg.clean(repo, node, show_stats=False)
950 hg.clean(repo, node, show_stats=False)
951 finally:
951 finally:
952 state['current'] = [node]
952 state['current'] = [node]
953 hbisect.save_state(repo, state)
953 hbisect.save_state(repo, state)
954 print_result(nodes, bgood)
954 print_result(nodes, bgood)
955 return
955 return
956
956
957 # update state
957 # update state
958
958
959 if rev:
959 if rev:
960 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
960 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
961 else:
961 else:
962 nodes = [repo.lookup('.')]
962 nodes = [repo.lookup('.')]
963
963
964 if good or bad or skip:
964 if good or bad or skip:
965 if good:
965 if good:
966 state['good'] += nodes
966 state['good'] += nodes
967 elif bad:
967 elif bad:
968 state['bad'] += nodes
968 state['bad'] += nodes
969 elif skip:
969 elif skip:
970 state['skip'] += nodes
970 state['skip'] += nodes
971 hbisect.save_state(repo, state)
971 hbisect.save_state(repo, state)
972
972
973 if not check_state(state):
973 if not check_state(state):
974 return
974 return
975
975
976 # actually bisect
976 # actually bisect
977 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
977 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
978 if extend:
978 if extend:
979 if not changesets:
979 if not changesets:
980 extendnode = extendbisectrange(nodes, good)
980 extendnode = extendbisectrange(nodes, good)
981 if extendnode is not None:
981 if extendnode is not None:
982 ui.write(_("Extending search to changeset %d:%s\n")
982 ui.write(_("Extending search to changeset %d:%s\n")
983 % (extendnode.rev(), extendnode))
983 % (extendnode.rev(), extendnode))
984 state['current'] = [extendnode.node()]
984 state['current'] = [extendnode.node()]
985 hbisect.save_state(repo, state)
985 hbisect.save_state(repo, state)
986 if noupdate:
986 if noupdate:
987 return
987 return
988 cmdutil.bailifchanged(repo)
988 cmdutil.bailifchanged(repo)
989 return hg.clean(repo, extendnode.node())
989 return hg.clean(repo, extendnode.node())
990 raise error.Abort(_("nothing to extend"))
990 raise error.Abort(_("nothing to extend"))
991
991
992 if changesets == 0:
992 if changesets == 0:
993 print_result(nodes, good)
993 print_result(nodes, good)
994 else:
994 else:
995 assert len(nodes) == 1 # only a single node can be tested next
995 assert len(nodes) == 1 # only a single node can be tested next
996 node = nodes[0]
996 node = nodes[0]
997 # compute the approximate number of remaining tests
997 # compute the approximate number of remaining tests
998 tests, size = 0, 2
998 tests, size = 0, 2
999 while size <= changesets:
999 while size <= changesets:
1000 tests, size = tests + 1, size * 2
1000 tests, size = tests + 1, size * 2
1001 rev = repo.changelog.rev(node)
1001 rev = repo.changelog.rev(node)
1002 ui.write(_("Testing changeset %d:%s "
1002 ui.write(_("Testing changeset %d:%s "
1003 "(%d changesets remaining, ~%d tests)\n")
1003 "(%d changesets remaining, ~%d tests)\n")
1004 % (rev, short(node), changesets, tests))
1004 % (rev, short(node), changesets, tests))
1005 state['current'] = [node]
1005 state['current'] = [node]
1006 hbisect.save_state(repo, state)
1006 hbisect.save_state(repo, state)
1007 if not noupdate:
1007 if not noupdate:
1008 cmdutil.bailifchanged(repo)
1008 cmdutil.bailifchanged(repo)
1009 return hg.clean(repo, node)
1009 return hg.clean(repo, node)
1010
1010
1011 @command('bookmarks|bookmark',
1011 @command('bookmarks|bookmark',
1012 [('f', 'force', False, _('force')),
1012 [('f', 'force', False, _('force')),
1013 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1013 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1014 ('d', 'delete', False, _('delete a given bookmark')),
1014 ('d', 'delete', False, _('delete a given bookmark')),
1015 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1015 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1016 ('i', 'inactive', False, _('mark a bookmark inactive')),
1016 ('i', 'inactive', False, _('mark a bookmark inactive')),
1017 ] + formatteropts,
1017 ] + formatteropts,
1018 _('hg bookmarks [OPTIONS]... [NAME]...'))
1018 _('hg bookmarks [OPTIONS]... [NAME]...'))
1019 def bookmark(ui, repo, *names, **opts):
1019 def bookmark(ui, repo, *names, **opts):
1020 '''create a new bookmark or list existing bookmarks
1020 '''create a new bookmark or list existing bookmarks
1021
1021
1022 Bookmarks are labels on changesets to help track lines of development.
1022 Bookmarks are labels on changesets to help track lines of development.
1023 Bookmarks are unversioned and can be moved, renamed and deleted.
1023 Bookmarks are unversioned and can be moved, renamed and deleted.
1024 Deleting or moving a bookmark has no effect on the associated changesets.
1024 Deleting or moving a bookmark has no effect on the associated changesets.
1025
1025
1026 Creating or updating to a bookmark causes it to be marked as 'active'.
1026 Creating or updating to a bookmark causes it to be marked as 'active'.
1027 The active bookmark is indicated with a '*'.
1027 The active bookmark is indicated with a '*'.
1028 When a commit is made, the active bookmark will advance to the new commit.
1028 When a commit is made, the active bookmark will advance to the new commit.
1029 A plain :hg:`update` will also advance an active bookmark, if possible.
1029 A plain :hg:`update` will also advance an active bookmark, if possible.
1030 Updating away from a bookmark will cause it to be deactivated.
1030 Updating away from a bookmark will cause it to be deactivated.
1031
1031
1032 Bookmarks can be pushed and pulled between repositories (see
1032 Bookmarks can be pushed and pulled between repositories (see
1033 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1033 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1034 diverged, a new 'divergent bookmark' of the form 'name@path' will
1034 diverged, a new 'divergent bookmark' of the form 'name@path' will
1035 be created. Using :hg:`merge` will resolve the divergence.
1035 be created. Using :hg:`merge` will resolve the divergence.
1036
1036
1037 A bookmark named '@' has the special property that :hg:`clone` will
1037 A bookmark named '@' has the special property that :hg:`clone` will
1038 check it out by default if it exists.
1038 check it out by default if it exists.
1039
1039
1040 .. container:: verbose
1040 .. container:: verbose
1041
1041
1042 Examples:
1042 Examples:
1043
1043
1044 - create an active bookmark for a new line of development::
1044 - create an active bookmark for a new line of development::
1045
1045
1046 hg book new-feature
1046 hg book new-feature
1047
1047
1048 - create an inactive bookmark as a place marker::
1048 - create an inactive bookmark as a place marker::
1049
1049
1050 hg book -i reviewed
1050 hg book -i reviewed
1051
1051
1052 - create an inactive bookmark on another changeset::
1052 - create an inactive bookmark on another changeset::
1053
1053
1054 hg book -r .^ tested
1054 hg book -r .^ tested
1055
1055
1056 - rename bookmark turkey to dinner::
1056 - rename bookmark turkey to dinner::
1057
1057
1058 hg book -m turkey dinner
1058 hg book -m turkey dinner
1059
1059
1060 - move the '@' bookmark from another branch::
1060 - move the '@' bookmark from another branch::
1061
1061
1062 hg book -f @
1062 hg book -f @
1063 '''
1063 '''
1064 force = opts.get('force')
1064 force = opts.get('force')
1065 rev = opts.get('rev')
1065 rev = opts.get('rev')
1066 delete = opts.get('delete')
1066 delete = opts.get('delete')
1067 rename = opts.get('rename')
1067 rename = opts.get('rename')
1068 inactive = opts.get('inactive')
1068 inactive = opts.get('inactive')
1069
1069
1070 def checkformat(mark):
1070 def checkformat(mark):
1071 mark = mark.strip()
1071 mark = mark.strip()
1072 if not mark:
1072 if not mark:
1073 raise error.Abort(_("bookmark names cannot consist entirely of "
1073 raise error.Abort(_("bookmark names cannot consist entirely of "
1074 "whitespace"))
1074 "whitespace"))
1075 scmutil.checknewlabel(repo, mark, 'bookmark')
1075 scmutil.checknewlabel(repo, mark, 'bookmark')
1076 return mark
1076 return mark
1077
1077
1078 def checkconflict(repo, mark, cur, force=False, target=None):
1078 def checkconflict(repo, mark, cur, force=False, target=None):
1079 if mark in marks and not force:
1079 if mark in marks and not force:
1080 if target:
1080 if target:
1081 if marks[mark] == target and target == cur:
1081 if marks[mark] == target and target == cur:
1082 # re-activating a bookmark
1082 # re-activating a bookmark
1083 return
1083 return
1084 anc = repo.changelog.ancestors([repo[target].rev()])
1084 anc = repo.changelog.ancestors([repo[target].rev()])
1085 bmctx = repo[marks[mark]]
1085 bmctx = repo[marks[mark]]
1086 divs = [repo[b].node() for b in marks
1086 divs = [repo[b].node() for b in marks
1087 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1087 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1088
1088
1089 # allow resolving a single divergent bookmark even if moving
1089 # allow resolving a single divergent bookmark even if moving
1090 # the bookmark across branches when a revision is specified
1090 # the bookmark across branches when a revision is specified
1091 # that contains a divergent bookmark
1091 # that contains a divergent bookmark
1092 if bmctx.rev() not in anc and target in divs:
1092 if bmctx.rev() not in anc and target in divs:
1093 bookmarks.deletedivergent(repo, [target], mark)
1093 bookmarks.deletedivergent(repo, [target], mark)
1094 return
1094 return
1095
1095
1096 deletefrom = [b for b in divs
1096 deletefrom = [b for b in divs
1097 if repo[b].rev() in anc or b == target]
1097 if repo[b].rev() in anc or b == target]
1098 bookmarks.deletedivergent(repo, deletefrom, mark)
1098 bookmarks.deletedivergent(repo, deletefrom, mark)
1099 if bookmarks.validdest(repo, bmctx, repo[target]):
1099 if bookmarks.validdest(repo, bmctx, repo[target]):
1100 ui.status(_("moving bookmark '%s' forward from %s\n") %
1100 ui.status(_("moving bookmark '%s' forward from %s\n") %
1101 (mark, short(bmctx.node())))
1101 (mark, short(bmctx.node())))
1102 return
1102 return
1103 raise error.Abort(_("bookmark '%s' already exists "
1103 raise error.Abort(_("bookmark '%s' already exists "
1104 "(use -f to force)") % mark)
1104 "(use -f to force)") % mark)
1105 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1105 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1106 and not force):
1106 and not force):
1107 raise error.Abort(
1107 raise error.Abort(
1108 _("a bookmark cannot have the name of an existing branch"))
1108 _("a bookmark cannot have the name of an existing branch"))
1109
1109
1110 if delete and rename:
1110 if delete and rename:
1111 raise error.Abort(_("--delete and --rename are incompatible"))
1111 raise error.Abort(_("--delete and --rename are incompatible"))
1112 if delete and rev:
1112 if delete and rev:
1113 raise error.Abort(_("--rev is incompatible with --delete"))
1113 raise error.Abort(_("--rev is incompatible with --delete"))
1114 if rename and rev:
1114 if rename and rev:
1115 raise error.Abort(_("--rev is incompatible with --rename"))
1115 raise error.Abort(_("--rev is incompatible with --rename"))
1116 if not names and (delete or rev):
1116 if not names and (delete or rev):
1117 raise error.Abort(_("bookmark name required"))
1117 raise error.Abort(_("bookmark name required"))
1118
1118
1119 if delete or rename or names or inactive:
1119 if delete or rename or names or inactive:
1120 wlock = lock = tr = None
1120 wlock = lock = tr = None
1121 try:
1121 try:
1122 wlock = repo.wlock()
1122 wlock = repo.wlock()
1123 lock = repo.lock()
1123 lock = repo.lock()
1124 cur = repo.changectx('.').node()
1124 cur = repo.changectx('.').node()
1125 marks = repo._bookmarks
1125 marks = repo._bookmarks
1126 if delete:
1126 if delete:
1127 tr = repo.transaction('bookmark')
1127 tr = repo.transaction('bookmark')
1128 for mark in names:
1128 for mark in names:
1129 if mark not in marks:
1129 if mark not in marks:
1130 raise error.Abort(_("bookmark '%s' does not exist") %
1130 raise error.Abort(_("bookmark '%s' does not exist") %
1131 mark)
1131 mark)
1132 if mark == repo._activebookmark:
1132 if mark == repo._activebookmark:
1133 bookmarks.deactivate(repo)
1133 bookmarks.deactivate(repo)
1134 del marks[mark]
1134 del marks[mark]
1135
1135
1136 elif rename:
1136 elif rename:
1137 tr = repo.transaction('bookmark')
1137 tr = repo.transaction('bookmark')
1138 if not names:
1138 if not names:
1139 raise error.Abort(_("new bookmark name required"))
1139 raise error.Abort(_("new bookmark name required"))
1140 elif len(names) > 1:
1140 elif len(names) > 1:
1141 raise error.Abort(_("only one new bookmark name allowed"))
1141 raise error.Abort(_("only one new bookmark name allowed"))
1142 mark = checkformat(names[0])
1142 mark = checkformat(names[0])
1143 if rename not in marks:
1143 if rename not in marks:
1144 raise error.Abort(_("bookmark '%s' does not exist")
1144 raise error.Abort(_("bookmark '%s' does not exist")
1145 % rename)
1145 % rename)
1146 checkconflict(repo, mark, cur, force)
1146 checkconflict(repo, mark, cur, force)
1147 marks[mark] = marks[rename]
1147 marks[mark] = marks[rename]
1148 if repo._activebookmark == rename and not inactive:
1148 if repo._activebookmark == rename and not inactive:
1149 bookmarks.activate(repo, mark)
1149 bookmarks.activate(repo, mark)
1150 del marks[rename]
1150 del marks[rename]
1151 elif names:
1151 elif names:
1152 tr = repo.transaction('bookmark')
1152 tr = repo.transaction('bookmark')
1153 newact = None
1153 newact = None
1154 for mark in names:
1154 for mark in names:
1155 mark = checkformat(mark)
1155 mark = checkformat(mark)
1156 if newact is None:
1156 if newact is None:
1157 newact = mark
1157 newact = mark
1158 if inactive and mark == repo._activebookmark:
1158 if inactive and mark == repo._activebookmark:
1159 bookmarks.deactivate(repo)
1159 bookmarks.deactivate(repo)
1160 return
1160 return
1161 tgt = cur
1161 tgt = cur
1162 if rev:
1162 if rev:
1163 tgt = scmutil.revsingle(repo, rev).node()
1163 tgt = scmutil.revsingle(repo, rev).node()
1164 checkconflict(repo, mark, cur, force, tgt)
1164 checkconflict(repo, mark, cur, force, tgt)
1165 marks[mark] = tgt
1165 marks[mark] = tgt
1166 if not inactive and cur == marks[newact] and not rev:
1166 if not inactive and cur == marks[newact] and not rev:
1167 bookmarks.activate(repo, newact)
1167 bookmarks.activate(repo, newact)
1168 elif cur != tgt and newact == repo._activebookmark:
1168 elif cur != tgt and newact == repo._activebookmark:
1169 bookmarks.deactivate(repo)
1169 bookmarks.deactivate(repo)
1170 elif inactive:
1170 elif inactive:
1171 if len(marks) == 0:
1171 if len(marks) == 0:
1172 ui.status(_("no bookmarks set\n"))
1172 ui.status(_("no bookmarks set\n"))
1173 elif not repo._activebookmark:
1173 elif not repo._activebookmark:
1174 ui.status(_("no active bookmark\n"))
1174 ui.status(_("no active bookmark\n"))
1175 else:
1175 else:
1176 bookmarks.deactivate(repo)
1176 bookmarks.deactivate(repo)
1177 if tr is not None:
1177 if tr is not None:
1178 marks.recordchange(tr)
1178 marks.recordchange(tr)
1179 tr.close()
1179 tr.close()
1180 finally:
1180 finally:
1181 lockmod.release(tr, lock, wlock)
1181 lockmod.release(tr, lock, wlock)
1182 else: # show bookmarks
1182 else: # show bookmarks
1183 fm = ui.formatter('bookmarks', opts)
1183 fm = ui.formatter('bookmarks', opts)
1184 hexfn = fm.hexfunc
1184 hexfn = fm.hexfunc
1185 marks = repo._bookmarks
1185 marks = repo._bookmarks
1186 if len(marks) == 0 and not fm:
1186 if len(marks) == 0 and not fm:
1187 ui.status(_("no bookmarks set\n"))
1187 ui.status(_("no bookmarks set\n"))
1188 for bmark, n in sorted(marks.iteritems()):
1188 for bmark, n in sorted(marks.iteritems()):
1189 active = repo._activebookmark
1189 active = repo._activebookmark
1190 if bmark == active:
1190 if bmark == active:
1191 prefix, label = '*', activebookmarklabel
1191 prefix, label = '*', activebookmarklabel
1192 else:
1192 else:
1193 prefix, label = ' ', ''
1193 prefix, label = ' ', ''
1194
1194
1195 fm.startitem()
1195 fm.startitem()
1196 if not ui.quiet:
1196 if not ui.quiet:
1197 fm.plain(' %s ' % prefix, label=label)
1197 fm.plain(' %s ' % prefix, label=label)
1198 fm.write('bookmark', '%s', bmark, label=label)
1198 fm.write('bookmark', '%s', bmark, label=label)
1199 pad = " " * (25 - encoding.colwidth(bmark))
1199 pad = " " * (25 - encoding.colwidth(bmark))
1200 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1200 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1201 repo.changelog.rev(n), hexfn(n), label=label)
1201 repo.changelog.rev(n), hexfn(n), label=label)
1202 fm.data(active=(bmark == active))
1202 fm.data(active=(bmark == active))
1203 fm.plain('\n')
1203 fm.plain('\n')
1204 fm.end()
1204 fm.end()
1205
1205
1206 @command('branch',
1206 @command('branch',
1207 [('f', 'force', None,
1207 [('f', 'force', None,
1208 _('set branch name even if it shadows an existing branch')),
1208 _('set branch name even if it shadows an existing branch')),
1209 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1209 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1210 _('[-fC] [NAME]'))
1210 _('[-fC] [NAME]'))
1211 def branch(ui, repo, label=None, **opts):
1211 def branch(ui, repo, label=None, **opts):
1212 """set or show the current branch name
1212 """set or show the current branch name
1213
1213
1214 .. note::
1214 .. note::
1215
1215
1216 Branch names are permanent and global. Use :hg:`bookmark` to create a
1216 Branch names are permanent and global. Use :hg:`bookmark` to create a
1217 light-weight bookmark instead. See :hg:`help glossary` for more
1217 light-weight bookmark instead. See :hg:`help glossary` for more
1218 information about named branches and bookmarks.
1218 information about named branches and bookmarks.
1219
1219
1220 With no argument, show the current branch name. With one argument,
1220 With no argument, show the current branch name. With one argument,
1221 set the working directory branch name (the branch will not exist
1221 set the working directory branch name (the branch will not exist
1222 in the repository until the next commit). Standard practice
1222 in the repository until the next commit). Standard practice
1223 recommends that primary development take place on the 'default'
1223 recommends that primary development take place on the 'default'
1224 branch.
1224 branch.
1225
1225
1226 Unless -f/--force is specified, branch will not let you set a
1226 Unless -f/--force is specified, branch will not let you set a
1227 branch name that already exists.
1227 branch name that already exists.
1228
1228
1229 Use -C/--clean to reset the working directory branch to that of
1229 Use -C/--clean to reset the working directory branch to that of
1230 the parent of the working directory, negating a previous branch
1230 the parent of the working directory, negating a previous branch
1231 change.
1231 change.
1232
1232
1233 Use the command :hg:`update` to switch to an existing branch. Use
1233 Use the command :hg:`update` to switch to an existing branch. Use
1234 :hg:`commit --close-branch` to mark this branch head as closed.
1234 :hg:`commit --close-branch` to mark this branch head as closed.
1235 When all heads of a branch are closed, the branch will be
1235 When all heads of a branch are closed, the branch will be
1236 considered closed.
1236 considered closed.
1237
1237
1238 Returns 0 on success.
1238 Returns 0 on success.
1239 """
1239 """
1240 if label:
1240 if label:
1241 label = label.strip()
1241 label = label.strip()
1242
1242
1243 if not opts.get('clean') and not label:
1243 if not opts.get('clean') and not label:
1244 ui.write("%s\n" % repo.dirstate.branch())
1244 ui.write("%s\n" % repo.dirstate.branch())
1245 return
1245 return
1246
1246
1247 with repo.wlock():
1247 with repo.wlock():
1248 if opts.get('clean'):
1248 if opts.get('clean'):
1249 label = repo[None].p1().branch()
1249 label = repo[None].p1().branch()
1250 repo.dirstate.setbranch(label)
1250 repo.dirstate.setbranch(label)
1251 ui.status(_('reset working directory to branch %s\n') % label)
1251 ui.status(_('reset working directory to branch %s\n') % label)
1252 elif label:
1252 elif label:
1253 if not opts.get('force') and label in repo.branchmap():
1253 if not opts.get('force') and label in repo.branchmap():
1254 if label not in [p.branch() for p in repo[None].parents()]:
1254 if label not in [p.branch() for p in repo[None].parents()]:
1255 raise error.Abort(_('a branch of the same name already'
1255 raise error.Abort(_('a branch of the same name already'
1256 ' exists'),
1256 ' exists'),
1257 # i18n: "it" refers to an existing branch
1257 # i18n: "it" refers to an existing branch
1258 hint=_("use 'hg update' to switch to it"))
1258 hint=_("use 'hg update' to switch to it"))
1259 scmutil.checknewlabel(repo, label, 'branch')
1259 scmutil.checknewlabel(repo, label, 'branch')
1260 repo.dirstate.setbranch(label)
1260 repo.dirstate.setbranch(label)
1261 ui.status(_('marked working directory as branch %s\n') % label)
1261 ui.status(_('marked working directory as branch %s\n') % label)
1262
1262
1263 # find any open named branches aside from default
1263 # find any open named branches aside from default
1264 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1264 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1265 if n != "default" and not c]
1265 if n != "default" and not c]
1266 if not others:
1266 if not others:
1267 ui.status(_('(branches are permanent and global, '
1267 ui.status(_('(branches are permanent and global, '
1268 'did you want a bookmark?)\n'))
1268 'did you want a bookmark?)\n'))
1269
1269
1270 @command('branches',
1270 @command('branches',
1271 [('a', 'active', False,
1271 [('a', 'active', False,
1272 _('show only branches that have unmerged heads (DEPRECATED)')),
1272 _('show only branches that have unmerged heads (DEPRECATED)')),
1273 ('c', 'closed', False, _('show normal and closed branches')),
1273 ('c', 'closed', False, _('show normal and closed branches')),
1274 ] + formatteropts,
1274 ] + formatteropts,
1275 _('[-c]'))
1275 _('[-c]'))
1276 def branches(ui, repo, active=False, closed=False, **opts):
1276 def branches(ui, repo, active=False, closed=False, **opts):
1277 """list repository named branches
1277 """list repository named branches
1278
1278
1279 List the repository's named branches, indicating which ones are
1279 List the repository's named branches, indicating which ones are
1280 inactive. If -c/--closed is specified, also list branches which have
1280 inactive. If -c/--closed is specified, also list branches which have
1281 been marked closed (see :hg:`commit --close-branch`).
1281 been marked closed (see :hg:`commit --close-branch`).
1282
1282
1283 Use the command :hg:`update` to switch to an existing branch.
1283 Use the command :hg:`update` to switch to an existing branch.
1284
1284
1285 Returns 0.
1285 Returns 0.
1286 """
1286 """
1287
1287
1288 fm = ui.formatter('branches', opts)
1288 fm = ui.formatter('branches', opts)
1289 hexfunc = fm.hexfunc
1289 hexfunc = fm.hexfunc
1290
1290
1291 allheads = set(repo.heads())
1291 allheads = set(repo.heads())
1292 branches = []
1292 branches = []
1293 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1293 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1294 isactive = not isclosed and bool(set(heads) & allheads)
1294 isactive = not isclosed and bool(set(heads) & allheads)
1295 branches.append((tag, repo[tip], isactive, not isclosed))
1295 branches.append((tag, repo[tip], isactive, not isclosed))
1296 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1296 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1297 reverse=True)
1297 reverse=True)
1298
1298
1299 for tag, ctx, isactive, isopen in branches:
1299 for tag, ctx, isactive, isopen in branches:
1300 if active and not isactive:
1300 if active and not isactive:
1301 continue
1301 continue
1302 if isactive:
1302 if isactive:
1303 label = 'branches.active'
1303 label = 'branches.active'
1304 notice = ''
1304 notice = ''
1305 elif not isopen:
1305 elif not isopen:
1306 if not closed:
1306 if not closed:
1307 continue
1307 continue
1308 label = 'branches.closed'
1308 label = 'branches.closed'
1309 notice = _(' (closed)')
1309 notice = _(' (closed)')
1310 else:
1310 else:
1311 label = 'branches.inactive'
1311 label = 'branches.inactive'
1312 notice = _(' (inactive)')
1312 notice = _(' (inactive)')
1313 current = (tag == repo.dirstate.branch())
1313 current = (tag == repo.dirstate.branch())
1314 if current:
1314 if current:
1315 label = 'branches.current'
1315 label = 'branches.current'
1316
1316
1317 fm.startitem()
1317 fm.startitem()
1318 fm.write('branch', '%s', tag, label=label)
1318 fm.write('branch', '%s', tag, label=label)
1319 rev = ctx.rev()
1319 rev = ctx.rev()
1320 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1320 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1321 fmt = ' ' * padsize + ' %d:%s'
1321 fmt = ' ' * padsize + ' %d:%s'
1322 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1322 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1323 label='log.changeset changeset.%s' % ctx.phasestr())
1323 label='log.changeset changeset.%s' % ctx.phasestr())
1324 fm.data(active=isactive, closed=not isopen, current=current)
1324 fm.data(active=isactive, closed=not isopen, current=current)
1325 if not ui.quiet:
1325 if not ui.quiet:
1326 fm.plain(notice)
1326 fm.plain(notice)
1327 fm.plain('\n')
1327 fm.plain('\n')
1328 fm.end()
1328 fm.end()
1329
1329
1330 @command('bundle',
1330 @command('bundle',
1331 [('f', 'force', None, _('run even when the destination is unrelated')),
1331 [('f', 'force', None, _('run even when the destination is unrelated')),
1332 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1332 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1333 _('REV')),
1333 _('REV')),
1334 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1334 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1335 _('BRANCH')),
1335 _('BRANCH')),
1336 ('', 'base', [],
1336 ('', 'base', [],
1337 _('a base changeset assumed to be available at the destination'),
1337 _('a base changeset assumed to be available at the destination'),
1338 _('REV')),
1338 _('REV')),
1339 ('a', 'all', None, _('bundle all changesets in the repository')),
1339 ('a', 'all', None, _('bundle all changesets in the repository')),
1340 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1340 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1341 ] + remoteopts,
1341 ] + remoteopts,
1342 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1342 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1343 def bundle(ui, repo, fname, dest=None, **opts):
1343 def bundle(ui, repo, fname, dest=None, **opts):
1344 """create a changegroup file
1344 """create a changegroup file
1345
1345
1346 Generate a changegroup file collecting changesets to be added
1346 Generate a changegroup file collecting changesets to be added
1347 to a repository.
1347 to a repository.
1348
1348
1349 To create a bundle containing all changesets, use -a/--all
1349 To create a bundle containing all changesets, use -a/--all
1350 (or --base null). Otherwise, hg assumes the destination will have
1350 (or --base null). Otherwise, hg assumes the destination will have
1351 all the nodes you specify with --base parameters. Otherwise, hg
1351 all the nodes you specify with --base parameters. Otherwise, hg
1352 will assume the repository has all the nodes in destination, or
1352 will assume the repository has all the nodes in destination, or
1353 default-push/default if no destination is specified.
1353 default-push/default if no destination is specified.
1354
1354
1355 You can change bundle format with the -t/--type option. You can
1355 You can change bundle format with the -t/--type option. You can
1356 specify a compression, a bundle version or both using a dash
1356 specify a compression, a bundle version or both using a dash
1357 (comp-version). The available compression methods are: none, bzip2,
1357 (comp-version). The available compression methods are: none, bzip2,
1358 and gzip (by default, bundles are compressed using bzip2). The
1358 and gzip (by default, bundles are compressed using bzip2). The
1359 available formats are: v1, v2 (default to most suitable).
1359 available formats are: v1, v2 (default to most suitable).
1360
1360
1361 The bundle file can then be transferred using conventional means
1361 The bundle file can then be transferred using conventional means
1362 and applied to another repository with the unbundle or pull
1362 and applied to another repository with the unbundle or pull
1363 command. This is useful when direct push and pull are not
1363 command. This is useful when direct push and pull are not
1364 available or when exporting an entire repository is undesirable.
1364 available or when exporting an entire repository is undesirable.
1365
1365
1366 Applying bundles preserves all changeset contents including
1366 Applying bundles preserves all changeset contents including
1367 permissions, copy/rename information, and revision history.
1367 permissions, copy/rename information, and revision history.
1368
1368
1369 Returns 0 on success, 1 if no changes found.
1369 Returns 0 on success, 1 if no changes found.
1370 """
1370 """
1371 revs = None
1371 revs = None
1372 if 'rev' in opts:
1372 if 'rev' in opts:
1373 revstrings = opts['rev']
1373 revstrings = opts['rev']
1374 revs = scmutil.revrange(repo, revstrings)
1374 revs = scmutil.revrange(repo, revstrings)
1375 if revstrings and not revs:
1375 if revstrings and not revs:
1376 raise error.Abort(_('no commits to bundle'))
1376 raise error.Abort(_('no commits to bundle'))
1377
1377
1378 bundletype = opts.get('type', 'bzip2').lower()
1378 bundletype = opts.get('type', 'bzip2').lower()
1379 try:
1379 try:
1380 bcompression, cgversion, params = exchange.parsebundlespec(
1380 bcompression, cgversion, params = exchange.parsebundlespec(
1381 repo, bundletype, strict=False)
1381 repo, bundletype, strict=False)
1382 except error.UnsupportedBundleSpecification as e:
1382 except error.UnsupportedBundleSpecification as e:
1383 raise error.Abort(str(e),
1383 raise error.Abort(str(e),
1384 hint=_('see "hg help bundle" for supported '
1384 hint=_('see "hg help bundle" for supported '
1385 'values for --type'))
1385 'values for --type'))
1386
1386
1387 # Packed bundles are a pseudo bundle format for now.
1387 # Packed bundles are a pseudo bundle format for now.
1388 if cgversion == 's1':
1388 if cgversion == 's1':
1389 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1389 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1390 hint=_("use 'hg debugcreatestreamclonebundle'"))
1390 hint=_("use 'hg debugcreatestreamclonebundle'"))
1391
1391
1392 if opts.get('all'):
1392 if opts.get('all'):
1393 if dest:
1393 if dest:
1394 raise error.Abort(_("--all is incompatible with specifying "
1394 raise error.Abort(_("--all is incompatible with specifying "
1395 "a destination"))
1395 "a destination"))
1396 if opts.get('base'):
1396 if opts.get('base'):
1397 ui.warn(_("ignoring --base because --all was specified\n"))
1397 ui.warn(_("ignoring --base because --all was specified\n"))
1398 base = ['null']
1398 base = ['null']
1399 else:
1399 else:
1400 base = scmutil.revrange(repo, opts.get('base'))
1400 base = scmutil.revrange(repo, opts.get('base'))
1401 # TODO: get desired bundlecaps from command line.
1401 # TODO: get desired bundlecaps from command line.
1402 bundlecaps = None
1402 bundlecaps = None
1403 if cgversion not in changegroup.supportedoutgoingversions(repo):
1403 if cgversion not in changegroup.supportedoutgoingversions(repo):
1404 raise error.Abort(_("repository does not support bundle version %s") %
1404 raise error.Abort(_("repository does not support bundle version %s") %
1405 cgversion)
1405 cgversion)
1406
1406
1407 if base:
1407 if base:
1408 if dest:
1408 if dest:
1409 raise error.Abort(_("--base is incompatible with specifying "
1409 raise error.Abort(_("--base is incompatible with specifying "
1410 "a destination"))
1410 "a destination"))
1411 common = [repo.lookup(rev) for rev in base]
1411 common = [repo.lookup(rev) for rev in base]
1412 heads = revs and map(repo.lookup, revs) or revs
1412 heads = revs and map(repo.lookup, revs) or revs
1413 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1413 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1414 common=common, bundlecaps=bundlecaps,
1414 common=common, bundlecaps=bundlecaps,
1415 version=cgversion)
1415 version=cgversion)
1416 outgoing = None
1416 outgoing = None
1417 else:
1417 else:
1418 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1418 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1419 dest, branches = hg.parseurl(dest, opts.get('branch'))
1419 dest, branches = hg.parseurl(dest, opts.get('branch'))
1420 other = hg.peer(repo, opts, dest)
1420 other = hg.peer(repo, opts, dest)
1421 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1421 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1422 heads = revs and map(repo.lookup, revs) or revs
1422 heads = revs and map(repo.lookup, revs) or revs
1423 outgoing = discovery.findcommonoutgoing(repo, other,
1423 outgoing = discovery.findcommonoutgoing(repo, other,
1424 onlyheads=heads,
1424 onlyheads=heads,
1425 force=opts.get('force'),
1425 force=opts.get('force'),
1426 portable=True)
1426 portable=True)
1427 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1427 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1428 bundlecaps, version=cgversion)
1428 bundlecaps, version=cgversion)
1429 if not cg:
1429 if not cg:
1430 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1430 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1431 return 1
1431 return 1
1432
1432
1433 if cgversion == '01': #bundle1
1433 if cgversion == '01': #bundle1
1434 if bcompression is None:
1434 if bcompression is None:
1435 bcompression = 'UN'
1435 bcompression = 'UN'
1436 bversion = 'HG10' + bcompression
1436 bversion = 'HG10' + bcompression
1437 bcompression = None
1437 bcompression = None
1438 else:
1438 else:
1439 assert cgversion == '02'
1439 assert cgversion == '02'
1440 bversion = 'HG20'
1440 bversion = 'HG20'
1441
1441
1442 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1442 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1443
1443
1444 @command('cat',
1444 @command('cat',
1445 [('o', 'output', '',
1445 [('o', 'output', '',
1446 _('print output to file with formatted name'), _('FORMAT')),
1446 _('print output to file with formatted name'), _('FORMAT')),
1447 ('r', 'rev', '', _('print the given revision'), _('REV')),
1447 ('r', 'rev', '', _('print the given revision'), _('REV')),
1448 ('', 'decode', None, _('apply any matching decode filter')),
1448 ('', 'decode', None, _('apply any matching decode filter')),
1449 ] + walkopts,
1449 ] + walkopts,
1450 _('[OPTION]... FILE...'),
1450 _('[OPTION]... FILE...'),
1451 inferrepo=True)
1451 inferrepo=True)
1452 def cat(ui, repo, file1, *pats, **opts):
1452 def cat(ui, repo, file1, *pats, **opts):
1453 """output the current or given revision of files
1453 """output the current or given revision of files
1454
1454
1455 Print the specified files as they were at the given revision. If
1455 Print the specified files as they were at the given revision. If
1456 no revision is given, the parent of the working directory is used.
1456 no revision is given, the parent of the working directory is used.
1457
1457
1458 Output may be to a file, in which case the name of the file is
1458 Output may be to a file, in which case the name of the file is
1459 given using a format string. The formatting rules as follows:
1459 given using a format string. The formatting rules as follows:
1460
1460
1461 :``%%``: literal "%" character
1461 :``%%``: literal "%" character
1462 :``%s``: basename of file being printed
1462 :``%s``: basename of file being printed
1463 :``%d``: dirname of file being printed, or '.' if in repository root
1463 :``%d``: dirname of file being printed, or '.' if in repository root
1464 :``%p``: root-relative path name of file being printed
1464 :``%p``: root-relative path name of file being printed
1465 :``%H``: changeset hash (40 hexadecimal digits)
1465 :``%H``: changeset hash (40 hexadecimal digits)
1466 :``%R``: changeset revision number
1466 :``%R``: changeset revision number
1467 :``%h``: short-form changeset hash (12 hexadecimal digits)
1467 :``%h``: short-form changeset hash (12 hexadecimal digits)
1468 :``%r``: zero-padded changeset revision number
1468 :``%r``: zero-padded changeset revision number
1469 :``%b``: basename of the exporting repository
1469 :``%b``: basename of the exporting repository
1470
1470
1471 Returns 0 on success.
1471 Returns 0 on success.
1472 """
1472 """
1473 ctx = scmutil.revsingle(repo, opts.get('rev'))
1473 ctx = scmutil.revsingle(repo, opts.get('rev'))
1474 m = scmutil.match(ctx, (file1,) + pats, opts)
1474 m = scmutil.match(ctx, (file1,) + pats, opts)
1475
1475
1476 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1476 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1477
1477
1478 @command('^clone',
1478 @command('^clone',
1479 [('U', 'noupdate', None, _('the clone will include an empty working '
1479 [('U', 'noupdate', None, _('the clone will include an empty working '
1480 'directory (only a repository)')),
1480 'directory (only a repository)')),
1481 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1481 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1482 _('REV')),
1482 _('REV')),
1483 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1483 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1484 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1484 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1485 ('', 'pull', None, _('use pull protocol to copy metadata')),
1485 ('', 'pull', None, _('use pull protocol to copy metadata')),
1486 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1486 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1487 ] + remoteopts,
1487 ] + remoteopts,
1488 _('[OPTION]... SOURCE [DEST]'),
1488 _('[OPTION]... SOURCE [DEST]'),
1489 norepo=True)
1489 norepo=True)
1490 def clone(ui, source, dest=None, **opts):
1490 def clone(ui, source, dest=None, **opts):
1491 """make a copy of an existing repository
1491 """make a copy of an existing repository
1492
1492
1493 Create a copy of an existing repository in a new directory.
1493 Create a copy of an existing repository in a new directory.
1494
1494
1495 If no destination directory name is specified, it defaults to the
1495 If no destination directory name is specified, it defaults to the
1496 basename of the source.
1496 basename of the source.
1497
1497
1498 The location of the source is added to the new repository's
1498 The location of the source is added to the new repository's
1499 ``.hg/hgrc`` file, as the default to be used for future pulls.
1499 ``.hg/hgrc`` file, as the default to be used for future pulls.
1500
1500
1501 Only local paths and ``ssh://`` URLs are supported as
1501 Only local paths and ``ssh://`` URLs are supported as
1502 destinations. For ``ssh://`` destinations, no working directory or
1502 destinations. For ``ssh://`` destinations, no working directory or
1503 ``.hg/hgrc`` will be created on the remote side.
1503 ``.hg/hgrc`` will be created on the remote side.
1504
1504
1505 If the source repository has a bookmark called '@' set, that
1505 If the source repository has a bookmark called '@' set, that
1506 revision will be checked out in the new repository by default.
1506 revision will be checked out in the new repository by default.
1507
1507
1508 To check out a particular version, use -u/--update, or
1508 To check out a particular version, use -u/--update, or
1509 -U/--noupdate to create a clone with no working directory.
1509 -U/--noupdate to create a clone with no working directory.
1510
1510
1511 To pull only a subset of changesets, specify one or more revisions
1511 To pull only a subset of changesets, specify one or more revisions
1512 identifiers with -r/--rev or branches with -b/--branch. The
1512 identifiers with -r/--rev or branches with -b/--branch. The
1513 resulting clone will contain only the specified changesets and
1513 resulting clone will contain only the specified changesets and
1514 their ancestors. These options (or 'clone src#rev dest') imply
1514 their ancestors. These options (or 'clone src#rev dest') imply
1515 --pull, even for local source repositories.
1515 --pull, even for local source repositories.
1516
1516
1517 .. note::
1517 .. note::
1518
1518
1519 Specifying a tag will include the tagged changeset but not the
1519 Specifying a tag will include the tagged changeset but not the
1520 changeset containing the tag.
1520 changeset containing the tag.
1521
1521
1522 .. container:: verbose
1522 .. container:: verbose
1523
1523
1524 For efficiency, hardlinks are used for cloning whenever the
1524 For efficiency, hardlinks are used for cloning whenever the
1525 source and destination are on the same filesystem (note this
1525 source and destination are on the same filesystem (note this
1526 applies only to the repository data, not to the working
1526 applies only to the repository data, not to the working
1527 directory). Some filesystems, such as AFS, implement hardlinking
1527 directory). Some filesystems, such as AFS, implement hardlinking
1528 incorrectly, but do not report errors. In these cases, use the
1528 incorrectly, but do not report errors. In these cases, use the
1529 --pull option to avoid hardlinking.
1529 --pull option to avoid hardlinking.
1530
1530
1531 In some cases, you can clone repositories and the working
1531 In some cases, you can clone repositories and the working
1532 directory using full hardlinks with ::
1532 directory using full hardlinks with ::
1533
1533
1534 $ cp -al REPO REPOCLONE
1534 $ cp -al REPO REPOCLONE
1535
1535
1536 This is the fastest way to clone, but it is not always safe. The
1536 This is the fastest way to clone, but it is not always safe. The
1537 operation is not atomic (making sure REPO is not modified during
1537 operation is not atomic (making sure REPO is not modified during
1538 the operation is up to you) and you have to make sure your
1538 the operation is up to you) and you have to make sure your
1539 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1539 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1540 so). Also, this is not compatible with certain extensions that
1540 so). Also, this is not compatible with certain extensions that
1541 place their metadata under the .hg directory, such as mq.
1541 place their metadata under the .hg directory, such as mq.
1542
1542
1543 Mercurial will update the working directory to the first applicable
1543 Mercurial will update the working directory to the first applicable
1544 revision from this list:
1544 revision from this list:
1545
1545
1546 a) null if -U or the source repository has no changesets
1546 a) null if -U or the source repository has no changesets
1547 b) if -u . and the source repository is local, the first parent of
1547 b) if -u . and the source repository is local, the first parent of
1548 the source repository's working directory
1548 the source repository's working directory
1549 c) the changeset specified with -u (if a branch name, this means the
1549 c) the changeset specified with -u (if a branch name, this means the
1550 latest head of that branch)
1550 latest head of that branch)
1551 d) the changeset specified with -r
1551 d) the changeset specified with -r
1552 e) the tipmost head specified with -b
1552 e) the tipmost head specified with -b
1553 f) the tipmost head specified with the url#branch source syntax
1553 f) the tipmost head specified with the url#branch source syntax
1554 g) the revision marked with the '@' bookmark, if present
1554 g) the revision marked with the '@' bookmark, if present
1555 h) the tipmost head of the default branch
1555 h) the tipmost head of the default branch
1556 i) tip
1556 i) tip
1557
1557
1558 When cloning from servers that support it, Mercurial may fetch
1558 When cloning from servers that support it, Mercurial may fetch
1559 pre-generated data from a server-advertised URL. When this is done,
1559 pre-generated data from a server-advertised URL. When this is done,
1560 hooks operating on incoming changesets and changegroups may fire twice,
1560 hooks operating on incoming changesets and changegroups may fire twice,
1561 once for the bundle fetched from the URL and another for any additional
1561 once for the bundle fetched from the URL and another for any additional
1562 data not fetched from this URL. In addition, if an error occurs, the
1562 data not fetched from this URL. In addition, if an error occurs, the
1563 repository may be rolled back to a partial clone. This behavior may
1563 repository may be rolled back to a partial clone. This behavior may
1564 change in future releases. See :hg:`help -e clonebundles` for more.
1564 change in future releases. See :hg:`help -e clonebundles` for more.
1565
1565
1566 Examples:
1566 Examples:
1567
1567
1568 - clone a remote repository to a new directory named hg/::
1568 - clone a remote repository to a new directory named hg/::
1569
1569
1570 hg clone http://selenic.com/hg
1570 hg clone http://selenic.com/hg
1571
1571
1572 - create a lightweight local clone::
1572 - create a lightweight local clone::
1573
1573
1574 hg clone project/ project-feature/
1574 hg clone project/ project-feature/
1575
1575
1576 - clone from an absolute path on an ssh server (note double-slash)::
1576 - clone from an absolute path on an ssh server (note double-slash)::
1577
1577
1578 hg clone ssh://user@server//home/projects/alpha/
1578 hg clone ssh://user@server//home/projects/alpha/
1579
1579
1580 - do a high-speed clone over a LAN while checking out a
1580 - do a high-speed clone over a LAN while checking out a
1581 specified version::
1581 specified version::
1582
1582
1583 hg clone --uncompressed http://server/repo -u 1.5
1583 hg clone --uncompressed http://server/repo -u 1.5
1584
1584
1585 - create a repository without changesets after a particular revision::
1585 - create a repository without changesets after a particular revision::
1586
1586
1587 hg clone -r 04e544 experimental/ good/
1587 hg clone -r 04e544 experimental/ good/
1588
1588
1589 - clone (and track) a particular named branch::
1589 - clone (and track) a particular named branch::
1590
1590
1591 hg clone http://selenic.com/hg#stable
1591 hg clone http://selenic.com/hg#stable
1592
1592
1593 See :hg:`help urls` for details on specifying URLs.
1593 See :hg:`help urls` for details on specifying URLs.
1594
1594
1595 Returns 0 on success.
1595 Returns 0 on success.
1596 """
1596 """
1597 if opts.get('noupdate') and opts.get('updaterev'):
1597 if opts.get('noupdate') and opts.get('updaterev'):
1598 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1598 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1599
1599
1600 r = hg.clone(ui, opts, source, dest,
1600 r = hg.clone(ui, opts, source, dest,
1601 pull=opts.get('pull'),
1601 pull=opts.get('pull'),
1602 stream=opts.get('uncompressed'),
1602 stream=opts.get('uncompressed'),
1603 rev=opts.get('rev'),
1603 rev=opts.get('rev'),
1604 update=opts.get('updaterev') or not opts.get('noupdate'),
1604 update=opts.get('updaterev') or not opts.get('noupdate'),
1605 branch=opts.get('branch'),
1605 branch=opts.get('branch'),
1606 shareopts=opts.get('shareopts'))
1606 shareopts=opts.get('shareopts'))
1607
1607
1608 return r is None
1608 return r is None
1609
1609
1610 @command('^commit|ci',
1610 @command('^commit|ci',
1611 [('A', 'addremove', None,
1611 [('A', 'addremove', None,
1612 _('mark new/missing files as added/removed before committing')),
1612 _('mark new/missing files as added/removed before committing')),
1613 ('', 'close-branch', None,
1613 ('', 'close-branch', None,
1614 _('mark a branch head as closed')),
1614 _('mark a branch head as closed')),
1615 ('', 'amend', None, _('amend the parent of the working directory')),
1615 ('', 'amend', None, _('amend the parent of the working directory')),
1616 ('s', 'secret', None, _('use the secret phase for committing')),
1616 ('s', 'secret', None, _('use the secret phase for committing')),
1617 ('e', 'edit', None, _('invoke editor on commit messages')),
1617 ('e', 'edit', None, _('invoke editor on commit messages')),
1618 ('i', 'interactive', None, _('use interactive mode')),
1618 ('i', 'interactive', None, _('use interactive mode')),
1619 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1619 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1620 _('[OPTION]... [FILE]...'),
1620 _('[OPTION]... [FILE]...'),
1621 inferrepo=True)
1621 inferrepo=True)
1622 def commit(ui, repo, *pats, **opts):
1622 def commit(ui, repo, *pats, **opts):
1623 """commit the specified files or all outstanding changes
1623 """commit the specified files or all outstanding changes
1624
1624
1625 Commit changes to the given files into the repository. Unlike a
1625 Commit changes to the given files into the repository. Unlike a
1626 centralized SCM, this operation is a local operation. See
1626 centralized SCM, this operation is a local operation. See
1627 :hg:`push` for a way to actively distribute your changes.
1627 :hg:`push` for a way to actively distribute your changes.
1628
1628
1629 If a list of files is omitted, all changes reported by :hg:`status`
1629 If a list of files is omitted, all changes reported by :hg:`status`
1630 will be committed.
1630 will be committed.
1631
1631
1632 If you are committing the result of a merge, do not provide any
1632 If you are committing the result of a merge, do not provide any
1633 filenames or -I/-X filters.
1633 filenames or -I/-X filters.
1634
1634
1635 If no commit message is specified, Mercurial starts your
1635 If no commit message is specified, Mercurial starts your
1636 configured editor where you can enter a message. In case your
1636 configured editor where you can enter a message. In case your
1637 commit fails, you will find a backup of your message in
1637 commit fails, you will find a backup of your message in
1638 ``.hg/last-message.txt``.
1638 ``.hg/last-message.txt``.
1639
1639
1640 The --close-branch flag can be used to mark the current branch
1640 The --close-branch flag can be used to mark the current branch
1641 head closed. When all heads of a branch are closed, the branch
1641 head closed. When all heads of a branch are closed, the branch
1642 will be considered closed and no longer listed.
1642 will be considered closed and no longer listed.
1643
1643
1644 The --amend flag can be used to amend the parent of the
1644 The --amend flag can be used to amend the parent of the
1645 working directory with a new commit that contains the changes
1645 working directory with a new commit that contains the changes
1646 in the parent in addition to those currently reported by :hg:`status`,
1646 in the parent in addition to those currently reported by :hg:`status`,
1647 if there are any. The old commit is stored in a backup bundle in
1647 if there are any. The old commit is stored in a backup bundle in
1648 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1648 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1649 on how to restore it).
1649 on how to restore it).
1650
1650
1651 Message, user and date are taken from the amended commit unless
1651 Message, user and date are taken from the amended commit unless
1652 specified. When a message isn't specified on the command line,
1652 specified. When a message isn't specified on the command line,
1653 the editor will open with the message of the amended commit.
1653 the editor will open with the message of the amended commit.
1654
1654
1655 It is not possible to amend public changesets (see :hg:`help phases`)
1655 It is not possible to amend public changesets (see :hg:`help phases`)
1656 or changesets that have children.
1656 or changesets that have children.
1657
1657
1658 See :hg:`help dates` for a list of formats valid for -d/--date.
1658 See :hg:`help dates` for a list of formats valid for -d/--date.
1659
1659
1660 Returns 0 on success, 1 if nothing changed.
1660 Returns 0 on success, 1 if nothing changed.
1661
1661
1662 .. container:: verbose
1662 .. container:: verbose
1663
1663
1664 Examples:
1664 Examples:
1665
1665
1666 - commit all files ending in .py::
1666 - commit all files ending in .py::
1667
1667
1668 hg commit --include "set:**.py"
1668 hg commit --include "set:**.py"
1669
1669
1670 - commit all non-binary files::
1670 - commit all non-binary files::
1671
1671
1672 hg commit --exclude "set:binary()"
1672 hg commit --exclude "set:binary()"
1673
1673
1674 - amend the current commit and set the date to now::
1674 - amend the current commit and set the date to now::
1675
1675
1676 hg commit --amend --date now
1676 hg commit --amend --date now
1677 """
1677 """
1678 wlock = lock = None
1678 wlock = lock = None
1679 try:
1679 try:
1680 wlock = repo.wlock()
1680 wlock = repo.wlock()
1681 lock = repo.lock()
1681 lock = repo.lock()
1682 return _docommit(ui, repo, *pats, **opts)
1682 return _docommit(ui, repo, *pats, **opts)
1683 finally:
1683 finally:
1684 release(lock, wlock)
1684 release(lock, wlock)
1685
1685
1686 def _docommit(ui, repo, *pats, **opts):
1686 def _docommit(ui, repo, *pats, **opts):
1687 if opts.get('interactive'):
1687 if opts.get('interactive'):
1688 opts.pop('interactive')
1688 opts.pop('interactive')
1689 cmdutil.dorecord(ui, repo, commit, None, False,
1689 cmdutil.dorecord(ui, repo, commit, None, False,
1690 cmdutil.recordfilter, *pats, **opts)
1690 cmdutil.recordfilter, *pats, **opts)
1691 return
1691 return
1692
1692
1693 if opts.get('subrepos'):
1693 if opts.get('subrepos'):
1694 if opts.get('amend'):
1694 if opts.get('amend'):
1695 raise error.Abort(_('cannot amend with --subrepos'))
1695 raise error.Abort(_('cannot amend with --subrepos'))
1696 # Let --subrepos on the command line override config setting.
1696 # Let --subrepos on the command line override config setting.
1697 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1697 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1698
1698
1699 cmdutil.checkunfinished(repo, commit=True)
1699 cmdutil.checkunfinished(repo, commit=True)
1700
1700
1701 branch = repo[None].branch()
1701 branch = repo[None].branch()
1702 bheads = repo.branchheads(branch)
1702 bheads = repo.branchheads(branch)
1703
1703
1704 extra = {}
1704 extra = {}
1705 if opts.get('close_branch'):
1705 if opts.get('close_branch'):
1706 extra['close'] = 1
1706 extra['close'] = 1
1707
1707
1708 if not bheads:
1708 if not bheads:
1709 raise error.Abort(_('can only close branch heads'))
1709 raise error.Abort(_('can only close branch heads'))
1710 elif opts.get('amend'):
1710 elif opts.get('amend'):
1711 if repo[None].parents()[0].p1().branch() != branch and \
1711 if repo[None].parents()[0].p1().branch() != branch and \
1712 repo[None].parents()[0].p2().branch() != branch:
1712 repo[None].parents()[0].p2().branch() != branch:
1713 raise error.Abort(_('can only close branch heads'))
1713 raise error.Abort(_('can only close branch heads'))
1714
1714
1715 if opts.get('amend'):
1715 if opts.get('amend'):
1716 if ui.configbool('ui', 'commitsubrepos'):
1716 if ui.configbool('ui', 'commitsubrepos'):
1717 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1717 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1718
1718
1719 old = repo['.']
1719 old = repo['.']
1720 if not old.mutable():
1720 if not old.mutable():
1721 raise error.Abort(_('cannot amend public changesets'))
1721 raise error.Abort(_('cannot amend public changesets'))
1722 if len(repo[None].parents()) > 1:
1722 if len(repo[None].parents()) > 1:
1723 raise error.Abort(_('cannot amend while merging'))
1723 raise error.Abort(_('cannot amend while merging'))
1724 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1724 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1725 if not allowunstable and old.children():
1725 if not allowunstable and old.children():
1726 raise error.Abort(_('cannot amend changeset with children'))
1726 raise error.Abort(_('cannot amend changeset with children'))
1727
1727
1728 # Currently histedit gets confused if an amend happens while histedit
1728 # Currently histedit gets confused if an amend happens while histedit
1729 # is in progress. Since we have a checkunfinished command, we are
1729 # is in progress. Since we have a checkunfinished command, we are
1730 # temporarily honoring it.
1730 # temporarily honoring it.
1731 #
1731 #
1732 # Note: eventually this guard will be removed. Please do not expect
1732 # Note: eventually this guard will be removed. Please do not expect
1733 # this behavior to remain.
1733 # this behavior to remain.
1734 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1734 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1735 cmdutil.checkunfinished(repo)
1735 cmdutil.checkunfinished(repo)
1736
1736
1737 # commitfunc is used only for temporary amend commit by cmdutil.amend
1737 # commitfunc is used only for temporary amend commit by cmdutil.amend
1738 def commitfunc(ui, repo, message, match, opts):
1738 def commitfunc(ui, repo, message, match, opts):
1739 return repo.commit(message,
1739 return repo.commit(message,
1740 opts.get('user') or old.user(),
1740 opts.get('user') or old.user(),
1741 opts.get('date') or old.date(),
1741 opts.get('date') or old.date(),
1742 match,
1742 match,
1743 extra=extra)
1743 extra=extra)
1744
1744
1745 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1745 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1746 if node == old.node():
1746 if node == old.node():
1747 ui.status(_("nothing changed\n"))
1747 ui.status(_("nothing changed\n"))
1748 return 1
1748 return 1
1749 else:
1749 else:
1750 def commitfunc(ui, repo, message, match, opts):
1750 def commitfunc(ui, repo, message, match, opts):
1751 backup = ui.backupconfig('phases', 'new-commit')
1751 backup = ui.backupconfig('phases', 'new-commit')
1752 baseui = repo.baseui
1752 baseui = repo.baseui
1753 basebackup = baseui.backupconfig('phases', 'new-commit')
1753 basebackup = baseui.backupconfig('phases', 'new-commit')
1754 try:
1754 try:
1755 if opts.get('secret'):
1755 if opts.get('secret'):
1756 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1756 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1757 # Propagate to subrepos
1757 # Propagate to subrepos
1758 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1758 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1759
1759
1760 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1760 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1761 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1761 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1762 return repo.commit(message, opts.get('user'), opts.get('date'),
1762 return repo.commit(message, opts.get('user'), opts.get('date'),
1763 match,
1763 match,
1764 editor=editor,
1764 editor=editor,
1765 extra=extra)
1765 extra=extra)
1766 finally:
1766 finally:
1767 ui.restoreconfig(backup)
1767 ui.restoreconfig(backup)
1768 repo.baseui.restoreconfig(basebackup)
1768 repo.baseui.restoreconfig(basebackup)
1769
1769
1770
1770
1771 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1771 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1772
1772
1773 if not node:
1773 if not node:
1774 stat = cmdutil.postcommitstatus(repo, pats, opts)
1774 stat = cmdutil.postcommitstatus(repo, pats, opts)
1775 if stat[3]:
1775 if stat[3]:
1776 ui.status(_("nothing changed (%d missing files, see "
1776 ui.status(_("nothing changed (%d missing files, see "
1777 "'hg status')\n") % len(stat[3]))
1777 "'hg status')\n") % len(stat[3]))
1778 else:
1778 else:
1779 ui.status(_("nothing changed\n"))
1779 ui.status(_("nothing changed\n"))
1780 return 1
1780 return 1
1781
1781
1782 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1782 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1783
1783
1784 @command('config|showconfig|debugconfig',
1784 @command('config|showconfig|debugconfig',
1785 [('u', 'untrusted', None, _('show untrusted configuration options')),
1785 [('u', 'untrusted', None, _('show untrusted configuration options')),
1786 ('e', 'edit', None, _('edit user config')),
1786 ('e', 'edit', None, _('edit user config')),
1787 ('l', 'local', None, _('edit repository config')),
1787 ('l', 'local', None, _('edit repository config')),
1788 ('g', 'global', None, _('edit global config'))],
1788 ('g', 'global', None, _('edit global config'))],
1789 _('[-u] [NAME]...'),
1789 _('[-u] [NAME]...'),
1790 optionalrepo=True)
1790 optionalrepo=True)
1791 def config(ui, repo, *values, **opts):
1791 def config(ui, repo, *values, **opts):
1792 """show combined config settings from all hgrc files
1792 """show combined config settings from all hgrc files
1793
1793
1794 With no arguments, print names and values of all config items.
1794 With no arguments, print names and values of all config items.
1795
1795
1796 With one argument of the form section.name, print just the value
1796 With one argument of the form section.name, print just the value
1797 of that config item.
1797 of that config item.
1798
1798
1799 With multiple arguments, print names and values of all config
1799 With multiple arguments, print names and values of all config
1800 items with matching section names.
1800 items with matching section names.
1801
1801
1802 With --edit, start an editor on the user-level config file. With
1802 With --edit, start an editor on the user-level config file. With
1803 --global, edit the system-wide config file. With --local, edit the
1803 --global, edit the system-wide config file. With --local, edit the
1804 repository-level config file.
1804 repository-level config file.
1805
1805
1806 With --debug, the source (filename and line number) is printed
1806 With --debug, the source (filename and line number) is printed
1807 for each config item.
1807 for each config item.
1808
1808
1809 See :hg:`help config` for more information about config files.
1809 See :hg:`help config` for more information about config files.
1810
1810
1811 Returns 0 on success, 1 if NAME does not exist.
1811 Returns 0 on success, 1 if NAME does not exist.
1812
1812
1813 """
1813 """
1814
1814
1815 if opts.get('edit') or opts.get('local') or opts.get('global'):
1815 if opts.get('edit') or opts.get('local') or opts.get('global'):
1816 if opts.get('local') and opts.get('global'):
1816 if opts.get('local') and opts.get('global'):
1817 raise error.Abort(_("can't use --local and --global together"))
1817 raise error.Abort(_("can't use --local and --global together"))
1818
1818
1819 if opts.get('local'):
1819 if opts.get('local'):
1820 if not repo:
1820 if not repo:
1821 raise error.Abort(_("can't use --local outside a repository"))
1821 raise error.Abort(_("can't use --local outside a repository"))
1822 paths = [repo.join('hgrc')]
1822 paths = [repo.join('hgrc')]
1823 elif opts.get('global'):
1823 elif opts.get('global'):
1824 paths = scmutil.systemrcpath()
1824 paths = scmutil.systemrcpath()
1825 else:
1825 else:
1826 paths = scmutil.userrcpath()
1826 paths = scmutil.userrcpath()
1827
1827
1828 for f in paths:
1828 for f in paths:
1829 if os.path.exists(f):
1829 if os.path.exists(f):
1830 break
1830 break
1831 else:
1831 else:
1832 if opts.get('global'):
1832 if opts.get('global'):
1833 samplehgrc = uimod.samplehgrcs['global']
1833 samplehgrc = uimod.samplehgrcs['global']
1834 elif opts.get('local'):
1834 elif opts.get('local'):
1835 samplehgrc = uimod.samplehgrcs['local']
1835 samplehgrc = uimod.samplehgrcs['local']
1836 else:
1836 else:
1837 samplehgrc = uimod.samplehgrcs['user']
1837 samplehgrc = uimod.samplehgrcs['user']
1838
1838
1839 f = paths[0]
1839 f = paths[0]
1840 fp = open(f, "w")
1840 fp = open(f, "w")
1841 fp.write(samplehgrc)
1841 fp.write(samplehgrc)
1842 fp.close()
1842 fp.close()
1843
1843
1844 editor = ui.geteditor()
1844 editor = ui.geteditor()
1845 ui.system("%s \"%s\"" % (editor, f),
1845 ui.system("%s \"%s\"" % (editor, f),
1846 onerr=error.Abort, errprefix=_("edit failed"))
1846 onerr=error.Abort, errprefix=_("edit failed"))
1847 return
1847 return
1848
1848
1849 for f in scmutil.rcpath():
1849 for f in scmutil.rcpath():
1850 ui.debug('read config from: %s\n' % f)
1850 ui.debug('read config from: %s\n' % f)
1851 untrusted = bool(opts.get('untrusted'))
1851 untrusted = bool(opts.get('untrusted'))
1852 if values:
1852 if values:
1853 sections = [v for v in values if '.' not in v]
1853 sections = [v for v in values if '.' not in v]
1854 items = [v for v in values if '.' in v]
1854 items = [v for v in values if '.' in v]
1855 if len(items) > 1 or items and sections:
1855 if len(items) > 1 or items and sections:
1856 raise error.Abort(_('only one config item permitted'))
1856 raise error.Abort(_('only one config item permitted'))
1857 matched = False
1857 matched = False
1858 for section, name, value in ui.walkconfig(untrusted=untrusted):
1858 for section, name, value in ui.walkconfig(untrusted=untrusted):
1859 value = str(value).replace('\n', '\\n')
1859 value = str(value).replace('\n', '\\n')
1860 sectname = section + '.' + name
1860 sectname = section + '.' + name
1861 if values:
1861 if values:
1862 for v in values:
1862 for v in values:
1863 if v == section:
1863 if v == section:
1864 ui.debug('%s: ' %
1864 ui.debug('%s: ' %
1865 ui.configsource(section, name, untrusted))
1865 ui.configsource(section, name, untrusted))
1866 ui.write('%s=%s\n' % (sectname, value))
1866 ui.write('%s=%s\n' % (sectname, value))
1867 matched = True
1867 matched = True
1868 elif v == sectname:
1868 elif v == sectname:
1869 ui.debug('%s: ' %
1869 ui.debug('%s: ' %
1870 ui.configsource(section, name, untrusted))
1870 ui.configsource(section, name, untrusted))
1871 ui.write(value, '\n')
1871 ui.write(value, '\n')
1872 matched = True
1872 matched = True
1873 else:
1873 else:
1874 ui.debug('%s: ' %
1874 ui.debug('%s: ' %
1875 ui.configsource(section, name, untrusted))
1875 ui.configsource(section, name, untrusted))
1876 ui.write('%s=%s\n' % (sectname, value))
1876 ui.write('%s=%s\n' % (sectname, value))
1877 matched = True
1877 matched = True
1878 if matched:
1878 if matched:
1879 return 0
1879 return 0
1880 return 1
1880 return 1
1881
1881
1882 @command('copy|cp',
1882 @command('copy|cp',
1883 [('A', 'after', None, _('record a copy that has already occurred')),
1883 [('A', 'after', None, _('record a copy that has already occurred')),
1884 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1884 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1885 ] + walkopts + dryrunopts,
1885 ] + walkopts + dryrunopts,
1886 _('[OPTION]... [SOURCE]... DEST'))
1886 _('[OPTION]... [SOURCE]... DEST'))
1887 def copy(ui, repo, *pats, **opts):
1887 def copy(ui, repo, *pats, **opts):
1888 """mark files as copied for the next commit
1888 """mark files as copied for the next commit
1889
1889
1890 Mark dest as having copies of source files. If dest is a
1890 Mark dest as having copies of source files. If dest is a
1891 directory, copies are put in that directory. If dest is a file,
1891 directory, copies are put in that directory. If dest is a file,
1892 the source must be a single file.
1892 the source must be a single file.
1893
1893
1894 By default, this command copies the contents of files as they
1894 By default, this command copies the contents of files as they
1895 exist in the working directory. If invoked with -A/--after, the
1895 exist in the working directory. If invoked with -A/--after, the
1896 operation is recorded, but no copying is performed.
1896 operation is recorded, but no copying is performed.
1897
1897
1898 This command takes effect with the next commit. To undo a copy
1898 This command takes effect with the next commit. To undo a copy
1899 before that, see :hg:`revert`.
1899 before that, see :hg:`revert`.
1900
1900
1901 Returns 0 on success, 1 if errors are encountered.
1901 Returns 0 on success, 1 if errors are encountered.
1902 """
1902 """
1903 with repo.wlock(False):
1903 with repo.wlock(False):
1904 return cmdutil.copy(ui, repo, pats, opts)
1904 return cmdutil.copy(ui, repo, pats, opts)
1905
1905
1906 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1906 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1907 def debugancestor(ui, repo, *args):
1907 def debugancestor(ui, repo, *args):
1908 """find the ancestor revision of two revisions in a given index"""
1908 """find the ancestor revision of two revisions in a given index"""
1909 if len(args) == 3:
1909 if len(args) == 3:
1910 index, rev1, rev2 = args
1910 index, rev1, rev2 = args
1911 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1911 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1912 lookup = r.lookup
1912 lookup = r.lookup
1913 elif len(args) == 2:
1913 elif len(args) == 2:
1914 if not repo:
1914 if not repo:
1915 raise error.Abort(_("there is no Mercurial repository here "
1915 raise error.Abort(_("there is no Mercurial repository here "
1916 "(.hg not found)"))
1916 "(.hg not found)"))
1917 rev1, rev2 = args
1917 rev1, rev2 = args
1918 r = repo.changelog
1918 r = repo.changelog
1919 lookup = repo.lookup
1919 lookup = repo.lookup
1920 else:
1920 else:
1921 raise error.Abort(_('either two or three arguments required'))
1921 raise error.Abort(_('either two or three arguments required'))
1922 a = r.ancestor(lookup(rev1), lookup(rev2))
1922 a = r.ancestor(lookup(rev1), lookup(rev2))
1923 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1923 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1924
1924
1925 @command('debugbuilddag',
1925 @command('debugbuilddag',
1926 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1926 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1927 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1927 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1928 ('n', 'new-file', None, _('add new file at each rev'))],
1928 ('n', 'new-file', None, _('add new file at each rev'))],
1929 _('[OPTION]... [TEXT]'))
1929 _('[OPTION]... [TEXT]'))
1930 def debugbuilddag(ui, repo, text=None,
1930 def debugbuilddag(ui, repo, text=None,
1931 mergeable_file=False,
1931 mergeable_file=False,
1932 overwritten_file=False,
1932 overwritten_file=False,
1933 new_file=False):
1933 new_file=False):
1934 """builds a repo with a given DAG from scratch in the current empty repo
1934 """builds a repo with a given DAG from scratch in the current empty repo
1935
1935
1936 The description of the DAG is read from stdin if not given on the
1936 The description of the DAG is read from stdin if not given on the
1937 command line.
1937 command line.
1938
1938
1939 Elements:
1939 Elements:
1940
1940
1941 - "+n" is a linear run of n nodes based on the current default parent
1941 - "+n" is a linear run of n nodes based on the current default parent
1942 - "." is a single node based on the current default parent
1942 - "." is a single node based on the current default parent
1943 - "$" resets the default parent to null (implied at the start);
1943 - "$" resets the default parent to null (implied at the start);
1944 otherwise the default parent is always the last node created
1944 otherwise the default parent is always the last node created
1945 - "<p" sets the default parent to the backref p
1945 - "<p" sets the default parent to the backref p
1946 - "*p" is a fork at parent p, which is a backref
1946 - "*p" is a fork at parent p, which is a backref
1947 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1947 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1948 - "/p2" is a merge of the preceding node and p2
1948 - "/p2" is a merge of the preceding node and p2
1949 - ":tag" defines a local tag for the preceding node
1949 - ":tag" defines a local tag for the preceding node
1950 - "@branch" sets the named branch for subsequent nodes
1950 - "@branch" sets the named branch for subsequent nodes
1951 - "#...\\n" is a comment up to the end of the line
1951 - "#...\\n" is a comment up to the end of the line
1952
1952
1953 Whitespace between the above elements is ignored.
1953 Whitespace between the above elements is ignored.
1954
1954
1955 A backref is either
1955 A backref is either
1956
1956
1957 - a number n, which references the node curr-n, where curr is the current
1957 - a number n, which references the node curr-n, where curr is the current
1958 node, or
1958 node, or
1959 - the name of a local tag you placed earlier using ":tag", or
1959 - the name of a local tag you placed earlier using ":tag", or
1960 - empty to denote the default parent.
1960 - empty to denote the default parent.
1961
1961
1962 All string valued-elements are either strictly alphanumeric, or must
1962 All string valued-elements are either strictly alphanumeric, or must
1963 be enclosed in double quotes ("..."), with "\\" as escape character.
1963 be enclosed in double quotes ("..."), with "\\" as escape character.
1964 """
1964 """
1965
1965
1966 if text is None:
1966 if text is None:
1967 ui.status(_("reading DAG from stdin\n"))
1967 ui.status(_("reading DAG from stdin\n"))
1968 text = ui.fin.read()
1968 text = ui.fin.read()
1969
1969
1970 cl = repo.changelog
1970 cl = repo.changelog
1971 if len(cl) > 0:
1971 if len(cl) > 0:
1972 raise error.Abort(_('repository is not empty'))
1972 raise error.Abort(_('repository is not empty'))
1973
1973
1974 # determine number of revs in DAG
1974 # determine number of revs in DAG
1975 total = 0
1975 total = 0
1976 for type, data in dagparser.parsedag(text):
1976 for type, data in dagparser.parsedag(text):
1977 if type == 'n':
1977 if type == 'n':
1978 total += 1
1978 total += 1
1979
1979
1980 if mergeable_file:
1980 if mergeable_file:
1981 linesperrev = 2
1981 linesperrev = 2
1982 # make a file with k lines per rev
1982 # make a file with k lines per rev
1983 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1983 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1984 initialmergedlines.append("")
1984 initialmergedlines.append("")
1985
1985
1986 tags = []
1986 tags = []
1987
1987
1988 lock = tr = None
1988 lock = tr = None
1989 try:
1989 try:
1990 lock = repo.lock()
1990 lock = repo.lock()
1991 tr = repo.transaction("builddag")
1991 tr = repo.transaction("builddag")
1992
1992
1993 at = -1
1993 at = -1
1994 atbranch = 'default'
1994 atbranch = 'default'
1995 nodeids = []
1995 nodeids = []
1996 id = 0
1996 id = 0
1997 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1997 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1998 for type, data in dagparser.parsedag(text):
1998 for type, data in dagparser.parsedag(text):
1999 if type == 'n':
1999 if type == 'n':
2000 ui.note(('node %s\n' % str(data)))
2000 ui.note(('node %s\n' % str(data)))
2001 id, ps = data
2001 id, ps = data
2002
2002
2003 files = []
2003 files = []
2004 fctxs = {}
2004 fctxs = {}
2005
2005
2006 p2 = None
2006 p2 = None
2007 if mergeable_file:
2007 if mergeable_file:
2008 fn = "mf"
2008 fn = "mf"
2009 p1 = repo[ps[0]]
2009 p1 = repo[ps[0]]
2010 if len(ps) > 1:
2010 if len(ps) > 1:
2011 p2 = repo[ps[1]]
2011 p2 = repo[ps[1]]
2012 pa = p1.ancestor(p2)
2012 pa = p1.ancestor(p2)
2013 base, local, other = [x[fn].data() for x in (pa, p1,
2013 base, local, other = [x[fn].data() for x in (pa, p1,
2014 p2)]
2014 p2)]
2015 m3 = simplemerge.Merge3Text(base, local, other)
2015 m3 = simplemerge.Merge3Text(base, local, other)
2016 ml = [l.strip() for l in m3.merge_lines()]
2016 ml = [l.strip() for l in m3.merge_lines()]
2017 ml.append("")
2017 ml.append("")
2018 elif at > 0:
2018 elif at > 0:
2019 ml = p1[fn].data().split("\n")
2019 ml = p1[fn].data().split("\n")
2020 else:
2020 else:
2021 ml = initialmergedlines
2021 ml = initialmergedlines
2022 ml[id * linesperrev] += " r%i" % id
2022 ml[id * linesperrev] += " r%i" % id
2023 mergedtext = "\n".join(ml)
2023 mergedtext = "\n".join(ml)
2024 files.append(fn)
2024 files.append(fn)
2025 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2025 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2026
2026
2027 if overwritten_file:
2027 if overwritten_file:
2028 fn = "of"
2028 fn = "of"
2029 files.append(fn)
2029 files.append(fn)
2030 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2030 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2031
2031
2032 if new_file:
2032 if new_file:
2033 fn = "nf%i" % id
2033 fn = "nf%i" % id
2034 files.append(fn)
2034 files.append(fn)
2035 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2035 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2036 if len(ps) > 1:
2036 if len(ps) > 1:
2037 if not p2:
2037 if not p2:
2038 p2 = repo[ps[1]]
2038 p2 = repo[ps[1]]
2039 for fn in p2:
2039 for fn in p2:
2040 if fn.startswith("nf"):
2040 if fn.startswith("nf"):
2041 files.append(fn)
2041 files.append(fn)
2042 fctxs[fn] = p2[fn]
2042 fctxs[fn] = p2[fn]
2043
2043
2044 def fctxfn(repo, cx, path):
2044 def fctxfn(repo, cx, path):
2045 return fctxs.get(path)
2045 return fctxs.get(path)
2046
2046
2047 if len(ps) == 0 or ps[0] < 0:
2047 if len(ps) == 0 or ps[0] < 0:
2048 pars = [None, None]
2048 pars = [None, None]
2049 elif len(ps) == 1:
2049 elif len(ps) == 1:
2050 pars = [nodeids[ps[0]], None]
2050 pars = [nodeids[ps[0]], None]
2051 else:
2051 else:
2052 pars = [nodeids[p] for p in ps]
2052 pars = [nodeids[p] for p in ps]
2053 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2053 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2054 date=(id, 0),
2054 date=(id, 0),
2055 user="debugbuilddag",
2055 user="debugbuilddag",
2056 extra={'branch': atbranch})
2056 extra={'branch': atbranch})
2057 nodeid = repo.commitctx(cx)
2057 nodeid = repo.commitctx(cx)
2058 nodeids.append(nodeid)
2058 nodeids.append(nodeid)
2059 at = id
2059 at = id
2060 elif type == 'l':
2060 elif type == 'l':
2061 id, name = data
2061 id, name = data
2062 ui.note(('tag %s\n' % name))
2062 ui.note(('tag %s\n' % name))
2063 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2063 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2064 elif type == 'a':
2064 elif type == 'a':
2065 ui.note(('branch %s\n' % data))
2065 ui.note(('branch %s\n' % data))
2066 atbranch = data
2066 atbranch = data
2067 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2067 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2068 tr.close()
2068 tr.close()
2069
2069
2070 if tags:
2070 if tags:
2071 repo.vfs.write("localtags", "".join(tags))
2071 repo.vfs.write("localtags", "".join(tags))
2072 finally:
2072 finally:
2073 ui.progress(_('building'), None)
2073 ui.progress(_('building'), None)
2074 release(tr, lock)
2074 release(tr, lock)
2075
2075
2076 @command('debugbundle',
2076 @command('debugbundle',
2077 [('a', 'all', None, _('show all details')),
2077 [('a', 'all', None, _('show all details')),
2078 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2078 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2079 _('FILE'),
2079 _('FILE'),
2080 norepo=True)
2080 norepo=True)
2081 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2081 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2082 """lists the contents of a bundle"""
2082 """lists the contents of a bundle"""
2083 with hg.openpath(ui, bundlepath) as f:
2083 with hg.openpath(ui, bundlepath) as f:
2084 if spec:
2084 if spec:
2085 spec = exchange.getbundlespec(ui, f)
2085 spec = exchange.getbundlespec(ui, f)
2086 ui.write('%s\n' % spec)
2086 ui.write('%s\n' % spec)
2087 return
2087 return
2088
2088
2089 gen = exchange.readbundle(ui, f, bundlepath)
2089 gen = exchange.readbundle(ui, f, bundlepath)
2090 if isinstance(gen, bundle2.unbundle20):
2090 if isinstance(gen, bundle2.unbundle20):
2091 return _debugbundle2(ui, gen, all=all, **opts)
2091 return _debugbundle2(ui, gen, all=all, **opts)
2092 _debugchangegroup(ui, gen, all=all, **opts)
2092 _debugchangegroup(ui, gen, all=all, **opts)
2093
2093
2094 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2094 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2095 indent_string = ' ' * indent
2095 indent_string = ' ' * indent
2096 if all:
2096 if all:
2097 ui.write("%sformat: id, p1, p2, cset, delta base, len(delta)\n"
2097 ui.write("%sformat: id, p1, p2, cset, delta base, len(delta)\n"
2098 % indent_string)
2098 % indent_string)
2099
2099
2100 def showchunks(named):
2100 def showchunks(named):
2101 ui.write("\n%s%s\n" % (indent_string, named))
2101 ui.write("\n%s%s\n" % (indent_string, named))
2102 chain = None
2102 chain = None
2103 while True:
2103 while True:
2104 chunkdata = gen.deltachunk(chain)
2104 chunkdata = gen.deltachunk(chain)
2105 if not chunkdata:
2105 if not chunkdata:
2106 break
2106 break
2107 node = chunkdata['node']
2107 node = chunkdata['node']
2108 p1 = chunkdata['p1']
2108 p1 = chunkdata['p1']
2109 p2 = chunkdata['p2']
2109 p2 = chunkdata['p2']
2110 cs = chunkdata['cs']
2110 cs = chunkdata['cs']
2111 deltabase = chunkdata['deltabase']
2111 deltabase = chunkdata['deltabase']
2112 delta = chunkdata['delta']
2112 delta = chunkdata['delta']
2113 ui.write("%s%s %s %s %s %s %s\n" %
2113 ui.write("%s%s %s %s %s %s %s\n" %
2114 (indent_string, hex(node), hex(p1), hex(p2),
2114 (indent_string, hex(node), hex(p1), hex(p2),
2115 hex(cs), hex(deltabase), len(delta)))
2115 hex(cs), hex(deltabase), len(delta)))
2116 chain = node
2116 chain = node
2117
2117
2118 chunkdata = gen.changelogheader()
2118 chunkdata = gen.changelogheader()
2119 showchunks("changelog")
2119 showchunks("changelog")
2120 chunkdata = gen.manifestheader()
2120 chunkdata = gen.manifestheader()
2121 showchunks("manifest")
2121 showchunks("manifest")
2122 while True:
2122 while True:
2123 chunkdata = gen.filelogheader()
2123 chunkdata = gen.filelogheader()
2124 if not chunkdata:
2124 if not chunkdata:
2125 break
2125 break
2126 fname = chunkdata['filename']
2126 fname = chunkdata['filename']
2127 showchunks(fname)
2127 showchunks(fname)
2128 else:
2128 else:
2129 if isinstance(gen, bundle2.unbundle20):
2129 if isinstance(gen, bundle2.unbundle20):
2130 raise error.Abort(_('use debugbundle2 for this file'))
2130 raise error.Abort(_('use debugbundle2 for this file'))
2131 chunkdata = gen.changelogheader()
2131 chunkdata = gen.changelogheader()
2132 chain = None
2132 chain = None
2133 while True:
2133 while True:
2134 chunkdata = gen.deltachunk(chain)
2134 chunkdata = gen.deltachunk(chain)
2135 if not chunkdata:
2135 if not chunkdata:
2136 break
2136 break
2137 node = chunkdata['node']
2137 node = chunkdata['node']
2138 ui.write("%s%s\n" % (indent_string, hex(node)))
2138 ui.write("%s%s\n" % (indent_string, hex(node)))
2139 chain = node
2139 chain = node
2140
2140
2141 def _debugbundle2(ui, gen, all=None, **opts):
2141 def _debugbundle2(ui, gen, all=None, **opts):
2142 """lists the contents of a bundle2"""
2142 """lists the contents of a bundle2"""
2143 if not isinstance(gen, bundle2.unbundle20):
2143 if not isinstance(gen, bundle2.unbundle20):
2144 raise error.Abort(_('not a bundle2 file'))
2144 raise error.Abort(_('not a bundle2 file'))
2145 ui.write(('Stream params: %s\n' % repr(gen.params)))
2145 ui.write(('Stream params: %s\n' % repr(gen.params)))
2146 for part in gen.iterparts():
2146 for part in gen.iterparts():
2147 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2147 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2148 if part.type == 'changegroup':
2148 if part.type == 'changegroup':
2149 version = part.params.get('version', '01')
2149 version = part.params.get('version', '01')
2150 cg = changegroup.getunbundler(version, part, 'UN')
2150 cg = changegroup.getunbundler(version, part, 'UN')
2151 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2151 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2152
2152
2153 @command('debugcreatestreamclonebundle', [], 'FILE')
2153 @command('debugcreatestreamclonebundle', [], 'FILE')
2154 def debugcreatestreamclonebundle(ui, repo, fname):
2154 def debugcreatestreamclonebundle(ui, repo, fname):
2155 """create a stream clone bundle file
2155 """create a stream clone bundle file
2156
2156
2157 Stream bundles are special bundles that are essentially archives of
2157 Stream bundles are special bundles that are essentially archives of
2158 revlog files. They are commonly used for cloning very quickly.
2158 revlog files. They are commonly used for cloning very quickly.
2159 """
2159 """
2160 requirements, gen = streamclone.generatebundlev1(repo)
2160 requirements, gen = streamclone.generatebundlev1(repo)
2161 changegroup.writechunks(ui, gen, fname)
2161 changegroup.writechunks(ui, gen, fname)
2162
2162
2163 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2163 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2164
2164
2165 @command('debugapplystreamclonebundle', [], 'FILE')
2165 @command('debugapplystreamclonebundle', [], 'FILE')
2166 def debugapplystreamclonebundle(ui, repo, fname):
2166 def debugapplystreamclonebundle(ui, repo, fname):
2167 """apply a stream clone bundle file"""
2167 """apply a stream clone bundle file"""
2168 f = hg.openpath(ui, fname)
2168 f = hg.openpath(ui, fname)
2169 gen = exchange.readbundle(ui, f, fname)
2169 gen = exchange.readbundle(ui, f, fname)
2170 gen.apply(repo)
2170 gen.apply(repo)
2171
2171
2172 @command('debugcheckstate', [], '')
2172 @command('debugcheckstate', [], '')
2173 def debugcheckstate(ui, repo):
2173 def debugcheckstate(ui, repo):
2174 """validate the correctness of the current dirstate"""
2174 """validate the correctness of the current dirstate"""
2175 parent1, parent2 = repo.dirstate.parents()
2175 parent1, parent2 = repo.dirstate.parents()
2176 m1 = repo[parent1].manifest()
2176 m1 = repo[parent1].manifest()
2177 m2 = repo[parent2].manifest()
2177 m2 = repo[parent2].manifest()
2178 errors = 0
2178 errors = 0
2179 for f in repo.dirstate:
2179 for f in repo.dirstate:
2180 state = repo.dirstate[f]
2180 state = repo.dirstate[f]
2181 if state in "nr" and f not in m1:
2181 if state in "nr" and f not in m1:
2182 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2182 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2183 errors += 1
2183 errors += 1
2184 if state in "a" and f in m1:
2184 if state in "a" and f in m1:
2185 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2185 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2186 errors += 1
2186 errors += 1
2187 if state in "m" and f not in m1 and f not in m2:
2187 if state in "m" and f not in m1 and f not in m2:
2188 ui.warn(_("%s in state %s, but not in either manifest\n") %
2188 ui.warn(_("%s in state %s, but not in either manifest\n") %
2189 (f, state))
2189 (f, state))
2190 errors += 1
2190 errors += 1
2191 for f in m1:
2191 for f in m1:
2192 state = repo.dirstate[f]
2192 state = repo.dirstate[f]
2193 if state not in "nrm":
2193 if state not in "nrm":
2194 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2194 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2195 errors += 1
2195 errors += 1
2196 if errors:
2196 if errors:
2197 error = _(".hg/dirstate inconsistent with current parent's manifest")
2197 error = _(".hg/dirstate inconsistent with current parent's manifest")
2198 raise error.Abort(error)
2198 raise error.Abort(error)
2199
2199
2200 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2200 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2201 def debugcommands(ui, cmd='', *args):
2201 def debugcommands(ui, cmd='', *args):
2202 """list all available commands and options"""
2202 """list all available commands and options"""
2203 for cmd, vals in sorted(table.iteritems()):
2203 for cmd, vals in sorted(table.iteritems()):
2204 cmd = cmd.split('|')[0].strip('^')
2204 cmd = cmd.split('|')[0].strip('^')
2205 opts = ', '.join([i[1] for i in vals[1]])
2205 opts = ', '.join([i[1] for i in vals[1]])
2206 ui.write('%s: %s\n' % (cmd, opts))
2206 ui.write('%s: %s\n' % (cmd, opts))
2207
2207
2208 @command('debugcomplete',
2208 @command('debugcomplete',
2209 [('o', 'options', None, _('show the command options'))],
2209 [('o', 'options', None, _('show the command options'))],
2210 _('[-o] CMD'),
2210 _('[-o] CMD'),
2211 norepo=True)
2211 norepo=True)
2212 def debugcomplete(ui, cmd='', **opts):
2212 def debugcomplete(ui, cmd='', **opts):
2213 """returns the completion list associated with the given command"""
2213 """returns the completion list associated with the given command"""
2214
2214
2215 if opts.get('options'):
2215 if opts.get('options'):
2216 options = []
2216 options = []
2217 otables = [globalopts]
2217 otables = [globalopts]
2218 if cmd:
2218 if cmd:
2219 aliases, entry = cmdutil.findcmd(cmd, table, False)
2219 aliases, entry = cmdutil.findcmd(cmd, table, False)
2220 otables.append(entry[1])
2220 otables.append(entry[1])
2221 for t in otables:
2221 for t in otables:
2222 for o in t:
2222 for o in t:
2223 if "(DEPRECATED)" in o[3]:
2223 if "(DEPRECATED)" in o[3]:
2224 continue
2224 continue
2225 if o[0]:
2225 if o[0]:
2226 options.append('-%s' % o[0])
2226 options.append('-%s' % o[0])
2227 options.append('--%s' % o[1])
2227 options.append('--%s' % o[1])
2228 ui.write("%s\n" % "\n".join(options))
2228 ui.write("%s\n" % "\n".join(options))
2229 return
2229 return
2230
2230
2231 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2231 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2232 if ui.verbose:
2232 if ui.verbose:
2233 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2233 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2234 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2234 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2235
2235
2236 @command('debugdag',
2236 @command('debugdag',
2237 [('t', 'tags', None, _('use tags as labels')),
2237 [('t', 'tags', None, _('use tags as labels')),
2238 ('b', 'branches', None, _('annotate with branch names')),
2238 ('b', 'branches', None, _('annotate with branch names')),
2239 ('', 'dots', None, _('use dots for runs')),
2239 ('', 'dots', None, _('use dots for runs')),
2240 ('s', 'spaces', None, _('separate elements by spaces'))],
2240 ('s', 'spaces', None, _('separate elements by spaces'))],
2241 _('[OPTION]... [FILE [REV]...]'),
2241 _('[OPTION]... [FILE [REV]...]'),
2242 optionalrepo=True)
2242 optionalrepo=True)
2243 def debugdag(ui, repo, file_=None, *revs, **opts):
2243 def debugdag(ui, repo, file_=None, *revs, **opts):
2244 """format the changelog or an index DAG as a concise textual description
2244 """format the changelog or an index DAG as a concise textual description
2245
2245
2246 If you pass a revlog index, the revlog's DAG is emitted. If you list
2246 If you pass a revlog index, the revlog's DAG is emitted. If you list
2247 revision numbers, they get labeled in the output as rN.
2247 revision numbers, they get labeled in the output as rN.
2248
2248
2249 Otherwise, the changelog DAG of the current repo is emitted.
2249 Otherwise, the changelog DAG of the current repo is emitted.
2250 """
2250 """
2251 spaces = opts.get('spaces')
2251 spaces = opts.get('spaces')
2252 dots = opts.get('dots')
2252 dots = opts.get('dots')
2253 if file_:
2253 if file_:
2254 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2254 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2255 revs = set((int(r) for r in revs))
2255 revs = set((int(r) for r in revs))
2256 def events():
2256 def events():
2257 for r in rlog:
2257 for r in rlog:
2258 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2258 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2259 if p != -1))
2259 if p != -1))
2260 if r in revs:
2260 if r in revs:
2261 yield 'l', (r, "r%i" % r)
2261 yield 'l', (r, "r%i" % r)
2262 elif repo:
2262 elif repo:
2263 cl = repo.changelog
2263 cl = repo.changelog
2264 tags = opts.get('tags')
2264 tags = opts.get('tags')
2265 branches = opts.get('branches')
2265 branches = opts.get('branches')
2266 if tags:
2266 if tags:
2267 labels = {}
2267 labels = {}
2268 for l, n in repo.tags().items():
2268 for l, n in repo.tags().items():
2269 labels.setdefault(cl.rev(n), []).append(l)
2269 labels.setdefault(cl.rev(n), []).append(l)
2270 def events():
2270 def events():
2271 b = "default"
2271 b = "default"
2272 for r in cl:
2272 for r in cl:
2273 if branches:
2273 if branches:
2274 newb = cl.read(cl.node(r))[5]['branch']
2274 newb = cl.read(cl.node(r))[5]['branch']
2275 if newb != b:
2275 if newb != b:
2276 yield 'a', newb
2276 yield 'a', newb
2277 b = newb
2277 b = newb
2278 yield 'n', (r, list(p for p in cl.parentrevs(r)
2278 yield 'n', (r, list(p for p in cl.parentrevs(r)
2279 if p != -1))
2279 if p != -1))
2280 if tags:
2280 if tags:
2281 ls = labels.get(r)
2281 ls = labels.get(r)
2282 if ls:
2282 if ls:
2283 for l in ls:
2283 for l in ls:
2284 yield 'l', (r, l)
2284 yield 'l', (r, l)
2285 else:
2285 else:
2286 raise error.Abort(_('need repo for changelog dag'))
2286 raise error.Abort(_('need repo for changelog dag'))
2287
2287
2288 for line in dagparser.dagtextlines(events(),
2288 for line in dagparser.dagtextlines(events(),
2289 addspaces=spaces,
2289 addspaces=spaces,
2290 wraplabels=True,
2290 wraplabels=True,
2291 wrapannotations=True,
2291 wrapannotations=True,
2292 wrapnonlinear=dots,
2292 wrapnonlinear=dots,
2293 usedots=dots,
2293 usedots=dots,
2294 maxlinewidth=70):
2294 maxlinewidth=70):
2295 ui.write(line)
2295 ui.write(line)
2296 ui.write("\n")
2296 ui.write("\n")
2297
2297
2298 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2298 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2299 def debugdata(ui, repo, file_, rev=None, **opts):
2299 def debugdata(ui, repo, file_, rev=None, **opts):
2300 """dump the contents of a data file revision"""
2300 """dump the contents of a data file revision"""
2301 if opts.get('changelog') or opts.get('manifest'):
2301 if opts.get('changelog') or opts.get('manifest'):
2302 file_, rev = None, file_
2302 file_, rev = None, file_
2303 elif rev is None:
2303 elif rev is None:
2304 raise error.CommandError('debugdata', _('invalid arguments'))
2304 raise error.CommandError('debugdata', _('invalid arguments'))
2305 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2305 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2306 try:
2306 try:
2307 ui.write(r.revision(r.lookup(rev)))
2307 ui.write(r.revision(r.lookup(rev)))
2308 except KeyError:
2308 except KeyError:
2309 raise error.Abort(_('invalid revision identifier %s') % rev)
2309 raise error.Abort(_('invalid revision identifier %s') % rev)
2310
2310
2311 @command('debugdate',
2311 @command('debugdate',
2312 [('e', 'extended', None, _('try extended date formats'))],
2312 [('e', 'extended', None, _('try extended date formats'))],
2313 _('[-e] DATE [RANGE]'),
2313 _('[-e] DATE [RANGE]'),
2314 norepo=True, optionalrepo=True)
2314 norepo=True, optionalrepo=True)
2315 def debugdate(ui, date, range=None, **opts):
2315 def debugdate(ui, date, range=None, **opts):
2316 """parse and display a date"""
2316 """parse and display a date"""
2317 if opts["extended"]:
2317 if opts["extended"]:
2318 d = util.parsedate(date, util.extendeddateformats)
2318 d = util.parsedate(date, util.extendeddateformats)
2319 else:
2319 else:
2320 d = util.parsedate(date)
2320 d = util.parsedate(date)
2321 ui.write(("internal: %s %s\n") % d)
2321 ui.write(("internal: %s %s\n") % d)
2322 ui.write(("standard: %s\n") % util.datestr(d))
2322 ui.write(("standard: %s\n") % util.datestr(d))
2323 if range:
2323 if range:
2324 m = util.matchdate(range)
2324 m = util.matchdate(range)
2325 ui.write(("match: %s\n") % m(d[0]))
2325 ui.write(("match: %s\n") % m(d[0]))
2326
2326
2327 @command('debugdiscovery',
2327 @command('debugdiscovery',
2328 [('', 'old', None, _('use old-style discovery')),
2328 [('', 'old', None, _('use old-style discovery')),
2329 ('', 'nonheads', None,
2329 ('', 'nonheads', None,
2330 _('use old-style discovery with non-heads included')),
2330 _('use old-style discovery with non-heads included')),
2331 ] + remoteopts,
2331 ] + remoteopts,
2332 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2332 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2333 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2333 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2334 """runs the changeset discovery protocol in isolation"""
2334 """runs the changeset discovery protocol in isolation"""
2335 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2335 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2336 opts.get('branch'))
2336 opts.get('branch'))
2337 remote = hg.peer(repo, opts, remoteurl)
2337 remote = hg.peer(repo, opts, remoteurl)
2338 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2338 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2339
2339
2340 # make sure tests are repeatable
2340 # make sure tests are repeatable
2341 random.seed(12323)
2341 random.seed(12323)
2342
2342
2343 def doit(localheads, remoteheads, remote=remote):
2343 def doit(localheads, remoteheads, remote=remote):
2344 if opts.get('old'):
2344 if opts.get('old'):
2345 if localheads:
2345 if localheads:
2346 raise error.Abort('cannot use localheads with old style '
2346 raise error.Abort('cannot use localheads with old style '
2347 'discovery')
2347 'discovery')
2348 if not util.safehasattr(remote, 'branches'):
2348 if not util.safehasattr(remote, 'branches'):
2349 # enable in-client legacy support
2349 # enable in-client legacy support
2350 remote = localrepo.locallegacypeer(remote.local())
2350 remote = localrepo.locallegacypeer(remote.local())
2351 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2351 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2352 force=True)
2352 force=True)
2353 common = set(common)
2353 common = set(common)
2354 if not opts.get('nonheads'):
2354 if not opts.get('nonheads'):
2355 ui.write(("unpruned common: %s\n") %
2355 ui.write(("unpruned common: %s\n") %
2356 " ".join(sorted(short(n) for n in common)))
2356 " ".join(sorted(short(n) for n in common)))
2357 dag = dagutil.revlogdag(repo.changelog)
2357 dag = dagutil.revlogdag(repo.changelog)
2358 all = dag.ancestorset(dag.internalizeall(common))
2358 all = dag.ancestorset(dag.internalizeall(common))
2359 common = dag.externalizeall(dag.headsetofconnecteds(all))
2359 common = dag.externalizeall(dag.headsetofconnecteds(all))
2360 else:
2360 else:
2361 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2361 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2362 common = set(common)
2362 common = set(common)
2363 rheads = set(hds)
2363 rheads = set(hds)
2364 lheads = set(repo.heads())
2364 lheads = set(repo.heads())
2365 ui.write(("common heads: %s\n") %
2365 ui.write(("common heads: %s\n") %
2366 " ".join(sorted(short(n) for n in common)))
2366 " ".join(sorted(short(n) for n in common)))
2367 if lheads <= common:
2367 if lheads <= common:
2368 ui.write(("local is subset\n"))
2368 ui.write(("local is subset\n"))
2369 elif rheads <= common:
2369 elif rheads <= common:
2370 ui.write(("remote is subset\n"))
2370 ui.write(("remote is subset\n"))
2371
2371
2372 serverlogs = opts.get('serverlog')
2372 serverlogs = opts.get('serverlog')
2373 if serverlogs:
2373 if serverlogs:
2374 for filename in serverlogs:
2374 for filename in serverlogs:
2375 with open(filename, 'r') as logfile:
2375 with open(filename, 'r') as logfile:
2376 line = logfile.readline()
2376 line = logfile.readline()
2377 while line:
2377 while line:
2378 parts = line.strip().split(';')
2378 parts = line.strip().split(';')
2379 op = parts[1]
2379 op = parts[1]
2380 if op == 'cg':
2380 if op == 'cg':
2381 pass
2381 pass
2382 elif op == 'cgss':
2382 elif op == 'cgss':
2383 doit(parts[2].split(' '), parts[3].split(' '))
2383 doit(parts[2].split(' '), parts[3].split(' '))
2384 elif op == 'unb':
2384 elif op == 'unb':
2385 doit(parts[3].split(' '), parts[2].split(' '))
2385 doit(parts[3].split(' '), parts[2].split(' '))
2386 line = logfile.readline()
2386 line = logfile.readline()
2387 else:
2387 else:
2388 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2388 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2389 opts.get('remote_head'))
2389 opts.get('remote_head'))
2390 localrevs = opts.get('local_head')
2390 localrevs = opts.get('local_head')
2391 doit(localrevs, remoterevs)
2391 doit(localrevs, remoterevs)
2392
2392
2393 @command('debugextensions', formatteropts, [], norepo=True)
2393 @command('debugextensions', formatteropts, [], norepo=True)
2394 def debugextensions(ui, **opts):
2394 def debugextensions(ui, **opts):
2395 '''show information about active extensions'''
2395 '''show information about active extensions'''
2396 exts = extensions.extensions(ui)
2396 exts = extensions.extensions(ui)
2397 fm = ui.formatter('debugextensions', opts)
2397 fm = ui.formatter('debugextensions', opts)
2398 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2398 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2399 extsource = extmod.__file__
2399 extsource = extmod.__file__
2400 exttestedwith = getattr(extmod, 'testedwith', None)
2400 exttestedwith = getattr(extmod, 'testedwith', None)
2401 if exttestedwith is not None:
2401 if exttestedwith is not None:
2402 exttestedwith = exttestedwith.split()
2402 exttestedwith = exttestedwith.split()
2403 extbuglink = getattr(extmod, 'buglink', None)
2403 extbuglink = getattr(extmod, 'buglink', None)
2404
2404
2405 fm.startitem()
2405 fm.startitem()
2406
2406
2407 if ui.quiet or ui.verbose:
2407 if ui.quiet or ui.verbose:
2408 fm.write('name', '%s\n', extname)
2408 fm.write('name', '%s\n', extname)
2409 else:
2409 else:
2410 fm.write('name', '%s', extname)
2410 fm.write('name', '%s', extname)
2411 if not exttestedwith:
2411 if not exttestedwith:
2412 fm.plain(_(' (untested!)\n'))
2412 fm.plain(_(' (untested!)\n'))
2413 else:
2413 else:
2414 if exttestedwith == ['internal'] or \
2414 if exttestedwith == ['internal'] or \
2415 util.version() in exttestedwith:
2415 util.version() in exttestedwith:
2416 fm.plain('\n')
2416 fm.plain('\n')
2417 else:
2417 else:
2418 lasttestedversion = exttestedwith[-1]
2418 lasttestedversion = exttestedwith[-1]
2419 fm.plain(' (%s!)\n' % lasttestedversion)
2419 fm.plain(' (%s!)\n' % lasttestedversion)
2420
2420
2421 fm.condwrite(ui.verbose and extsource, 'source',
2421 fm.condwrite(ui.verbose and extsource, 'source',
2422 _(' location: %s\n'), extsource or "")
2422 _(' location: %s\n'), extsource or "")
2423
2423
2424 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2424 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2425 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2425 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2426
2426
2427 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2427 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2428 _(' bug reporting: %s\n'), extbuglink or "")
2428 _(' bug reporting: %s\n'), extbuglink or "")
2429
2429
2430 fm.end()
2430 fm.end()
2431
2431
2432 @command('debugfileset',
2432 @command('debugfileset',
2433 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2433 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2434 _('[-r REV] FILESPEC'))
2434 _('[-r REV] FILESPEC'))
2435 def debugfileset(ui, repo, expr, **opts):
2435 def debugfileset(ui, repo, expr, **opts):
2436 '''parse and apply a fileset specification'''
2436 '''parse and apply a fileset specification'''
2437 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2437 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2438 if ui.verbose:
2438 if ui.verbose:
2439 tree = fileset.parse(expr)
2439 tree = fileset.parse(expr)
2440 ui.note(fileset.prettyformat(tree), "\n")
2440 ui.note(fileset.prettyformat(tree), "\n")
2441
2441
2442 for f in ctx.getfileset(expr):
2442 for f in ctx.getfileset(expr):
2443 ui.write("%s\n" % f)
2443 ui.write("%s\n" % f)
2444
2444
2445 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2445 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2446 def debugfsinfo(ui, path="."):
2446 def debugfsinfo(ui, path="."):
2447 """show information detected about current filesystem"""
2447 """show information detected about current filesystem"""
2448 util.writefile('.debugfsinfo', '')
2448 util.writefile('.debugfsinfo', '')
2449 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2449 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2450 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2450 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2451 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2451 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2452 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2452 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2453 and 'yes' or 'no'))
2453 and 'yes' or 'no'))
2454 os.unlink('.debugfsinfo')
2454 os.unlink('.debugfsinfo')
2455
2455
2456 @command('debuggetbundle',
2456 @command('debuggetbundle',
2457 [('H', 'head', [], _('id of head node'), _('ID')),
2457 [('H', 'head', [], _('id of head node'), _('ID')),
2458 ('C', 'common', [], _('id of common node'), _('ID')),
2458 ('C', 'common', [], _('id of common node'), _('ID')),
2459 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2459 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2460 _('REPO FILE [-H|-C ID]...'),
2460 _('REPO FILE [-H|-C ID]...'),
2461 norepo=True)
2461 norepo=True)
2462 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2462 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2463 """retrieves a bundle from a repo
2463 """retrieves a bundle from a repo
2464
2464
2465 Every ID must be a full-length hex node id string. Saves the bundle to the
2465 Every ID must be a full-length hex node id string. Saves the bundle to the
2466 given file.
2466 given file.
2467 """
2467 """
2468 repo = hg.peer(ui, opts, repopath)
2468 repo = hg.peer(ui, opts, repopath)
2469 if not repo.capable('getbundle'):
2469 if not repo.capable('getbundle'):
2470 raise error.Abort("getbundle() not supported by target repository")
2470 raise error.Abort("getbundle() not supported by target repository")
2471 args = {}
2471 args = {}
2472 if common:
2472 if common:
2473 args['common'] = [bin(s) for s in common]
2473 args['common'] = [bin(s) for s in common]
2474 if head:
2474 if head:
2475 args['heads'] = [bin(s) for s in head]
2475 args['heads'] = [bin(s) for s in head]
2476 # TODO: get desired bundlecaps from command line.
2476 # TODO: get desired bundlecaps from command line.
2477 args['bundlecaps'] = None
2477 args['bundlecaps'] = None
2478 bundle = repo.getbundle('debug', **args)
2478 bundle = repo.getbundle('debug', **args)
2479
2479
2480 bundletype = opts.get('type', 'bzip2').lower()
2480 bundletype = opts.get('type', 'bzip2').lower()
2481 btypes = {'none': 'HG10UN',
2481 btypes = {'none': 'HG10UN',
2482 'bzip2': 'HG10BZ',
2482 'bzip2': 'HG10BZ',
2483 'gzip': 'HG10GZ',
2483 'gzip': 'HG10GZ',
2484 'bundle2': 'HG20'}
2484 'bundle2': 'HG20'}
2485 bundletype = btypes.get(bundletype)
2485 bundletype = btypes.get(bundletype)
2486 if bundletype not in bundle2.bundletypes:
2486 if bundletype not in bundle2.bundletypes:
2487 raise error.Abort(_('unknown bundle type specified with --type'))
2487 raise error.Abort(_('unknown bundle type specified with --type'))
2488 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2488 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2489
2489
2490 @command('debugignore', [], '[FILE]')
2490 @command('debugignore', [], '[FILE]')
2491 def debugignore(ui, repo, *files, **opts):
2491 def debugignore(ui, repo, *files, **opts):
2492 """display the combined ignore pattern and information about ignored files
2492 """display the combined ignore pattern and information about ignored files
2493
2493
2494 With no argument display the combined ignore pattern.
2494 With no argument display the combined ignore pattern.
2495
2495
2496 Given space separated file names, shows if the given file is ignored and
2496 Given space separated file names, shows if the given file is ignored and
2497 if so, show the ignore rule (file and line number) that matched it.
2497 if so, show the ignore rule (file and line number) that matched it.
2498 """
2498 """
2499 ignore = repo.dirstate._ignore
2499 ignore = repo.dirstate._ignore
2500 if not files:
2500 if not files:
2501 # Show all the patterns
2501 # Show all the patterns
2502 includepat = getattr(ignore, 'includepat', None)
2502 includepat = getattr(ignore, 'includepat', None)
2503 if includepat is not None:
2503 if includepat is not None:
2504 ui.write("%s\n" % includepat)
2504 ui.write("%s\n" % includepat)
2505 else:
2505 else:
2506 raise error.Abort(_("no ignore patterns found"))
2506 raise error.Abort(_("no ignore patterns found"))
2507 else:
2507 else:
2508 for f in files:
2508 for f in files:
2509 nf = util.normpath(f)
2509 nf = util.normpath(f)
2510 ignored = None
2510 ignored = None
2511 ignoredata = None
2511 ignoredata = None
2512 if nf != '.':
2512 if nf != '.':
2513 if ignore(nf):
2513 if ignore(nf):
2514 ignored = nf
2514 ignored = nf
2515 ignoredata = repo.dirstate._ignorefileandline(nf)
2515 ignoredata = repo.dirstate._ignorefileandline(nf)
2516 else:
2516 else:
2517 for p in util.finddirs(nf):
2517 for p in util.finddirs(nf):
2518 if ignore(p):
2518 if ignore(p):
2519 ignored = p
2519 ignored = p
2520 ignoredata = repo.dirstate._ignorefileandline(p)
2520 ignoredata = repo.dirstate._ignorefileandline(p)
2521 break
2521 break
2522 if ignored:
2522 if ignored:
2523 if ignored == nf:
2523 if ignored == nf:
2524 ui.write("%s is ignored\n" % f)
2524 ui.write("%s is ignored\n" % f)
2525 else:
2525 else:
2526 ui.write("%s is ignored because of containing folder %s\n"
2526 ui.write("%s is ignored because of containing folder %s\n"
2527 % (f, ignored))
2527 % (f, ignored))
2528 ignorefile, lineno, line = ignoredata
2528 ignorefile, lineno, line = ignoredata
2529 ui.write("(ignore rule in %s, line %d: '%s')\n"
2529 ui.write("(ignore rule in %s, line %d: '%s')\n"
2530 % (ignorefile, lineno, line))
2530 % (ignorefile, lineno, line))
2531 else:
2531 else:
2532 ui.write("%s is not ignored\n" % f)
2532 ui.write("%s is not ignored\n" % f)
2533
2533
2534 @command('debugindex', debugrevlogopts +
2534 @command('debugindex', debugrevlogopts +
2535 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2535 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2536 _('[-f FORMAT] -c|-m|FILE'),
2536 _('[-f FORMAT] -c|-m|FILE'),
2537 optionalrepo=True)
2537 optionalrepo=True)
2538 def debugindex(ui, repo, file_=None, **opts):
2538 def debugindex(ui, repo, file_=None, **opts):
2539 """dump the contents of an index file"""
2539 """dump the contents of an index file"""
2540 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2540 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2541 format = opts.get('format', 0)
2541 format = opts.get('format', 0)
2542 if format not in (0, 1):
2542 if format not in (0, 1):
2543 raise error.Abort(_("unknown format %d") % format)
2543 raise error.Abort(_("unknown format %d") % format)
2544
2544
2545 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2545 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2546 if generaldelta:
2546 if generaldelta:
2547 basehdr = ' delta'
2547 basehdr = ' delta'
2548 else:
2548 else:
2549 basehdr = ' base'
2549 basehdr = ' base'
2550
2550
2551 if ui.debugflag:
2551 if ui.debugflag:
2552 shortfn = hex
2552 shortfn = hex
2553 else:
2553 else:
2554 shortfn = short
2554 shortfn = short
2555
2555
2556 # There might not be anything in r, so have a sane default
2556 # There might not be anything in r, so have a sane default
2557 idlen = 12
2557 idlen = 12
2558 for i in r:
2558 for i in r:
2559 idlen = len(shortfn(r.node(i)))
2559 idlen = len(shortfn(r.node(i)))
2560 break
2560 break
2561
2561
2562 if format == 0:
2562 if format == 0:
2563 ui.write(" rev offset length " + basehdr + " linkrev"
2563 ui.write(" rev offset length " + basehdr + " linkrev"
2564 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2564 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2565 elif format == 1:
2565 elif format == 1:
2566 ui.write(" rev flag offset length"
2566 ui.write(" rev flag offset length"
2567 " size " + basehdr + " link p1 p2"
2567 " size " + basehdr + " link p1 p2"
2568 " %s\n" % "nodeid".rjust(idlen))
2568 " %s\n" % "nodeid".rjust(idlen))
2569
2569
2570 for i in r:
2570 for i in r:
2571 node = r.node(i)
2571 node = r.node(i)
2572 if generaldelta:
2572 if generaldelta:
2573 base = r.deltaparent(i)
2573 base = r.deltaparent(i)
2574 else:
2574 else:
2575 base = r.chainbase(i)
2575 base = r.chainbase(i)
2576 if format == 0:
2576 if format == 0:
2577 try:
2577 try:
2578 pp = r.parents(node)
2578 pp = r.parents(node)
2579 except Exception:
2579 except Exception:
2580 pp = [nullid, nullid]
2580 pp = [nullid, nullid]
2581 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2581 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2582 i, r.start(i), r.length(i), base, r.linkrev(i),
2582 i, r.start(i), r.length(i), base, r.linkrev(i),
2583 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2583 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2584 elif format == 1:
2584 elif format == 1:
2585 pr = r.parentrevs(i)
2585 pr = r.parentrevs(i)
2586 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2586 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2587 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2587 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2588 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2588 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2589
2589
2590 @command('debugindexdot', debugrevlogopts,
2590 @command('debugindexdot', debugrevlogopts,
2591 _('-c|-m|FILE'), optionalrepo=True)
2591 _('-c|-m|FILE'), optionalrepo=True)
2592 def debugindexdot(ui, repo, file_=None, **opts):
2592 def debugindexdot(ui, repo, file_=None, **opts):
2593 """dump an index DAG as a graphviz dot file"""
2593 """dump an index DAG as a graphviz dot file"""
2594 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2594 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2595 ui.write(("digraph G {\n"))
2595 ui.write(("digraph G {\n"))
2596 for i in r:
2596 for i in r:
2597 node = r.node(i)
2597 node = r.node(i)
2598 pp = r.parents(node)
2598 pp = r.parents(node)
2599 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2599 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2600 if pp[1] != nullid:
2600 if pp[1] != nullid:
2601 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2601 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2602 ui.write("}\n")
2602 ui.write("}\n")
2603
2603
2604 @command('debugdeltachain',
2604 @command('debugdeltachain',
2605 debugrevlogopts + formatteropts,
2605 debugrevlogopts + formatteropts,
2606 _('-c|-m|FILE'),
2606 _('-c|-m|FILE'),
2607 optionalrepo=True)
2607 optionalrepo=True)
2608 def debugdeltachain(ui, repo, file_=None, **opts):
2608 def debugdeltachain(ui, repo, file_=None, **opts):
2609 """dump information about delta chains in a revlog
2609 """dump information about delta chains in a revlog
2610
2610
2611 Output can be templatized. Available template keywords are:
2611 Output can be templatized. Available template keywords are:
2612
2612
2613 rev revision number
2613 rev revision number
2614 chainid delta chain identifier (numbered by unique base)
2614 chainid delta chain identifier (numbered by unique base)
2615 chainlen delta chain length to this revision
2615 chainlen delta chain length to this revision
2616 prevrev previous revision in delta chain
2616 prevrev previous revision in delta chain
2617 deltatype role of delta / how it was computed
2617 deltatype role of delta / how it was computed
2618 compsize compressed size of revision
2618 compsize compressed size of revision
2619 uncompsize uncompressed size of revision
2619 uncompsize uncompressed size of revision
2620 chainsize total size of compressed revisions in chain
2620 chainsize total size of compressed revisions in chain
2621 chainratio total chain size divided by uncompressed revision size
2621 chainratio total chain size divided by uncompressed revision size
2622 (new delta chains typically start at ratio 2.00)
2622 (new delta chains typically start at ratio 2.00)
2623 lindist linear distance from base revision in delta chain to end
2623 lindist linear distance from base revision in delta chain to end
2624 of this revision
2624 of this revision
2625 extradist total size of revisions not part of this delta chain from
2625 extradist total size of revisions not part of this delta chain from
2626 base of delta chain to end of this revision; a measurement
2626 base of delta chain to end of this revision; a measurement
2627 of how much extra data we need to read/seek across to read
2627 of how much extra data we need to read/seek across to read
2628 the delta chain for this revision
2628 the delta chain for this revision
2629 extraratio extradist divided by chainsize; another representation of
2629 extraratio extradist divided by chainsize; another representation of
2630 how much unrelated data is needed to load this delta chain
2630 how much unrelated data is needed to load this delta chain
2631 """
2631 """
2632 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2632 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2633 index = r.index
2633 index = r.index
2634 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2634 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2635
2635
2636 def revinfo(rev):
2636 def revinfo(rev):
2637 e = index[rev]
2637 e = index[rev]
2638 compsize = e[1]
2638 compsize = e[1]
2639 uncompsize = e[2]
2639 uncompsize = e[2]
2640 chainsize = 0
2640 chainsize = 0
2641
2641
2642 if generaldelta:
2642 if generaldelta:
2643 if e[3] == e[5]:
2643 if e[3] == e[5]:
2644 deltatype = 'p1'
2644 deltatype = 'p1'
2645 elif e[3] == e[6]:
2645 elif e[3] == e[6]:
2646 deltatype = 'p2'
2646 deltatype = 'p2'
2647 elif e[3] == rev - 1:
2647 elif e[3] == rev - 1:
2648 deltatype = 'prev'
2648 deltatype = 'prev'
2649 elif e[3] == rev:
2649 elif e[3] == rev:
2650 deltatype = 'base'
2650 deltatype = 'base'
2651 else:
2651 else:
2652 deltatype = 'other'
2652 deltatype = 'other'
2653 else:
2653 else:
2654 if e[3] == rev:
2654 if e[3] == rev:
2655 deltatype = 'base'
2655 deltatype = 'base'
2656 else:
2656 else:
2657 deltatype = 'prev'
2657 deltatype = 'prev'
2658
2658
2659 chain = r._deltachain(rev)[0]
2659 chain = r._deltachain(rev)[0]
2660 for iterrev in chain:
2660 for iterrev in chain:
2661 e = index[iterrev]
2661 e = index[iterrev]
2662 chainsize += e[1]
2662 chainsize += e[1]
2663
2663
2664 return compsize, uncompsize, deltatype, chain, chainsize
2664 return compsize, uncompsize, deltatype, chain, chainsize
2665
2665
2666 fm = ui.formatter('debugdeltachain', opts)
2666 fm = ui.formatter('debugdeltachain', opts)
2667
2667
2668 fm.plain(' rev chain# chainlen prev delta '
2668 fm.plain(' rev chain# chainlen prev delta '
2669 'size rawsize chainsize ratio lindist extradist '
2669 'size rawsize chainsize ratio lindist extradist '
2670 'extraratio\n')
2670 'extraratio\n')
2671
2671
2672 chainbases = {}
2672 chainbases = {}
2673 for rev in r:
2673 for rev in r:
2674 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2674 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2675 chainbase = chain[0]
2675 chainbase = chain[0]
2676 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2676 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2677 basestart = r.start(chainbase)
2677 basestart = r.start(chainbase)
2678 revstart = r.start(rev)
2678 revstart = r.start(rev)
2679 lineardist = revstart + comp - basestart
2679 lineardist = revstart + comp - basestart
2680 extradist = lineardist - chainsize
2680 extradist = lineardist - chainsize
2681 try:
2681 try:
2682 prevrev = chain[-2]
2682 prevrev = chain[-2]
2683 except IndexError:
2683 except IndexError:
2684 prevrev = -1
2684 prevrev = -1
2685
2685
2686 chainratio = float(chainsize) / float(uncomp)
2686 chainratio = float(chainsize) / float(uncomp)
2687 extraratio = float(extradist) / float(chainsize)
2687 extraratio = float(extradist) / float(chainsize)
2688
2688
2689 fm.startitem()
2689 fm.startitem()
2690 fm.write('rev chainid chainlen prevrev deltatype compsize '
2690 fm.write('rev chainid chainlen prevrev deltatype compsize '
2691 'uncompsize chainsize chainratio lindist extradist '
2691 'uncompsize chainsize chainratio lindist extradist '
2692 'extraratio',
2692 'extraratio',
2693 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2693 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2694 rev, chainid, len(chain), prevrev, deltatype, comp,
2694 rev, chainid, len(chain), prevrev, deltatype, comp,
2695 uncomp, chainsize, chainratio, lineardist, extradist,
2695 uncomp, chainsize, chainratio, lineardist, extradist,
2696 extraratio,
2696 extraratio,
2697 rev=rev, chainid=chainid, chainlen=len(chain),
2697 rev=rev, chainid=chainid, chainlen=len(chain),
2698 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2698 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2699 uncompsize=uncomp, chainsize=chainsize,
2699 uncompsize=uncomp, chainsize=chainsize,
2700 chainratio=chainratio, lindist=lineardist,
2700 chainratio=chainratio, lindist=lineardist,
2701 extradist=extradist, extraratio=extraratio)
2701 extradist=extradist, extraratio=extraratio)
2702
2702
2703 fm.end()
2703 fm.end()
2704
2704
2705 @command('debuginstall', [] + formatteropts, '', norepo=True)
2705 @command('debuginstall', [] + formatteropts, '', norepo=True)
2706 def debuginstall(ui, **opts):
2706 def debuginstall(ui, **opts):
2707 '''test Mercurial installation
2707 '''test Mercurial installation
2708
2708
2709 Returns 0 on success.
2709 Returns 0 on success.
2710 '''
2710 '''
2711
2711
2712 def writetemp(contents):
2712 def writetemp(contents):
2713 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2713 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2714 f = os.fdopen(fd, "wb")
2714 f = os.fdopen(fd, "wb")
2715 f.write(contents)
2715 f.write(contents)
2716 f.close()
2716 f.close()
2717 return name
2717 return name
2718
2718
2719 problems = 0
2719 problems = 0
2720
2720
2721 fm = ui.formatter('debuginstall', opts)
2721 fm = ui.formatter('debuginstall', opts)
2722 fm.startitem()
2722 fm.startitem()
2723
2723
2724 # encoding
2724 # encoding
2725 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2725 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2726 err = None
2726 err = None
2727 try:
2727 try:
2728 encoding.fromlocal("test")
2728 encoding.fromlocal("test")
2729 except error.Abort as inst:
2729 except error.Abort as inst:
2730 err = inst
2730 err = inst
2731 problems += 1
2731 problems += 1
2732 fm.condwrite(err, 'encodingerror', _(" %s\n"
2732 fm.condwrite(err, 'encodingerror', _(" %s\n"
2733 " (check that your locale is properly set)\n"), err)
2733 " (check that your locale is properly set)\n"), err)
2734
2734
2735 # Python
2735 # Python
2736 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2736 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2737 sys.executable)
2737 sys.executable)
2738 fm.write('pythonver', _("checking Python version (%s)\n"),
2738 fm.write('pythonver', _("checking Python version (%s)\n"),
2739 ("%s.%s.%s" % sys.version_info[:3]))
2739 ("%s.%s.%s" % sys.version_info[:3]))
2740 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2740 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2741 os.path.dirname(os.__file__))
2741 os.path.dirname(os.__file__))
2742
2742
2743 # compiled modules
2743 # compiled modules
2744 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2744 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2745 os.path.dirname(__file__))
2745 os.path.dirname(__file__))
2746
2746
2747 err = None
2747 err = None
2748 try:
2748 try:
2749 from . import (
2749 from . import (
2750 base85,
2750 base85,
2751 bdiff,
2751 bdiff,
2752 mpatch,
2752 mpatch,
2753 osutil,
2753 osutil,
2754 )
2754 )
2755 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2755 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2756 except Exception as inst:
2756 except Exception as inst:
2757 err = inst
2757 err = inst
2758 problems += 1
2758 problems += 1
2759 fm.condwrite(err, 'extensionserror', " %s\n", err)
2759 fm.condwrite(err, 'extensionserror', " %s\n", err)
2760
2760
2761 # templates
2761 # templates
2762 p = templater.templatepaths()
2762 p = templater.templatepaths()
2763 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2763 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2764 fm.condwrite(not p, '', _(" no template directories found\n"))
2764 fm.condwrite(not p, '', _(" no template directories found\n"))
2765 if p:
2765 if p:
2766 m = templater.templatepath("map-cmdline.default")
2766 m = templater.templatepath("map-cmdline.default")
2767 if m:
2767 if m:
2768 # template found, check if it is working
2768 # template found, check if it is working
2769 err = None
2769 err = None
2770 try:
2770 try:
2771 templater.templater.frommapfile(m)
2771 templater.templater.frommapfile(m)
2772 except Exception as inst:
2772 except Exception as inst:
2773 err = inst
2773 err = inst
2774 p = None
2774 p = None
2775 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2775 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2776 else:
2776 else:
2777 p = None
2777 p = None
2778 fm.condwrite(p, 'defaulttemplate',
2778 fm.condwrite(p, 'defaulttemplate',
2779 _("checking default template (%s)\n"), m)
2779 _("checking default template (%s)\n"), m)
2780 fm.condwrite(not m, 'defaulttemplatenotfound',
2780 fm.condwrite(not m, 'defaulttemplatenotfound',
2781 _(" template '%s' not found\n"), "default")
2781 _(" template '%s' not found\n"), "default")
2782 if not p:
2782 if not p:
2783 problems += 1
2783 problems += 1
2784 fm.condwrite(not p, '',
2784 fm.condwrite(not p, '',
2785 _(" (templates seem to have been installed incorrectly)\n"))
2785 _(" (templates seem to have been installed incorrectly)\n"))
2786
2786
2787 # editor
2787 # editor
2788 editor = ui.geteditor()
2788 editor = ui.geteditor()
2789 editor = util.expandpath(editor)
2789 editor = util.expandpath(editor)
2790 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2790 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2791 cmdpath = util.findexe(shlex.split(editor)[0])
2791 cmdpath = util.findexe(shlex.split(editor)[0])
2792 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2792 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2793 _(" No commit editor set and can't find %s in PATH\n"
2793 _(" No commit editor set and can't find %s in PATH\n"
2794 " (specify a commit editor in your configuration"
2794 " (specify a commit editor in your configuration"
2795 " file)\n"), not cmdpath and editor == 'vi' and editor)
2795 " file)\n"), not cmdpath and editor == 'vi' and editor)
2796 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2796 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2797 _(" Can't find editor '%s' in PATH\n"
2797 _(" Can't find editor '%s' in PATH\n"
2798 " (specify a commit editor in your configuration"
2798 " (specify a commit editor in your configuration"
2799 " file)\n"), not cmdpath and editor)
2799 " file)\n"), not cmdpath and editor)
2800 if not cmdpath and editor != 'vi':
2800 if not cmdpath and editor != 'vi':
2801 problems += 1
2801 problems += 1
2802
2802
2803 # check username
2803 # check username
2804 username = None
2804 username = None
2805 err = None
2805 err = None
2806 try:
2806 try:
2807 username = ui.username()
2807 username = ui.username()
2808 except error.Abort as e:
2808 except error.Abort as e:
2809 err = e
2809 err = e
2810 problems += 1
2810 problems += 1
2811
2811
2812 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2812 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2813 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2813 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2814 " (specify a username in your configuration file)\n"), err)
2814 " (specify a username in your configuration file)\n"), err)
2815
2815
2816 fm.condwrite(not problems, '',
2816 fm.condwrite(not problems, '',
2817 _("no problems detected\n"))
2817 _("no problems detected\n"))
2818 if not problems:
2818 if not problems:
2819 fm.data(problems=problems)
2819 fm.data(problems=problems)
2820 fm.condwrite(problems, 'problems',
2820 fm.condwrite(problems, 'problems',
2821 _("%s problems detected,"
2821 _("%s problems detected,"
2822 " please check your install!\n"), problems)
2822 " please check your install!\n"), problems)
2823 fm.end()
2823 fm.end()
2824
2824
2825 return problems
2825 return problems
2826
2826
2827 @command('debugknown', [], _('REPO ID...'), norepo=True)
2827 @command('debugknown', [], _('REPO ID...'), norepo=True)
2828 def debugknown(ui, repopath, *ids, **opts):
2828 def debugknown(ui, repopath, *ids, **opts):
2829 """test whether node ids are known to a repo
2829 """test whether node ids are known to a repo
2830
2830
2831 Every ID must be a full-length hex node id string. Returns a list of 0s
2831 Every ID must be a full-length hex node id string. Returns a list of 0s
2832 and 1s indicating unknown/known.
2832 and 1s indicating unknown/known.
2833 """
2833 """
2834 repo = hg.peer(ui, opts, repopath)
2834 repo = hg.peer(ui, opts, repopath)
2835 if not repo.capable('known'):
2835 if not repo.capable('known'):
2836 raise error.Abort("known() not supported by target repository")
2836 raise error.Abort("known() not supported by target repository")
2837 flags = repo.known([bin(s) for s in ids])
2837 flags = repo.known([bin(s) for s in ids])
2838 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2838 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2839
2839
2840 @command('debuglabelcomplete', [], _('LABEL...'))
2840 @command('debuglabelcomplete', [], _('LABEL...'))
2841 def debuglabelcomplete(ui, repo, *args):
2841 def debuglabelcomplete(ui, repo, *args):
2842 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2842 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2843 debugnamecomplete(ui, repo, *args)
2843 debugnamecomplete(ui, repo, *args)
2844
2844
2845 @command('debugmergestate', [], '')
2845 @command('debugmergestate', [], '')
2846 def debugmergestate(ui, repo, *args):
2846 def debugmergestate(ui, repo, *args):
2847 """print merge state
2847 """print merge state
2848
2848
2849 Use --verbose to print out information about whether v1 or v2 merge state
2849 Use --verbose to print out information about whether v1 or v2 merge state
2850 was chosen."""
2850 was chosen."""
2851 def _hashornull(h):
2851 def _hashornull(h):
2852 if h == nullhex:
2852 if h == nullhex:
2853 return 'null'
2853 return 'null'
2854 else:
2854 else:
2855 return h
2855 return h
2856
2856
2857 def printrecords(version):
2857 def printrecords(version):
2858 ui.write(('* version %s records\n') % version)
2858 ui.write(('* version %s records\n') % version)
2859 if version == 1:
2859 if version == 1:
2860 records = v1records
2860 records = v1records
2861 else:
2861 else:
2862 records = v2records
2862 records = v2records
2863
2863
2864 for rtype, record in records:
2864 for rtype, record in records:
2865 # pretty print some record types
2865 # pretty print some record types
2866 if rtype == 'L':
2866 if rtype == 'L':
2867 ui.write(('local: %s\n') % record)
2867 ui.write(('local: %s\n') % record)
2868 elif rtype == 'O':
2868 elif rtype == 'O':
2869 ui.write(('other: %s\n') % record)
2869 ui.write(('other: %s\n') % record)
2870 elif rtype == 'm':
2870 elif rtype == 'm':
2871 driver, mdstate = record.split('\0', 1)
2871 driver, mdstate = record.split('\0', 1)
2872 ui.write(('merge driver: %s (state "%s")\n')
2872 ui.write(('merge driver: %s (state "%s")\n')
2873 % (driver, mdstate))
2873 % (driver, mdstate))
2874 elif rtype in 'FDC':
2874 elif rtype in 'FDC':
2875 r = record.split('\0')
2875 r = record.split('\0')
2876 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2876 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2877 if version == 1:
2877 if version == 1:
2878 onode = 'not stored in v1 format'
2878 onode = 'not stored in v1 format'
2879 flags = r[7]
2879 flags = r[7]
2880 else:
2880 else:
2881 onode, flags = r[7:9]
2881 onode, flags = r[7:9]
2882 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2882 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2883 % (f, rtype, state, _hashornull(hash)))
2883 % (f, rtype, state, _hashornull(hash)))
2884 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2884 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2885 ui.write((' ancestor path: %s (node %s)\n')
2885 ui.write((' ancestor path: %s (node %s)\n')
2886 % (afile, _hashornull(anode)))
2886 % (afile, _hashornull(anode)))
2887 ui.write((' other path: %s (node %s)\n')
2887 ui.write((' other path: %s (node %s)\n')
2888 % (ofile, _hashornull(onode)))
2888 % (ofile, _hashornull(onode)))
2889 elif rtype == 'f':
2889 elif rtype == 'f':
2890 filename, rawextras = record.split('\0', 1)
2890 filename, rawextras = record.split('\0', 1)
2891 extras = rawextras.split('\0')
2891 extras = rawextras.split('\0')
2892 i = 0
2892 i = 0
2893 extrastrings = []
2893 extrastrings = []
2894 while i < len(extras):
2894 while i < len(extras):
2895 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2895 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2896 i += 2
2896 i += 2
2897
2897
2898 ui.write(('file extras: %s (%s)\n')
2898 ui.write(('file extras: %s (%s)\n')
2899 % (filename, ', '.join(extrastrings)))
2899 % (filename, ', '.join(extrastrings)))
2900 elif rtype == 'l':
2900 elif rtype == 'l':
2901 labels = record.split('\0', 2)
2901 labels = record.split('\0', 2)
2902 labels = [l for l in labels if len(l) > 0]
2902 labels = [l for l in labels if len(l) > 0]
2903 ui.write(('labels:\n'))
2903 ui.write(('labels:\n'))
2904 ui.write((' local: %s\n' % labels[0]))
2904 ui.write((' local: %s\n' % labels[0]))
2905 ui.write((' other: %s\n' % labels[1]))
2905 ui.write((' other: %s\n' % labels[1]))
2906 if len(labels) > 2:
2906 if len(labels) > 2:
2907 ui.write((' base: %s\n' % labels[2]))
2907 ui.write((' base: %s\n' % labels[2]))
2908 else:
2908 else:
2909 ui.write(('unrecognized entry: %s\t%s\n')
2909 ui.write(('unrecognized entry: %s\t%s\n')
2910 % (rtype, record.replace('\0', '\t')))
2910 % (rtype, record.replace('\0', '\t')))
2911
2911
2912 # Avoid mergestate.read() since it may raise an exception for unsupported
2912 # Avoid mergestate.read() since it may raise an exception for unsupported
2913 # merge state records. We shouldn't be doing this, but this is OK since this
2913 # merge state records. We shouldn't be doing this, but this is OK since this
2914 # command is pretty low-level.
2914 # command is pretty low-level.
2915 ms = mergemod.mergestate(repo)
2915 ms = mergemod.mergestate(repo)
2916
2916
2917 # sort so that reasonable information is on top
2917 # sort so that reasonable information is on top
2918 v1records = ms._readrecordsv1()
2918 v1records = ms._readrecordsv1()
2919 v2records = ms._readrecordsv2()
2919 v2records = ms._readrecordsv2()
2920 order = 'LOml'
2920 order = 'LOml'
2921 def key(r):
2921 def key(r):
2922 idx = order.find(r[0])
2922 idx = order.find(r[0])
2923 if idx == -1:
2923 if idx == -1:
2924 return (1, r[1])
2924 return (1, r[1])
2925 else:
2925 else:
2926 return (0, idx)
2926 return (0, idx)
2927 v1records.sort(key=key)
2927 v1records.sort(key=key)
2928 v2records.sort(key=key)
2928 v2records.sort(key=key)
2929
2929
2930 if not v1records and not v2records:
2930 if not v1records and not v2records:
2931 ui.write(('no merge state found\n'))
2931 ui.write(('no merge state found\n'))
2932 elif not v2records:
2932 elif not v2records:
2933 ui.note(('no version 2 merge state\n'))
2933 ui.note(('no version 2 merge state\n'))
2934 printrecords(1)
2934 printrecords(1)
2935 elif ms._v1v2match(v1records, v2records):
2935 elif ms._v1v2match(v1records, v2records):
2936 ui.note(('v1 and v2 states match: using v2\n'))
2936 ui.note(('v1 and v2 states match: using v2\n'))
2937 printrecords(2)
2937 printrecords(2)
2938 else:
2938 else:
2939 ui.note(('v1 and v2 states mismatch: using v1\n'))
2939 ui.note(('v1 and v2 states mismatch: using v1\n'))
2940 printrecords(1)
2940 printrecords(1)
2941 if ui.verbose:
2941 if ui.verbose:
2942 printrecords(2)
2942 printrecords(2)
2943
2943
2944 @command('debugnamecomplete', [], _('NAME...'))
2944 @command('debugnamecomplete', [], _('NAME...'))
2945 def debugnamecomplete(ui, repo, *args):
2945 def debugnamecomplete(ui, repo, *args):
2946 '''complete "names" - tags, open branch names, bookmark names'''
2946 '''complete "names" - tags, open branch names, bookmark names'''
2947
2947
2948 names = set()
2948 names = set()
2949 # since we previously only listed open branches, we will handle that
2949 # since we previously only listed open branches, we will handle that
2950 # specially (after this for loop)
2950 # specially (after this for loop)
2951 for name, ns in repo.names.iteritems():
2951 for name, ns in repo.names.iteritems():
2952 if name != 'branches':
2952 if name != 'branches':
2953 names.update(ns.listnames(repo))
2953 names.update(ns.listnames(repo))
2954 names.update(tag for (tag, heads, tip, closed)
2954 names.update(tag for (tag, heads, tip, closed)
2955 in repo.branchmap().iterbranches() if not closed)
2955 in repo.branchmap().iterbranches() if not closed)
2956 completions = set()
2956 completions = set()
2957 if not args:
2957 if not args:
2958 args = ['']
2958 args = ['']
2959 for a in args:
2959 for a in args:
2960 completions.update(n for n in names if n.startswith(a))
2960 completions.update(n for n in names if n.startswith(a))
2961 ui.write('\n'.join(sorted(completions)))
2961 ui.write('\n'.join(sorted(completions)))
2962 ui.write('\n')
2962 ui.write('\n')
2963
2963
2964 @command('debuglocks',
2964 @command('debuglocks',
2965 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2965 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2966 ('W', 'force-wlock', None,
2966 ('W', 'force-wlock', None,
2967 _('free the working state lock (DANGEROUS)'))],
2967 _('free the working state lock (DANGEROUS)'))],
2968 _('[OPTION]...'))
2968 _('[OPTION]...'))
2969 def debuglocks(ui, repo, **opts):
2969 def debuglocks(ui, repo, **opts):
2970 """show or modify state of locks
2970 """show or modify state of locks
2971
2971
2972 By default, this command will show which locks are held. This
2972 By default, this command will show which locks are held. This
2973 includes the user and process holding the lock, the amount of time
2973 includes the user and process holding the lock, the amount of time
2974 the lock has been held, and the machine name where the process is
2974 the lock has been held, and the machine name where the process is
2975 running if it's not local.
2975 running if it's not local.
2976
2976
2977 Locks protect the integrity of Mercurial's data, so should be
2977 Locks protect the integrity of Mercurial's data, so should be
2978 treated with care. System crashes or other interruptions may cause
2978 treated with care. System crashes or other interruptions may cause
2979 locks to not be properly released, though Mercurial will usually
2979 locks to not be properly released, though Mercurial will usually
2980 detect and remove such stale locks automatically.
2980 detect and remove such stale locks automatically.
2981
2981
2982 However, detecting stale locks may not always be possible (for
2982 However, detecting stale locks may not always be possible (for
2983 instance, on a shared filesystem). Removing locks may also be
2983 instance, on a shared filesystem). Removing locks may also be
2984 blocked by filesystem permissions.
2984 blocked by filesystem permissions.
2985
2985
2986 Returns 0 if no locks are held.
2986 Returns 0 if no locks are held.
2987
2987
2988 """
2988 """
2989
2989
2990 if opts.get('force_lock'):
2990 if opts.get('force_lock'):
2991 repo.svfs.unlink('lock')
2991 repo.svfs.unlink('lock')
2992 if opts.get('force_wlock'):
2992 if opts.get('force_wlock'):
2993 repo.vfs.unlink('wlock')
2993 repo.vfs.unlink('wlock')
2994 if opts.get('force_lock') or opts.get('force_lock'):
2994 if opts.get('force_lock') or opts.get('force_lock'):
2995 return 0
2995 return 0
2996
2996
2997 now = time.time()
2997 now = time.time()
2998 held = 0
2998 held = 0
2999
2999
3000 def report(vfs, name, method):
3000 def report(vfs, name, method):
3001 # this causes stale locks to get reaped for more accurate reporting
3001 # this causes stale locks to get reaped for more accurate reporting
3002 try:
3002 try:
3003 l = method(False)
3003 l = method(False)
3004 except error.LockHeld:
3004 except error.LockHeld:
3005 l = None
3005 l = None
3006
3006
3007 if l:
3007 if l:
3008 l.release()
3008 l.release()
3009 else:
3009 else:
3010 try:
3010 try:
3011 stat = vfs.lstat(name)
3011 stat = vfs.lstat(name)
3012 age = now - stat.st_mtime
3012 age = now - stat.st_mtime
3013 user = util.username(stat.st_uid)
3013 user = util.username(stat.st_uid)
3014 locker = vfs.readlock(name)
3014 locker = vfs.readlock(name)
3015 if ":" in locker:
3015 if ":" in locker:
3016 host, pid = locker.split(':')
3016 host, pid = locker.split(':')
3017 if host == socket.gethostname():
3017 if host == socket.gethostname():
3018 locker = 'user %s, process %s' % (user, pid)
3018 locker = 'user %s, process %s' % (user, pid)
3019 else:
3019 else:
3020 locker = 'user %s, process %s, host %s' \
3020 locker = 'user %s, process %s, host %s' \
3021 % (user, pid, host)
3021 % (user, pid, host)
3022 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
3022 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
3023 return 1
3023 return 1
3024 except OSError as e:
3024 except OSError as e:
3025 if e.errno != errno.ENOENT:
3025 if e.errno != errno.ENOENT:
3026 raise
3026 raise
3027
3027
3028 ui.write("%-6s free\n" % (name + ":"))
3028 ui.write("%-6s free\n" % (name + ":"))
3029 return 0
3029 return 0
3030
3030
3031 held += report(repo.svfs, "lock", repo.lock)
3031 held += report(repo.svfs, "lock", repo.lock)
3032 held += report(repo.vfs, "wlock", repo.wlock)
3032 held += report(repo.vfs, "wlock", repo.wlock)
3033
3033
3034 return held
3034 return held
3035
3035
3036 @command('debugobsolete',
3036 @command('debugobsolete',
3037 [('', 'flags', 0, _('markers flag')),
3037 [('', 'flags', 0, _('markers flag')),
3038 ('', 'record-parents', False,
3038 ('', 'record-parents', False,
3039 _('record parent information for the precursor')),
3039 _('record parent information for the precursor')),
3040 ('r', 'rev', [], _('display markers relevant to REV')),
3040 ('r', 'rev', [], _('display markers relevant to REV')),
3041 ('', 'index', False, _('display index of the marker')),
3041 ('', 'index', False, _('display index of the marker')),
3042 ('', 'delete', [], _('delete markers specified by indices')),
3042 ('', 'delete', [], _('delete markers specified by indices')),
3043 ] + commitopts2,
3043 ] + commitopts2,
3044 _('[OBSOLETED [REPLACEMENT ...]]'))
3044 _('[OBSOLETED [REPLACEMENT ...]]'))
3045 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3045 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3046 """create arbitrary obsolete marker
3046 """create arbitrary obsolete marker
3047
3047
3048 With no arguments, displays the list of obsolescence markers."""
3048 With no arguments, displays the list of obsolescence markers."""
3049
3049
3050 def parsenodeid(s):
3050 def parsenodeid(s):
3051 try:
3051 try:
3052 # We do not use revsingle/revrange functions here to accept
3052 # We do not use revsingle/revrange functions here to accept
3053 # arbitrary node identifiers, possibly not present in the
3053 # arbitrary node identifiers, possibly not present in the
3054 # local repository.
3054 # local repository.
3055 n = bin(s)
3055 n = bin(s)
3056 if len(n) != len(nullid):
3056 if len(n) != len(nullid):
3057 raise TypeError()
3057 raise TypeError()
3058 return n
3058 return n
3059 except TypeError:
3059 except TypeError:
3060 raise error.Abort('changeset references must be full hexadecimal '
3060 raise error.Abort('changeset references must be full hexadecimal '
3061 'node identifiers')
3061 'node identifiers')
3062
3062
3063 if opts.get('delete'):
3063 if opts.get('delete'):
3064 indices = []
3064 indices = []
3065 for v in opts.get('delete'):
3065 for v in opts.get('delete'):
3066 try:
3066 try:
3067 indices.append(int(v))
3067 indices.append(int(v))
3068 except ValueError:
3068 except ValueError:
3069 raise error.Abort(_('invalid index value: %r') % v,
3069 raise error.Abort(_('invalid index value: %r') % v,
3070 hint=_('use integers for indices'))
3070 hint=_('use integers for indices'))
3071
3071
3072 if repo.currenttransaction():
3072 if repo.currenttransaction():
3073 raise error.Abort(_('cannot delete obsmarkers in the middle '
3073 raise error.Abort(_('cannot delete obsmarkers in the middle '
3074 'of transaction.'))
3074 'of transaction.'))
3075
3075
3076 with repo.lock():
3076 with repo.lock():
3077 n = repair.deleteobsmarkers(repo.obsstore, indices)
3077 n = repair.deleteobsmarkers(repo.obsstore, indices)
3078 ui.write(_('deleted %i obsolescense markers\n') % n)
3078 ui.write(_('deleted %i obsolescense markers\n') % n)
3079
3079
3080 return
3080 return
3081
3081
3082 if precursor is not None:
3082 if precursor is not None:
3083 if opts['rev']:
3083 if opts['rev']:
3084 raise error.Abort('cannot select revision when creating marker')
3084 raise error.Abort('cannot select revision when creating marker')
3085 metadata = {}
3085 metadata = {}
3086 metadata['user'] = opts['user'] or ui.username()
3086 metadata['user'] = opts['user'] or ui.username()
3087 succs = tuple(parsenodeid(succ) for succ in successors)
3087 succs = tuple(parsenodeid(succ) for succ in successors)
3088 l = repo.lock()
3088 l = repo.lock()
3089 try:
3089 try:
3090 tr = repo.transaction('debugobsolete')
3090 tr = repo.transaction('debugobsolete')
3091 try:
3091 try:
3092 date = opts.get('date')
3092 date = opts.get('date')
3093 if date:
3093 if date:
3094 date = util.parsedate(date)
3094 date = util.parsedate(date)
3095 else:
3095 else:
3096 date = None
3096 date = None
3097 prec = parsenodeid(precursor)
3097 prec = parsenodeid(precursor)
3098 parents = None
3098 parents = None
3099 if opts['record_parents']:
3099 if opts['record_parents']:
3100 if prec not in repo.unfiltered():
3100 if prec not in repo.unfiltered():
3101 raise error.Abort('cannot used --record-parents on '
3101 raise error.Abort('cannot used --record-parents on '
3102 'unknown changesets')
3102 'unknown changesets')
3103 parents = repo.unfiltered()[prec].parents()
3103 parents = repo.unfiltered()[prec].parents()
3104 parents = tuple(p.node() for p in parents)
3104 parents = tuple(p.node() for p in parents)
3105 repo.obsstore.create(tr, prec, succs, opts['flags'],
3105 repo.obsstore.create(tr, prec, succs, opts['flags'],
3106 parents=parents, date=date,
3106 parents=parents, date=date,
3107 metadata=metadata)
3107 metadata=metadata)
3108 tr.close()
3108 tr.close()
3109 except ValueError as exc:
3109 except ValueError as exc:
3110 raise error.Abort(_('bad obsmarker input: %s') % exc)
3110 raise error.Abort(_('bad obsmarker input: %s') % exc)
3111 finally:
3111 finally:
3112 tr.release()
3112 tr.release()
3113 finally:
3113 finally:
3114 l.release()
3114 l.release()
3115 else:
3115 else:
3116 if opts['rev']:
3116 if opts['rev']:
3117 revs = scmutil.revrange(repo, opts['rev'])
3117 revs = scmutil.revrange(repo, opts['rev'])
3118 nodes = [repo[r].node() for r in revs]
3118 nodes = [repo[r].node() for r in revs]
3119 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3119 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3120 markers.sort(key=lambda x: x._data)
3120 markers.sort(key=lambda x: x._data)
3121 else:
3121 else:
3122 markers = obsolete.getmarkers(repo)
3122 markers = obsolete.getmarkers(repo)
3123
3123
3124 markerstoiter = markers
3124 markerstoiter = markers
3125 isrelevant = lambda m: True
3125 isrelevant = lambda m: True
3126 if opts.get('rev') and opts.get('index'):
3126 if opts.get('rev') and opts.get('index'):
3127 markerstoiter = obsolete.getmarkers(repo)
3127 markerstoiter = obsolete.getmarkers(repo)
3128 markerset = set(markers)
3128 markerset = set(markers)
3129 isrelevant = lambda m: m in markerset
3129 isrelevant = lambda m: m in markerset
3130
3130
3131 for i, m in enumerate(markerstoiter):
3131 for i, m in enumerate(markerstoiter):
3132 if not isrelevant(m):
3132 if not isrelevant(m):
3133 # marker can be irrelevant when we're iterating over a set
3133 # marker can be irrelevant when we're iterating over a set
3134 # of markers (markerstoiter) which is bigger than the set
3134 # of markers (markerstoiter) which is bigger than the set
3135 # of markers we want to display (markers)
3135 # of markers we want to display (markers)
3136 # this can happen if both --index and --rev options are
3136 # this can happen if both --index and --rev options are
3137 # provided and thus we need to iterate over all of the markers
3137 # provided and thus we need to iterate over all of the markers
3138 # to get the correct indices, but only display the ones that
3138 # to get the correct indices, but only display the ones that
3139 # are relevant to --rev value
3139 # are relevant to --rev value
3140 continue
3140 continue
3141 ind = i if opts.get('index') else None
3141 ind = i if opts.get('index') else None
3142 cmdutil.showmarker(ui, m, index=ind)
3142 cmdutil.showmarker(ui, m, index=ind)
3143
3143
3144 @command('debugpathcomplete',
3144 @command('debugpathcomplete',
3145 [('f', 'full', None, _('complete an entire path')),
3145 [('f', 'full', None, _('complete an entire path')),
3146 ('n', 'normal', None, _('show only normal files')),
3146 ('n', 'normal', None, _('show only normal files')),
3147 ('a', 'added', None, _('show only added files')),
3147 ('a', 'added', None, _('show only added files')),
3148 ('r', 'removed', None, _('show only removed files'))],
3148 ('r', 'removed', None, _('show only removed files'))],
3149 _('FILESPEC...'))
3149 _('FILESPEC...'))
3150 def debugpathcomplete(ui, repo, *specs, **opts):
3150 def debugpathcomplete(ui, repo, *specs, **opts):
3151 '''complete part or all of a tracked path
3151 '''complete part or all of a tracked path
3152
3152
3153 This command supports shells that offer path name completion. It
3153 This command supports shells that offer path name completion. It
3154 currently completes only files already known to the dirstate.
3154 currently completes only files already known to the dirstate.
3155
3155
3156 Completion extends only to the next path segment unless
3156 Completion extends only to the next path segment unless
3157 --full is specified, in which case entire paths are used.'''
3157 --full is specified, in which case entire paths are used.'''
3158
3158
3159 def complete(path, acceptable):
3159 def complete(path, acceptable):
3160 dirstate = repo.dirstate
3160 dirstate = repo.dirstate
3161 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3161 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3162 rootdir = repo.root + os.sep
3162 rootdir = repo.root + os.sep
3163 if spec != repo.root and not spec.startswith(rootdir):
3163 if spec != repo.root and not spec.startswith(rootdir):
3164 return [], []
3164 return [], []
3165 if os.path.isdir(spec):
3165 if os.path.isdir(spec):
3166 spec += '/'
3166 spec += '/'
3167 spec = spec[len(rootdir):]
3167 spec = spec[len(rootdir):]
3168 fixpaths = os.sep != '/'
3168 fixpaths = os.sep != '/'
3169 if fixpaths:
3169 if fixpaths:
3170 spec = spec.replace(os.sep, '/')
3170 spec = spec.replace(os.sep, '/')
3171 speclen = len(spec)
3171 speclen = len(spec)
3172 fullpaths = opts['full']
3172 fullpaths = opts['full']
3173 files, dirs = set(), set()
3173 files, dirs = set(), set()
3174 adddir, addfile = dirs.add, files.add
3174 adddir, addfile = dirs.add, files.add
3175 for f, st in dirstate.iteritems():
3175 for f, st in dirstate.iteritems():
3176 if f.startswith(spec) and st[0] in acceptable:
3176 if f.startswith(spec) and st[0] in acceptable:
3177 if fixpaths:
3177 if fixpaths:
3178 f = f.replace('/', os.sep)
3178 f = f.replace('/', os.sep)
3179 if fullpaths:
3179 if fullpaths:
3180 addfile(f)
3180 addfile(f)
3181 continue
3181 continue
3182 s = f.find(os.sep, speclen)
3182 s = f.find(os.sep, speclen)
3183 if s >= 0:
3183 if s >= 0:
3184 adddir(f[:s])
3184 adddir(f[:s])
3185 else:
3185 else:
3186 addfile(f)
3186 addfile(f)
3187 return files, dirs
3187 return files, dirs
3188
3188
3189 acceptable = ''
3189 acceptable = ''
3190 if opts['normal']:
3190 if opts['normal']:
3191 acceptable += 'nm'
3191 acceptable += 'nm'
3192 if opts['added']:
3192 if opts['added']:
3193 acceptable += 'a'
3193 acceptable += 'a'
3194 if opts['removed']:
3194 if opts['removed']:
3195 acceptable += 'r'
3195 acceptable += 'r'
3196 cwd = repo.getcwd()
3196 cwd = repo.getcwd()
3197 if not specs:
3197 if not specs:
3198 specs = ['.']
3198 specs = ['.']
3199
3199
3200 files, dirs = set(), set()
3200 files, dirs = set(), set()
3201 for spec in specs:
3201 for spec in specs:
3202 f, d = complete(spec, acceptable or 'nmar')
3202 f, d = complete(spec, acceptable or 'nmar')
3203 files.update(f)
3203 files.update(f)
3204 dirs.update(d)
3204 dirs.update(d)
3205 files.update(dirs)
3205 files.update(dirs)
3206 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3206 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3207 ui.write('\n')
3207 ui.write('\n')
3208
3208
3209 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3209 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3210 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3210 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3211 '''access the pushkey key/value protocol
3211 '''access the pushkey key/value protocol
3212
3212
3213 With two args, list the keys in the given namespace.
3213 With two args, list the keys in the given namespace.
3214
3214
3215 With five args, set a key to new if it currently is set to old.
3215 With five args, set a key to new if it currently is set to old.
3216 Reports success or failure.
3216 Reports success or failure.
3217 '''
3217 '''
3218
3218
3219 target = hg.peer(ui, {}, repopath)
3219 target = hg.peer(ui, {}, repopath)
3220 if keyinfo:
3220 if keyinfo:
3221 key, old, new = keyinfo
3221 key, old, new = keyinfo
3222 r = target.pushkey(namespace, key, old, new)
3222 r = target.pushkey(namespace, key, old, new)
3223 ui.status(str(r) + '\n')
3223 ui.status(str(r) + '\n')
3224 return not r
3224 return not r
3225 else:
3225 else:
3226 for k, v in sorted(target.listkeys(namespace).iteritems()):
3226 for k, v in sorted(target.listkeys(namespace).iteritems()):
3227 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3227 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3228 v.encode('string-escape')))
3228 v.encode('string-escape')))
3229
3229
3230 @command('debugpvec', [], _('A B'))
3230 @command('debugpvec', [], _('A B'))
3231 def debugpvec(ui, repo, a, b=None):
3231 def debugpvec(ui, repo, a, b=None):
3232 ca = scmutil.revsingle(repo, a)
3232 ca = scmutil.revsingle(repo, a)
3233 cb = scmutil.revsingle(repo, b)
3233 cb = scmutil.revsingle(repo, b)
3234 pa = pvec.ctxpvec(ca)
3234 pa = pvec.ctxpvec(ca)
3235 pb = pvec.ctxpvec(cb)
3235 pb = pvec.ctxpvec(cb)
3236 if pa == pb:
3236 if pa == pb:
3237 rel = "="
3237 rel = "="
3238 elif pa > pb:
3238 elif pa > pb:
3239 rel = ">"
3239 rel = ">"
3240 elif pa < pb:
3240 elif pa < pb:
3241 rel = "<"
3241 rel = "<"
3242 elif pa | pb:
3242 elif pa | pb:
3243 rel = "|"
3243 rel = "|"
3244 ui.write(_("a: %s\n") % pa)
3244 ui.write(_("a: %s\n") % pa)
3245 ui.write(_("b: %s\n") % pb)
3245 ui.write(_("b: %s\n") % pb)
3246 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3246 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3247 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3247 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3248 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3248 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3249 pa.distance(pb), rel))
3249 pa.distance(pb), rel))
3250
3250
3251 @command('debugrebuilddirstate|debugrebuildstate',
3251 @command('debugrebuilddirstate|debugrebuildstate',
3252 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3252 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3253 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3253 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3254 'the working copy parent')),
3254 'the working copy parent')),
3255 ],
3255 ],
3256 _('[-r REV]'))
3256 _('[-r REV]'))
3257 def debugrebuilddirstate(ui, repo, rev, **opts):
3257 def debugrebuilddirstate(ui, repo, rev, **opts):
3258 """rebuild the dirstate as it would look like for the given revision
3258 """rebuild the dirstate as it would look like for the given revision
3259
3259
3260 If no revision is specified the first current parent will be used.
3260 If no revision is specified the first current parent will be used.
3261
3261
3262 The dirstate will be set to the files of the given revision.
3262 The dirstate will be set to the files of the given revision.
3263 The actual working directory content or existing dirstate
3263 The actual working directory content or existing dirstate
3264 information such as adds or removes is not considered.
3264 information such as adds or removes is not considered.
3265
3265
3266 ``minimal`` will only rebuild the dirstate status for files that claim to be
3266 ``minimal`` will only rebuild the dirstate status for files that claim to be
3267 tracked but are not in the parent manifest, or that exist in the parent
3267 tracked but are not in the parent manifest, or that exist in the parent
3268 manifest but are not in the dirstate. It will not change adds, removes, or
3268 manifest but are not in the dirstate. It will not change adds, removes, or
3269 modified files that are in the working copy parent.
3269 modified files that are in the working copy parent.
3270
3270
3271 One use of this command is to make the next :hg:`status` invocation
3271 One use of this command is to make the next :hg:`status` invocation
3272 check the actual file content.
3272 check the actual file content.
3273 """
3273 """
3274 ctx = scmutil.revsingle(repo, rev)
3274 ctx = scmutil.revsingle(repo, rev)
3275 with repo.wlock():
3275 with repo.wlock():
3276 dirstate = repo.dirstate
3276 dirstate = repo.dirstate
3277 changedfiles = None
3277 changedfiles = None
3278 # See command doc for what minimal does.
3278 # See command doc for what minimal does.
3279 if opts.get('minimal'):
3279 if opts.get('minimal'):
3280 manifestfiles = set(ctx.manifest().keys())
3280 manifestfiles = set(ctx.manifest().keys())
3281 dirstatefiles = set(dirstate)
3281 dirstatefiles = set(dirstate)
3282 manifestonly = manifestfiles - dirstatefiles
3282 manifestonly = manifestfiles - dirstatefiles
3283 dsonly = dirstatefiles - manifestfiles
3283 dsonly = dirstatefiles - manifestfiles
3284 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3284 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3285 changedfiles = manifestonly | dsnotadded
3285 changedfiles = manifestonly | dsnotadded
3286
3286
3287 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3287 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3288
3288
3289 @command('debugrebuildfncache', [], '')
3289 @command('debugrebuildfncache', [], '')
3290 def debugrebuildfncache(ui, repo):
3290 def debugrebuildfncache(ui, repo):
3291 """rebuild the fncache file"""
3291 """rebuild the fncache file"""
3292 repair.rebuildfncache(ui, repo)
3292 repair.rebuildfncache(ui, repo)
3293
3293
3294 @command('debugrename',
3294 @command('debugrename',
3295 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3295 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3296 _('[-r REV] FILE'))
3296 _('[-r REV] FILE'))
3297 def debugrename(ui, repo, file1, *pats, **opts):
3297 def debugrename(ui, repo, file1, *pats, **opts):
3298 """dump rename information"""
3298 """dump rename information"""
3299
3299
3300 ctx = scmutil.revsingle(repo, opts.get('rev'))
3300 ctx = scmutil.revsingle(repo, opts.get('rev'))
3301 m = scmutil.match(ctx, (file1,) + pats, opts)
3301 m = scmutil.match(ctx, (file1,) + pats, opts)
3302 for abs in ctx.walk(m):
3302 for abs in ctx.walk(m):
3303 fctx = ctx[abs]
3303 fctx = ctx[abs]
3304 o = fctx.filelog().renamed(fctx.filenode())
3304 o = fctx.filelog().renamed(fctx.filenode())
3305 rel = m.rel(abs)
3305 rel = m.rel(abs)
3306 if o:
3306 if o:
3307 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3307 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3308 else:
3308 else:
3309 ui.write(_("%s not renamed\n") % rel)
3309 ui.write(_("%s not renamed\n") % rel)
3310
3310
3311 @command('debugrevlog', debugrevlogopts +
3311 @command('debugrevlog', debugrevlogopts +
3312 [('d', 'dump', False, _('dump index data'))],
3312 [('d', 'dump', False, _('dump index data'))],
3313 _('-c|-m|FILE'),
3313 _('-c|-m|FILE'),
3314 optionalrepo=True)
3314 optionalrepo=True)
3315 def debugrevlog(ui, repo, file_=None, **opts):
3315 def debugrevlog(ui, repo, file_=None, **opts):
3316 """show data and statistics about a revlog"""
3316 """show data and statistics about a revlog"""
3317 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3317 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3318
3318
3319 if opts.get("dump"):
3319 if opts.get("dump"):
3320 numrevs = len(r)
3320 numrevs = len(r)
3321 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3321 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3322 " rawsize totalsize compression heads chainlen\n")
3322 " rawsize totalsize compression heads chainlen\n")
3323 ts = 0
3323 ts = 0
3324 heads = set()
3324 heads = set()
3325
3325
3326 for rev in xrange(numrevs):
3326 for rev in xrange(numrevs):
3327 dbase = r.deltaparent(rev)
3327 dbase = r.deltaparent(rev)
3328 if dbase == -1:
3328 if dbase == -1:
3329 dbase = rev
3329 dbase = rev
3330 cbase = r.chainbase(rev)
3330 cbase = r.chainbase(rev)
3331 clen = r.chainlen(rev)
3331 clen = r.chainlen(rev)
3332 p1, p2 = r.parentrevs(rev)
3332 p1, p2 = r.parentrevs(rev)
3333 rs = r.rawsize(rev)
3333 rs = r.rawsize(rev)
3334 ts = ts + rs
3334 ts = ts + rs
3335 heads -= set(r.parentrevs(rev))
3335 heads -= set(r.parentrevs(rev))
3336 heads.add(rev)
3336 heads.add(rev)
3337 try:
3337 try:
3338 compression = ts / r.end(rev)
3338 compression = ts / r.end(rev)
3339 except ZeroDivisionError:
3339 except ZeroDivisionError:
3340 compression = 0
3340 compression = 0
3341 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3341 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3342 "%11d %5d %8d\n" %
3342 "%11d %5d %8d\n" %
3343 (rev, p1, p2, r.start(rev), r.end(rev),
3343 (rev, p1, p2, r.start(rev), r.end(rev),
3344 r.start(dbase), r.start(cbase),
3344 r.start(dbase), r.start(cbase),
3345 r.start(p1), r.start(p2),
3345 r.start(p1), r.start(p2),
3346 rs, ts, compression, len(heads), clen))
3346 rs, ts, compression, len(heads), clen))
3347 return 0
3347 return 0
3348
3348
3349 v = r.version
3349 v = r.version
3350 format = v & 0xFFFF
3350 format = v & 0xFFFF
3351 flags = []
3351 flags = []
3352 gdelta = False
3352 gdelta = False
3353 if v & revlog.REVLOGNGINLINEDATA:
3353 if v & revlog.REVLOGNGINLINEDATA:
3354 flags.append('inline')
3354 flags.append('inline')
3355 if v & revlog.REVLOGGENERALDELTA:
3355 if v & revlog.REVLOGGENERALDELTA:
3356 gdelta = True
3356 gdelta = True
3357 flags.append('generaldelta')
3357 flags.append('generaldelta')
3358 if not flags:
3358 if not flags:
3359 flags = ['(none)']
3359 flags = ['(none)']
3360
3360
3361 nummerges = 0
3361 nummerges = 0
3362 numfull = 0
3362 numfull = 0
3363 numprev = 0
3363 numprev = 0
3364 nump1 = 0
3364 nump1 = 0
3365 nump2 = 0
3365 nump2 = 0
3366 numother = 0
3366 numother = 0
3367 nump1prev = 0
3367 nump1prev = 0
3368 nump2prev = 0
3368 nump2prev = 0
3369 chainlengths = []
3369 chainlengths = []
3370
3370
3371 datasize = [None, 0, 0L]
3371 datasize = [None, 0, 0L]
3372 fullsize = [None, 0, 0L]
3372 fullsize = [None, 0, 0L]
3373 deltasize = [None, 0, 0L]
3373 deltasize = [None, 0, 0L]
3374
3374
3375 def addsize(size, l):
3375 def addsize(size, l):
3376 if l[0] is None or size < l[0]:
3376 if l[0] is None or size < l[0]:
3377 l[0] = size
3377 l[0] = size
3378 if size > l[1]:
3378 if size > l[1]:
3379 l[1] = size
3379 l[1] = size
3380 l[2] += size
3380 l[2] += size
3381
3381
3382 numrevs = len(r)
3382 numrevs = len(r)
3383 for rev in xrange(numrevs):
3383 for rev in xrange(numrevs):
3384 p1, p2 = r.parentrevs(rev)
3384 p1, p2 = r.parentrevs(rev)
3385 delta = r.deltaparent(rev)
3385 delta = r.deltaparent(rev)
3386 if format > 0:
3386 if format > 0:
3387 addsize(r.rawsize(rev), datasize)
3387 addsize(r.rawsize(rev), datasize)
3388 if p2 != nullrev:
3388 if p2 != nullrev:
3389 nummerges += 1
3389 nummerges += 1
3390 size = r.length(rev)
3390 size = r.length(rev)
3391 if delta == nullrev:
3391 if delta == nullrev:
3392 chainlengths.append(0)
3392 chainlengths.append(0)
3393 numfull += 1
3393 numfull += 1
3394 addsize(size, fullsize)
3394 addsize(size, fullsize)
3395 else:
3395 else:
3396 chainlengths.append(chainlengths[delta] + 1)
3396 chainlengths.append(chainlengths[delta] + 1)
3397 addsize(size, deltasize)
3397 addsize(size, deltasize)
3398 if delta == rev - 1:
3398 if delta == rev - 1:
3399 numprev += 1
3399 numprev += 1
3400 if delta == p1:
3400 if delta == p1:
3401 nump1prev += 1
3401 nump1prev += 1
3402 elif delta == p2:
3402 elif delta == p2:
3403 nump2prev += 1
3403 nump2prev += 1
3404 elif delta == p1:
3404 elif delta == p1:
3405 nump1 += 1
3405 nump1 += 1
3406 elif delta == p2:
3406 elif delta == p2:
3407 nump2 += 1
3407 nump2 += 1
3408 elif delta != nullrev:
3408 elif delta != nullrev:
3409 numother += 1
3409 numother += 1
3410
3410
3411 # Adjust size min value for empty cases
3411 # Adjust size min value for empty cases
3412 for size in (datasize, fullsize, deltasize):
3412 for size in (datasize, fullsize, deltasize):
3413 if size[0] is None:
3413 if size[0] is None:
3414 size[0] = 0
3414 size[0] = 0
3415
3415
3416 numdeltas = numrevs - numfull
3416 numdeltas = numrevs - numfull
3417 numoprev = numprev - nump1prev - nump2prev
3417 numoprev = numprev - nump1prev - nump2prev
3418 totalrawsize = datasize[2]
3418 totalrawsize = datasize[2]
3419 datasize[2] /= numrevs
3419 datasize[2] /= numrevs
3420 fulltotal = fullsize[2]
3420 fulltotal = fullsize[2]
3421 fullsize[2] /= numfull
3421 fullsize[2] /= numfull
3422 deltatotal = deltasize[2]
3422 deltatotal = deltasize[2]
3423 if numrevs - numfull > 0:
3423 if numrevs - numfull > 0:
3424 deltasize[2] /= numrevs - numfull
3424 deltasize[2] /= numrevs - numfull
3425 totalsize = fulltotal + deltatotal
3425 totalsize = fulltotal + deltatotal
3426 avgchainlen = sum(chainlengths) / numrevs
3426 avgchainlen = sum(chainlengths) / numrevs
3427 maxchainlen = max(chainlengths)
3427 maxchainlen = max(chainlengths)
3428 compratio = 1
3428 compratio = 1
3429 if totalsize:
3429 if totalsize:
3430 compratio = totalrawsize / totalsize
3430 compratio = totalrawsize / totalsize
3431
3431
3432 basedfmtstr = '%%%dd\n'
3432 basedfmtstr = '%%%dd\n'
3433 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3433 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3434
3434
3435 def dfmtstr(max):
3435 def dfmtstr(max):
3436 return basedfmtstr % len(str(max))
3436 return basedfmtstr % len(str(max))
3437 def pcfmtstr(max, padding=0):
3437 def pcfmtstr(max, padding=0):
3438 return basepcfmtstr % (len(str(max)), ' ' * padding)
3438 return basepcfmtstr % (len(str(max)), ' ' * padding)
3439
3439
3440 def pcfmt(value, total):
3440 def pcfmt(value, total):
3441 if total:
3441 if total:
3442 return (value, 100 * float(value) / total)
3442 return (value, 100 * float(value) / total)
3443 else:
3443 else:
3444 return value, 100.0
3444 return value, 100.0
3445
3445
3446 ui.write(('format : %d\n') % format)
3446 ui.write(('format : %d\n') % format)
3447 ui.write(('flags : %s\n') % ', '.join(flags))
3447 ui.write(('flags : %s\n') % ', '.join(flags))
3448
3448
3449 ui.write('\n')
3449 ui.write('\n')
3450 fmt = pcfmtstr(totalsize)
3450 fmt = pcfmtstr(totalsize)
3451 fmt2 = dfmtstr(totalsize)
3451 fmt2 = dfmtstr(totalsize)
3452 ui.write(('revisions : ') + fmt2 % numrevs)
3452 ui.write(('revisions : ') + fmt2 % numrevs)
3453 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3453 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3454 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3454 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3455 ui.write(('revisions : ') + fmt2 % numrevs)
3455 ui.write(('revisions : ') + fmt2 % numrevs)
3456 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3456 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3457 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3457 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3458 ui.write(('revision size : ') + fmt2 % totalsize)
3458 ui.write(('revision size : ') + fmt2 % totalsize)
3459 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3459 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3460 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3460 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3461
3461
3462 ui.write('\n')
3462 ui.write('\n')
3463 fmt = dfmtstr(max(avgchainlen, compratio))
3463 fmt = dfmtstr(max(avgchainlen, compratio))
3464 ui.write(('avg chain length : ') + fmt % avgchainlen)
3464 ui.write(('avg chain length : ') + fmt % avgchainlen)
3465 ui.write(('max chain length : ') + fmt % maxchainlen)
3465 ui.write(('max chain length : ') + fmt % maxchainlen)
3466 ui.write(('compression ratio : ') + fmt % compratio)
3466 ui.write(('compression ratio : ') + fmt % compratio)
3467
3467
3468 if format > 0:
3468 if format > 0:
3469 ui.write('\n')
3469 ui.write('\n')
3470 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3470 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3471 % tuple(datasize))
3471 % tuple(datasize))
3472 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3472 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3473 % tuple(fullsize))
3473 % tuple(fullsize))
3474 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3474 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3475 % tuple(deltasize))
3475 % tuple(deltasize))
3476
3476
3477 if numdeltas > 0:
3477 if numdeltas > 0:
3478 ui.write('\n')
3478 ui.write('\n')
3479 fmt = pcfmtstr(numdeltas)
3479 fmt = pcfmtstr(numdeltas)
3480 fmt2 = pcfmtstr(numdeltas, 4)
3480 fmt2 = pcfmtstr(numdeltas, 4)
3481 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3481 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3482 if numprev > 0:
3482 if numprev > 0:
3483 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3483 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3484 numprev))
3484 numprev))
3485 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3485 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3486 numprev))
3486 numprev))
3487 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3487 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3488 numprev))
3488 numprev))
3489 if gdelta:
3489 if gdelta:
3490 ui.write(('deltas against p1 : ')
3490 ui.write(('deltas against p1 : ')
3491 + fmt % pcfmt(nump1, numdeltas))
3491 + fmt % pcfmt(nump1, numdeltas))
3492 ui.write(('deltas against p2 : ')
3492 ui.write(('deltas against p2 : ')
3493 + fmt % pcfmt(nump2, numdeltas))
3493 + fmt % pcfmt(nump2, numdeltas))
3494 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3494 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3495 numdeltas))
3495 numdeltas))
3496
3496
3497 @command('debugrevspec',
3497 @command('debugrevspec',
3498 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3498 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3499 ('REVSPEC'))
3499 ('REVSPEC'))
3500 def debugrevspec(ui, repo, expr, **opts):
3500 def debugrevspec(ui, repo, expr, **opts):
3501 """parse and apply a revision specification
3501 """parse and apply a revision specification
3502
3502
3503 Use --verbose to print the parsed tree before and after aliases
3503 Use --verbose to print the parsed tree before and after aliases
3504 expansion.
3504 expansion.
3505 """
3505 """
3506 if ui.verbose:
3506 if ui.verbose:
3507 tree = revset.parse(expr, lookup=repo.__contains__)
3507 tree = revset.parse(expr, lookup=repo.__contains__)
3508 ui.note(revset.prettyformat(tree), "\n")
3508 ui.note(revset.prettyformat(tree), "\n")
3509 newtree = revset.expandaliases(ui, tree)
3509 newtree = revset.expandaliases(ui, tree)
3510 if newtree != tree:
3510 if newtree != tree:
3511 ui.note("* expanded:\n", revset.prettyformat(newtree), "\n")
3511 ui.note("* expanded:\n", revset.prettyformat(newtree), "\n")
3512 tree = newtree
3512 tree = newtree
3513 newtree = revset.foldconcat(tree)
3513 newtree = revset.foldconcat(tree)
3514 if newtree != tree:
3514 if newtree != tree:
3515 ui.note("* concatenated:\n", revset.prettyformat(newtree), "\n")
3515 ui.note("* concatenated:\n", revset.prettyformat(newtree), "\n")
3516 if opts["optimize"]:
3516 if opts["optimize"]:
3517 weight, optimizedtree = revset.optimize(newtree, True)
3517 weight, optimizedtree = revset.optimize(newtree, True)
3518 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3518 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3519 func = revset.match(ui, expr, repo)
3519 func = revset.match(ui, expr, repo)
3520 revs = func(repo)
3520 revs = func(repo)
3521 if ui.verbose:
3521 if ui.verbose:
3522 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3522 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3523 for c in revs:
3523 for c in revs:
3524 ui.write("%s\n" % c)
3524 ui.write("%s\n" % c)
3525
3525
3526 @command('debugsetparents', [], _('REV1 [REV2]'))
3526 @command('debugsetparents', [], _('REV1 [REV2]'))
3527 def debugsetparents(ui, repo, rev1, rev2=None):
3527 def debugsetparents(ui, repo, rev1, rev2=None):
3528 """manually set the parents of the current working directory
3528 """manually set the parents of the current working directory
3529
3529
3530 This is useful for writing repository conversion tools, but should
3530 This is useful for writing repository conversion tools, but should
3531 be used with care. For example, neither the working directory nor the
3531 be used with care. For example, neither the working directory nor the
3532 dirstate is updated, so file status may be incorrect after running this
3532 dirstate is updated, so file status may be incorrect after running this
3533 command.
3533 command.
3534
3534
3535 Returns 0 on success.
3535 Returns 0 on success.
3536 """
3536 """
3537
3537
3538 r1 = scmutil.revsingle(repo, rev1).node()
3538 r1 = scmutil.revsingle(repo, rev1).node()
3539 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3539 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3540
3540
3541 with repo.wlock():
3541 with repo.wlock():
3542 repo.setparents(r1, r2)
3542 repo.setparents(r1, r2)
3543
3543
3544 @command('debugdirstate|debugstate',
3544 @command('debugdirstate|debugstate',
3545 [('', 'nodates', None, _('do not display the saved mtime')),
3545 [('', 'nodates', None, _('do not display the saved mtime')),
3546 ('', 'datesort', None, _('sort by saved mtime'))],
3546 ('', 'datesort', None, _('sort by saved mtime'))],
3547 _('[OPTION]...'))
3547 _('[OPTION]...'))
3548 def debugstate(ui, repo, **opts):
3548 def debugstate(ui, repo, **opts):
3549 """show the contents of the current dirstate"""
3549 """show the contents of the current dirstate"""
3550
3550
3551 nodates = opts.get('nodates')
3551 nodates = opts.get('nodates')
3552 datesort = opts.get('datesort')
3552 datesort = opts.get('datesort')
3553
3553
3554 timestr = ""
3554 timestr = ""
3555 if datesort:
3555 if datesort:
3556 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3556 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3557 else:
3557 else:
3558 keyfunc = None # sort by filename
3558 keyfunc = None # sort by filename
3559 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3559 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3560 if ent[3] == -1:
3560 if ent[3] == -1:
3561 timestr = 'unset '
3561 timestr = 'unset '
3562 elif nodates:
3562 elif nodates:
3563 timestr = 'set '
3563 timestr = 'set '
3564 else:
3564 else:
3565 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3565 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3566 time.localtime(ent[3]))
3566 time.localtime(ent[3]))
3567 if ent[1] & 0o20000:
3567 if ent[1] & 0o20000:
3568 mode = 'lnk'
3568 mode = 'lnk'
3569 else:
3569 else:
3570 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3570 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3571 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3571 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3572 for f in repo.dirstate.copies():
3572 for f in repo.dirstate.copies():
3573 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3573 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3574
3574
3575 @command('debugsub',
3575 @command('debugsub',
3576 [('r', 'rev', '',
3576 [('r', 'rev', '',
3577 _('revision to check'), _('REV'))],
3577 _('revision to check'), _('REV'))],
3578 _('[-r REV] [REV]'))
3578 _('[-r REV] [REV]'))
3579 def debugsub(ui, repo, rev=None):
3579 def debugsub(ui, repo, rev=None):
3580 ctx = scmutil.revsingle(repo, rev, None)
3580 ctx = scmutil.revsingle(repo, rev, None)
3581 for k, v in sorted(ctx.substate.items()):
3581 for k, v in sorted(ctx.substate.items()):
3582 ui.write(('path %s\n') % k)
3582 ui.write(('path %s\n') % k)
3583 ui.write((' source %s\n') % v[0])
3583 ui.write((' source %s\n') % v[0])
3584 ui.write((' revision %s\n') % v[1])
3584 ui.write((' revision %s\n') % v[1])
3585
3585
3586 @command('debugsuccessorssets',
3586 @command('debugsuccessorssets',
3587 [],
3587 [],
3588 _('[REV]'))
3588 _('[REV]'))
3589 def debugsuccessorssets(ui, repo, *revs):
3589 def debugsuccessorssets(ui, repo, *revs):
3590 """show set of successors for revision
3590 """show set of successors for revision
3591
3591
3592 A successors set of changeset A is a consistent group of revisions that
3592 A successors set of changeset A is a consistent group of revisions that
3593 succeed A. It contains non-obsolete changesets only.
3593 succeed A. It contains non-obsolete changesets only.
3594
3594
3595 In most cases a changeset A has a single successors set containing a single
3595 In most cases a changeset A has a single successors set containing a single
3596 successor (changeset A replaced by A').
3596 successor (changeset A replaced by A').
3597
3597
3598 A changeset that is made obsolete with no successors are called "pruned".
3598 A changeset that is made obsolete with no successors are called "pruned".
3599 Such changesets have no successors sets at all.
3599 Such changesets have no successors sets at all.
3600
3600
3601 A changeset that has been "split" will have a successors set containing
3601 A changeset that has been "split" will have a successors set containing
3602 more than one successor.
3602 more than one successor.
3603
3603
3604 A changeset that has been rewritten in multiple different ways is called
3604 A changeset that has been rewritten in multiple different ways is called
3605 "divergent". Such changesets have multiple successor sets (each of which
3605 "divergent". Such changesets have multiple successor sets (each of which
3606 may also be split, i.e. have multiple successors).
3606 may also be split, i.e. have multiple successors).
3607
3607
3608 Results are displayed as follows::
3608 Results are displayed as follows::
3609
3609
3610 <rev1>
3610 <rev1>
3611 <successors-1A>
3611 <successors-1A>
3612 <rev2>
3612 <rev2>
3613 <successors-2A>
3613 <successors-2A>
3614 <successors-2B1> <successors-2B2> <successors-2B3>
3614 <successors-2B1> <successors-2B2> <successors-2B3>
3615
3615
3616 Here rev2 has two possible (i.e. divergent) successors sets. The first
3616 Here rev2 has two possible (i.e. divergent) successors sets. The first
3617 holds one element, whereas the second holds three (i.e. the changeset has
3617 holds one element, whereas the second holds three (i.e. the changeset has
3618 been split).
3618 been split).
3619 """
3619 """
3620 # passed to successorssets caching computation from one call to another
3620 # passed to successorssets caching computation from one call to another
3621 cache = {}
3621 cache = {}
3622 ctx2str = str
3622 ctx2str = str
3623 node2str = short
3623 node2str = short
3624 if ui.debug():
3624 if ui.debug():
3625 def ctx2str(ctx):
3625 def ctx2str(ctx):
3626 return ctx.hex()
3626 return ctx.hex()
3627 node2str = hex
3627 node2str = hex
3628 for rev in scmutil.revrange(repo, revs):
3628 for rev in scmutil.revrange(repo, revs):
3629 ctx = repo[rev]
3629 ctx = repo[rev]
3630 ui.write('%s\n'% ctx2str(ctx))
3630 ui.write('%s\n'% ctx2str(ctx))
3631 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3631 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3632 if succsset:
3632 if succsset:
3633 ui.write(' ')
3633 ui.write(' ')
3634 ui.write(node2str(succsset[0]))
3634 ui.write(node2str(succsset[0]))
3635 for node in succsset[1:]:
3635 for node in succsset[1:]:
3636 ui.write(' ')
3636 ui.write(' ')
3637 ui.write(node2str(node))
3637 ui.write(node2str(node))
3638 ui.write('\n')
3638 ui.write('\n')
3639
3639
3640 @command('debugtemplate',
3640 @command('debugtemplate',
3641 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3641 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3642 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3642 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3643 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3643 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3644 optionalrepo=True)
3644 optionalrepo=True)
3645 def debugtemplate(ui, repo, tmpl, **opts):
3645 def debugtemplate(ui, repo, tmpl, **opts):
3646 """parse and apply a template
3646 """parse and apply a template
3647
3647
3648 If -r/--rev is given, the template is processed as a log template and
3648 If -r/--rev is given, the template is processed as a log template and
3649 applied to the given changesets. Otherwise, it is processed as a generic
3649 applied to the given changesets. Otherwise, it is processed as a generic
3650 template.
3650 template.
3651
3651
3652 Use --verbose to print the parsed tree.
3652 Use --verbose to print the parsed tree.
3653 """
3653 """
3654 revs = None
3654 revs = None
3655 if opts['rev']:
3655 if opts['rev']:
3656 if repo is None:
3656 if repo is None:
3657 raise error.RepoError(_('there is no Mercurial repository here '
3657 raise error.RepoError(_('there is no Mercurial repository here '
3658 '(.hg not found)'))
3658 '(.hg not found)'))
3659 revs = scmutil.revrange(repo, opts['rev'])
3659 revs = scmutil.revrange(repo, opts['rev'])
3660
3660
3661 props = {}
3661 props = {}
3662 for d in opts['define']:
3662 for d in opts['define']:
3663 try:
3663 try:
3664 k, v = (e.strip() for e in d.split('=', 1))
3664 k, v = (e.strip() for e in d.split('=', 1))
3665 if not k:
3665 if not k:
3666 raise ValueError
3666 raise ValueError
3667 props[k] = v
3667 props[k] = v
3668 except ValueError:
3668 except ValueError:
3669 raise error.Abort(_('malformed keyword definition: %s') % d)
3669 raise error.Abort(_('malformed keyword definition: %s') % d)
3670
3670
3671 if ui.verbose:
3671 if ui.verbose:
3672 aliases = ui.configitems('templatealias')
3672 aliases = ui.configitems('templatealias')
3673 tree = templater.parse(tmpl)
3673 tree = templater.parse(tmpl)
3674 ui.note(templater.prettyformat(tree), '\n')
3674 ui.note(templater.prettyformat(tree), '\n')
3675 newtree = templater.expandaliases(tree, aliases)
3675 newtree = templater.expandaliases(tree, aliases)
3676 if newtree != tree:
3676 if newtree != tree:
3677 ui.note("* expanded:\n", templater.prettyformat(newtree), '\n')
3677 ui.note("* expanded:\n", templater.prettyformat(newtree), '\n')
3678
3678
3679 mapfile = None
3679 mapfile = None
3680 if revs is None:
3680 if revs is None:
3681 k = 'debugtemplate'
3681 k = 'debugtemplate'
3682 t = formatter.maketemplater(ui, k, tmpl)
3682 t = formatter.maketemplater(ui, k, tmpl)
3683 ui.write(templater.stringify(t(k, **props)))
3683 ui.write(templater.stringify(t(k, **props)))
3684 else:
3684 else:
3685 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3685 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3686 mapfile, buffered=False)
3686 mapfile, buffered=False)
3687 for r in revs:
3687 for r in revs:
3688 displayer.show(repo[r], **props)
3688 displayer.show(repo[r], **props)
3689 displayer.close()
3689 displayer.close()
3690
3690
3691 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3691 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3692 def debugwalk(ui, repo, *pats, **opts):
3692 def debugwalk(ui, repo, *pats, **opts):
3693 """show how files match on given patterns"""
3693 """show how files match on given patterns"""
3694 m = scmutil.match(repo[None], pats, opts)
3694 m = scmutil.match(repo[None], pats, opts)
3695 items = list(repo.walk(m))
3695 items = list(repo.walk(m))
3696 if not items:
3696 if not items:
3697 return
3697 return
3698 f = lambda fn: fn
3698 f = lambda fn: fn
3699 if ui.configbool('ui', 'slash') and os.sep != '/':
3699 if ui.configbool('ui', 'slash') and os.sep != '/':
3700 f = lambda fn: util.normpath(fn)
3700 f = lambda fn: util.normpath(fn)
3701 fmt = 'f %%-%ds %%-%ds %%s' % (
3701 fmt = 'f %%-%ds %%-%ds %%s' % (
3702 max([len(abs) for abs in items]),
3702 max([len(abs) for abs in items]),
3703 max([len(m.rel(abs)) for abs in items]))
3703 max([len(m.rel(abs)) for abs in items]))
3704 for abs in items:
3704 for abs in items:
3705 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3705 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3706 ui.write("%s\n" % line.rstrip())
3706 ui.write("%s\n" % line.rstrip())
3707
3707
3708 @command('debugwireargs',
3708 @command('debugwireargs',
3709 [('', 'three', '', 'three'),
3709 [('', 'three', '', 'three'),
3710 ('', 'four', '', 'four'),
3710 ('', 'four', '', 'four'),
3711 ('', 'five', '', 'five'),
3711 ('', 'five', '', 'five'),
3712 ] + remoteopts,
3712 ] + remoteopts,
3713 _('REPO [OPTIONS]... [ONE [TWO]]'),
3713 _('REPO [OPTIONS]... [ONE [TWO]]'),
3714 norepo=True)
3714 norepo=True)
3715 def debugwireargs(ui, repopath, *vals, **opts):
3715 def debugwireargs(ui, repopath, *vals, **opts):
3716 repo = hg.peer(ui, opts, repopath)
3716 repo = hg.peer(ui, opts, repopath)
3717 for opt in remoteopts:
3717 for opt in remoteopts:
3718 del opts[opt[1]]
3718 del opts[opt[1]]
3719 args = {}
3719 args = {}
3720 for k, v in opts.iteritems():
3720 for k, v in opts.iteritems():
3721 if v:
3721 if v:
3722 args[k] = v
3722 args[k] = v
3723 # run twice to check that we don't mess up the stream for the next command
3723 # run twice to check that we don't mess up the stream for the next command
3724 res1 = repo.debugwireargs(*vals, **args)
3724 res1 = repo.debugwireargs(*vals, **args)
3725 res2 = repo.debugwireargs(*vals, **args)
3725 res2 = repo.debugwireargs(*vals, **args)
3726 ui.write("%s\n" % res1)
3726 ui.write("%s\n" % res1)
3727 if res1 != res2:
3727 if res1 != res2:
3728 ui.warn("%s\n" % res2)
3728 ui.warn("%s\n" % res2)
3729
3729
3730 @command('^diff',
3730 @command('^diff',
3731 [('r', 'rev', [], _('revision'), _('REV')),
3731 [('r', 'rev', [], _('revision'), _('REV')),
3732 ('c', 'change', '', _('change made by revision'), _('REV'))
3732 ('c', 'change', '', _('change made by revision'), _('REV'))
3733 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3733 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3734 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3734 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3735 inferrepo=True)
3735 inferrepo=True)
3736 def diff(ui, repo, *pats, **opts):
3736 def diff(ui, repo, *pats, **opts):
3737 """diff repository (or selected files)
3737 """diff repository (or selected files)
3738
3738
3739 Show differences between revisions for the specified files.
3739 Show differences between revisions for the specified files.
3740
3740
3741 Differences between files are shown using the unified diff format.
3741 Differences between files are shown using the unified diff format.
3742
3742
3743 .. note::
3743 .. note::
3744
3744
3745 :hg:`diff` may generate unexpected results for merges, as it will
3745 :hg:`diff` may generate unexpected results for merges, as it will
3746 default to comparing against the working directory's first
3746 default to comparing against the working directory's first
3747 parent changeset if no revisions are specified.
3747 parent changeset if no revisions are specified.
3748
3748
3749 When two revision arguments are given, then changes are shown
3749 When two revision arguments are given, then changes are shown
3750 between those revisions. If only one revision is specified then
3750 between those revisions. If only one revision is specified then
3751 that revision is compared to the working directory, and, when no
3751 that revision is compared to the working directory, and, when no
3752 revisions are specified, the working directory files are compared
3752 revisions are specified, the working directory files are compared
3753 to its first parent.
3753 to its first parent.
3754
3754
3755 Alternatively you can specify -c/--change with a revision to see
3755 Alternatively you can specify -c/--change with a revision to see
3756 the changes in that changeset relative to its first parent.
3756 the changes in that changeset relative to its first parent.
3757
3757
3758 Without the -a/--text option, diff will avoid generating diffs of
3758 Without the -a/--text option, diff will avoid generating diffs of
3759 files it detects as binary. With -a, diff will generate a diff
3759 files it detects as binary. With -a, diff will generate a diff
3760 anyway, probably with undesirable results.
3760 anyway, probably with undesirable results.
3761
3761
3762 Use the -g/--git option to generate diffs in the git extended diff
3762 Use the -g/--git option to generate diffs in the git extended diff
3763 format. For more information, read :hg:`help diffs`.
3763 format. For more information, read :hg:`help diffs`.
3764
3764
3765 .. container:: verbose
3765 .. container:: verbose
3766
3766
3767 Examples:
3767 Examples:
3768
3768
3769 - compare a file in the current working directory to its parent::
3769 - compare a file in the current working directory to its parent::
3770
3770
3771 hg diff foo.c
3771 hg diff foo.c
3772
3772
3773 - compare two historical versions of a directory, with rename info::
3773 - compare two historical versions of a directory, with rename info::
3774
3774
3775 hg diff --git -r 1.0:1.2 lib/
3775 hg diff --git -r 1.0:1.2 lib/
3776
3776
3777 - get change stats relative to the last change on some date::
3777 - get change stats relative to the last change on some date::
3778
3778
3779 hg diff --stat -r "date('may 2')"
3779 hg diff --stat -r "date('may 2')"
3780
3780
3781 - diff all newly-added files that contain a keyword::
3781 - diff all newly-added files that contain a keyword::
3782
3782
3783 hg diff "set:added() and grep(GNU)"
3783 hg diff "set:added() and grep(GNU)"
3784
3784
3785 - compare a revision and its parents::
3785 - compare a revision and its parents::
3786
3786
3787 hg diff -c 9353 # compare against first parent
3787 hg diff -c 9353 # compare against first parent
3788 hg diff -r 9353^:9353 # same using revset syntax
3788 hg diff -r 9353^:9353 # same using revset syntax
3789 hg diff -r 9353^2:9353 # compare against the second parent
3789 hg diff -r 9353^2:9353 # compare against the second parent
3790
3790
3791 Returns 0 on success.
3791 Returns 0 on success.
3792 """
3792 """
3793
3793
3794 revs = opts.get('rev')
3794 revs = opts.get('rev')
3795 change = opts.get('change')
3795 change = opts.get('change')
3796 stat = opts.get('stat')
3796 stat = opts.get('stat')
3797 reverse = opts.get('reverse')
3797 reverse = opts.get('reverse')
3798
3798
3799 if revs and change:
3799 if revs and change:
3800 msg = _('cannot specify --rev and --change at the same time')
3800 msg = _('cannot specify --rev and --change at the same time')
3801 raise error.Abort(msg)
3801 raise error.Abort(msg)
3802 elif change:
3802 elif change:
3803 node2 = scmutil.revsingle(repo, change, None).node()
3803 node2 = scmutil.revsingle(repo, change, None).node()
3804 node1 = repo[node2].p1().node()
3804 node1 = repo[node2].p1().node()
3805 else:
3805 else:
3806 node1, node2 = scmutil.revpair(repo, revs)
3806 node1, node2 = scmutil.revpair(repo, revs)
3807
3807
3808 if reverse:
3808 if reverse:
3809 node1, node2 = node2, node1
3809 node1, node2 = node2, node1
3810
3810
3811 diffopts = patch.diffallopts(ui, opts)
3811 diffopts = patch.diffallopts(ui, opts)
3812 m = scmutil.match(repo[node2], pats, opts)
3812 m = scmutil.match(repo[node2], pats, opts)
3813 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3813 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3814 listsubrepos=opts.get('subrepos'),
3814 listsubrepos=opts.get('subrepos'),
3815 root=opts.get('root'))
3815 root=opts.get('root'))
3816
3816
3817 @command('^export',
3817 @command('^export',
3818 [('o', 'output', '',
3818 [('o', 'output', '',
3819 _('print output to file with formatted name'), _('FORMAT')),
3819 _('print output to file with formatted name'), _('FORMAT')),
3820 ('', 'switch-parent', None, _('diff against the second parent')),
3820 ('', 'switch-parent', None, _('diff against the second parent')),
3821 ('r', 'rev', [], _('revisions to export'), _('REV')),
3821 ('r', 'rev', [], _('revisions to export'), _('REV')),
3822 ] + diffopts,
3822 ] + diffopts,
3823 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3823 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3824 def export(ui, repo, *changesets, **opts):
3824 def export(ui, repo, *changesets, **opts):
3825 """dump the header and diffs for one or more changesets
3825 """dump the header and diffs for one or more changesets
3826
3826
3827 Print the changeset header and diffs for one or more revisions.
3827 Print the changeset header and diffs for one or more revisions.
3828 If no revision is given, the parent of the working directory is used.
3828 If no revision is given, the parent of the working directory is used.
3829
3829
3830 The information shown in the changeset header is: author, date,
3830 The information shown in the changeset header is: author, date,
3831 branch name (if non-default), changeset hash, parent(s) and commit
3831 branch name (if non-default), changeset hash, parent(s) and commit
3832 comment.
3832 comment.
3833
3833
3834 .. note::
3834 .. note::
3835
3835
3836 :hg:`export` may generate unexpected diff output for merge
3836 :hg:`export` may generate unexpected diff output for merge
3837 changesets, as it will compare the merge changeset against its
3837 changesets, as it will compare the merge changeset against its
3838 first parent only.
3838 first parent only.
3839
3839
3840 Output may be to a file, in which case the name of the file is
3840 Output may be to a file, in which case the name of the file is
3841 given using a format string. The formatting rules are as follows:
3841 given using a format string. The formatting rules are as follows:
3842
3842
3843 :``%%``: literal "%" character
3843 :``%%``: literal "%" character
3844 :``%H``: changeset hash (40 hexadecimal digits)
3844 :``%H``: changeset hash (40 hexadecimal digits)
3845 :``%N``: number of patches being generated
3845 :``%N``: number of patches being generated
3846 :``%R``: changeset revision number
3846 :``%R``: changeset revision number
3847 :``%b``: basename of the exporting repository
3847 :``%b``: basename of the exporting repository
3848 :``%h``: short-form changeset hash (12 hexadecimal digits)
3848 :``%h``: short-form changeset hash (12 hexadecimal digits)
3849 :``%m``: first line of the commit message (only alphanumeric characters)
3849 :``%m``: first line of the commit message (only alphanumeric characters)
3850 :``%n``: zero-padded sequence number, starting at 1
3850 :``%n``: zero-padded sequence number, starting at 1
3851 :``%r``: zero-padded changeset revision number
3851 :``%r``: zero-padded changeset revision number
3852
3852
3853 Without the -a/--text option, export will avoid generating diffs
3853 Without the -a/--text option, export will avoid generating diffs
3854 of files it detects as binary. With -a, export will generate a
3854 of files it detects as binary. With -a, export will generate a
3855 diff anyway, probably with undesirable results.
3855 diff anyway, probably with undesirable results.
3856
3856
3857 Use the -g/--git option to generate diffs in the git extended diff
3857 Use the -g/--git option to generate diffs in the git extended diff
3858 format. See :hg:`help diffs` for more information.
3858 format. See :hg:`help diffs` for more information.
3859
3859
3860 With the --switch-parent option, the diff will be against the
3860 With the --switch-parent option, the diff will be against the
3861 second parent. It can be useful to review a merge.
3861 second parent. It can be useful to review a merge.
3862
3862
3863 .. container:: verbose
3863 .. container:: verbose
3864
3864
3865 Examples:
3865 Examples:
3866
3866
3867 - use export and import to transplant a bugfix to the current
3867 - use export and import to transplant a bugfix to the current
3868 branch::
3868 branch::
3869
3869
3870 hg export -r 9353 | hg import -
3870 hg export -r 9353 | hg import -
3871
3871
3872 - export all the changesets between two revisions to a file with
3872 - export all the changesets between two revisions to a file with
3873 rename information::
3873 rename information::
3874
3874
3875 hg export --git -r 123:150 > changes.txt
3875 hg export --git -r 123:150 > changes.txt
3876
3876
3877 - split outgoing changes into a series of patches with
3877 - split outgoing changes into a series of patches with
3878 descriptive names::
3878 descriptive names::
3879
3879
3880 hg export -r "outgoing()" -o "%n-%m.patch"
3880 hg export -r "outgoing()" -o "%n-%m.patch"
3881
3881
3882 Returns 0 on success.
3882 Returns 0 on success.
3883 """
3883 """
3884 changesets += tuple(opts.get('rev', []))
3884 changesets += tuple(opts.get('rev', []))
3885 if not changesets:
3885 if not changesets:
3886 changesets = ['.']
3886 changesets = ['.']
3887 revs = scmutil.revrange(repo, changesets)
3887 revs = scmutil.revrange(repo, changesets)
3888 if not revs:
3888 if not revs:
3889 raise error.Abort(_("export requires at least one changeset"))
3889 raise error.Abort(_("export requires at least one changeset"))
3890 if len(revs) > 1:
3890 if len(revs) > 1:
3891 ui.note(_('exporting patches:\n'))
3891 ui.note(_('exporting patches:\n'))
3892 else:
3892 else:
3893 ui.note(_('exporting patch:\n'))
3893 ui.note(_('exporting patch:\n'))
3894 cmdutil.export(repo, revs, template=opts.get('output'),
3894 cmdutil.export(repo, revs, template=opts.get('output'),
3895 switch_parent=opts.get('switch_parent'),
3895 switch_parent=opts.get('switch_parent'),
3896 opts=patch.diffallopts(ui, opts))
3896 opts=patch.diffallopts(ui, opts))
3897
3897
3898 @command('files',
3898 @command('files',
3899 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3899 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3900 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3900 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3901 ] + walkopts + formatteropts + subrepoopts,
3901 ] + walkopts + formatteropts + subrepoopts,
3902 _('[OPTION]... [PATTERN]...'))
3902 _('[OPTION]... [PATTERN]...'))
3903 def files(ui, repo, *pats, **opts):
3903 def files(ui, repo, *pats, **opts):
3904 """list tracked files
3904 """list tracked files
3905
3905
3906 Print files under Mercurial control in the working directory or
3906 Print files under Mercurial control in the working directory or
3907 specified revision whose names match the given patterns (excluding
3907 specified revision whose names match the given patterns (excluding
3908 removed files).
3908 removed files).
3909
3909
3910 If no patterns are given to match, this command prints the names
3910 If no patterns are given to match, this command prints the names
3911 of all files under Mercurial control in the working directory.
3911 of all files under Mercurial control in the working directory.
3912
3912
3913 .. container:: verbose
3913 .. container:: verbose
3914
3914
3915 Examples:
3915 Examples:
3916
3916
3917 - list all files under the current directory::
3917 - list all files under the current directory::
3918
3918
3919 hg files .
3919 hg files .
3920
3920
3921 - shows sizes and flags for current revision::
3921 - shows sizes and flags for current revision::
3922
3922
3923 hg files -vr .
3923 hg files -vr .
3924
3924
3925 - list all files named README::
3925 - list all files named README::
3926
3926
3927 hg files -I "**/README"
3927 hg files -I "**/README"
3928
3928
3929 - list all binary files::
3929 - list all binary files::
3930
3930
3931 hg files "set:binary()"
3931 hg files "set:binary()"
3932
3932
3933 - find files containing a regular expression::
3933 - find files containing a regular expression::
3934
3934
3935 hg files "set:grep('bob')"
3935 hg files "set:grep('bob')"
3936
3936
3937 - search tracked file contents with xargs and grep::
3937 - search tracked file contents with xargs and grep::
3938
3938
3939 hg files -0 | xargs -0 grep foo
3939 hg files -0 | xargs -0 grep foo
3940
3940
3941 See :hg:`help patterns` and :hg:`help filesets` for more information
3941 See :hg:`help patterns` and :hg:`help filesets` for more information
3942 on specifying file patterns.
3942 on specifying file patterns.
3943
3943
3944 Returns 0 if a match is found, 1 otherwise.
3944 Returns 0 if a match is found, 1 otherwise.
3945
3945
3946 """
3946 """
3947 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3947 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3948
3948
3949 end = '\n'
3949 end = '\n'
3950 if opts.get('print0'):
3950 if opts.get('print0'):
3951 end = '\0'
3951 end = '\0'
3952 fm = ui.formatter('files', opts)
3952 fm = ui.formatter('files', opts)
3953 fmt = '%s' + end
3953 fmt = '%s' + end
3954
3954
3955 m = scmutil.match(ctx, pats, opts)
3955 m = scmutil.match(ctx, pats, opts)
3956 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3956 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3957
3957
3958 fm.end()
3958 fm.end()
3959
3959
3960 return ret
3960 return ret
3961
3961
3962 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3962 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3963 def forget(ui, repo, *pats, **opts):
3963 def forget(ui, repo, *pats, **opts):
3964 """forget the specified files on the next commit
3964 """forget the specified files on the next commit
3965
3965
3966 Mark the specified files so they will no longer be tracked
3966 Mark the specified files so they will no longer be tracked
3967 after the next commit.
3967 after the next commit.
3968
3968
3969 This only removes files from the current branch, not from the
3969 This only removes files from the current branch, not from the
3970 entire project history, and it does not delete them from the
3970 entire project history, and it does not delete them from the
3971 working directory.
3971 working directory.
3972
3972
3973 To delete the file from the working directory, see :hg:`remove`.
3973 To delete the file from the working directory, see :hg:`remove`.
3974
3974
3975 To undo a forget before the next commit, see :hg:`add`.
3975 To undo a forget before the next commit, see :hg:`add`.
3976
3976
3977 .. container:: verbose
3977 .. container:: verbose
3978
3978
3979 Examples:
3979 Examples:
3980
3980
3981 - forget newly-added binary files::
3981 - forget newly-added binary files::
3982
3982
3983 hg forget "set:added() and binary()"
3983 hg forget "set:added() and binary()"
3984
3984
3985 - forget files that would be excluded by .hgignore::
3985 - forget files that would be excluded by .hgignore::
3986
3986
3987 hg forget "set:hgignore()"
3987 hg forget "set:hgignore()"
3988
3988
3989 Returns 0 on success.
3989 Returns 0 on success.
3990 """
3990 """
3991
3991
3992 if not pats:
3992 if not pats:
3993 raise error.Abort(_('no files specified'))
3993 raise error.Abort(_('no files specified'))
3994
3994
3995 m = scmutil.match(repo[None], pats, opts)
3995 m = scmutil.match(repo[None], pats, opts)
3996 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3996 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3997 return rejected and 1 or 0
3997 return rejected and 1 or 0
3998
3998
3999 @command(
3999 @command(
4000 'graft',
4000 'graft',
4001 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4001 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4002 ('c', 'continue', False, _('resume interrupted graft')),
4002 ('c', 'continue', False, _('resume interrupted graft')),
4003 ('e', 'edit', False, _('invoke editor on commit messages')),
4003 ('e', 'edit', False, _('invoke editor on commit messages')),
4004 ('', 'log', None, _('append graft info to log message')),
4004 ('', 'log', None, _('append graft info to log message')),
4005 ('f', 'force', False, _('force graft')),
4005 ('f', 'force', False, _('force graft')),
4006 ('D', 'currentdate', False,
4006 ('D', 'currentdate', False,
4007 _('record the current date as commit date')),
4007 _('record the current date as commit date')),
4008 ('U', 'currentuser', False,
4008 ('U', 'currentuser', False,
4009 _('record the current user as committer'), _('DATE'))]
4009 _('record the current user as committer'), _('DATE'))]
4010 + commitopts2 + mergetoolopts + dryrunopts,
4010 + commitopts2 + mergetoolopts + dryrunopts,
4011 _('[OPTION]... [-r REV]... REV...'))
4011 _('[OPTION]... [-r REV]... REV...'))
4012 def graft(ui, repo, *revs, **opts):
4012 def graft(ui, repo, *revs, **opts):
4013 '''copy changes from other branches onto the current branch
4013 '''copy changes from other branches onto the current branch
4014
4014
4015 This command uses Mercurial's merge logic to copy individual
4015 This command uses Mercurial's merge logic to copy individual
4016 changes from other branches without merging branches in the
4016 changes from other branches without merging branches in the
4017 history graph. This is sometimes known as 'backporting' or
4017 history graph. This is sometimes known as 'backporting' or
4018 'cherry-picking'. By default, graft will copy user, date, and
4018 'cherry-picking'. By default, graft will copy user, date, and
4019 description from the source changesets.
4019 description from the source changesets.
4020
4020
4021 Changesets that are ancestors of the current revision, that have
4021 Changesets that are ancestors of the current revision, that have
4022 already been grafted, or that are merges will be skipped.
4022 already been grafted, or that are merges will be skipped.
4023
4023
4024 If --log is specified, log messages will have a comment appended
4024 If --log is specified, log messages will have a comment appended
4025 of the form::
4025 of the form::
4026
4026
4027 (grafted from CHANGESETHASH)
4027 (grafted from CHANGESETHASH)
4028
4028
4029 If --force is specified, revisions will be grafted even if they
4029 If --force is specified, revisions will be grafted even if they
4030 are already ancestors of or have been grafted to the destination.
4030 are already ancestors of or have been grafted to the destination.
4031 This is useful when the revisions have since been backed out.
4031 This is useful when the revisions have since been backed out.
4032
4032
4033 If a graft merge results in conflicts, the graft process is
4033 If a graft merge results in conflicts, the graft process is
4034 interrupted so that the current merge can be manually resolved.
4034 interrupted so that the current merge can be manually resolved.
4035 Once all conflicts are addressed, the graft process can be
4035 Once all conflicts are addressed, the graft process can be
4036 continued with the -c/--continue option.
4036 continued with the -c/--continue option.
4037
4037
4038 .. note::
4038 .. note::
4039
4039
4040 The -c/--continue option does not reapply earlier options, except
4040 The -c/--continue option does not reapply earlier options, except
4041 for --force.
4041 for --force.
4042
4042
4043 .. container:: verbose
4043 .. container:: verbose
4044
4044
4045 Examples:
4045 Examples:
4046
4046
4047 - copy a single change to the stable branch and edit its description::
4047 - copy a single change to the stable branch and edit its description::
4048
4048
4049 hg update stable
4049 hg update stable
4050 hg graft --edit 9393
4050 hg graft --edit 9393
4051
4051
4052 - graft a range of changesets with one exception, updating dates::
4052 - graft a range of changesets with one exception, updating dates::
4053
4053
4054 hg graft -D "2085::2093 and not 2091"
4054 hg graft -D "2085::2093 and not 2091"
4055
4055
4056 - continue a graft after resolving conflicts::
4056 - continue a graft after resolving conflicts::
4057
4057
4058 hg graft -c
4058 hg graft -c
4059
4059
4060 - show the source of a grafted changeset::
4060 - show the source of a grafted changeset::
4061
4061
4062 hg log --debug -r .
4062 hg log --debug -r .
4063
4063
4064 - show revisions sorted by date::
4064 - show revisions sorted by date::
4065
4065
4066 hg log -r "sort(all(), date)"
4066 hg log -r "sort(all(), date)"
4067
4067
4068 See :hg:`help revisions` and :hg:`help revsets` for more about
4068 See :hg:`help revisions` and :hg:`help revsets` for more about
4069 specifying revisions.
4069 specifying revisions.
4070
4070
4071 Returns 0 on successful completion.
4071 Returns 0 on successful completion.
4072 '''
4072 '''
4073 with repo.wlock():
4073 with repo.wlock():
4074 return _dograft(ui, repo, *revs, **opts)
4074 return _dograft(ui, repo, *revs, **opts)
4075
4075
4076 def _dograft(ui, repo, *revs, **opts):
4076 def _dograft(ui, repo, *revs, **opts):
4077 if revs and opts['rev']:
4077 if revs and opts['rev']:
4078 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4078 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4079 'revision ordering!\n'))
4079 'revision ordering!\n'))
4080
4080
4081 revs = list(revs)
4081 revs = list(revs)
4082 revs.extend(opts['rev'])
4082 revs.extend(opts['rev'])
4083
4083
4084 if not opts.get('user') and opts.get('currentuser'):
4084 if not opts.get('user') and opts.get('currentuser'):
4085 opts['user'] = ui.username()
4085 opts['user'] = ui.username()
4086 if not opts.get('date') and opts.get('currentdate'):
4086 if not opts.get('date') and opts.get('currentdate'):
4087 opts['date'] = "%d %d" % util.makedate()
4087 opts['date'] = "%d %d" % util.makedate()
4088
4088
4089 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4089 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4090
4090
4091 cont = False
4091 cont = False
4092 if opts['continue']:
4092 if opts['continue']:
4093 cont = True
4093 cont = True
4094 if revs:
4094 if revs:
4095 raise error.Abort(_("can't specify --continue and revisions"))
4095 raise error.Abort(_("can't specify --continue and revisions"))
4096 # read in unfinished revisions
4096 # read in unfinished revisions
4097 try:
4097 try:
4098 nodes = repo.vfs.read('graftstate').splitlines()
4098 nodes = repo.vfs.read('graftstate').splitlines()
4099 revs = [repo[node].rev() for node in nodes]
4099 revs = [repo[node].rev() for node in nodes]
4100 except IOError as inst:
4100 except IOError as inst:
4101 if inst.errno != errno.ENOENT:
4101 if inst.errno != errno.ENOENT:
4102 raise
4102 raise
4103 cmdutil.wrongtooltocontinue(repo, _('graft'))
4103 cmdutil.wrongtooltocontinue(repo, _('graft'))
4104 else:
4104 else:
4105 cmdutil.checkunfinished(repo)
4105 cmdutil.checkunfinished(repo)
4106 cmdutil.bailifchanged(repo)
4106 cmdutil.bailifchanged(repo)
4107 if not revs:
4107 if not revs:
4108 raise error.Abort(_('no revisions specified'))
4108 raise error.Abort(_('no revisions specified'))
4109 revs = scmutil.revrange(repo, revs)
4109 revs = scmutil.revrange(repo, revs)
4110
4110
4111 skipped = set()
4111 skipped = set()
4112 # check for merges
4112 # check for merges
4113 for rev in repo.revs('%ld and merge()', revs):
4113 for rev in repo.revs('%ld and merge()', revs):
4114 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4114 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4115 skipped.add(rev)
4115 skipped.add(rev)
4116 revs = [r for r in revs if r not in skipped]
4116 revs = [r for r in revs if r not in skipped]
4117 if not revs:
4117 if not revs:
4118 return -1
4118 return -1
4119
4119
4120 # Don't check in the --continue case, in effect retaining --force across
4120 # Don't check in the --continue case, in effect retaining --force across
4121 # --continues. That's because without --force, any revisions we decided to
4121 # --continues. That's because without --force, any revisions we decided to
4122 # skip would have been filtered out here, so they wouldn't have made their
4122 # skip would have been filtered out here, so they wouldn't have made their
4123 # way to the graftstate. With --force, any revisions we would have otherwise
4123 # way to the graftstate. With --force, any revisions we would have otherwise
4124 # skipped would not have been filtered out, and if they hadn't been applied
4124 # skipped would not have been filtered out, and if they hadn't been applied
4125 # already, they'd have been in the graftstate.
4125 # already, they'd have been in the graftstate.
4126 if not (cont or opts.get('force')):
4126 if not (cont or opts.get('force')):
4127 # check for ancestors of dest branch
4127 # check for ancestors of dest branch
4128 crev = repo['.'].rev()
4128 crev = repo['.'].rev()
4129 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4129 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4130 # Cannot use x.remove(y) on smart set, this has to be a list.
4130 # Cannot use x.remove(y) on smart set, this has to be a list.
4131 # XXX make this lazy in the future
4131 # XXX make this lazy in the future
4132 revs = list(revs)
4132 revs = list(revs)
4133 # don't mutate while iterating, create a copy
4133 # don't mutate while iterating, create a copy
4134 for rev in list(revs):
4134 for rev in list(revs):
4135 if rev in ancestors:
4135 if rev in ancestors:
4136 ui.warn(_('skipping ancestor revision %d:%s\n') %
4136 ui.warn(_('skipping ancestor revision %d:%s\n') %
4137 (rev, repo[rev]))
4137 (rev, repo[rev]))
4138 # XXX remove on list is slow
4138 # XXX remove on list is slow
4139 revs.remove(rev)
4139 revs.remove(rev)
4140 if not revs:
4140 if not revs:
4141 return -1
4141 return -1
4142
4142
4143 # analyze revs for earlier grafts
4143 # analyze revs for earlier grafts
4144 ids = {}
4144 ids = {}
4145 for ctx in repo.set("%ld", revs):
4145 for ctx in repo.set("%ld", revs):
4146 ids[ctx.hex()] = ctx.rev()
4146 ids[ctx.hex()] = ctx.rev()
4147 n = ctx.extra().get('source')
4147 n = ctx.extra().get('source')
4148 if n:
4148 if n:
4149 ids[n] = ctx.rev()
4149 ids[n] = ctx.rev()
4150
4150
4151 # check ancestors for earlier grafts
4151 # check ancestors for earlier grafts
4152 ui.debug('scanning for duplicate grafts\n')
4152 ui.debug('scanning for duplicate grafts\n')
4153
4153
4154 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4154 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4155 ctx = repo[rev]
4155 ctx = repo[rev]
4156 n = ctx.extra().get('source')
4156 n = ctx.extra().get('source')
4157 if n in ids:
4157 if n in ids:
4158 try:
4158 try:
4159 r = repo[n].rev()
4159 r = repo[n].rev()
4160 except error.RepoLookupError:
4160 except error.RepoLookupError:
4161 r = None
4161 r = None
4162 if r in revs:
4162 if r in revs:
4163 ui.warn(_('skipping revision %d:%s '
4163 ui.warn(_('skipping revision %d:%s '
4164 '(already grafted to %d:%s)\n')
4164 '(already grafted to %d:%s)\n')
4165 % (r, repo[r], rev, ctx))
4165 % (r, repo[r], rev, ctx))
4166 revs.remove(r)
4166 revs.remove(r)
4167 elif ids[n] in revs:
4167 elif ids[n] in revs:
4168 if r is None:
4168 if r is None:
4169 ui.warn(_('skipping already grafted revision %d:%s '
4169 ui.warn(_('skipping already grafted revision %d:%s '
4170 '(%d:%s also has unknown origin %s)\n')
4170 '(%d:%s also has unknown origin %s)\n')
4171 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4171 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4172 else:
4172 else:
4173 ui.warn(_('skipping already grafted revision %d:%s '
4173 ui.warn(_('skipping already grafted revision %d:%s '
4174 '(%d:%s also has origin %d:%s)\n')
4174 '(%d:%s also has origin %d:%s)\n')
4175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4176 revs.remove(ids[n])
4176 revs.remove(ids[n])
4177 elif ctx.hex() in ids:
4177 elif ctx.hex() in ids:
4178 r = ids[ctx.hex()]
4178 r = ids[ctx.hex()]
4179 ui.warn(_('skipping already grafted revision %d:%s '
4179 ui.warn(_('skipping already grafted revision %d:%s '
4180 '(was grafted from %d:%s)\n') %
4180 '(was grafted from %d:%s)\n') %
4181 (r, repo[r], rev, ctx))
4181 (r, repo[r], rev, ctx))
4182 revs.remove(r)
4182 revs.remove(r)
4183 if not revs:
4183 if not revs:
4184 return -1
4184 return -1
4185
4185
4186 for pos, ctx in enumerate(repo.set("%ld", revs)):
4186 for pos, ctx in enumerate(repo.set("%ld", revs)):
4187 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4187 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4188 ctx.description().split('\n', 1)[0])
4188 ctx.description().split('\n', 1)[0])
4189 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4189 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4190 if names:
4190 if names:
4191 desc += ' (%s)' % ' '.join(names)
4191 desc += ' (%s)' % ' '.join(names)
4192 ui.status(_('grafting %s\n') % desc)
4192 ui.status(_('grafting %s\n') % desc)
4193 if opts.get('dry_run'):
4193 if opts.get('dry_run'):
4194 continue
4194 continue
4195
4195
4196 source = ctx.extra().get('source')
4196 source = ctx.extra().get('source')
4197 extra = {}
4197 extra = {}
4198 if source:
4198 if source:
4199 extra['source'] = source
4199 extra['source'] = source
4200 extra['intermediate-source'] = ctx.hex()
4200 extra['intermediate-source'] = ctx.hex()
4201 else:
4201 else:
4202 extra['source'] = ctx.hex()
4202 extra['source'] = ctx.hex()
4203 user = ctx.user()
4203 user = ctx.user()
4204 if opts.get('user'):
4204 if opts.get('user'):
4205 user = opts['user']
4205 user = opts['user']
4206 date = ctx.date()
4206 date = ctx.date()
4207 if opts.get('date'):
4207 if opts.get('date'):
4208 date = opts['date']
4208 date = opts['date']
4209 message = ctx.description()
4209 message = ctx.description()
4210 if opts.get('log'):
4210 if opts.get('log'):
4211 message += '\n(grafted from %s)' % ctx.hex()
4211 message += '\n(grafted from %s)' % ctx.hex()
4212
4212
4213 # we don't merge the first commit when continuing
4213 # we don't merge the first commit when continuing
4214 if not cont:
4214 if not cont:
4215 # perform the graft merge with p1(rev) as 'ancestor'
4215 # perform the graft merge with p1(rev) as 'ancestor'
4216 try:
4216 try:
4217 # ui.forcemerge is an internal variable, do not document
4217 # ui.forcemerge is an internal variable, do not document
4218 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4218 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4219 'graft')
4219 'graft')
4220 stats = mergemod.graft(repo, ctx, ctx.p1(),
4220 stats = mergemod.graft(repo, ctx, ctx.p1(),
4221 ['local', 'graft'])
4221 ['local', 'graft'])
4222 finally:
4222 finally:
4223 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4223 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4224 # report any conflicts
4224 # report any conflicts
4225 if stats and stats[3] > 0:
4225 if stats and stats[3] > 0:
4226 # write out state for --continue
4226 # write out state for --continue
4227 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4227 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4228 repo.vfs.write('graftstate', ''.join(nodelines))
4228 repo.vfs.write('graftstate', ''.join(nodelines))
4229 extra = ''
4229 extra = ''
4230 if opts.get('user'):
4230 if opts.get('user'):
4231 extra += ' --user %s' % util.shellquote(opts['user'])
4231 extra += ' --user %s' % util.shellquote(opts['user'])
4232 if opts.get('date'):
4232 if opts.get('date'):
4233 extra += ' --date %s' % util.shellquote(opts['date'])
4233 extra += ' --date %s' % util.shellquote(opts['date'])
4234 if opts.get('log'):
4234 if opts.get('log'):
4235 extra += ' --log'
4235 extra += ' --log'
4236 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4236 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4237 raise error.Abort(
4237 raise error.Abort(
4238 _("unresolved conflicts, can't continue"),
4238 _("unresolved conflicts, can't continue"),
4239 hint=hint)
4239 hint=hint)
4240 else:
4240 else:
4241 cont = False
4241 cont = False
4242
4242
4243 # commit
4243 # commit
4244 node = repo.commit(text=message, user=user,
4244 node = repo.commit(text=message, user=user,
4245 date=date, extra=extra, editor=editor)
4245 date=date, extra=extra, editor=editor)
4246 if node is None:
4246 if node is None:
4247 ui.warn(
4247 ui.warn(
4248 _('note: graft of %d:%s created no changes to commit\n') %
4248 _('note: graft of %d:%s created no changes to commit\n') %
4249 (ctx.rev(), ctx))
4249 (ctx.rev(), ctx))
4250
4250
4251 # remove state when we complete successfully
4251 # remove state when we complete successfully
4252 if not opts.get('dry_run'):
4252 if not opts.get('dry_run'):
4253 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4253 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4254
4254
4255 return 0
4255 return 0
4256
4256
4257 @command('grep',
4257 @command('grep',
4258 [('0', 'print0', None, _('end fields with NUL')),
4258 [('0', 'print0', None, _('end fields with NUL')),
4259 ('', 'all', None, _('print all revisions that match')),
4259 ('', 'all', None, _('print all revisions that match')),
4260 ('a', 'text', None, _('treat all files as text')),
4260 ('a', 'text', None, _('treat all files as text')),
4261 ('f', 'follow', None,
4261 ('f', 'follow', None,
4262 _('follow changeset history,'
4262 _('follow changeset history,'
4263 ' or file history across copies and renames')),
4263 ' or file history across copies and renames')),
4264 ('i', 'ignore-case', None, _('ignore case when matching')),
4264 ('i', 'ignore-case', None, _('ignore case when matching')),
4265 ('l', 'files-with-matches', None,
4265 ('l', 'files-with-matches', None,
4266 _('print only filenames and revisions that match')),
4266 _('print only filenames and revisions that match')),
4267 ('n', 'line-number', None, _('print matching line numbers')),
4267 ('n', 'line-number', None, _('print matching line numbers')),
4268 ('r', 'rev', [],
4268 ('r', 'rev', [],
4269 _('only search files changed within revision range'), _('REV')),
4269 _('only search files changed within revision range'), _('REV')),
4270 ('u', 'user', None, _('list the author (long with -v)')),
4270 ('u', 'user', None, _('list the author (long with -v)')),
4271 ('d', 'date', None, _('list the date (short with -q)')),
4271 ('d', 'date', None, _('list the date (short with -q)')),
4272 ] + walkopts,
4272 ] + walkopts,
4273 _('[OPTION]... PATTERN [FILE]...'),
4273 _('[OPTION]... PATTERN [FILE]...'),
4274 inferrepo=True)
4274 inferrepo=True)
4275 def grep(ui, repo, pattern, *pats, **opts):
4275 def grep(ui, repo, pattern, *pats, **opts):
4276 """search for a pattern in specified files and revisions
4276 """search for a pattern in specified files and revisions
4277
4277
4278 Search revisions of files for a regular expression.
4278 Search revisions of files for a regular expression.
4279
4279
4280 This command behaves differently than Unix grep. It only accepts
4280 This command behaves differently than Unix grep. It only accepts
4281 Python/Perl regexps. It searches repository history, not the
4281 Python/Perl regexps. It searches repository history, not the
4282 working directory. It always prints the revision number in which a
4282 working directory. It always prints the revision number in which a
4283 match appears.
4283 match appears.
4284
4284
4285 By default, grep only prints output for the first revision of a
4285 By default, grep only prints output for the first revision of a
4286 file in which it finds a match. To get it to print every revision
4286 file in which it finds a match. To get it to print every revision
4287 that contains a change in match status ("-" for a match that
4287 that contains a change in match status ("-" for a match that
4288 becomes a non-match, or "+" for a non-match that becomes a match),
4288 becomes a non-match, or "+" for a non-match that becomes a match),
4289 use the --all flag.
4289 use the --all flag.
4290
4290
4291 Returns 0 if a match is found, 1 otherwise.
4291 Returns 0 if a match is found, 1 otherwise.
4292 """
4292 """
4293 reflags = re.M
4293 reflags = re.M
4294 if opts.get('ignore_case'):
4294 if opts.get('ignore_case'):
4295 reflags |= re.I
4295 reflags |= re.I
4296 try:
4296 try:
4297 regexp = util.re.compile(pattern, reflags)
4297 regexp = util.re.compile(pattern, reflags)
4298 except re.error as inst:
4298 except re.error as inst:
4299 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4299 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4300 return 1
4300 return 1
4301 sep, eol = ':', '\n'
4301 sep, eol = ':', '\n'
4302 if opts.get('print0'):
4302 if opts.get('print0'):
4303 sep = eol = '\0'
4303 sep = eol = '\0'
4304
4304
4305 getfile = util.lrucachefunc(repo.file)
4305 getfile = util.lrucachefunc(repo.file)
4306
4306
4307 def matchlines(body):
4307 def matchlines(body):
4308 begin = 0
4308 begin = 0
4309 linenum = 0
4309 linenum = 0
4310 while begin < len(body):
4310 while begin < len(body):
4311 match = regexp.search(body, begin)
4311 match = regexp.search(body, begin)
4312 if not match:
4312 if not match:
4313 break
4313 break
4314 mstart, mend = match.span()
4314 mstart, mend = match.span()
4315 linenum += body.count('\n', begin, mstart) + 1
4315 linenum += body.count('\n', begin, mstart) + 1
4316 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4316 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4317 begin = body.find('\n', mend) + 1 or len(body) + 1
4317 begin = body.find('\n', mend) + 1 or len(body) + 1
4318 lend = begin - 1
4318 lend = begin - 1
4319 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4319 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4320
4320
4321 class linestate(object):
4321 class linestate(object):
4322 def __init__(self, line, linenum, colstart, colend):
4322 def __init__(self, line, linenum, colstart, colend):
4323 self.line = line
4323 self.line = line
4324 self.linenum = linenum
4324 self.linenum = linenum
4325 self.colstart = colstart
4325 self.colstart = colstart
4326 self.colend = colend
4326 self.colend = colend
4327
4327
4328 def __hash__(self):
4328 def __hash__(self):
4329 return hash((self.linenum, self.line))
4329 return hash((self.linenum, self.line))
4330
4330
4331 def __eq__(self, other):
4331 def __eq__(self, other):
4332 return self.line == other.line
4332 return self.line == other.line
4333
4333
4334 def __iter__(self):
4334 def __iter__(self):
4335 yield (self.line[:self.colstart], '')
4335 yield (self.line[:self.colstart], '')
4336 yield (self.line[self.colstart:self.colend], 'grep.match')
4336 yield (self.line[self.colstart:self.colend], 'grep.match')
4337 rest = self.line[self.colend:]
4337 rest = self.line[self.colend:]
4338 while rest != '':
4338 while rest != '':
4339 match = regexp.search(rest)
4339 match = regexp.search(rest)
4340 if not match:
4340 if not match:
4341 yield (rest, '')
4341 yield (rest, '')
4342 break
4342 break
4343 mstart, mend = match.span()
4343 mstart, mend = match.span()
4344 yield (rest[:mstart], '')
4344 yield (rest[:mstart], '')
4345 yield (rest[mstart:mend], 'grep.match')
4345 yield (rest[mstart:mend], 'grep.match')
4346 rest = rest[mend:]
4346 rest = rest[mend:]
4347
4347
4348 matches = {}
4348 matches = {}
4349 copies = {}
4349 copies = {}
4350 def grepbody(fn, rev, body):
4350 def grepbody(fn, rev, body):
4351 matches[rev].setdefault(fn, [])
4351 matches[rev].setdefault(fn, [])
4352 m = matches[rev][fn]
4352 m = matches[rev][fn]
4353 for lnum, cstart, cend, line in matchlines(body):
4353 for lnum, cstart, cend, line in matchlines(body):
4354 s = linestate(line, lnum, cstart, cend)
4354 s = linestate(line, lnum, cstart, cend)
4355 m.append(s)
4355 m.append(s)
4356
4356
4357 def difflinestates(a, b):
4357 def difflinestates(a, b):
4358 sm = difflib.SequenceMatcher(None, a, b)
4358 sm = difflib.SequenceMatcher(None, a, b)
4359 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4359 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4360 if tag == 'insert':
4360 if tag == 'insert':
4361 for i in xrange(blo, bhi):
4361 for i in xrange(blo, bhi):
4362 yield ('+', b[i])
4362 yield ('+', b[i])
4363 elif tag == 'delete':
4363 elif tag == 'delete':
4364 for i in xrange(alo, ahi):
4364 for i in xrange(alo, ahi):
4365 yield ('-', a[i])
4365 yield ('-', a[i])
4366 elif tag == 'replace':
4366 elif tag == 'replace':
4367 for i in xrange(alo, ahi):
4367 for i in xrange(alo, ahi):
4368 yield ('-', a[i])
4368 yield ('-', a[i])
4369 for i in xrange(blo, bhi):
4369 for i in xrange(blo, bhi):
4370 yield ('+', b[i])
4370 yield ('+', b[i])
4371
4371
4372 def display(fn, ctx, pstates, states):
4372 def display(fn, ctx, pstates, states):
4373 rev = ctx.rev()
4373 rev = ctx.rev()
4374 if ui.quiet:
4374 if ui.quiet:
4375 datefunc = util.shortdate
4375 datefunc = util.shortdate
4376 else:
4376 else:
4377 datefunc = util.datestr
4377 datefunc = util.datestr
4378 found = False
4378 found = False
4379 @util.cachefunc
4379 @util.cachefunc
4380 def binary():
4380 def binary():
4381 flog = getfile(fn)
4381 flog = getfile(fn)
4382 return util.binary(flog.read(ctx.filenode(fn)))
4382 return util.binary(flog.read(ctx.filenode(fn)))
4383
4383
4384 if opts.get('all'):
4384 if opts.get('all'):
4385 iter = difflinestates(pstates, states)
4385 iter = difflinestates(pstates, states)
4386 else:
4386 else:
4387 iter = [('', l) for l in states]
4387 iter = [('', l) for l in states]
4388 for change, l in iter:
4388 for change, l in iter:
4389 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4389 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4390
4390
4391 if opts.get('line_number'):
4391 if opts.get('line_number'):
4392 cols.append((str(l.linenum), 'grep.linenumber'))
4392 cols.append((str(l.linenum), 'grep.linenumber'))
4393 if opts.get('all'):
4393 if opts.get('all'):
4394 cols.append((change, 'grep.change'))
4394 cols.append((change, 'grep.change'))
4395 if opts.get('user'):
4395 if opts.get('user'):
4396 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4396 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4397 if opts.get('date'):
4397 if opts.get('date'):
4398 cols.append((datefunc(ctx.date()), 'grep.date'))
4398 cols.append((datefunc(ctx.date()), 'grep.date'))
4399 for col, label in cols[:-1]:
4399 for col, label in cols[:-1]:
4400 ui.write(col, label=label)
4400 ui.write(col, label=label)
4401 ui.write(sep, label='grep.sep')
4401 ui.write(sep, label='grep.sep')
4402 ui.write(cols[-1][0], label=cols[-1][1])
4402 ui.write(cols[-1][0], label=cols[-1][1])
4403 if not opts.get('files_with_matches'):
4403 if not opts.get('files_with_matches'):
4404 ui.write(sep, label='grep.sep')
4404 ui.write(sep, label='grep.sep')
4405 if not opts.get('text') and binary():
4405 if not opts.get('text') and binary():
4406 ui.write(" Binary file matches")
4406 ui.write(" Binary file matches")
4407 else:
4407 else:
4408 for s, label in l:
4408 for s, label in l:
4409 ui.write(s, label=label)
4409 ui.write(s, label=label)
4410 ui.write(eol)
4410 ui.write(eol)
4411 found = True
4411 found = True
4412 if opts.get('files_with_matches'):
4412 if opts.get('files_with_matches'):
4413 break
4413 break
4414 return found
4414 return found
4415
4415
4416 skip = {}
4416 skip = {}
4417 revfiles = {}
4417 revfiles = {}
4418 matchfn = scmutil.match(repo[None], pats, opts)
4418 matchfn = scmutil.match(repo[None], pats, opts)
4419 found = False
4419 found = False
4420 follow = opts.get('follow')
4420 follow = opts.get('follow')
4421
4421
4422 def prep(ctx, fns):
4422 def prep(ctx, fns):
4423 rev = ctx.rev()
4423 rev = ctx.rev()
4424 pctx = ctx.p1()
4424 pctx = ctx.p1()
4425 parent = pctx.rev()
4425 parent = pctx.rev()
4426 matches.setdefault(rev, {})
4426 matches.setdefault(rev, {})
4427 matches.setdefault(parent, {})
4427 matches.setdefault(parent, {})
4428 files = revfiles.setdefault(rev, [])
4428 files = revfiles.setdefault(rev, [])
4429 for fn in fns:
4429 for fn in fns:
4430 flog = getfile(fn)
4430 flog = getfile(fn)
4431 try:
4431 try:
4432 fnode = ctx.filenode(fn)
4432 fnode = ctx.filenode(fn)
4433 except error.LookupError:
4433 except error.LookupError:
4434 continue
4434 continue
4435
4435
4436 copied = flog.renamed(fnode)
4436 copied = flog.renamed(fnode)
4437 copy = follow and copied and copied[0]
4437 copy = follow and copied and copied[0]
4438 if copy:
4438 if copy:
4439 copies.setdefault(rev, {})[fn] = copy
4439 copies.setdefault(rev, {})[fn] = copy
4440 if fn in skip:
4440 if fn in skip:
4441 if copy:
4441 if copy:
4442 skip[copy] = True
4442 skip[copy] = True
4443 continue
4443 continue
4444 files.append(fn)
4444 files.append(fn)
4445
4445
4446 if fn not in matches[rev]:
4446 if fn not in matches[rev]:
4447 grepbody(fn, rev, flog.read(fnode))
4447 grepbody(fn, rev, flog.read(fnode))
4448
4448
4449 pfn = copy or fn
4449 pfn = copy or fn
4450 if pfn not in matches[parent]:
4450 if pfn not in matches[parent]:
4451 try:
4451 try:
4452 fnode = pctx.filenode(pfn)
4452 fnode = pctx.filenode(pfn)
4453 grepbody(pfn, parent, flog.read(fnode))
4453 grepbody(pfn, parent, flog.read(fnode))
4454 except error.LookupError:
4454 except error.LookupError:
4455 pass
4455 pass
4456
4456
4457 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4457 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4458 rev = ctx.rev()
4458 rev = ctx.rev()
4459 parent = ctx.p1().rev()
4459 parent = ctx.p1().rev()
4460 for fn in sorted(revfiles.get(rev, [])):
4460 for fn in sorted(revfiles.get(rev, [])):
4461 states = matches[rev][fn]
4461 states = matches[rev][fn]
4462 copy = copies.get(rev, {}).get(fn)
4462 copy = copies.get(rev, {}).get(fn)
4463 if fn in skip:
4463 if fn in skip:
4464 if copy:
4464 if copy:
4465 skip[copy] = True
4465 skip[copy] = True
4466 continue
4466 continue
4467 pstates = matches.get(parent, {}).get(copy or fn, [])
4467 pstates = matches.get(parent, {}).get(copy or fn, [])
4468 if pstates or states:
4468 if pstates or states:
4469 r = display(fn, ctx, pstates, states)
4469 r = display(fn, ctx, pstates, states)
4470 found = found or r
4470 found = found or r
4471 if r and not opts.get('all'):
4471 if r and not opts.get('all'):
4472 skip[fn] = True
4472 skip[fn] = True
4473 if copy:
4473 if copy:
4474 skip[copy] = True
4474 skip[copy] = True
4475 del matches[rev]
4475 del matches[rev]
4476 del revfiles[rev]
4476 del revfiles[rev]
4477
4477
4478 return not found
4478 return not found
4479
4479
4480 @command('heads',
4480 @command('heads',
4481 [('r', 'rev', '',
4481 [('r', 'rev', '',
4482 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4482 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4483 ('t', 'topo', False, _('show topological heads only')),
4483 ('t', 'topo', False, _('show topological heads only')),
4484 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4484 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4485 ('c', 'closed', False, _('show normal and closed branch heads')),
4485 ('c', 'closed', False, _('show normal and closed branch heads')),
4486 ] + templateopts,
4486 ] + templateopts,
4487 _('[-ct] [-r STARTREV] [REV]...'))
4487 _('[-ct] [-r STARTREV] [REV]...'))
4488 def heads(ui, repo, *branchrevs, **opts):
4488 def heads(ui, repo, *branchrevs, **opts):
4489 """show branch heads
4489 """show branch heads
4490
4490
4491 With no arguments, show all open branch heads in the repository.
4491 With no arguments, show all open branch heads in the repository.
4492 Branch heads are changesets that have no descendants on the
4492 Branch heads are changesets that have no descendants on the
4493 same branch. They are where development generally takes place and
4493 same branch. They are where development generally takes place and
4494 are the usual targets for update and merge operations.
4494 are the usual targets for update and merge operations.
4495
4495
4496 If one or more REVs are given, only open branch heads on the
4496 If one or more REVs are given, only open branch heads on the
4497 branches associated with the specified changesets are shown. This
4497 branches associated with the specified changesets are shown. This
4498 means that you can use :hg:`heads .` to see the heads on the
4498 means that you can use :hg:`heads .` to see the heads on the
4499 currently checked-out branch.
4499 currently checked-out branch.
4500
4500
4501 If -c/--closed is specified, also show branch heads marked closed
4501 If -c/--closed is specified, also show branch heads marked closed
4502 (see :hg:`commit --close-branch`).
4502 (see :hg:`commit --close-branch`).
4503
4503
4504 If STARTREV is specified, only those heads that are descendants of
4504 If STARTREV is specified, only those heads that are descendants of
4505 STARTREV will be displayed.
4505 STARTREV will be displayed.
4506
4506
4507 If -t/--topo is specified, named branch mechanics will be ignored and only
4507 If -t/--topo is specified, named branch mechanics will be ignored and only
4508 topological heads (changesets with no children) will be shown.
4508 topological heads (changesets with no children) will be shown.
4509
4509
4510 Returns 0 if matching heads are found, 1 if not.
4510 Returns 0 if matching heads are found, 1 if not.
4511 """
4511 """
4512
4512
4513 start = None
4513 start = None
4514 if 'rev' in opts:
4514 if 'rev' in opts:
4515 start = scmutil.revsingle(repo, opts['rev'], None).node()
4515 start = scmutil.revsingle(repo, opts['rev'], None).node()
4516
4516
4517 if opts.get('topo'):
4517 if opts.get('topo'):
4518 heads = [repo[h] for h in repo.heads(start)]
4518 heads = [repo[h] for h in repo.heads(start)]
4519 else:
4519 else:
4520 heads = []
4520 heads = []
4521 for branch in repo.branchmap():
4521 for branch in repo.branchmap():
4522 heads += repo.branchheads(branch, start, opts.get('closed'))
4522 heads += repo.branchheads(branch, start, opts.get('closed'))
4523 heads = [repo[h] for h in heads]
4523 heads = [repo[h] for h in heads]
4524
4524
4525 if branchrevs:
4525 if branchrevs:
4526 branches = set(repo[br].branch() for br in branchrevs)
4526 branches = set(repo[br].branch() for br in branchrevs)
4527 heads = [h for h in heads if h.branch() in branches]
4527 heads = [h for h in heads if h.branch() in branches]
4528
4528
4529 if opts.get('active') and branchrevs:
4529 if opts.get('active') and branchrevs:
4530 dagheads = repo.heads(start)
4530 dagheads = repo.heads(start)
4531 heads = [h for h in heads if h.node() in dagheads]
4531 heads = [h for h in heads if h.node() in dagheads]
4532
4532
4533 if branchrevs:
4533 if branchrevs:
4534 haveheads = set(h.branch() for h in heads)
4534 haveheads = set(h.branch() for h in heads)
4535 if branches - haveheads:
4535 if branches - haveheads:
4536 headless = ', '.join(b for b in branches - haveheads)
4536 headless = ', '.join(b for b in branches - haveheads)
4537 msg = _('no open branch heads found on branches %s')
4537 msg = _('no open branch heads found on branches %s')
4538 if opts.get('rev'):
4538 if opts.get('rev'):
4539 msg += _(' (started at %s)') % opts['rev']
4539 msg += _(' (started at %s)') % opts['rev']
4540 ui.warn((msg + '\n') % headless)
4540 ui.warn((msg + '\n') % headless)
4541
4541
4542 if not heads:
4542 if not heads:
4543 return 1
4543 return 1
4544
4544
4545 heads = sorted(heads, key=lambda x: -x.rev())
4545 heads = sorted(heads, key=lambda x: -x.rev())
4546 displayer = cmdutil.show_changeset(ui, repo, opts)
4546 displayer = cmdutil.show_changeset(ui, repo, opts)
4547 for ctx in heads:
4547 for ctx in heads:
4548 displayer.show(ctx)
4548 displayer.show(ctx)
4549 displayer.close()
4549 displayer.close()
4550
4550
4551 @command('help',
4551 @command('help',
4552 [('e', 'extension', None, _('show only help for extensions')),
4552 [('e', 'extension', None, _('show only help for extensions')),
4553 ('c', 'command', None, _('show only help for commands')),
4553 ('c', 'command', None, _('show only help for commands')),
4554 ('k', 'keyword', None, _('show topics matching keyword')),
4554 ('k', 'keyword', None, _('show topics matching keyword')),
4555 ('s', 'system', [], _('show help for specific platform(s)')),
4555 ('s', 'system', [], _('show help for specific platform(s)')),
4556 ],
4556 ],
4557 _('[-ecks] [TOPIC]'),
4557 _('[-ecks] [TOPIC]'),
4558 norepo=True)
4558 norepo=True)
4559 def help_(ui, name=None, **opts):
4559 def help_(ui, name=None, **opts):
4560 """show help for a given topic or a help overview
4560 """show help for a given topic or a help overview
4561
4561
4562 With no arguments, print a list of commands with short help messages.
4562 With no arguments, print a list of commands with short help messages.
4563
4563
4564 Given a topic, extension, or command name, print help for that
4564 Given a topic, extension, or command name, print help for that
4565 topic.
4565 topic.
4566
4566
4567 Returns 0 if successful.
4567 Returns 0 if successful.
4568 """
4568 """
4569
4569
4570 textwidth = min(ui.termwidth(), 80) - 2
4570 textwidth = ui.configint('ui', 'textwidth', 78)
4571 termwidth = ui.termwidth() - 2
4572 if textwidth <= 0 or termwidth < textwidth:
4573 textwidth = termwidth
4571
4574
4572 keep = opts.get('system') or []
4575 keep = opts.get('system') or []
4573 if len(keep) == 0:
4576 if len(keep) == 0:
4574 if sys.platform.startswith('win'):
4577 if sys.platform.startswith('win'):
4575 keep.append('windows')
4578 keep.append('windows')
4576 elif sys.platform == 'OpenVMS':
4579 elif sys.platform == 'OpenVMS':
4577 keep.append('vms')
4580 keep.append('vms')
4578 elif sys.platform == 'plan9':
4581 elif sys.platform == 'plan9':
4579 keep.append('plan9')
4582 keep.append('plan9')
4580 else:
4583 else:
4581 keep.append('unix')
4584 keep.append('unix')
4582 keep.append(sys.platform.lower())
4585 keep.append(sys.platform.lower())
4583 if ui.verbose:
4586 if ui.verbose:
4584 keep.append('verbose')
4587 keep.append('verbose')
4585
4588
4586 section = None
4589 section = None
4587 subtopic = None
4590 subtopic = None
4588 if name and '.' in name:
4591 if name and '.' in name:
4589 name, section = name.split('.', 1)
4592 name, section = name.split('.', 1)
4590 section = section.lower()
4593 section = section.lower()
4591 if '.' in section:
4594 if '.' in section:
4592 subtopic, section = section.split('.', 1)
4595 subtopic, section = section.split('.', 1)
4593 else:
4596 else:
4594 subtopic = section
4597 subtopic = section
4595
4598
4596 text = help.help_(ui, name, subtopic=subtopic, **opts)
4599 text = help.help_(ui, name, subtopic=subtopic, **opts)
4597
4600
4598 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4601 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4599 section=section)
4602 section=section)
4600
4603
4601 # We could have been given a weird ".foo" section without a name
4604 # We could have been given a weird ".foo" section without a name
4602 # to look for, or we could have simply failed to found "foo.bar"
4605 # to look for, or we could have simply failed to found "foo.bar"
4603 # because bar isn't a section of foo
4606 # because bar isn't a section of foo
4604 if section and not (formatted and name):
4607 if section and not (formatted and name):
4605 raise error.Abort(_("help section not found"))
4608 raise error.Abort(_("help section not found"))
4606
4609
4607 if 'verbose' in pruned:
4610 if 'verbose' in pruned:
4608 keep.append('omitted')
4611 keep.append('omitted')
4609 else:
4612 else:
4610 keep.append('notomitted')
4613 keep.append('notomitted')
4611 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4614 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4612 section=section)
4615 section=section)
4613 ui.write(formatted)
4616 ui.write(formatted)
4614
4617
4615
4618
4616 @command('identify|id',
4619 @command('identify|id',
4617 [('r', 'rev', '',
4620 [('r', 'rev', '',
4618 _('identify the specified revision'), _('REV')),
4621 _('identify the specified revision'), _('REV')),
4619 ('n', 'num', None, _('show local revision number')),
4622 ('n', 'num', None, _('show local revision number')),
4620 ('i', 'id', None, _('show global revision id')),
4623 ('i', 'id', None, _('show global revision id')),
4621 ('b', 'branch', None, _('show branch')),
4624 ('b', 'branch', None, _('show branch')),
4622 ('t', 'tags', None, _('show tags')),
4625 ('t', 'tags', None, _('show tags')),
4623 ('B', 'bookmarks', None, _('show bookmarks')),
4626 ('B', 'bookmarks', None, _('show bookmarks')),
4624 ] + remoteopts,
4627 ] + remoteopts,
4625 _('[-nibtB] [-r REV] [SOURCE]'),
4628 _('[-nibtB] [-r REV] [SOURCE]'),
4626 optionalrepo=True)
4629 optionalrepo=True)
4627 def identify(ui, repo, source=None, rev=None,
4630 def identify(ui, repo, source=None, rev=None,
4628 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4631 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4629 """identify the working directory or specified revision
4632 """identify the working directory or specified revision
4630
4633
4631 Print a summary identifying the repository state at REV using one or
4634 Print a summary identifying the repository state at REV using one or
4632 two parent hash identifiers, followed by a "+" if the working
4635 two parent hash identifiers, followed by a "+" if the working
4633 directory has uncommitted changes, the branch name (if not default),
4636 directory has uncommitted changes, the branch name (if not default),
4634 a list of tags, and a list of bookmarks.
4637 a list of tags, and a list of bookmarks.
4635
4638
4636 When REV is not given, print a summary of the current state of the
4639 When REV is not given, print a summary of the current state of the
4637 repository.
4640 repository.
4638
4641
4639 Specifying a path to a repository root or Mercurial bundle will
4642 Specifying a path to a repository root or Mercurial bundle will
4640 cause lookup to operate on that repository/bundle.
4643 cause lookup to operate on that repository/bundle.
4641
4644
4642 .. container:: verbose
4645 .. container:: verbose
4643
4646
4644 Examples:
4647 Examples:
4645
4648
4646 - generate a build identifier for the working directory::
4649 - generate a build identifier for the working directory::
4647
4650
4648 hg id --id > build-id.dat
4651 hg id --id > build-id.dat
4649
4652
4650 - find the revision corresponding to a tag::
4653 - find the revision corresponding to a tag::
4651
4654
4652 hg id -n -r 1.3
4655 hg id -n -r 1.3
4653
4656
4654 - check the most recent revision of a remote repository::
4657 - check the most recent revision of a remote repository::
4655
4658
4656 hg id -r tip http://selenic.com/hg/
4659 hg id -r tip http://selenic.com/hg/
4657
4660
4658 See :hg:`log` for generating more information about specific revisions,
4661 See :hg:`log` for generating more information about specific revisions,
4659 including full hash identifiers.
4662 including full hash identifiers.
4660
4663
4661 Returns 0 if successful.
4664 Returns 0 if successful.
4662 """
4665 """
4663
4666
4664 if not repo and not source:
4667 if not repo and not source:
4665 raise error.Abort(_("there is no Mercurial repository here "
4668 raise error.Abort(_("there is no Mercurial repository here "
4666 "(.hg not found)"))
4669 "(.hg not found)"))
4667
4670
4668 if ui.debugflag:
4671 if ui.debugflag:
4669 hexfunc = hex
4672 hexfunc = hex
4670 else:
4673 else:
4671 hexfunc = short
4674 hexfunc = short
4672 default = not (num or id or branch or tags or bookmarks)
4675 default = not (num or id or branch or tags or bookmarks)
4673 output = []
4676 output = []
4674 revs = []
4677 revs = []
4675
4678
4676 if source:
4679 if source:
4677 source, branches = hg.parseurl(ui.expandpath(source))
4680 source, branches = hg.parseurl(ui.expandpath(source))
4678 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4681 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4679 repo = peer.local()
4682 repo = peer.local()
4680 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4683 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4681
4684
4682 if not repo:
4685 if not repo:
4683 if num or branch or tags:
4686 if num or branch or tags:
4684 raise error.Abort(
4687 raise error.Abort(
4685 _("can't query remote revision number, branch, or tags"))
4688 _("can't query remote revision number, branch, or tags"))
4686 if not rev and revs:
4689 if not rev and revs:
4687 rev = revs[0]
4690 rev = revs[0]
4688 if not rev:
4691 if not rev:
4689 rev = "tip"
4692 rev = "tip"
4690
4693
4691 remoterev = peer.lookup(rev)
4694 remoterev = peer.lookup(rev)
4692 if default or id:
4695 if default or id:
4693 output = [hexfunc(remoterev)]
4696 output = [hexfunc(remoterev)]
4694
4697
4695 def getbms():
4698 def getbms():
4696 bms = []
4699 bms = []
4697
4700
4698 if 'bookmarks' in peer.listkeys('namespaces'):
4701 if 'bookmarks' in peer.listkeys('namespaces'):
4699 hexremoterev = hex(remoterev)
4702 hexremoterev = hex(remoterev)
4700 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4703 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4701 if bmr == hexremoterev]
4704 if bmr == hexremoterev]
4702
4705
4703 return sorted(bms)
4706 return sorted(bms)
4704
4707
4705 if bookmarks:
4708 if bookmarks:
4706 output.extend(getbms())
4709 output.extend(getbms())
4707 elif default and not ui.quiet:
4710 elif default and not ui.quiet:
4708 # multiple bookmarks for a single parent separated by '/'
4711 # multiple bookmarks for a single parent separated by '/'
4709 bm = '/'.join(getbms())
4712 bm = '/'.join(getbms())
4710 if bm:
4713 if bm:
4711 output.append(bm)
4714 output.append(bm)
4712 else:
4715 else:
4713 ctx = scmutil.revsingle(repo, rev, None)
4716 ctx = scmutil.revsingle(repo, rev, None)
4714
4717
4715 if ctx.rev() is None:
4718 if ctx.rev() is None:
4716 ctx = repo[None]
4719 ctx = repo[None]
4717 parents = ctx.parents()
4720 parents = ctx.parents()
4718 taglist = []
4721 taglist = []
4719 for p in parents:
4722 for p in parents:
4720 taglist.extend(p.tags())
4723 taglist.extend(p.tags())
4721
4724
4722 changed = ""
4725 changed = ""
4723 if default or id or num:
4726 if default or id or num:
4724 if (any(repo.status())
4727 if (any(repo.status())
4725 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4728 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4726 changed = '+'
4729 changed = '+'
4727 if default or id:
4730 if default or id:
4728 output = ["%s%s" %
4731 output = ["%s%s" %
4729 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4732 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4730 if num:
4733 if num:
4731 output.append("%s%s" %
4734 output.append("%s%s" %
4732 ('+'.join([str(p.rev()) for p in parents]), changed))
4735 ('+'.join([str(p.rev()) for p in parents]), changed))
4733 else:
4736 else:
4734 if default or id:
4737 if default or id:
4735 output = [hexfunc(ctx.node())]
4738 output = [hexfunc(ctx.node())]
4736 if num:
4739 if num:
4737 output.append(str(ctx.rev()))
4740 output.append(str(ctx.rev()))
4738 taglist = ctx.tags()
4741 taglist = ctx.tags()
4739
4742
4740 if default and not ui.quiet:
4743 if default and not ui.quiet:
4741 b = ctx.branch()
4744 b = ctx.branch()
4742 if b != 'default':
4745 if b != 'default':
4743 output.append("(%s)" % b)
4746 output.append("(%s)" % b)
4744
4747
4745 # multiple tags for a single parent separated by '/'
4748 # multiple tags for a single parent separated by '/'
4746 t = '/'.join(taglist)
4749 t = '/'.join(taglist)
4747 if t:
4750 if t:
4748 output.append(t)
4751 output.append(t)
4749
4752
4750 # multiple bookmarks for a single parent separated by '/'
4753 # multiple bookmarks for a single parent separated by '/'
4751 bm = '/'.join(ctx.bookmarks())
4754 bm = '/'.join(ctx.bookmarks())
4752 if bm:
4755 if bm:
4753 output.append(bm)
4756 output.append(bm)
4754 else:
4757 else:
4755 if branch:
4758 if branch:
4756 output.append(ctx.branch())
4759 output.append(ctx.branch())
4757
4760
4758 if tags:
4761 if tags:
4759 output.extend(taglist)
4762 output.extend(taglist)
4760
4763
4761 if bookmarks:
4764 if bookmarks:
4762 output.extend(ctx.bookmarks())
4765 output.extend(ctx.bookmarks())
4763
4766
4764 ui.write("%s\n" % ' '.join(output))
4767 ui.write("%s\n" % ' '.join(output))
4765
4768
4766 @command('import|patch',
4769 @command('import|patch',
4767 [('p', 'strip', 1,
4770 [('p', 'strip', 1,
4768 _('directory strip option for patch. This has the same '
4771 _('directory strip option for patch. This has the same '
4769 'meaning as the corresponding patch option'), _('NUM')),
4772 'meaning as the corresponding patch option'), _('NUM')),
4770 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4773 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4771 ('e', 'edit', False, _('invoke editor on commit messages')),
4774 ('e', 'edit', False, _('invoke editor on commit messages')),
4772 ('f', 'force', None,
4775 ('f', 'force', None,
4773 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4776 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4774 ('', 'no-commit', None,
4777 ('', 'no-commit', None,
4775 _("don't commit, just update the working directory")),
4778 _("don't commit, just update the working directory")),
4776 ('', 'bypass', None,
4779 ('', 'bypass', None,
4777 _("apply patch without touching the working directory")),
4780 _("apply patch without touching the working directory")),
4778 ('', 'partial', None,
4781 ('', 'partial', None,
4779 _('commit even if some hunks fail')),
4782 _('commit even if some hunks fail')),
4780 ('', 'exact', None,
4783 ('', 'exact', None,
4781 _('abort if patch would apply lossily')),
4784 _('abort if patch would apply lossily')),
4782 ('', 'prefix', '',
4785 ('', 'prefix', '',
4783 _('apply patch to subdirectory'), _('DIR')),
4786 _('apply patch to subdirectory'), _('DIR')),
4784 ('', 'import-branch', None,
4787 ('', 'import-branch', None,
4785 _('use any branch information in patch (implied by --exact)'))] +
4788 _('use any branch information in patch (implied by --exact)'))] +
4786 commitopts + commitopts2 + similarityopts,
4789 commitopts + commitopts2 + similarityopts,
4787 _('[OPTION]... PATCH...'))
4790 _('[OPTION]... PATCH...'))
4788 def import_(ui, repo, patch1=None, *patches, **opts):
4791 def import_(ui, repo, patch1=None, *patches, **opts):
4789 """import an ordered set of patches
4792 """import an ordered set of patches
4790
4793
4791 Import a list of patches and commit them individually (unless
4794 Import a list of patches and commit them individually (unless
4792 --no-commit is specified).
4795 --no-commit is specified).
4793
4796
4794 To read a patch from standard input, use "-" as the patch name. If
4797 To read a patch from standard input, use "-" as the patch name. If
4795 a URL is specified, the patch will be downloaded from there.
4798 a URL is specified, the patch will be downloaded from there.
4796
4799
4797 Import first applies changes to the working directory (unless
4800 Import first applies changes to the working directory (unless
4798 --bypass is specified), import will abort if there are outstanding
4801 --bypass is specified), import will abort if there are outstanding
4799 changes.
4802 changes.
4800
4803
4801 Use --bypass to apply and commit patches directly to the
4804 Use --bypass to apply and commit patches directly to the
4802 repository, without affecting the working directory. Without
4805 repository, without affecting the working directory. Without
4803 --exact, patches will be applied on top of the working directory
4806 --exact, patches will be applied on top of the working directory
4804 parent revision.
4807 parent revision.
4805
4808
4806 You can import a patch straight from a mail message. Even patches
4809 You can import a patch straight from a mail message. Even patches
4807 as attachments work (to use the body part, it must have type
4810 as attachments work (to use the body part, it must have type
4808 text/plain or text/x-patch). From and Subject headers of email
4811 text/plain or text/x-patch). From and Subject headers of email
4809 message are used as default committer and commit message. All
4812 message are used as default committer and commit message. All
4810 text/plain body parts before first diff are added to the commit
4813 text/plain body parts before first diff are added to the commit
4811 message.
4814 message.
4812
4815
4813 If the imported patch was generated by :hg:`export`, user and
4816 If the imported patch was generated by :hg:`export`, user and
4814 description from patch override values from message headers and
4817 description from patch override values from message headers and
4815 body. Values given on command line with -m/--message and -u/--user
4818 body. Values given on command line with -m/--message and -u/--user
4816 override these.
4819 override these.
4817
4820
4818 If --exact is specified, import will set the working directory to
4821 If --exact is specified, import will set the working directory to
4819 the parent of each patch before applying it, and will abort if the
4822 the parent of each patch before applying it, and will abort if the
4820 resulting changeset has a different ID than the one recorded in
4823 resulting changeset has a different ID than the one recorded in
4821 the patch. This will guard against various ways that portable
4824 the patch. This will guard against various ways that portable
4822 patch formats and mail systems might fail to transfer Mercurial
4825 patch formats and mail systems might fail to transfer Mercurial
4823 data or metadata. See ':hg: bundle' for lossless transmission.
4826 data or metadata. See ':hg: bundle' for lossless transmission.
4824
4827
4825 Use --partial to ensure a changeset will be created from the patch
4828 Use --partial to ensure a changeset will be created from the patch
4826 even if some hunks fail to apply. Hunks that fail to apply will be
4829 even if some hunks fail to apply. Hunks that fail to apply will be
4827 written to a <target-file>.rej file. Conflicts can then be resolved
4830 written to a <target-file>.rej file. Conflicts can then be resolved
4828 by hand before :hg:`commit --amend` is run to update the created
4831 by hand before :hg:`commit --amend` is run to update the created
4829 changeset. This flag exists to let people import patches that
4832 changeset. This flag exists to let people import patches that
4830 partially apply without losing the associated metadata (author,
4833 partially apply without losing the associated metadata (author,
4831 date, description, ...).
4834 date, description, ...).
4832
4835
4833 .. note::
4836 .. note::
4834
4837
4835 When no hunks apply cleanly, :hg:`import --partial` will create
4838 When no hunks apply cleanly, :hg:`import --partial` will create
4836 an empty changeset, importing only the patch metadata.
4839 an empty changeset, importing only the patch metadata.
4837
4840
4838 With -s/--similarity, hg will attempt to discover renames and
4841 With -s/--similarity, hg will attempt to discover renames and
4839 copies in the patch in the same way as :hg:`addremove`.
4842 copies in the patch in the same way as :hg:`addremove`.
4840
4843
4841 It is possible to use external patch programs to perform the patch
4844 It is possible to use external patch programs to perform the patch
4842 by setting the ``ui.patch`` configuration option. For the default
4845 by setting the ``ui.patch`` configuration option. For the default
4843 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4846 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4844 See :hg:`help config` for more information about configuration
4847 See :hg:`help config` for more information about configuration
4845 files and how to use these options.
4848 files and how to use these options.
4846
4849
4847 See :hg:`help dates` for a list of formats valid for -d/--date.
4850 See :hg:`help dates` for a list of formats valid for -d/--date.
4848
4851
4849 .. container:: verbose
4852 .. container:: verbose
4850
4853
4851 Examples:
4854 Examples:
4852
4855
4853 - import a traditional patch from a website and detect renames::
4856 - import a traditional patch from a website and detect renames::
4854
4857
4855 hg import -s 80 http://example.com/bugfix.patch
4858 hg import -s 80 http://example.com/bugfix.patch
4856
4859
4857 - import a changeset from an hgweb server::
4860 - import a changeset from an hgweb server::
4858
4861
4859 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4862 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4860
4863
4861 - import all the patches in an Unix-style mbox::
4864 - import all the patches in an Unix-style mbox::
4862
4865
4863 hg import incoming-patches.mbox
4866 hg import incoming-patches.mbox
4864
4867
4865 - attempt to exactly restore an exported changeset (not always
4868 - attempt to exactly restore an exported changeset (not always
4866 possible)::
4869 possible)::
4867
4870
4868 hg import --exact proposed-fix.patch
4871 hg import --exact proposed-fix.patch
4869
4872
4870 - use an external tool to apply a patch which is too fuzzy for
4873 - use an external tool to apply a patch which is too fuzzy for
4871 the default internal tool.
4874 the default internal tool.
4872
4875
4873 hg import --config ui.patch="patch --merge" fuzzy.patch
4876 hg import --config ui.patch="patch --merge" fuzzy.patch
4874
4877
4875 - change the default fuzzing from 2 to a less strict 7
4878 - change the default fuzzing from 2 to a less strict 7
4876
4879
4877 hg import --config ui.fuzz=7 fuzz.patch
4880 hg import --config ui.fuzz=7 fuzz.patch
4878
4881
4879 Returns 0 on success, 1 on partial success (see --partial).
4882 Returns 0 on success, 1 on partial success (see --partial).
4880 """
4883 """
4881
4884
4882 if not patch1:
4885 if not patch1:
4883 raise error.Abort(_('need at least one patch to import'))
4886 raise error.Abort(_('need at least one patch to import'))
4884
4887
4885 patches = (patch1,) + patches
4888 patches = (patch1,) + patches
4886
4889
4887 date = opts.get('date')
4890 date = opts.get('date')
4888 if date:
4891 if date:
4889 opts['date'] = util.parsedate(date)
4892 opts['date'] = util.parsedate(date)
4890
4893
4891 exact = opts.get('exact')
4894 exact = opts.get('exact')
4892 update = not opts.get('bypass')
4895 update = not opts.get('bypass')
4893 if not update and opts.get('no_commit'):
4896 if not update and opts.get('no_commit'):
4894 raise error.Abort(_('cannot use --no-commit with --bypass'))
4897 raise error.Abort(_('cannot use --no-commit with --bypass'))
4895 try:
4898 try:
4896 sim = float(opts.get('similarity') or 0)
4899 sim = float(opts.get('similarity') or 0)
4897 except ValueError:
4900 except ValueError:
4898 raise error.Abort(_('similarity must be a number'))
4901 raise error.Abort(_('similarity must be a number'))
4899 if sim < 0 or sim > 100:
4902 if sim < 0 or sim > 100:
4900 raise error.Abort(_('similarity must be between 0 and 100'))
4903 raise error.Abort(_('similarity must be between 0 and 100'))
4901 if sim and not update:
4904 if sim and not update:
4902 raise error.Abort(_('cannot use --similarity with --bypass'))
4905 raise error.Abort(_('cannot use --similarity with --bypass'))
4903 if exact:
4906 if exact:
4904 if opts.get('edit'):
4907 if opts.get('edit'):
4905 raise error.Abort(_('cannot use --exact with --edit'))
4908 raise error.Abort(_('cannot use --exact with --edit'))
4906 if opts.get('prefix'):
4909 if opts.get('prefix'):
4907 raise error.Abort(_('cannot use --exact with --prefix'))
4910 raise error.Abort(_('cannot use --exact with --prefix'))
4908
4911
4909 base = opts["base"]
4912 base = opts["base"]
4910 wlock = dsguard = lock = tr = None
4913 wlock = dsguard = lock = tr = None
4911 msgs = []
4914 msgs = []
4912 ret = 0
4915 ret = 0
4913
4916
4914
4917
4915 try:
4918 try:
4916 wlock = repo.wlock()
4919 wlock = repo.wlock()
4917
4920
4918 if update:
4921 if update:
4919 cmdutil.checkunfinished(repo)
4922 cmdutil.checkunfinished(repo)
4920 if (exact or not opts.get('force')):
4923 if (exact or not opts.get('force')):
4921 cmdutil.bailifchanged(repo)
4924 cmdutil.bailifchanged(repo)
4922
4925
4923 if not opts.get('no_commit'):
4926 if not opts.get('no_commit'):
4924 lock = repo.lock()
4927 lock = repo.lock()
4925 tr = repo.transaction('import')
4928 tr = repo.transaction('import')
4926 else:
4929 else:
4927 dsguard = cmdutil.dirstateguard(repo, 'import')
4930 dsguard = cmdutil.dirstateguard(repo, 'import')
4928 parents = repo[None].parents()
4931 parents = repo[None].parents()
4929 for patchurl in patches:
4932 for patchurl in patches:
4930 if patchurl == '-':
4933 if patchurl == '-':
4931 ui.status(_('applying patch from stdin\n'))
4934 ui.status(_('applying patch from stdin\n'))
4932 patchfile = ui.fin
4935 patchfile = ui.fin
4933 patchurl = 'stdin' # for error message
4936 patchurl = 'stdin' # for error message
4934 else:
4937 else:
4935 patchurl = os.path.join(base, patchurl)
4938 patchurl = os.path.join(base, patchurl)
4936 ui.status(_('applying %s\n') % patchurl)
4939 ui.status(_('applying %s\n') % patchurl)
4937 patchfile = hg.openpath(ui, patchurl)
4940 patchfile = hg.openpath(ui, patchurl)
4938
4941
4939 haspatch = False
4942 haspatch = False
4940 for hunk in patch.split(patchfile):
4943 for hunk in patch.split(patchfile):
4941 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4944 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4942 parents, opts,
4945 parents, opts,
4943 msgs, hg.clean)
4946 msgs, hg.clean)
4944 if msg:
4947 if msg:
4945 haspatch = True
4948 haspatch = True
4946 ui.note(msg + '\n')
4949 ui.note(msg + '\n')
4947 if update or exact:
4950 if update or exact:
4948 parents = repo[None].parents()
4951 parents = repo[None].parents()
4949 else:
4952 else:
4950 parents = [repo[node]]
4953 parents = [repo[node]]
4951 if rej:
4954 if rej:
4952 ui.write_err(_("patch applied partially\n"))
4955 ui.write_err(_("patch applied partially\n"))
4953 ui.write_err(_("(fix the .rej files and run "
4956 ui.write_err(_("(fix the .rej files and run "
4954 "`hg commit --amend`)\n"))
4957 "`hg commit --amend`)\n"))
4955 ret = 1
4958 ret = 1
4956 break
4959 break
4957
4960
4958 if not haspatch:
4961 if not haspatch:
4959 raise error.Abort(_('%s: no diffs found') % patchurl)
4962 raise error.Abort(_('%s: no diffs found') % patchurl)
4960
4963
4961 if tr:
4964 if tr:
4962 tr.close()
4965 tr.close()
4963 if msgs:
4966 if msgs:
4964 repo.savecommitmessage('\n* * *\n'.join(msgs))
4967 repo.savecommitmessage('\n* * *\n'.join(msgs))
4965 if dsguard:
4968 if dsguard:
4966 dsguard.close()
4969 dsguard.close()
4967 return ret
4970 return ret
4968 finally:
4971 finally:
4969 if tr:
4972 if tr:
4970 tr.release()
4973 tr.release()
4971 release(lock, dsguard, wlock)
4974 release(lock, dsguard, wlock)
4972
4975
4973 @command('incoming|in',
4976 @command('incoming|in',
4974 [('f', 'force', None,
4977 [('f', 'force', None,
4975 _('run even if remote repository is unrelated')),
4978 _('run even if remote repository is unrelated')),
4976 ('n', 'newest-first', None, _('show newest record first')),
4979 ('n', 'newest-first', None, _('show newest record first')),
4977 ('', 'bundle', '',
4980 ('', 'bundle', '',
4978 _('file to store the bundles into'), _('FILE')),
4981 _('file to store the bundles into'), _('FILE')),
4979 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4982 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4980 ('B', 'bookmarks', False, _("compare bookmarks")),
4983 ('B', 'bookmarks', False, _("compare bookmarks")),
4981 ('b', 'branch', [],
4984 ('b', 'branch', [],
4982 _('a specific branch you would like to pull'), _('BRANCH')),
4985 _('a specific branch you would like to pull'), _('BRANCH')),
4983 ] + logopts + remoteopts + subrepoopts,
4986 ] + logopts + remoteopts + subrepoopts,
4984 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4987 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4985 def incoming(ui, repo, source="default", **opts):
4988 def incoming(ui, repo, source="default", **opts):
4986 """show new changesets found in source
4989 """show new changesets found in source
4987
4990
4988 Show new changesets found in the specified path/URL or the default
4991 Show new changesets found in the specified path/URL or the default
4989 pull location. These are the changesets that would have been pulled
4992 pull location. These are the changesets that would have been pulled
4990 if a pull at the time you issued this command.
4993 if a pull at the time you issued this command.
4991
4994
4992 See pull for valid source format details.
4995 See pull for valid source format details.
4993
4996
4994 .. container:: verbose
4997 .. container:: verbose
4995
4998
4996 With -B/--bookmarks, the result of bookmark comparison between
4999 With -B/--bookmarks, the result of bookmark comparison between
4997 local and remote repositories is displayed. With -v/--verbose,
5000 local and remote repositories is displayed. With -v/--verbose,
4998 status is also displayed for each bookmark like below::
5001 status is also displayed for each bookmark like below::
4999
5002
5000 BM1 01234567890a added
5003 BM1 01234567890a added
5001 BM2 1234567890ab advanced
5004 BM2 1234567890ab advanced
5002 BM3 234567890abc diverged
5005 BM3 234567890abc diverged
5003 BM4 34567890abcd changed
5006 BM4 34567890abcd changed
5004
5007
5005 The action taken locally when pulling depends on the
5008 The action taken locally when pulling depends on the
5006 status of each bookmark:
5009 status of each bookmark:
5007
5010
5008 :``added``: pull will create it
5011 :``added``: pull will create it
5009 :``advanced``: pull will update it
5012 :``advanced``: pull will update it
5010 :``diverged``: pull will create a divergent bookmark
5013 :``diverged``: pull will create a divergent bookmark
5011 :``changed``: result depends on remote changesets
5014 :``changed``: result depends on remote changesets
5012
5015
5013 From the point of view of pulling behavior, bookmark
5016 From the point of view of pulling behavior, bookmark
5014 existing only in the remote repository are treated as ``added``,
5017 existing only in the remote repository are treated as ``added``,
5015 even if it is in fact locally deleted.
5018 even if it is in fact locally deleted.
5016
5019
5017 .. container:: verbose
5020 .. container:: verbose
5018
5021
5019 For remote repository, using --bundle avoids downloading the
5022 For remote repository, using --bundle avoids downloading the
5020 changesets twice if the incoming is followed by a pull.
5023 changesets twice if the incoming is followed by a pull.
5021
5024
5022 Examples:
5025 Examples:
5023
5026
5024 - show incoming changes with patches and full description::
5027 - show incoming changes with patches and full description::
5025
5028
5026 hg incoming -vp
5029 hg incoming -vp
5027
5030
5028 - show incoming changes excluding merges, store a bundle::
5031 - show incoming changes excluding merges, store a bundle::
5029
5032
5030 hg in -vpM --bundle incoming.hg
5033 hg in -vpM --bundle incoming.hg
5031 hg pull incoming.hg
5034 hg pull incoming.hg
5032
5035
5033 - briefly list changes inside a bundle::
5036 - briefly list changes inside a bundle::
5034
5037
5035 hg in changes.hg -T "{desc|firstline}\\n"
5038 hg in changes.hg -T "{desc|firstline}\\n"
5036
5039
5037 Returns 0 if there are incoming changes, 1 otherwise.
5040 Returns 0 if there are incoming changes, 1 otherwise.
5038 """
5041 """
5039 if opts.get('graph'):
5042 if opts.get('graph'):
5040 cmdutil.checkunsupportedgraphflags([], opts)
5043 cmdutil.checkunsupportedgraphflags([], opts)
5041 def display(other, chlist, displayer):
5044 def display(other, chlist, displayer):
5042 revdag = cmdutil.graphrevs(other, chlist, opts)
5045 revdag = cmdutil.graphrevs(other, chlist, opts)
5043 cmdutil.displaygraph(ui, repo, revdag, displayer,
5046 cmdutil.displaygraph(ui, repo, revdag, displayer,
5044 graphmod.asciiedges)
5047 graphmod.asciiedges)
5045
5048
5046 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5049 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5047 return 0
5050 return 0
5048
5051
5049 if opts.get('bundle') and opts.get('subrepos'):
5052 if opts.get('bundle') and opts.get('subrepos'):
5050 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5053 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5051
5054
5052 if opts.get('bookmarks'):
5055 if opts.get('bookmarks'):
5053 source, branches = hg.parseurl(ui.expandpath(source),
5056 source, branches = hg.parseurl(ui.expandpath(source),
5054 opts.get('branch'))
5057 opts.get('branch'))
5055 other = hg.peer(repo, opts, source)
5058 other = hg.peer(repo, opts, source)
5056 if 'bookmarks' not in other.listkeys('namespaces'):
5059 if 'bookmarks' not in other.listkeys('namespaces'):
5057 ui.warn(_("remote doesn't support bookmarks\n"))
5060 ui.warn(_("remote doesn't support bookmarks\n"))
5058 return 0
5061 return 0
5059 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5062 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5060 return bookmarks.incoming(ui, repo, other)
5063 return bookmarks.incoming(ui, repo, other)
5061
5064
5062 repo._subtoppath = ui.expandpath(source)
5065 repo._subtoppath = ui.expandpath(source)
5063 try:
5066 try:
5064 return hg.incoming(ui, repo, source, opts)
5067 return hg.incoming(ui, repo, source, opts)
5065 finally:
5068 finally:
5066 del repo._subtoppath
5069 del repo._subtoppath
5067
5070
5068
5071
5069 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5072 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5070 norepo=True)
5073 norepo=True)
5071 def init(ui, dest=".", **opts):
5074 def init(ui, dest=".", **opts):
5072 """create a new repository in the given directory
5075 """create a new repository in the given directory
5073
5076
5074 Initialize a new repository in the given directory. If the given
5077 Initialize a new repository in the given directory. If the given
5075 directory does not exist, it will be created.
5078 directory does not exist, it will be created.
5076
5079
5077 If no directory is given, the current directory is used.
5080 If no directory is given, the current directory is used.
5078
5081
5079 It is possible to specify an ``ssh://`` URL as the destination.
5082 It is possible to specify an ``ssh://`` URL as the destination.
5080 See :hg:`help urls` for more information.
5083 See :hg:`help urls` for more information.
5081
5084
5082 Returns 0 on success.
5085 Returns 0 on success.
5083 """
5086 """
5084 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5087 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5085
5088
5086 @command('locate',
5089 @command('locate',
5087 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5090 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5088 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5091 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5089 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5092 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5090 ] + walkopts,
5093 ] + walkopts,
5091 _('[OPTION]... [PATTERN]...'))
5094 _('[OPTION]... [PATTERN]...'))
5092 def locate(ui, repo, *pats, **opts):
5095 def locate(ui, repo, *pats, **opts):
5093 """locate files matching specific patterns (DEPRECATED)
5096 """locate files matching specific patterns (DEPRECATED)
5094
5097
5095 Print files under Mercurial control in the working directory whose
5098 Print files under Mercurial control in the working directory whose
5096 names match the given patterns.
5099 names match the given patterns.
5097
5100
5098 By default, this command searches all directories in the working
5101 By default, this command searches all directories in the working
5099 directory. To search just the current directory and its
5102 directory. To search just the current directory and its
5100 subdirectories, use "--include .".
5103 subdirectories, use "--include .".
5101
5104
5102 If no patterns are given to match, this command prints the names
5105 If no patterns are given to match, this command prints the names
5103 of all files under Mercurial control in the working directory.
5106 of all files under Mercurial control in the working directory.
5104
5107
5105 If you want to feed the output of this command into the "xargs"
5108 If you want to feed the output of this command into the "xargs"
5106 command, use the -0 option to both this command and "xargs". This
5109 command, use the -0 option to both this command and "xargs". This
5107 will avoid the problem of "xargs" treating single filenames that
5110 will avoid the problem of "xargs" treating single filenames that
5108 contain whitespace as multiple filenames.
5111 contain whitespace as multiple filenames.
5109
5112
5110 See :hg:`help files` for a more versatile command.
5113 See :hg:`help files` for a more versatile command.
5111
5114
5112 Returns 0 if a match is found, 1 otherwise.
5115 Returns 0 if a match is found, 1 otherwise.
5113 """
5116 """
5114 if opts.get('print0'):
5117 if opts.get('print0'):
5115 end = '\0'
5118 end = '\0'
5116 else:
5119 else:
5117 end = '\n'
5120 end = '\n'
5118 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5121 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5119
5122
5120 ret = 1
5123 ret = 1
5121 ctx = repo[rev]
5124 ctx = repo[rev]
5122 m = scmutil.match(ctx, pats, opts, default='relglob',
5125 m = scmutil.match(ctx, pats, opts, default='relglob',
5123 badfn=lambda x, y: False)
5126 badfn=lambda x, y: False)
5124
5127
5125 for abs in ctx.matches(m):
5128 for abs in ctx.matches(m):
5126 if opts.get('fullpath'):
5129 if opts.get('fullpath'):
5127 ui.write(repo.wjoin(abs), end)
5130 ui.write(repo.wjoin(abs), end)
5128 else:
5131 else:
5129 ui.write(((pats and m.rel(abs)) or abs), end)
5132 ui.write(((pats and m.rel(abs)) or abs), end)
5130 ret = 0
5133 ret = 0
5131
5134
5132 return ret
5135 return ret
5133
5136
5134 @command('^log|history',
5137 @command('^log|history',
5135 [('f', 'follow', None,
5138 [('f', 'follow', None,
5136 _('follow changeset history, or file history across copies and renames')),
5139 _('follow changeset history, or file history across copies and renames')),
5137 ('', 'follow-first', None,
5140 ('', 'follow-first', None,
5138 _('only follow the first parent of merge changesets (DEPRECATED)')),
5141 _('only follow the first parent of merge changesets (DEPRECATED)')),
5139 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5142 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5140 ('C', 'copies', None, _('show copied files')),
5143 ('C', 'copies', None, _('show copied files')),
5141 ('k', 'keyword', [],
5144 ('k', 'keyword', [],
5142 _('do case-insensitive search for a given text'), _('TEXT')),
5145 _('do case-insensitive search for a given text'), _('TEXT')),
5143 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5146 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5144 ('', 'removed', None, _('include revisions where files were removed')),
5147 ('', 'removed', None, _('include revisions where files were removed')),
5145 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5148 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5146 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5149 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5147 ('', 'only-branch', [],
5150 ('', 'only-branch', [],
5148 _('show only changesets within the given named branch (DEPRECATED)'),
5151 _('show only changesets within the given named branch (DEPRECATED)'),
5149 _('BRANCH')),
5152 _('BRANCH')),
5150 ('b', 'branch', [],
5153 ('b', 'branch', [],
5151 _('show changesets within the given named branch'), _('BRANCH')),
5154 _('show changesets within the given named branch'), _('BRANCH')),
5152 ('P', 'prune', [],
5155 ('P', 'prune', [],
5153 _('do not display revision or any of its ancestors'), _('REV')),
5156 _('do not display revision or any of its ancestors'), _('REV')),
5154 ] + logopts + walkopts,
5157 ] + logopts + walkopts,
5155 _('[OPTION]... [FILE]'),
5158 _('[OPTION]... [FILE]'),
5156 inferrepo=True)
5159 inferrepo=True)
5157 def log(ui, repo, *pats, **opts):
5160 def log(ui, repo, *pats, **opts):
5158 """show revision history of entire repository or files
5161 """show revision history of entire repository or files
5159
5162
5160 Print the revision history of the specified files or the entire
5163 Print the revision history of the specified files or the entire
5161 project.
5164 project.
5162
5165
5163 If no revision range is specified, the default is ``tip:0`` unless
5166 If no revision range is specified, the default is ``tip:0`` unless
5164 --follow is set, in which case the working directory parent is
5167 --follow is set, in which case the working directory parent is
5165 used as the starting revision.
5168 used as the starting revision.
5166
5169
5167 File history is shown without following rename or copy history of
5170 File history is shown without following rename or copy history of
5168 files. Use -f/--follow with a filename to follow history across
5171 files. Use -f/--follow with a filename to follow history across
5169 renames and copies. --follow without a filename will only show
5172 renames and copies. --follow without a filename will only show
5170 ancestors or descendants of the starting revision.
5173 ancestors or descendants of the starting revision.
5171
5174
5172 By default this command prints revision number and changeset id,
5175 By default this command prints revision number and changeset id,
5173 tags, non-trivial parents, user, date and time, and a summary for
5176 tags, non-trivial parents, user, date and time, and a summary for
5174 each commit. When the -v/--verbose switch is used, the list of
5177 each commit. When the -v/--verbose switch is used, the list of
5175 changed files and full commit message are shown.
5178 changed files and full commit message are shown.
5176
5179
5177 With --graph the revisions are shown as an ASCII art DAG with the most
5180 With --graph the revisions are shown as an ASCII art DAG with the most
5178 recent changeset at the top.
5181 recent changeset at the top.
5179 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5182 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5180 and '+' represents a fork where the changeset from the lines below is a
5183 and '+' represents a fork where the changeset from the lines below is a
5181 parent of the 'o' merge on the same line.
5184 parent of the 'o' merge on the same line.
5182
5185
5183 .. note::
5186 .. note::
5184
5187
5185 :hg:`log --patch` may generate unexpected diff output for merge
5188 :hg:`log --patch` may generate unexpected diff output for merge
5186 changesets, as it will only compare the merge changeset against
5189 changesets, as it will only compare the merge changeset against
5187 its first parent. Also, only files different from BOTH parents
5190 its first parent. Also, only files different from BOTH parents
5188 will appear in files:.
5191 will appear in files:.
5189
5192
5190 .. note::
5193 .. note::
5191
5194
5192 For performance reasons, :hg:`log FILE` may omit duplicate changes
5195 For performance reasons, :hg:`log FILE` may omit duplicate changes
5193 made on branches and will not show removals or mode changes. To
5196 made on branches and will not show removals or mode changes. To
5194 see all such changes, use the --removed switch.
5197 see all such changes, use the --removed switch.
5195
5198
5196 .. container:: verbose
5199 .. container:: verbose
5197
5200
5198 Some examples:
5201 Some examples:
5199
5202
5200 - changesets with full descriptions and file lists::
5203 - changesets with full descriptions and file lists::
5201
5204
5202 hg log -v
5205 hg log -v
5203
5206
5204 - changesets ancestral to the working directory::
5207 - changesets ancestral to the working directory::
5205
5208
5206 hg log -f
5209 hg log -f
5207
5210
5208 - last 10 commits on the current branch::
5211 - last 10 commits on the current branch::
5209
5212
5210 hg log -l 10 -b .
5213 hg log -l 10 -b .
5211
5214
5212 - changesets showing all modifications of a file, including removals::
5215 - changesets showing all modifications of a file, including removals::
5213
5216
5214 hg log --removed file.c
5217 hg log --removed file.c
5215
5218
5216 - all changesets that touch a directory, with diffs, excluding merges::
5219 - all changesets that touch a directory, with diffs, excluding merges::
5217
5220
5218 hg log -Mp lib/
5221 hg log -Mp lib/
5219
5222
5220 - all revision numbers that match a keyword::
5223 - all revision numbers that match a keyword::
5221
5224
5222 hg log -k bug --template "{rev}\\n"
5225 hg log -k bug --template "{rev}\\n"
5223
5226
5224 - the full hash identifier of the working directory parent::
5227 - the full hash identifier of the working directory parent::
5225
5228
5226 hg log -r . --template "{node}\\n"
5229 hg log -r . --template "{node}\\n"
5227
5230
5228 - list available log templates::
5231 - list available log templates::
5229
5232
5230 hg log -T list
5233 hg log -T list
5231
5234
5232 - check if a given changeset is included in a tagged release::
5235 - check if a given changeset is included in a tagged release::
5233
5236
5234 hg log -r "a21ccf and ancestor(1.9)"
5237 hg log -r "a21ccf and ancestor(1.9)"
5235
5238
5236 - find all changesets by some user in a date range::
5239 - find all changesets by some user in a date range::
5237
5240
5238 hg log -k alice -d "may 2008 to jul 2008"
5241 hg log -k alice -d "may 2008 to jul 2008"
5239
5242
5240 - summary of all changesets after the last tag::
5243 - summary of all changesets after the last tag::
5241
5244
5242 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5245 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5243
5246
5244 See :hg:`help dates` for a list of formats valid for -d/--date.
5247 See :hg:`help dates` for a list of formats valid for -d/--date.
5245
5248
5246 See :hg:`help revisions` and :hg:`help revsets` for more about
5249 See :hg:`help revisions` and :hg:`help revsets` for more about
5247 specifying and ordering revisions.
5250 specifying and ordering revisions.
5248
5251
5249 See :hg:`help templates` for more about pre-packaged styles and
5252 See :hg:`help templates` for more about pre-packaged styles and
5250 specifying custom templates.
5253 specifying custom templates.
5251
5254
5252 Returns 0 on success.
5255 Returns 0 on success.
5253
5256
5254 """
5257 """
5255 if opts.get('follow') and opts.get('rev'):
5258 if opts.get('follow') and opts.get('rev'):
5256 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5259 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5257 del opts['follow']
5260 del opts['follow']
5258
5261
5259 if opts.get('graph'):
5262 if opts.get('graph'):
5260 return cmdutil.graphlog(ui, repo, *pats, **opts)
5263 return cmdutil.graphlog(ui, repo, *pats, **opts)
5261
5264
5262 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5265 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5263 limit = cmdutil.loglimit(opts)
5266 limit = cmdutil.loglimit(opts)
5264 count = 0
5267 count = 0
5265
5268
5266 getrenamed = None
5269 getrenamed = None
5267 if opts.get('copies'):
5270 if opts.get('copies'):
5268 endrev = None
5271 endrev = None
5269 if opts.get('rev'):
5272 if opts.get('rev'):
5270 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5273 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5271 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5274 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5272
5275
5273 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5276 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5274 for rev in revs:
5277 for rev in revs:
5275 if count == limit:
5278 if count == limit:
5276 break
5279 break
5277 ctx = repo[rev]
5280 ctx = repo[rev]
5278 copies = None
5281 copies = None
5279 if getrenamed is not None and rev:
5282 if getrenamed is not None and rev:
5280 copies = []
5283 copies = []
5281 for fn in ctx.files():
5284 for fn in ctx.files():
5282 rename = getrenamed(fn, rev)
5285 rename = getrenamed(fn, rev)
5283 if rename:
5286 if rename:
5284 copies.append((fn, rename[0]))
5287 copies.append((fn, rename[0]))
5285 if filematcher:
5288 if filematcher:
5286 revmatchfn = filematcher(ctx.rev())
5289 revmatchfn = filematcher(ctx.rev())
5287 else:
5290 else:
5288 revmatchfn = None
5291 revmatchfn = None
5289 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5292 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5290 if displayer.flush(ctx):
5293 if displayer.flush(ctx):
5291 count += 1
5294 count += 1
5292
5295
5293 displayer.close()
5296 displayer.close()
5294
5297
5295 @command('manifest',
5298 @command('manifest',
5296 [('r', 'rev', '', _('revision to display'), _('REV')),
5299 [('r', 'rev', '', _('revision to display'), _('REV')),
5297 ('', 'all', False, _("list files from all revisions"))]
5300 ('', 'all', False, _("list files from all revisions"))]
5298 + formatteropts,
5301 + formatteropts,
5299 _('[-r REV]'))
5302 _('[-r REV]'))
5300 def manifest(ui, repo, node=None, rev=None, **opts):
5303 def manifest(ui, repo, node=None, rev=None, **opts):
5301 """output the current or given revision of the project manifest
5304 """output the current or given revision of the project manifest
5302
5305
5303 Print a list of version controlled files for the given revision.
5306 Print a list of version controlled files for the given revision.
5304 If no revision is given, the first parent of the working directory
5307 If no revision is given, the first parent of the working directory
5305 is used, or the null revision if no revision is checked out.
5308 is used, or the null revision if no revision is checked out.
5306
5309
5307 With -v, print file permissions, symlink and executable bits.
5310 With -v, print file permissions, symlink and executable bits.
5308 With --debug, print file revision hashes.
5311 With --debug, print file revision hashes.
5309
5312
5310 If option --all is specified, the list of all files from all revisions
5313 If option --all is specified, the list of all files from all revisions
5311 is printed. This includes deleted and renamed files.
5314 is printed. This includes deleted and renamed files.
5312
5315
5313 Returns 0 on success.
5316 Returns 0 on success.
5314 """
5317 """
5315
5318
5316 fm = ui.formatter('manifest', opts)
5319 fm = ui.formatter('manifest', opts)
5317
5320
5318 if opts.get('all'):
5321 if opts.get('all'):
5319 if rev or node:
5322 if rev or node:
5320 raise error.Abort(_("can't specify a revision with --all"))
5323 raise error.Abort(_("can't specify a revision with --all"))
5321
5324
5322 res = []
5325 res = []
5323 prefix = "data/"
5326 prefix = "data/"
5324 suffix = ".i"
5327 suffix = ".i"
5325 plen = len(prefix)
5328 plen = len(prefix)
5326 slen = len(suffix)
5329 slen = len(suffix)
5327 with repo.lock():
5330 with repo.lock():
5328 for fn, b, size in repo.store.datafiles():
5331 for fn, b, size in repo.store.datafiles():
5329 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5332 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5330 res.append(fn[plen:-slen])
5333 res.append(fn[plen:-slen])
5331 for f in res:
5334 for f in res:
5332 fm.startitem()
5335 fm.startitem()
5333 fm.write("path", '%s\n', f)
5336 fm.write("path", '%s\n', f)
5334 fm.end()
5337 fm.end()
5335 return
5338 return
5336
5339
5337 if rev and node:
5340 if rev and node:
5338 raise error.Abort(_("please specify just one revision"))
5341 raise error.Abort(_("please specify just one revision"))
5339
5342
5340 if not node:
5343 if not node:
5341 node = rev
5344 node = rev
5342
5345
5343 char = {'l': '@', 'x': '*', '': ''}
5346 char = {'l': '@', 'x': '*', '': ''}
5344 mode = {'l': '644', 'x': '755', '': '644'}
5347 mode = {'l': '644', 'x': '755', '': '644'}
5345 ctx = scmutil.revsingle(repo, node)
5348 ctx = scmutil.revsingle(repo, node)
5346 mf = ctx.manifest()
5349 mf = ctx.manifest()
5347 for f in ctx:
5350 for f in ctx:
5348 fm.startitem()
5351 fm.startitem()
5349 fl = ctx[f].flags()
5352 fl = ctx[f].flags()
5350 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5353 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5351 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5354 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5352 fm.write('path', '%s\n', f)
5355 fm.write('path', '%s\n', f)
5353 fm.end()
5356 fm.end()
5354
5357
5355 @command('^merge',
5358 @command('^merge',
5356 [('f', 'force', None,
5359 [('f', 'force', None,
5357 _('force a merge including outstanding changes (DEPRECATED)')),
5360 _('force a merge including outstanding changes (DEPRECATED)')),
5358 ('r', 'rev', '', _('revision to merge'), _('REV')),
5361 ('r', 'rev', '', _('revision to merge'), _('REV')),
5359 ('P', 'preview', None,
5362 ('P', 'preview', None,
5360 _('review revisions to merge (no merge is performed)'))
5363 _('review revisions to merge (no merge is performed)'))
5361 ] + mergetoolopts,
5364 ] + mergetoolopts,
5362 _('[-P] [[-r] REV]'))
5365 _('[-P] [[-r] REV]'))
5363 def merge(ui, repo, node=None, **opts):
5366 def merge(ui, repo, node=None, **opts):
5364 """merge another revision into working directory
5367 """merge another revision into working directory
5365
5368
5366 The current working directory is updated with all changes made in
5369 The current working directory is updated with all changes made in
5367 the requested revision since the last common predecessor revision.
5370 the requested revision since the last common predecessor revision.
5368
5371
5369 Files that changed between either parent are marked as changed for
5372 Files that changed between either parent are marked as changed for
5370 the next commit and a commit must be performed before any further
5373 the next commit and a commit must be performed before any further
5371 updates to the repository are allowed. The next commit will have
5374 updates to the repository are allowed. The next commit will have
5372 two parents.
5375 two parents.
5373
5376
5374 ``--tool`` can be used to specify the merge tool used for file
5377 ``--tool`` can be used to specify the merge tool used for file
5375 merges. It overrides the HGMERGE environment variable and your
5378 merges. It overrides the HGMERGE environment variable and your
5376 configuration files. See :hg:`help merge-tools` for options.
5379 configuration files. See :hg:`help merge-tools` for options.
5377
5380
5378 If no revision is specified, the working directory's parent is a
5381 If no revision is specified, the working directory's parent is a
5379 head revision, and the current branch contains exactly one other
5382 head revision, and the current branch contains exactly one other
5380 head, the other head is merged with by default. Otherwise, an
5383 head, the other head is merged with by default. Otherwise, an
5381 explicit revision with which to merge with must be provided.
5384 explicit revision with which to merge with must be provided.
5382
5385
5383 See :hg:`help resolve` for information on handling file conflicts.
5386 See :hg:`help resolve` for information on handling file conflicts.
5384
5387
5385 To undo an uncommitted merge, use :hg:`update --clean .` which
5388 To undo an uncommitted merge, use :hg:`update --clean .` which
5386 will check out a clean copy of the original merge parent, losing
5389 will check out a clean copy of the original merge parent, losing
5387 all changes.
5390 all changes.
5388
5391
5389 Returns 0 on success, 1 if there are unresolved files.
5392 Returns 0 on success, 1 if there are unresolved files.
5390 """
5393 """
5391
5394
5392 if opts.get('rev') and node:
5395 if opts.get('rev') and node:
5393 raise error.Abort(_("please specify just one revision"))
5396 raise error.Abort(_("please specify just one revision"))
5394 if not node:
5397 if not node:
5395 node = opts.get('rev')
5398 node = opts.get('rev')
5396
5399
5397 if node:
5400 if node:
5398 node = scmutil.revsingle(repo, node).node()
5401 node = scmutil.revsingle(repo, node).node()
5399
5402
5400 if not node:
5403 if not node:
5401 node = repo[destutil.destmerge(repo)].node()
5404 node = repo[destutil.destmerge(repo)].node()
5402
5405
5403 if opts.get('preview'):
5406 if opts.get('preview'):
5404 # find nodes that are ancestors of p2 but not of p1
5407 # find nodes that are ancestors of p2 but not of p1
5405 p1 = repo.lookup('.')
5408 p1 = repo.lookup('.')
5406 p2 = repo.lookup(node)
5409 p2 = repo.lookup(node)
5407 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5410 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5408
5411
5409 displayer = cmdutil.show_changeset(ui, repo, opts)
5412 displayer = cmdutil.show_changeset(ui, repo, opts)
5410 for node in nodes:
5413 for node in nodes:
5411 displayer.show(repo[node])
5414 displayer.show(repo[node])
5412 displayer.close()
5415 displayer.close()
5413 return 0
5416 return 0
5414
5417
5415 try:
5418 try:
5416 # ui.forcemerge is an internal variable, do not document
5419 # ui.forcemerge is an internal variable, do not document
5417 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5420 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5418 force = opts.get('force')
5421 force = opts.get('force')
5419 return hg.merge(repo, node, force=force, mergeforce=force)
5422 return hg.merge(repo, node, force=force, mergeforce=force)
5420 finally:
5423 finally:
5421 ui.setconfig('ui', 'forcemerge', '', 'merge')
5424 ui.setconfig('ui', 'forcemerge', '', 'merge')
5422
5425
5423 @command('outgoing|out',
5426 @command('outgoing|out',
5424 [('f', 'force', None, _('run even when the destination is unrelated')),
5427 [('f', 'force', None, _('run even when the destination is unrelated')),
5425 ('r', 'rev', [],
5428 ('r', 'rev', [],
5426 _('a changeset intended to be included in the destination'), _('REV')),
5429 _('a changeset intended to be included in the destination'), _('REV')),
5427 ('n', 'newest-first', None, _('show newest record first')),
5430 ('n', 'newest-first', None, _('show newest record first')),
5428 ('B', 'bookmarks', False, _('compare bookmarks')),
5431 ('B', 'bookmarks', False, _('compare bookmarks')),
5429 ('b', 'branch', [], _('a specific branch you would like to push'),
5432 ('b', 'branch', [], _('a specific branch you would like to push'),
5430 _('BRANCH')),
5433 _('BRANCH')),
5431 ] + logopts + remoteopts + subrepoopts,
5434 ] + logopts + remoteopts + subrepoopts,
5432 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5435 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5433 def outgoing(ui, repo, dest=None, **opts):
5436 def outgoing(ui, repo, dest=None, **opts):
5434 """show changesets not found in the destination
5437 """show changesets not found in the destination
5435
5438
5436 Show changesets not found in the specified destination repository
5439 Show changesets not found in the specified destination repository
5437 or the default push location. These are the changesets that would
5440 or the default push location. These are the changesets that would
5438 be pushed if a push was requested.
5441 be pushed if a push was requested.
5439
5442
5440 See pull for details of valid destination formats.
5443 See pull for details of valid destination formats.
5441
5444
5442 .. container:: verbose
5445 .. container:: verbose
5443
5446
5444 With -B/--bookmarks, the result of bookmark comparison between
5447 With -B/--bookmarks, the result of bookmark comparison between
5445 local and remote repositories is displayed. With -v/--verbose,
5448 local and remote repositories is displayed. With -v/--verbose,
5446 status is also displayed for each bookmark like below::
5449 status is also displayed for each bookmark like below::
5447
5450
5448 BM1 01234567890a added
5451 BM1 01234567890a added
5449 BM2 deleted
5452 BM2 deleted
5450 BM3 234567890abc advanced
5453 BM3 234567890abc advanced
5451 BM4 34567890abcd diverged
5454 BM4 34567890abcd diverged
5452 BM5 4567890abcde changed
5455 BM5 4567890abcde changed
5453
5456
5454 The action taken when pushing depends on the
5457 The action taken when pushing depends on the
5455 status of each bookmark:
5458 status of each bookmark:
5456
5459
5457 :``added``: push with ``-B`` will create it
5460 :``added``: push with ``-B`` will create it
5458 :``deleted``: push with ``-B`` will delete it
5461 :``deleted``: push with ``-B`` will delete it
5459 :``advanced``: push will update it
5462 :``advanced``: push will update it
5460 :``diverged``: push with ``-B`` will update it
5463 :``diverged``: push with ``-B`` will update it
5461 :``changed``: push with ``-B`` will update it
5464 :``changed``: push with ``-B`` will update it
5462
5465
5463 From the point of view of pushing behavior, bookmarks
5466 From the point of view of pushing behavior, bookmarks
5464 existing only in the remote repository are treated as
5467 existing only in the remote repository are treated as
5465 ``deleted``, even if it is in fact added remotely.
5468 ``deleted``, even if it is in fact added remotely.
5466
5469
5467 Returns 0 if there are outgoing changes, 1 otherwise.
5470 Returns 0 if there are outgoing changes, 1 otherwise.
5468 """
5471 """
5469 if opts.get('graph'):
5472 if opts.get('graph'):
5470 cmdutil.checkunsupportedgraphflags([], opts)
5473 cmdutil.checkunsupportedgraphflags([], opts)
5471 o, other = hg._outgoing(ui, repo, dest, opts)
5474 o, other = hg._outgoing(ui, repo, dest, opts)
5472 if not o:
5475 if not o:
5473 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5476 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5474 return
5477 return
5475
5478
5476 revdag = cmdutil.graphrevs(repo, o, opts)
5479 revdag = cmdutil.graphrevs(repo, o, opts)
5477 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5480 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5478 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5481 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5479 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5482 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5480 return 0
5483 return 0
5481
5484
5482 if opts.get('bookmarks'):
5485 if opts.get('bookmarks'):
5483 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5486 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5484 dest, branches = hg.parseurl(dest, opts.get('branch'))
5487 dest, branches = hg.parseurl(dest, opts.get('branch'))
5485 other = hg.peer(repo, opts, dest)
5488 other = hg.peer(repo, opts, dest)
5486 if 'bookmarks' not in other.listkeys('namespaces'):
5489 if 'bookmarks' not in other.listkeys('namespaces'):
5487 ui.warn(_("remote doesn't support bookmarks\n"))
5490 ui.warn(_("remote doesn't support bookmarks\n"))
5488 return 0
5491 return 0
5489 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5492 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5490 return bookmarks.outgoing(ui, repo, other)
5493 return bookmarks.outgoing(ui, repo, other)
5491
5494
5492 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5495 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5493 try:
5496 try:
5494 return hg.outgoing(ui, repo, dest, opts)
5497 return hg.outgoing(ui, repo, dest, opts)
5495 finally:
5498 finally:
5496 del repo._subtoppath
5499 del repo._subtoppath
5497
5500
5498 @command('parents',
5501 @command('parents',
5499 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5502 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5500 ] + templateopts,
5503 ] + templateopts,
5501 _('[-r REV] [FILE]'),
5504 _('[-r REV] [FILE]'),
5502 inferrepo=True)
5505 inferrepo=True)
5503 def parents(ui, repo, file_=None, **opts):
5506 def parents(ui, repo, file_=None, **opts):
5504 """show the parents of the working directory or revision (DEPRECATED)
5507 """show the parents of the working directory or revision (DEPRECATED)
5505
5508
5506 Print the working directory's parent revisions. If a revision is
5509 Print the working directory's parent revisions. If a revision is
5507 given via -r/--rev, the parent of that revision will be printed.
5510 given via -r/--rev, the parent of that revision will be printed.
5508 If a file argument is given, the revision in which the file was
5511 If a file argument is given, the revision in which the file was
5509 last changed (before the working directory revision or the
5512 last changed (before the working directory revision or the
5510 argument to --rev if given) is printed.
5513 argument to --rev if given) is printed.
5511
5514
5512 This command is equivalent to::
5515 This command is equivalent to::
5513
5516
5514 hg log -r "p1()+p2()" or
5517 hg log -r "p1()+p2()" or
5515 hg log -r "p1(REV)+p2(REV)" or
5518 hg log -r "p1(REV)+p2(REV)" or
5516 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5519 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5517 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5520 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5518
5521
5519 See :hg:`summary` and :hg:`help revsets` for related information.
5522 See :hg:`summary` and :hg:`help revsets` for related information.
5520
5523
5521 Returns 0 on success.
5524 Returns 0 on success.
5522 """
5525 """
5523
5526
5524 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5527 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5525
5528
5526 if file_:
5529 if file_:
5527 m = scmutil.match(ctx, (file_,), opts)
5530 m = scmutil.match(ctx, (file_,), opts)
5528 if m.anypats() or len(m.files()) != 1:
5531 if m.anypats() or len(m.files()) != 1:
5529 raise error.Abort(_('can only specify an explicit filename'))
5532 raise error.Abort(_('can only specify an explicit filename'))
5530 file_ = m.files()[0]
5533 file_ = m.files()[0]
5531 filenodes = []
5534 filenodes = []
5532 for cp in ctx.parents():
5535 for cp in ctx.parents():
5533 if not cp:
5536 if not cp:
5534 continue
5537 continue
5535 try:
5538 try:
5536 filenodes.append(cp.filenode(file_))
5539 filenodes.append(cp.filenode(file_))
5537 except error.LookupError:
5540 except error.LookupError:
5538 pass
5541 pass
5539 if not filenodes:
5542 if not filenodes:
5540 raise error.Abort(_("'%s' not found in manifest!") % file_)
5543 raise error.Abort(_("'%s' not found in manifest!") % file_)
5541 p = []
5544 p = []
5542 for fn in filenodes:
5545 for fn in filenodes:
5543 fctx = repo.filectx(file_, fileid=fn)
5546 fctx = repo.filectx(file_, fileid=fn)
5544 p.append(fctx.node())
5547 p.append(fctx.node())
5545 else:
5548 else:
5546 p = [cp.node() for cp in ctx.parents()]
5549 p = [cp.node() for cp in ctx.parents()]
5547
5550
5548 displayer = cmdutil.show_changeset(ui, repo, opts)
5551 displayer = cmdutil.show_changeset(ui, repo, opts)
5549 for n in p:
5552 for n in p:
5550 if n != nullid:
5553 if n != nullid:
5551 displayer.show(repo[n])
5554 displayer.show(repo[n])
5552 displayer.close()
5555 displayer.close()
5553
5556
5554 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5557 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5555 def paths(ui, repo, search=None, **opts):
5558 def paths(ui, repo, search=None, **opts):
5556 """show aliases for remote repositories
5559 """show aliases for remote repositories
5557
5560
5558 Show definition of symbolic path name NAME. If no name is given,
5561 Show definition of symbolic path name NAME. If no name is given,
5559 show definition of all available names.
5562 show definition of all available names.
5560
5563
5561 Option -q/--quiet suppresses all output when searching for NAME
5564 Option -q/--quiet suppresses all output when searching for NAME
5562 and shows only the path names when listing all definitions.
5565 and shows only the path names when listing all definitions.
5563
5566
5564 Path names are defined in the [paths] section of your
5567 Path names are defined in the [paths] section of your
5565 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5568 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5566 repository, ``.hg/hgrc`` is used, too.
5569 repository, ``.hg/hgrc`` is used, too.
5567
5570
5568 The path names ``default`` and ``default-push`` have a special
5571 The path names ``default`` and ``default-push`` have a special
5569 meaning. When performing a push or pull operation, they are used
5572 meaning. When performing a push or pull operation, they are used
5570 as fallbacks if no location is specified on the command-line.
5573 as fallbacks if no location is specified on the command-line.
5571 When ``default-push`` is set, it will be used for push and
5574 When ``default-push`` is set, it will be used for push and
5572 ``default`` will be used for pull; otherwise ``default`` is used
5575 ``default`` will be used for pull; otherwise ``default`` is used
5573 as the fallback for both. When cloning a repository, the clone
5576 as the fallback for both. When cloning a repository, the clone
5574 source is written as ``default`` in ``.hg/hgrc``.
5577 source is written as ``default`` in ``.hg/hgrc``.
5575
5578
5576 .. note::
5579 .. note::
5577
5580
5578 ``default`` and ``default-push`` apply to all inbound (e.g.
5581 ``default`` and ``default-push`` apply to all inbound (e.g.
5579 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5582 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5580 and :hg:`bundle`) operations.
5583 and :hg:`bundle`) operations.
5581
5584
5582 See :hg:`help urls` for more information.
5585 See :hg:`help urls` for more information.
5583
5586
5584 Returns 0 on success.
5587 Returns 0 on success.
5585 """
5588 """
5586 if search:
5589 if search:
5587 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5590 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5588 if name == search]
5591 if name == search]
5589 else:
5592 else:
5590 pathitems = sorted(ui.paths.iteritems())
5593 pathitems = sorted(ui.paths.iteritems())
5591
5594
5592 fm = ui.formatter('paths', opts)
5595 fm = ui.formatter('paths', opts)
5593 if fm:
5596 if fm:
5594 hidepassword = str
5597 hidepassword = str
5595 else:
5598 else:
5596 hidepassword = util.hidepassword
5599 hidepassword = util.hidepassword
5597 if ui.quiet:
5600 if ui.quiet:
5598 namefmt = '%s\n'
5601 namefmt = '%s\n'
5599 else:
5602 else:
5600 namefmt = '%s = '
5603 namefmt = '%s = '
5601 showsubopts = not search and not ui.quiet
5604 showsubopts = not search and not ui.quiet
5602
5605
5603 for name, path in pathitems:
5606 for name, path in pathitems:
5604 fm.startitem()
5607 fm.startitem()
5605 fm.condwrite(not search, 'name', namefmt, name)
5608 fm.condwrite(not search, 'name', namefmt, name)
5606 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5609 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5607 for subopt, value in sorted(path.suboptions.items()):
5610 for subopt, value in sorted(path.suboptions.items()):
5608 assert subopt not in ('name', 'url')
5611 assert subopt not in ('name', 'url')
5609 if showsubopts:
5612 if showsubopts:
5610 fm.plain('%s:%s = ' % (name, subopt))
5613 fm.plain('%s:%s = ' % (name, subopt))
5611 fm.condwrite(showsubopts, subopt, '%s\n', value)
5614 fm.condwrite(showsubopts, subopt, '%s\n', value)
5612
5615
5613 fm.end()
5616 fm.end()
5614
5617
5615 if search and not pathitems:
5618 if search and not pathitems:
5616 if not ui.quiet:
5619 if not ui.quiet:
5617 ui.warn(_("not found!\n"))
5620 ui.warn(_("not found!\n"))
5618 return 1
5621 return 1
5619 else:
5622 else:
5620 return 0
5623 return 0
5621
5624
5622 @command('phase',
5625 @command('phase',
5623 [('p', 'public', False, _('set changeset phase to public')),
5626 [('p', 'public', False, _('set changeset phase to public')),
5624 ('d', 'draft', False, _('set changeset phase to draft')),
5627 ('d', 'draft', False, _('set changeset phase to draft')),
5625 ('s', 'secret', False, _('set changeset phase to secret')),
5628 ('s', 'secret', False, _('set changeset phase to secret')),
5626 ('f', 'force', False, _('allow to move boundary backward')),
5629 ('f', 'force', False, _('allow to move boundary backward')),
5627 ('r', 'rev', [], _('target revision'), _('REV')),
5630 ('r', 'rev', [], _('target revision'), _('REV')),
5628 ],
5631 ],
5629 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5632 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5630 def phase(ui, repo, *revs, **opts):
5633 def phase(ui, repo, *revs, **opts):
5631 """set or show the current phase name
5634 """set or show the current phase name
5632
5635
5633 With no argument, show the phase name of the current revision(s).
5636 With no argument, show the phase name of the current revision(s).
5634
5637
5635 With one of -p/--public, -d/--draft or -s/--secret, change the
5638 With one of -p/--public, -d/--draft or -s/--secret, change the
5636 phase value of the specified revisions.
5639 phase value of the specified revisions.
5637
5640
5638 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5641 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5639 lower phase to an higher phase. Phases are ordered as follows::
5642 lower phase to an higher phase. Phases are ordered as follows::
5640
5643
5641 public < draft < secret
5644 public < draft < secret
5642
5645
5643 Returns 0 on success, 1 if some phases could not be changed.
5646 Returns 0 on success, 1 if some phases could not be changed.
5644
5647
5645 (For more information about the phases concept, see :hg:`help phases`.)
5648 (For more information about the phases concept, see :hg:`help phases`.)
5646 """
5649 """
5647 # search for a unique phase argument
5650 # search for a unique phase argument
5648 targetphase = None
5651 targetphase = None
5649 for idx, name in enumerate(phases.phasenames):
5652 for idx, name in enumerate(phases.phasenames):
5650 if opts[name]:
5653 if opts[name]:
5651 if targetphase is not None:
5654 if targetphase is not None:
5652 raise error.Abort(_('only one phase can be specified'))
5655 raise error.Abort(_('only one phase can be specified'))
5653 targetphase = idx
5656 targetphase = idx
5654
5657
5655 # look for specified revision
5658 # look for specified revision
5656 revs = list(revs)
5659 revs = list(revs)
5657 revs.extend(opts['rev'])
5660 revs.extend(opts['rev'])
5658 if not revs:
5661 if not revs:
5659 # display both parents as the second parent phase can influence
5662 # display both parents as the second parent phase can influence
5660 # the phase of a merge commit
5663 # the phase of a merge commit
5661 revs = [c.rev() for c in repo[None].parents()]
5664 revs = [c.rev() for c in repo[None].parents()]
5662
5665
5663 revs = scmutil.revrange(repo, revs)
5666 revs = scmutil.revrange(repo, revs)
5664
5667
5665 lock = None
5668 lock = None
5666 ret = 0
5669 ret = 0
5667 if targetphase is None:
5670 if targetphase is None:
5668 # display
5671 # display
5669 for r in revs:
5672 for r in revs:
5670 ctx = repo[r]
5673 ctx = repo[r]
5671 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5674 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5672 else:
5675 else:
5673 tr = None
5676 tr = None
5674 lock = repo.lock()
5677 lock = repo.lock()
5675 try:
5678 try:
5676 tr = repo.transaction("phase")
5679 tr = repo.transaction("phase")
5677 # set phase
5680 # set phase
5678 if not revs:
5681 if not revs:
5679 raise error.Abort(_('empty revision set'))
5682 raise error.Abort(_('empty revision set'))
5680 nodes = [repo[r].node() for r in revs]
5683 nodes = [repo[r].node() for r in revs]
5681 # moving revision from public to draft may hide them
5684 # moving revision from public to draft may hide them
5682 # We have to check result on an unfiltered repository
5685 # We have to check result on an unfiltered repository
5683 unfi = repo.unfiltered()
5686 unfi = repo.unfiltered()
5684 getphase = unfi._phasecache.phase
5687 getphase = unfi._phasecache.phase
5685 olddata = [getphase(unfi, r) for r in unfi]
5688 olddata = [getphase(unfi, r) for r in unfi]
5686 phases.advanceboundary(repo, tr, targetphase, nodes)
5689 phases.advanceboundary(repo, tr, targetphase, nodes)
5687 if opts['force']:
5690 if opts['force']:
5688 phases.retractboundary(repo, tr, targetphase, nodes)
5691 phases.retractboundary(repo, tr, targetphase, nodes)
5689 tr.close()
5692 tr.close()
5690 finally:
5693 finally:
5691 if tr is not None:
5694 if tr is not None:
5692 tr.release()
5695 tr.release()
5693 lock.release()
5696 lock.release()
5694 getphase = unfi._phasecache.phase
5697 getphase = unfi._phasecache.phase
5695 newdata = [getphase(unfi, r) for r in unfi]
5698 newdata = [getphase(unfi, r) for r in unfi]
5696 changes = sum(newdata[r] != olddata[r] for r in unfi)
5699 changes = sum(newdata[r] != olddata[r] for r in unfi)
5697 cl = unfi.changelog
5700 cl = unfi.changelog
5698 rejected = [n for n in nodes
5701 rejected = [n for n in nodes
5699 if newdata[cl.rev(n)] < targetphase]
5702 if newdata[cl.rev(n)] < targetphase]
5700 if rejected:
5703 if rejected:
5701 ui.warn(_('cannot move %i changesets to a higher '
5704 ui.warn(_('cannot move %i changesets to a higher '
5702 'phase, use --force\n') % len(rejected))
5705 'phase, use --force\n') % len(rejected))
5703 ret = 1
5706 ret = 1
5704 if changes:
5707 if changes:
5705 msg = _('phase changed for %i changesets\n') % changes
5708 msg = _('phase changed for %i changesets\n') % changes
5706 if ret:
5709 if ret:
5707 ui.status(msg)
5710 ui.status(msg)
5708 else:
5711 else:
5709 ui.note(msg)
5712 ui.note(msg)
5710 else:
5713 else:
5711 ui.warn(_('no phases changed\n'))
5714 ui.warn(_('no phases changed\n'))
5712 return ret
5715 return ret
5713
5716
5714 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5717 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5715 """Run after a changegroup has been added via pull/unbundle
5718 """Run after a changegroup has been added via pull/unbundle
5716
5719
5717 This takes arguments below:
5720 This takes arguments below:
5718
5721
5719 :modheads: change of heads by pull/unbundle
5722 :modheads: change of heads by pull/unbundle
5720 :optupdate: updating working directory is needed or not
5723 :optupdate: updating working directory is needed or not
5721 :checkout: update destination revision (or None to default destination)
5724 :checkout: update destination revision (or None to default destination)
5722 :brev: a name, which might be a bookmark to be activated after updating
5725 :brev: a name, which might be a bookmark to be activated after updating
5723 """
5726 """
5724 if modheads == 0:
5727 if modheads == 0:
5725 return
5728 return
5726 if optupdate:
5729 if optupdate:
5727 try:
5730 try:
5728 return hg.updatetotally(ui, repo, checkout, brev)
5731 return hg.updatetotally(ui, repo, checkout, brev)
5729 except error.UpdateAbort as inst:
5732 except error.UpdateAbort as inst:
5730 msg = _("not updating: %s") % str(inst)
5733 msg = _("not updating: %s") % str(inst)
5731 hint = inst.hint
5734 hint = inst.hint
5732 raise error.UpdateAbort(msg, hint=hint)
5735 raise error.UpdateAbort(msg, hint=hint)
5733 if modheads > 1:
5736 if modheads > 1:
5734 currentbranchheads = len(repo.branchheads())
5737 currentbranchheads = len(repo.branchheads())
5735 if currentbranchheads == modheads:
5738 if currentbranchheads == modheads:
5736 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5739 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5737 elif currentbranchheads > 1:
5740 elif currentbranchheads > 1:
5738 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5741 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5739 "merge)\n"))
5742 "merge)\n"))
5740 else:
5743 else:
5741 ui.status(_("(run 'hg heads' to see heads)\n"))
5744 ui.status(_("(run 'hg heads' to see heads)\n"))
5742 else:
5745 else:
5743 ui.status(_("(run 'hg update' to get a working copy)\n"))
5746 ui.status(_("(run 'hg update' to get a working copy)\n"))
5744
5747
5745 @command('^pull',
5748 @command('^pull',
5746 [('u', 'update', None,
5749 [('u', 'update', None,
5747 _('update to new branch head if changesets were pulled')),
5750 _('update to new branch head if changesets were pulled')),
5748 ('f', 'force', None, _('run even when remote repository is unrelated')),
5751 ('f', 'force', None, _('run even when remote repository is unrelated')),
5749 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5752 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5750 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5753 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5751 ('b', 'branch', [], _('a specific branch you would like to pull'),
5754 ('b', 'branch', [], _('a specific branch you would like to pull'),
5752 _('BRANCH')),
5755 _('BRANCH')),
5753 ] + remoteopts,
5756 ] + remoteopts,
5754 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5757 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5755 def pull(ui, repo, source="default", **opts):
5758 def pull(ui, repo, source="default", **opts):
5756 """pull changes from the specified source
5759 """pull changes from the specified source
5757
5760
5758 Pull changes from a remote repository to a local one.
5761 Pull changes from a remote repository to a local one.
5759
5762
5760 This finds all changes from the repository at the specified path
5763 This finds all changes from the repository at the specified path
5761 or URL and adds them to a local repository (the current one unless
5764 or URL and adds them to a local repository (the current one unless
5762 -R is specified). By default, this does not update the copy of the
5765 -R is specified). By default, this does not update the copy of the
5763 project in the working directory.
5766 project in the working directory.
5764
5767
5765 Use :hg:`incoming` if you want to see what would have been added
5768 Use :hg:`incoming` if you want to see what would have been added
5766 by a pull at the time you issued this command. If you then decide
5769 by a pull at the time you issued this command. If you then decide
5767 to add those changes to the repository, you should use :hg:`pull
5770 to add those changes to the repository, you should use :hg:`pull
5768 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5771 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5769
5772
5770 If SOURCE is omitted, the 'default' path will be used.
5773 If SOURCE is omitted, the 'default' path will be used.
5771 See :hg:`help urls` for more information.
5774 See :hg:`help urls` for more information.
5772
5775
5773 Returns 0 on success, 1 if an update had unresolved files.
5776 Returns 0 on success, 1 if an update had unresolved files.
5774 """
5777 """
5775 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5778 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5776 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5779 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5777 other = hg.peer(repo, opts, source)
5780 other = hg.peer(repo, opts, source)
5778 try:
5781 try:
5779 revs, checkout = hg.addbranchrevs(repo, other, branches,
5782 revs, checkout = hg.addbranchrevs(repo, other, branches,
5780 opts.get('rev'))
5783 opts.get('rev'))
5781
5784
5782
5785
5783 pullopargs = {}
5786 pullopargs = {}
5784 if opts.get('bookmark'):
5787 if opts.get('bookmark'):
5785 if not revs:
5788 if not revs:
5786 revs = []
5789 revs = []
5787 # The list of bookmark used here is not the one used to actually
5790 # The list of bookmark used here is not the one used to actually
5788 # update the bookmark name. This can result in the revision pulled
5791 # update the bookmark name. This can result in the revision pulled
5789 # not ending up with the name of the bookmark because of a race
5792 # not ending up with the name of the bookmark because of a race
5790 # condition on the server. (See issue 4689 for details)
5793 # condition on the server. (See issue 4689 for details)
5791 remotebookmarks = other.listkeys('bookmarks')
5794 remotebookmarks = other.listkeys('bookmarks')
5792 pullopargs['remotebookmarks'] = remotebookmarks
5795 pullopargs['remotebookmarks'] = remotebookmarks
5793 for b in opts['bookmark']:
5796 for b in opts['bookmark']:
5794 if b not in remotebookmarks:
5797 if b not in remotebookmarks:
5795 raise error.Abort(_('remote bookmark %s not found!') % b)
5798 raise error.Abort(_('remote bookmark %s not found!') % b)
5796 revs.append(remotebookmarks[b])
5799 revs.append(remotebookmarks[b])
5797
5800
5798 if revs:
5801 if revs:
5799 try:
5802 try:
5800 # When 'rev' is a bookmark name, we cannot guarantee that it
5803 # When 'rev' is a bookmark name, we cannot guarantee that it
5801 # will be updated with that name because of a race condition
5804 # will be updated with that name because of a race condition
5802 # server side. (See issue 4689 for details)
5805 # server side. (See issue 4689 for details)
5803 oldrevs = revs
5806 oldrevs = revs
5804 revs = [] # actually, nodes
5807 revs = [] # actually, nodes
5805 for r in oldrevs:
5808 for r in oldrevs:
5806 node = other.lookup(r)
5809 node = other.lookup(r)
5807 revs.append(node)
5810 revs.append(node)
5808 if r == checkout:
5811 if r == checkout:
5809 checkout = node
5812 checkout = node
5810 except error.CapabilityError:
5813 except error.CapabilityError:
5811 err = _("other repository doesn't support revision lookup, "
5814 err = _("other repository doesn't support revision lookup, "
5812 "so a rev cannot be specified.")
5815 "so a rev cannot be specified.")
5813 raise error.Abort(err)
5816 raise error.Abort(err)
5814
5817
5815 pullopargs.update(opts.get('opargs', {}))
5818 pullopargs.update(opts.get('opargs', {}))
5816 modheads = exchange.pull(repo, other, heads=revs,
5819 modheads = exchange.pull(repo, other, heads=revs,
5817 force=opts.get('force'),
5820 force=opts.get('force'),
5818 bookmarks=opts.get('bookmark', ()),
5821 bookmarks=opts.get('bookmark', ()),
5819 opargs=pullopargs).cgresult
5822 opargs=pullopargs).cgresult
5820
5823
5821 # brev is a name, which might be a bookmark to be activated at
5824 # brev is a name, which might be a bookmark to be activated at
5822 # the end of the update. In other words, it is an explicit
5825 # the end of the update. In other words, it is an explicit
5823 # destination of the update
5826 # destination of the update
5824 brev = None
5827 brev = None
5825
5828
5826 if checkout:
5829 if checkout:
5827 checkout = str(repo.changelog.rev(checkout))
5830 checkout = str(repo.changelog.rev(checkout))
5828
5831
5829 # order below depends on implementation of
5832 # order below depends on implementation of
5830 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5833 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5831 # because 'checkout' is determined without it.
5834 # because 'checkout' is determined without it.
5832 if opts.get('rev'):
5835 if opts.get('rev'):
5833 brev = opts['rev'][0]
5836 brev = opts['rev'][0]
5834 elif opts.get('branch'):
5837 elif opts.get('branch'):
5835 brev = opts['branch'][0]
5838 brev = opts['branch'][0]
5836 else:
5839 else:
5837 brev = branches[0]
5840 brev = branches[0]
5838 repo._subtoppath = source
5841 repo._subtoppath = source
5839 try:
5842 try:
5840 ret = postincoming(ui, repo, modheads, opts.get('update'),
5843 ret = postincoming(ui, repo, modheads, opts.get('update'),
5841 checkout, brev)
5844 checkout, brev)
5842
5845
5843 finally:
5846 finally:
5844 del repo._subtoppath
5847 del repo._subtoppath
5845
5848
5846 finally:
5849 finally:
5847 other.close()
5850 other.close()
5848 return ret
5851 return ret
5849
5852
5850 @command('^push',
5853 @command('^push',
5851 [('f', 'force', None, _('force push')),
5854 [('f', 'force', None, _('force push')),
5852 ('r', 'rev', [],
5855 ('r', 'rev', [],
5853 _('a changeset intended to be included in the destination'),
5856 _('a changeset intended to be included in the destination'),
5854 _('REV')),
5857 _('REV')),
5855 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5858 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5856 ('b', 'branch', [],
5859 ('b', 'branch', [],
5857 _('a specific branch you would like to push'), _('BRANCH')),
5860 _('a specific branch you would like to push'), _('BRANCH')),
5858 ('', 'new-branch', False, _('allow pushing a new branch')),
5861 ('', 'new-branch', False, _('allow pushing a new branch')),
5859 ] + remoteopts,
5862 ] + remoteopts,
5860 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5863 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5861 def push(ui, repo, dest=None, **opts):
5864 def push(ui, repo, dest=None, **opts):
5862 """push changes to the specified destination
5865 """push changes to the specified destination
5863
5866
5864 Push changesets from the local repository to the specified
5867 Push changesets from the local repository to the specified
5865 destination.
5868 destination.
5866
5869
5867 This operation is symmetrical to pull: it is identical to a pull
5870 This operation is symmetrical to pull: it is identical to a pull
5868 in the destination repository from the current one.
5871 in the destination repository from the current one.
5869
5872
5870 By default, push will not allow creation of new heads at the
5873 By default, push will not allow creation of new heads at the
5871 destination, since multiple heads would make it unclear which head
5874 destination, since multiple heads would make it unclear which head
5872 to use. In this situation, it is recommended to pull and merge
5875 to use. In this situation, it is recommended to pull and merge
5873 before pushing.
5876 before pushing.
5874
5877
5875 Use --new-branch if you want to allow push to create a new named
5878 Use --new-branch if you want to allow push to create a new named
5876 branch that is not present at the destination. This allows you to
5879 branch that is not present at the destination. This allows you to
5877 only create a new branch without forcing other changes.
5880 only create a new branch without forcing other changes.
5878
5881
5879 .. note::
5882 .. note::
5880
5883
5881 Extra care should be taken with the -f/--force option,
5884 Extra care should be taken with the -f/--force option,
5882 which will push all new heads on all branches, an action which will
5885 which will push all new heads on all branches, an action which will
5883 almost always cause confusion for collaborators.
5886 almost always cause confusion for collaborators.
5884
5887
5885 If -r/--rev is used, the specified revision and all its ancestors
5888 If -r/--rev is used, the specified revision and all its ancestors
5886 will be pushed to the remote repository.
5889 will be pushed to the remote repository.
5887
5890
5888 If -B/--bookmark is used, the specified bookmarked revision, its
5891 If -B/--bookmark is used, the specified bookmarked revision, its
5889 ancestors, and the bookmark will be pushed to the remote
5892 ancestors, and the bookmark will be pushed to the remote
5890 repository. Specifying ``.`` is equivalent to specifying the active
5893 repository. Specifying ``.`` is equivalent to specifying the active
5891 bookmark's name.
5894 bookmark's name.
5892
5895
5893 Please see :hg:`help urls` for important details about ``ssh://``
5896 Please see :hg:`help urls` for important details about ``ssh://``
5894 URLs. If DESTINATION is omitted, a default path will be used.
5897 URLs. If DESTINATION is omitted, a default path will be used.
5895
5898
5896 Returns 0 if push was successful, 1 if nothing to push.
5899 Returns 0 if push was successful, 1 if nothing to push.
5897 """
5900 """
5898
5901
5899 if opts.get('bookmark'):
5902 if opts.get('bookmark'):
5900 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5903 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5901 for b in opts['bookmark']:
5904 for b in opts['bookmark']:
5902 # translate -B options to -r so changesets get pushed
5905 # translate -B options to -r so changesets get pushed
5903 b = repo._bookmarks.expandname(b)
5906 b = repo._bookmarks.expandname(b)
5904 if b in repo._bookmarks:
5907 if b in repo._bookmarks:
5905 opts.setdefault('rev', []).append(b)
5908 opts.setdefault('rev', []).append(b)
5906 else:
5909 else:
5907 # if we try to push a deleted bookmark, translate it to null
5910 # if we try to push a deleted bookmark, translate it to null
5908 # this lets simultaneous -r, -b options continue working
5911 # this lets simultaneous -r, -b options continue working
5909 opts.setdefault('rev', []).append("null")
5912 opts.setdefault('rev', []).append("null")
5910
5913
5911 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5914 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5912 if not path:
5915 if not path:
5913 raise error.Abort(_('default repository not configured!'),
5916 raise error.Abort(_('default repository not configured!'),
5914 hint=_('see the "path" section in "hg help config"'))
5917 hint=_('see the "path" section in "hg help config"'))
5915 dest = path.pushloc or path.loc
5918 dest = path.pushloc or path.loc
5916 branches = (path.branch, opts.get('branch') or [])
5919 branches = (path.branch, opts.get('branch') or [])
5917 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5920 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5918 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5921 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5919 other = hg.peer(repo, opts, dest)
5922 other = hg.peer(repo, opts, dest)
5920
5923
5921 if revs:
5924 if revs:
5922 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5925 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5923 if not revs:
5926 if not revs:
5924 raise error.Abort(_("specified revisions evaluate to an empty set"),
5927 raise error.Abort(_("specified revisions evaluate to an empty set"),
5925 hint=_("use different revision arguments"))
5928 hint=_("use different revision arguments"))
5926
5929
5927 repo._subtoppath = dest
5930 repo._subtoppath = dest
5928 try:
5931 try:
5929 # push subrepos depth-first for coherent ordering
5932 # push subrepos depth-first for coherent ordering
5930 c = repo['']
5933 c = repo['']
5931 subs = c.substate # only repos that are committed
5934 subs = c.substate # only repos that are committed
5932 for s in sorted(subs):
5935 for s in sorted(subs):
5933 result = c.sub(s).push(opts)
5936 result = c.sub(s).push(opts)
5934 if result == 0:
5937 if result == 0:
5935 return not result
5938 return not result
5936 finally:
5939 finally:
5937 del repo._subtoppath
5940 del repo._subtoppath
5938 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5941 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5939 newbranch=opts.get('new_branch'),
5942 newbranch=opts.get('new_branch'),
5940 bookmarks=opts.get('bookmark', ()),
5943 bookmarks=opts.get('bookmark', ()),
5941 opargs=opts.get('opargs'))
5944 opargs=opts.get('opargs'))
5942
5945
5943 result = not pushop.cgresult
5946 result = not pushop.cgresult
5944
5947
5945 if pushop.bkresult is not None:
5948 if pushop.bkresult is not None:
5946 if pushop.bkresult == 2:
5949 if pushop.bkresult == 2:
5947 result = 2
5950 result = 2
5948 elif not result and pushop.bkresult:
5951 elif not result and pushop.bkresult:
5949 result = 2
5952 result = 2
5950
5953
5951 return result
5954 return result
5952
5955
5953 @command('recover', [])
5956 @command('recover', [])
5954 def recover(ui, repo):
5957 def recover(ui, repo):
5955 """roll back an interrupted transaction
5958 """roll back an interrupted transaction
5956
5959
5957 Recover from an interrupted commit or pull.
5960 Recover from an interrupted commit or pull.
5958
5961
5959 This command tries to fix the repository status after an
5962 This command tries to fix the repository status after an
5960 interrupted operation. It should only be necessary when Mercurial
5963 interrupted operation. It should only be necessary when Mercurial
5961 suggests it.
5964 suggests it.
5962
5965
5963 Returns 0 if successful, 1 if nothing to recover or verify fails.
5966 Returns 0 if successful, 1 if nothing to recover or verify fails.
5964 """
5967 """
5965 if repo.recover():
5968 if repo.recover():
5966 return hg.verify(repo)
5969 return hg.verify(repo)
5967 return 1
5970 return 1
5968
5971
5969 @command('^remove|rm',
5972 @command('^remove|rm',
5970 [('A', 'after', None, _('record delete for missing files')),
5973 [('A', 'after', None, _('record delete for missing files')),
5971 ('f', 'force', None,
5974 ('f', 'force', None,
5972 _('forget added files, delete modified files')),
5975 _('forget added files, delete modified files')),
5973 ] + subrepoopts + walkopts,
5976 ] + subrepoopts + walkopts,
5974 _('[OPTION]... FILE...'),
5977 _('[OPTION]... FILE...'),
5975 inferrepo=True)
5978 inferrepo=True)
5976 def remove(ui, repo, *pats, **opts):
5979 def remove(ui, repo, *pats, **opts):
5977 """remove the specified files on the next commit
5980 """remove the specified files on the next commit
5978
5981
5979 Schedule the indicated files for removal from the current branch.
5982 Schedule the indicated files for removal from the current branch.
5980
5983
5981 This command schedules the files to be removed at the next commit.
5984 This command schedules the files to be removed at the next commit.
5982 To undo a remove before that, see :hg:`revert`. To undo added
5985 To undo a remove before that, see :hg:`revert`. To undo added
5983 files, see :hg:`forget`.
5986 files, see :hg:`forget`.
5984
5987
5985 .. container:: verbose
5988 .. container:: verbose
5986
5989
5987 -A/--after can be used to remove only files that have already
5990 -A/--after can be used to remove only files that have already
5988 been deleted, -f/--force can be used to force deletion, and -Af
5991 been deleted, -f/--force can be used to force deletion, and -Af
5989 can be used to remove files from the next revision without
5992 can be used to remove files from the next revision without
5990 deleting them from the working directory.
5993 deleting them from the working directory.
5991
5994
5992 The following table details the behavior of remove for different
5995 The following table details the behavior of remove for different
5993 file states (columns) and option combinations (rows). The file
5996 file states (columns) and option combinations (rows). The file
5994 states are Added [A], Clean [C], Modified [M] and Missing [!]
5997 states are Added [A], Clean [C], Modified [M] and Missing [!]
5995 (as reported by :hg:`status`). The actions are Warn, Remove
5998 (as reported by :hg:`status`). The actions are Warn, Remove
5996 (from branch) and Delete (from disk):
5999 (from branch) and Delete (from disk):
5997
6000
5998 ========= == == == ==
6001 ========= == == == ==
5999 opt/state A C M !
6002 opt/state A C M !
6000 ========= == == == ==
6003 ========= == == == ==
6001 none W RD W R
6004 none W RD W R
6002 -f R RD RD R
6005 -f R RD RD R
6003 -A W W W R
6006 -A W W W R
6004 -Af R R R R
6007 -Af R R R R
6005 ========= == == == ==
6008 ========= == == == ==
6006
6009
6007 .. note::
6010 .. note::
6008
6011
6009 :hg:`remove` never deletes files in Added [A] state from the
6012 :hg:`remove` never deletes files in Added [A] state from the
6010 working directory, not even if ``--force`` is specified.
6013 working directory, not even if ``--force`` is specified.
6011
6014
6012 Returns 0 on success, 1 if any warnings encountered.
6015 Returns 0 on success, 1 if any warnings encountered.
6013 """
6016 """
6014
6017
6015 after, force = opts.get('after'), opts.get('force')
6018 after, force = opts.get('after'), opts.get('force')
6016 if not pats and not after:
6019 if not pats and not after:
6017 raise error.Abort(_('no files specified'))
6020 raise error.Abort(_('no files specified'))
6018
6021
6019 m = scmutil.match(repo[None], pats, opts)
6022 m = scmutil.match(repo[None], pats, opts)
6020 subrepos = opts.get('subrepos')
6023 subrepos = opts.get('subrepos')
6021 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6024 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6022
6025
6023 @command('rename|move|mv',
6026 @command('rename|move|mv',
6024 [('A', 'after', None, _('record a rename that has already occurred')),
6027 [('A', 'after', None, _('record a rename that has already occurred')),
6025 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6028 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6026 ] + walkopts + dryrunopts,
6029 ] + walkopts + dryrunopts,
6027 _('[OPTION]... SOURCE... DEST'))
6030 _('[OPTION]... SOURCE... DEST'))
6028 def rename(ui, repo, *pats, **opts):
6031 def rename(ui, repo, *pats, **opts):
6029 """rename files; equivalent of copy + remove
6032 """rename files; equivalent of copy + remove
6030
6033
6031 Mark dest as copies of sources; mark sources for deletion. If dest
6034 Mark dest as copies of sources; mark sources for deletion. If dest
6032 is a directory, copies are put in that directory. If dest is a
6035 is a directory, copies are put in that directory. If dest is a
6033 file, there can only be one source.
6036 file, there can only be one source.
6034
6037
6035 By default, this command copies the contents of files as they
6038 By default, this command copies the contents of files as they
6036 exist in the working directory. If invoked with -A/--after, the
6039 exist in the working directory. If invoked with -A/--after, the
6037 operation is recorded, but no copying is performed.
6040 operation is recorded, but no copying is performed.
6038
6041
6039 This command takes effect at the next commit. To undo a rename
6042 This command takes effect at the next commit. To undo a rename
6040 before that, see :hg:`revert`.
6043 before that, see :hg:`revert`.
6041
6044
6042 Returns 0 on success, 1 if errors are encountered.
6045 Returns 0 on success, 1 if errors are encountered.
6043 """
6046 """
6044 with repo.wlock(False):
6047 with repo.wlock(False):
6045 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6048 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6046
6049
6047 @command('resolve',
6050 @command('resolve',
6048 [('a', 'all', None, _('select all unresolved files')),
6051 [('a', 'all', None, _('select all unresolved files')),
6049 ('l', 'list', None, _('list state of files needing merge')),
6052 ('l', 'list', None, _('list state of files needing merge')),
6050 ('m', 'mark', None, _('mark files as resolved')),
6053 ('m', 'mark', None, _('mark files as resolved')),
6051 ('u', 'unmark', None, _('mark files as unresolved')),
6054 ('u', 'unmark', None, _('mark files as unresolved')),
6052 ('n', 'no-status', None, _('hide status prefix'))]
6055 ('n', 'no-status', None, _('hide status prefix'))]
6053 + mergetoolopts + walkopts + formatteropts,
6056 + mergetoolopts + walkopts + formatteropts,
6054 _('[OPTION]... [FILE]...'),
6057 _('[OPTION]... [FILE]...'),
6055 inferrepo=True)
6058 inferrepo=True)
6056 def resolve(ui, repo, *pats, **opts):
6059 def resolve(ui, repo, *pats, **opts):
6057 """redo merges or set/view the merge status of files
6060 """redo merges or set/view the merge status of files
6058
6061
6059 Merges with unresolved conflicts are often the result of
6062 Merges with unresolved conflicts are often the result of
6060 non-interactive merging using the ``internal:merge`` configuration
6063 non-interactive merging using the ``internal:merge`` configuration
6061 setting, or a command-line merge tool like ``diff3``. The resolve
6064 setting, or a command-line merge tool like ``diff3``. The resolve
6062 command is used to manage the files involved in a merge, after
6065 command is used to manage the files involved in a merge, after
6063 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6066 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6064 working directory must have two parents). See :hg:`help
6067 working directory must have two parents). See :hg:`help
6065 merge-tools` for information on configuring merge tools.
6068 merge-tools` for information on configuring merge tools.
6066
6069
6067 The resolve command can be used in the following ways:
6070 The resolve command can be used in the following ways:
6068
6071
6069 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6072 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6070 files, discarding any previous merge attempts. Re-merging is not
6073 files, discarding any previous merge attempts. Re-merging is not
6071 performed for files already marked as resolved. Use ``--all/-a``
6074 performed for files already marked as resolved. Use ``--all/-a``
6072 to select all unresolved files. ``--tool`` can be used to specify
6075 to select all unresolved files. ``--tool`` can be used to specify
6073 the merge tool used for the given files. It overrides the HGMERGE
6076 the merge tool used for the given files. It overrides the HGMERGE
6074 environment variable and your configuration files. Previous file
6077 environment variable and your configuration files. Previous file
6075 contents are saved with a ``.orig`` suffix.
6078 contents are saved with a ``.orig`` suffix.
6076
6079
6077 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6080 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6078 (e.g. after having manually fixed-up the files). The default is
6081 (e.g. after having manually fixed-up the files). The default is
6079 to mark all unresolved files.
6082 to mark all unresolved files.
6080
6083
6081 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6084 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6082 default is to mark all resolved files.
6085 default is to mark all resolved files.
6083
6086
6084 - :hg:`resolve -l`: list files which had or still have conflicts.
6087 - :hg:`resolve -l`: list files which had or still have conflicts.
6085 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6088 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6086
6089
6087 .. note::
6090 .. note::
6088
6091
6089 Mercurial will not let you commit files with unresolved merge
6092 Mercurial will not let you commit files with unresolved merge
6090 conflicts. You must use :hg:`resolve -m ...` before you can
6093 conflicts. You must use :hg:`resolve -m ...` before you can
6091 commit after a conflicting merge.
6094 commit after a conflicting merge.
6092
6095
6093 Returns 0 on success, 1 if any files fail a resolve attempt.
6096 Returns 0 on success, 1 if any files fail a resolve attempt.
6094 """
6097 """
6095
6098
6096 flaglist = 'all mark unmark list no_status'.split()
6099 flaglist = 'all mark unmark list no_status'.split()
6097 all, mark, unmark, show, nostatus = \
6100 all, mark, unmark, show, nostatus = \
6098 [opts.get(o) for o in flaglist]
6101 [opts.get(o) for o in flaglist]
6099
6102
6100 if (show and (mark or unmark)) or (mark and unmark):
6103 if (show and (mark or unmark)) or (mark and unmark):
6101 raise error.Abort(_("too many options specified"))
6104 raise error.Abort(_("too many options specified"))
6102 if pats and all:
6105 if pats and all:
6103 raise error.Abort(_("can't specify --all and patterns"))
6106 raise error.Abort(_("can't specify --all and patterns"))
6104 if not (all or pats or show or mark or unmark):
6107 if not (all or pats or show or mark or unmark):
6105 raise error.Abort(_('no files or directories specified'),
6108 raise error.Abort(_('no files or directories specified'),
6106 hint=('use --all to re-merge all unresolved files'))
6109 hint=('use --all to re-merge all unresolved files'))
6107
6110
6108 if show:
6111 if show:
6109 fm = ui.formatter('resolve', opts)
6112 fm = ui.formatter('resolve', opts)
6110 ms = mergemod.mergestate.read(repo)
6113 ms = mergemod.mergestate.read(repo)
6111 m = scmutil.match(repo[None], pats, opts)
6114 m = scmutil.match(repo[None], pats, opts)
6112 for f in ms:
6115 for f in ms:
6113 if not m(f):
6116 if not m(f):
6114 continue
6117 continue
6115 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6118 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6116 'd': 'driverresolved'}[ms[f]]
6119 'd': 'driverresolved'}[ms[f]]
6117 fm.startitem()
6120 fm.startitem()
6118 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6121 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6119 fm.write('path', '%s\n', f, label=l)
6122 fm.write('path', '%s\n', f, label=l)
6120 fm.end()
6123 fm.end()
6121 return 0
6124 return 0
6122
6125
6123 with repo.wlock():
6126 with repo.wlock():
6124 ms = mergemod.mergestate.read(repo)
6127 ms = mergemod.mergestate.read(repo)
6125
6128
6126 if not (ms.active() or repo.dirstate.p2() != nullid):
6129 if not (ms.active() or repo.dirstate.p2() != nullid):
6127 raise error.Abort(
6130 raise error.Abort(
6128 _('resolve command not applicable when not merging'))
6131 _('resolve command not applicable when not merging'))
6129
6132
6130 wctx = repo[None]
6133 wctx = repo[None]
6131
6134
6132 if ms.mergedriver and ms.mdstate() == 'u':
6135 if ms.mergedriver and ms.mdstate() == 'u':
6133 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6136 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6134 ms.commit()
6137 ms.commit()
6135 # allow mark and unmark to go through
6138 # allow mark and unmark to go through
6136 if not mark and not unmark and not proceed:
6139 if not mark and not unmark and not proceed:
6137 return 1
6140 return 1
6138
6141
6139 m = scmutil.match(wctx, pats, opts)
6142 m = scmutil.match(wctx, pats, opts)
6140 ret = 0
6143 ret = 0
6141 didwork = False
6144 didwork = False
6142 runconclude = False
6145 runconclude = False
6143
6146
6144 tocomplete = []
6147 tocomplete = []
6145 for f in ms:
6148 for f in ms:
6146 if not m(f):
6149 if not m(f):
6147 continue
6150 continue
6148
6151
6149 didwork = True
6152 didwork = True
6150
6153
6151 # don't let driver-resolved files be marked, and run the conclude
6154 # don't let driver-resolved files be marked, and run the conclude
6152 # step if asked to resolve
6155 # step if asked to resolve
6153 if ms[f] == "d":
6156 if ms[f] == "d":
6154 exact = m.exact(f)
6157 exact = m.exact(f)
6155 if mark:
6158 if mark:
6156 if exact:
6159 if exact:
6157 ui.warn(_('not marking %s as it is driver-resolved\n')
6160 ui.warn(_('not marking %s as it is driver-resolved\n')
6158 % f)
6161 % f)
6159 elif unmark:
6162 elif unmark:
6160 if exact:
6163 if exact:
6161 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6164 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6162 % f)
6165 % f)
6163 else:
6166 else:
6164 runconclude = True
6167 runconclude = True
6165 continue
6168 continue
6166
6169
6167 if mark:
6170 if mark:
6168 ms.mark(f, "r")
6171 ms.mark(f, "r")
6169 elif unmark:
6172 elif unmark:
6170 ms.mark(f, "u")
6173 ms.mark(f, "u")
6171 else:
6174 else:
6172 # backup pre-resolve (merge uses .orig for its own purposes)
6175 # backup pre-resolve (merge uses .orig for its own purposes)
6173 a = repo.wjoin(f)
6176 a = repo.wjoin(f)
6174 try:
6177 try:
6175 util.copyfile(a, a + ".resolve")
6178 util.copyfile(a, a + ".resolve")
6176 except (IOError, OSError) as inst:
6179 except (IOError, OSError) as inst:
6177 if inst.errno != errno.ENOENT:
6180 if inst.errno != errno.ENOENT:
6178 raise
6181 raise
6179
6182
6180 try:
6183 try:
6181 # preresolve file
6184 # preresolve file
6182 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6185 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6183 'resolve')
6186 'resolve')
6184 complete, r = ms.preresolve(f, wctx)
6187 complete, r = ms.preresolve(f, wctx)
6185 if not complete:
6188 if not complete:
6186 tocomplete.append(f)
6189 tocomplete.append(f)
6187 elif r:
6190 elif r:
6188 ret = 1
6191 ret = 1
6189 finally:
6192 finally:
6190 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6193 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6191 ms.commit()
6194 ms.commit()
6192
6195
6193 # replace filemerge's .orig file with our resolve file, but only
6196 # replace filemerge's .orig file with our resolve file, but only
6194 # for merges that are complete
6197 # for merges that are complete
6195 if complete:
6198 if complete:
6196 try:
6199 try:
6197 util.rename(a + ".resolve",
6200 util.rename(a + ".resolve",
6198 scmutil.origpath(ui, repo, a))
6201 scmutil.origpath(ui, repo, a))
6199 except OSError as inst:
6202 except OSError as inst:
6200 if inst.errno != errno.ENOENT:
6203 if inst.errno != errno.ENOENT:
6201 raise
6204 raise
6202
6205
6203 for f in tocomplete:
6206 for f in tocomplete:
6204 try:
6207 try:
6205 # resolve file
6208 # resolve file
6206 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6209 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6207 'resolve')
6210 'resolve')
6208 r = ms.resolve(f, wctx)
6211 r = ms.resolve(f, wctx)
6209 if r:
6212 if r:
6210 ret = 1
6213 ret = 1
6211 finally:
6214 finally:
6212 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6215 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6213 ms.commit()
6216 ms.commit()
6214
6217
6215 # replace filemerge's .orig file with our resolve file
6218 # replace filemerge's .orig file with our resolve file
6216 a = repo.wjoin(f)
6219 a = repo.wjoin(f)
6217 try:
6220 try:
6218 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6221 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6219 except OSError as inst:
6222 except OSError as inst:
6220 if inst.errno != errno.ENOENT:
6223 if inst.errno != errno.ENOENT:
6221 raise
6224 raise
6222
6225
6223 ms.commit()
6226 ms.commit()
6224 ms.recordactions()
6227 ms.recordactions()
6225
6228
6226 if not didwork and pats:
6229 if not didwork and pats:
6227 hint = None
6230 hint = None
6228 if not any([p for p in pats if p.find(':') >= 0]):
6231 if not any([p for p in pats if p.find(':') >= 0]):
6229 pats = ['path:%s' % p for p in pats]
6232 pats = ['path:%s' % p for p in pats]
6230 m = scmutil.match(wctx, pats, opts)
6233 m = scmutil.match(wctx, pats, opts)
6231 for f in ms:
6234 for f in ms:
6232 if not m(f):
6235 if not m(f):
6233 continue
6236 continue
6234 flags = ''.join(['-%s ' % o[0] for o in flaglist
6237 flags = ''.join(['-%s ' % o[0] for o in flaglist
6235 if opts.get(o)])
6238 if opts.get(o)])
6236 hint = _("(try: hg resolve %s%s)\n") % (
6239 hint = _("(try: hg resolve %s%s)\n") % (
6237 flags,
6240 flags,
6238 ' '.join(pats))
6241 ' '.join(pats))
6239 break
6242 break
6240 ui.warn(_("arguments do not match paths that need resolving\n"))
6243 ui.warn(_("arguments do not match paths that need resolving\n"))
6241 if hint:
6244 if hint:
6242 ui.warn(hint)
6245 ui.warn(hint)
6243 elif ms.mergedriver and ms.mdstate() != 's':
6246 elif ms.mergedriver and ms.mdstate() != 's':
6244 # run conclude step when either a driver-resolved file is requested
6247 # run conclude step when either a driver-resolved file is requested
6245 # or there are no driver-resolved files
6248 # or there are no driver-resolved files
6246 # we can't use 'ret' to determine whether any files are unresolved
6249 # we can't use 'ret' to determine whether any files are unresolved
6247 # because we might not have tried to resolve some
6250 # because we might not have tried to resolve some
6248 if ((runconclude or not list(ms.driverresolved()))
6251 if ((runconclude or not list(ms.driverresolved()))
6249 and not list(ms.unresolved())):
6252 and not list(ms.unresolved())):
6250 proceed = mergemod.driverconclude(repo, ms, wctx)
6253 proceed = mergemod.driverconclude(repo, ms, wctx)
6251 ms.commit()
6254 ms.commit()
6252 if not proceed:
6255 if not proceed:
6253 return 1
6256 return 1
6254
6257
6255 # Nudge users into finishing an unfinished operation
6258 # Nudge users into finishing an unfinished operation
6256 unresolvedf = list(ms.unresolved())
6259 unresolvedf = list(ms.unresolved())
6257 driverresolvedf = list(ms.driverresolved())
6260 driverresolvedf = list(ms.driverresolved())
6258 if not unresolvedf and not driverresolvedf:
6261 if not unresolvedf and not driverresolvedf:
6259 ui.status(_('(no more unresolved files)\n'))
6262 ui.status(_('(no more unresolved files)\n'))
6260 cmdutil.checkafterresolved(repo)
6263 cmdutil.checkafterresolved(repo)
6261 elif not unresolvedf:
6264 elif not unresolvedf:
6262 ui.status(_('(no more unresolved files -- '
6265 ui.status(_('(no more unresolved files -- '
6263 'run "hg resolve --all" to conclude)\n'))
6266 'run "hg resolve --all" to conclude)\n'))
6264
6267
6265 return ret
6268 return ret
6266
6269
6267 @command('revert',
6270 @command('revert',
6268 [('a', 'all', None, _('revert all changes when no arguments given')),
6271 [('a', 'all', None, _('revert all changes when no arguments given')),
6269 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6272 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6270 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6273 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6271 ('C', 'no-backup', None, _('do not save backup copies of files')),
6274 ('C', 'no-backup', None, _('do not save backup copies of files')),
6272 ('i', 'interactive', None,
6275 ('i', 'interactive', None,
6273 _('interactively select the changes (EXPERIMENTAL)')),
6276 _('interactively select the changes (EXPERIMENTAL)')),
6274 ] + walkopts + dryrunopts,
6277 ] + walkopts + dryrunopts,
6275 _('[OPTION]... [-r REV] [NAME]...'))
6278 _('[OPTION]... [-r REV] [NAME]...'))
6276 def revert(ui, repo, *pats, **opts):
6279 def revert(ui, repo, *pats, **opts):
6277 """restore files to their checkout state
6280 """restore files to their checkout state
6278
6281
6279 .. note::
6282 .. note::
6280
6283
6281 To check out earlier revisions, you should use :hg:`update REV`.
6284 To check out earlier revisions, you should use :hg:`update REV`.
6282 To cancel an uncommitted merge (and lose your changes),
6285 To cancel an uncommitted merge (and lose your changes),
6283 use :hg:`update --clean .`.
6286 use :hg:`update --clean .`.
6284
6287
6285 With no revision specified, revert the specified files or directories
6288 With no revision specified, revert the specified files or directories
6286 to the contents they had in the parent of the working directory.
6289 to the contents they had in the parent of the working directory.
6287 This restores the contents of files to an unmodified
6290 This restores the contents of files to an unmodified
6288 state and unschedules adds, removes, copies, and renames. If the
6291 state and unschedules adds, removes, copies, and renames. If the
6289 working directory has two parents, you must explicitly specify a
6292 working directory has two parents, you must explicitly specify a
6290 revision.
6293 revision.
6291
6294
6292 Using the -r/--rev or -d/--date options, revert the given files or
6295 Using the -r/--rev or -d/--date options, revert the given files or
6293 directories to their states as of a specific revision. Because
6296 directories to their states as of a specific revision. Because
6294 revert does not change the working directory parents, this will
6297 revert does not change the working directory parents, this will
6295 cause these files to appear modified. This can be helpful to "back
6298 cause these files to appear modified. This can be helpful to "back
6296 out" some or all of an earlier change. See :hg:`backout` for a
6299 out" some or all of an earlier change. See :hg:`backout` for a
6297 related method.
6300 related method.
6298
6301
6299 Modified files are saved with a .orig suffix before reverting.
6302 Modified files are saved with a .orig suffix before reverting.
6300 To disable these backups, use --no-backup. It is possible to store
6303 To disable these backups, use --no-backup. It is possible to store
6301 the backup files in a custom directory relative to the root of the
6304 the backup files in a custom directory relative to the root of the
6302 repository by setting the ``ui.origbackuppath`` configuration
6305 repository by setting the ``ui.origbackuppath`` configuration
6303 option.
6306 option.
6304
6307
6305 See :hg:`help dates` for a list of formats valid for -d/--date.
6308 See :hg:`help dates` for a list of formats valid for -d/--date.
6306
6309
6307 See :hg:`help backout` for a way to reverse the effect of an
6310 See :hg:`help backout` for a way to reverse the effect of an
6308 earlier changeset.
6311 earlier changeset.
6309
6312
6310 Returns 0 on success.
6313 Returns 0 on success.
6311 """
6314 """
6312
6315
6313 if opts.get("date"):
6316 if opts.get("date"):
6314 if opts.get("rev"):
6317 if opts.get("rev"):
6315 raise error.Abort(_("you can't specify a revision and a date"))
6318 raise error.Abort(_("you can't specify a revision and a date"))
6316 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6319 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6317
6320
6318 parent, p2 = repo.dirstate.parents()
6321 parent, p2 = repo.dirstate.parents()
6319 if not opts.get('rev') and p2 != nullid:
6322 if not opts.get('rev') and p2 != nullid:
6320 # revert after merge is a trap for new users (issue2915)
6323 # revert after merge is a trap for new users (issue2915)
6321 raise error.Abort(_('uncommitted merge with no revision specified'),
6324 raise error.Abort(_('uncommitted merge with no revision specified'),
6322 hint=_("use 'hg update' or see 'hg help revert'"))
6325 hint=_("use 'hg update' or see 'hg help revert'"))
6323
6326
6324 ctx = scmutil.revsingle(repo, opts.get('rev'))
6327 ctx = scmutil.revsingle(repo, opts.get('rev'))
6325
6328
6326 if (not (pats or opts.get('include') or opts.get('exclude') or
6329 if (not (pats or opts.get('include') or opts.get('exclude') or
6327 opts.get('all') or opts.get('interactive'))):
6330 opts.get('all') or opts.get('interactive'))):
6328 msg = _("no files or directories specified")
6331 msg = _("no files or directories specified")
6329 if p2 != nullid:
6332 if p2 != nullid:
6330 hint = _("uncommitted merge, use --all to discard all changes,"
6333 hint = _("uncommitted merge, use --all to discard all changes,"
6331 " or 'hg update -C .' to abort the merge")
6334 " or 'hg update -C .' to abort the merge")
6332 raise error.Abort(msg, hint=hint)
6335 raise error.Abort(msg, hint=hint)
6333 dirty = any(repo.status())
6336 dirty = any(repo.status())
6334 node = ctx.node()
6337 node = ctx.node()
6335 if node != parent:
6338 if node != parent:
6336 if dirty:
6339 if dirty:
6337 hint = _("uncommitted changes, use --all to discard all"
6340 hint = _("uncommitted changes, use --all to discard all"
6338 " changes, or 'hg update %s' to update") % ctx.rev()
6341 " changes, or 'hg update %s' to update") % ctx.rev()
6339 else:
6342 else:
6340 hint = _("use --all to revert all files,"
6343 hint = _("use --all to revert all files,"
6341 " or 'hg update %s' to update") % ctx.rev()
6344 " or 'hg update %s' to update") % ctx.rev()
6342 elif dirty:
6345 elif dirty:
6343 hint = _("uncommitted changes, use --all to discard all changes")
6346 hint = _("uncommitted changes, use --all to discard all changes")
6344 else:
6347 else:
6345 hint = _("use --all to revert all files")
6348 hint = _("use --all to revert all files")
6346 raise error.Abort(msg, hint=hint)
6349 raise error.Abort(msg, hint=hint)
6347
6350
6348 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6351 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6349
6352
6350 @command('rollback', dryrunopts +
6353 @command('rollback', dryrunopts +
6351 [('f', 'force', False, _('ignore safety measures'))])
6354 [('f', 'force', False, _('ignore safety measures'))])
6352 def rollback(ui, repo, **opts):
6355 def rollback(ui, repo, **opts):
6353 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6356 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6354
6357
6355 Please use :hg:`commit --amend` instead of rollback to correct
6358 Please use :hg:`commit --amend` instead of rollback to correct
6356 mistakes in the last commit.
6359 mistakes in the last commit.
6357
6360
6358 This command should be used with care. There is only one level of
6361 This command should be used with care. There is only one level of
6359 rollback, and there is no way to undo a rollback. It will also
6362 rollback, and there is no way to undo a rollback. It will also
6360 restore the dirstate at the time of the last transaction, losing
6363 restore the dirstate at the time of the last transaction, losing
6361 any dirstate changes since that time. This command does not alter
6364 any dirstate changes since that time. This command does not alter
6362 the working directory.
6365 the working directory.
6363
6366
6364 Transactions are used to encapsulate the effects of all commands
6367 Transactions are used to encapsulate the effects of all commands
6365 that create new changesets or propagate existing changesets into a
6368 that create new changesets or propagate existing changesets into a
6366 repository.
6369 repository.
6367
6370
6368 .. container:: verbose
6371 .. container:: verbose
6369
6372
6370 For example, the following commands are transactional, and their
6373 For example, the following commands are transactional, and their
6371 effects can be rolled back:
6374 effects can be rolled back:
6372
6375
6373 - commit
6376 - commit
6374 - import
6377 - import
6375 - pull
6378 - pull
6376 - push (with this repository as the destination)
6379 - push (with this repository as the destination)
6377 - unbundle
6380 - unbundle
6378
6381
6379 To avoid permanent data loss, rollback will refuse to rollback a
6382 To avoid permanent data loss, rollback will refuse to rollback a
6380 commit transaction if it isn't checked out. Use --force to
6383 commit transaction if it isn't checked out. Use --force to
6381 override this protection.
6384 override this protection.
6382
6385
6383 This command is not intended for use on public repositories. Once
6386 This command is not intended for use on public repositories. Once
6384 changes are visible for pull by other users, rolling a transaction
6387 changes are visible for pull by other users, rolling a transaction
6385 back locally is ineffective (someone else may already have pulled
6388 back locally is ineffective (someone else may already have pulled
6386 the changes). Furthermore, a race is possible with readers of the
6389 the changes). Furthermore, a race is possible with readers of the
6387 repository; for example an in-progress pull from the repository
6390 repository; for example an in-progress pull from the repository
6388 may fail if a rollback is performed.
6391 may fail if a rollback is performed.
6389
6392
6390 Returns 0 on success, 1 if no rollback data is available.
6393 Returns 0 on success, 1 if no rollback data is available.
6391 """
6394 """
6392 return repo.rollback(dryrun=opts.get('dry_run'),
6395 return repo.rollback(dryrun=opts.get('dry_run'),
6393 force=opts.get('force'))
6396 force=opts.get('force'))
6394
6397
6395 @command('root', [])
6398 @command('root', [])
6396 def root(ui, repo):
6399 def root(ui, repo):
6397 """print the root (top) of the current working directory
6400 """print the root (top) of the current working directory
6398
6401
6399 Print the root directory of the current repository.
6402 Print the root directory of the current repository.
6400
6403
6401 Returns 0 on success.
6404 Returns 0 on success.
6402 """
6405 """
6403 ui.write(repo.root + "\n")
6406 ui.write(repo.root + "\n")
6404
6407
6405 @command('^serve',
6408 @command('^serve',
6406 [('A', 'accesslog', '', _('name of access log file to write to'),
6409 [('A', 'accesslog', '', _('name of access log file to write to'),
6407 _('FILE')),
6410 _('FILE')),
6408 ('d', 'daemon', None, _('run server in background')),
6411 ('d', 'daemon', None, _('run server in background')),
6409 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6412 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6410 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6413 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6411 # use string type, then we can check if something was passed
6414 # use string type, then we can check if something was passed
6412 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6415 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6413 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6416 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6414 _('ADDR')),
6417 _('ADDR')),
6415 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6418 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6416 _('PREFIX')),
6419 _('PREFIX')),
6417 ('n', 'name', '',
6420 ('n', 'name', '',
6418 _('name to show in web pages (default: working directory)'), _('NAME')),
6421 _('name to show in web pages (default: working directory)'), _('NAME')),
6419 ('', 'web-conf', '',
6422 ('', 'web-conf', '',
6420 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6423 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6421 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6424 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6422 _('FILE')),
6425 _('FILE')),
6423 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6426 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6424 ('', 'stdio', None, _('for remote clients')),
6427 ('', 'stdio', None, _('for remote clients')),
6425 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6428 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6426 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6429 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6427 ('', 'style', '', _('template style to use'), _('STYLE')),
6430 ('', 'style', '', _('template style to use'), _('STYLE')),
6428 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6431 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6429 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6432 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6430 _('[OPTION]...'),
6433 _('[OPTION]...'),
6431 optionalrepo=True)
6434 optionalrepo=True)
6432 def serve(ui, repo, **opts):
6435 def serve(ui, repo, **opts):
6433 """start stand-alone webserver
6436 """start stand-alone webserver
6434
6437
6435 Start a local HTTP repository browser and pull server. You can use
6438 Start a local HTTP repository browser and pull server. You can use
6436 this for ad-hoc sharing and browsing of repositories. It is
6439 this for ad-hoc sharing and browsing of repositories. It is
6437 recommended to use a real web server to serve a repository for
6440 recommended to use a real web server to serve a repository for
6438 longer periods of time.
6441 longer periods of time.
6439
6442
6440 Please note that the server does not implement access control.
6443 Please note that the server does not implement access control.
6441 This means that, by default, anybody can read from the server and
6444 This means that, by default, anybody can read from the server and
6442 nobody can write to it by default. Set the ``web.allow_push``
6445 nobody can write to it by default. Set the ``web.allow_push``
6443 option to ``*`` to allow everybody to push to the server. You
6446 option to ``*`` to allow everybody to push to the server. You
6444 should use a real web server if you need to authenticate users.
6447 should use a real web server if you need to authenticate users.
6445
6448
6446 By default, the server logs accesses to stdout and errors to
6449 By default, the server logs accesses to stdout and errors to
6447 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6450 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6448 files.
6451 files.
6449
6452
6450 To have the server choose a free port number to listen on, specify
6453 To have the server choose a free port number to listen on, specify
6451 a port number of 0; in this case, the server will print the port
6454 a port number of 0; in this case, the server will print the port
6452 number it uses.
6455 number it uses.
6453
6456
6454 Returns 0 on success.
6457 Returns 0 on success.
6455 """
6458 """
6456
6459
6457 if opts["stdio"] and opts["cmdserver"]:
6460 if opts["stdio"] and opts["cmdserver"]:
6458 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6461 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6459
6462
6460 if opts["stdio"]:
6463 if opts["stdio"]:
6461 if repo is None:
6464 if repo is None:
6462 raise error.RepoError(_("there is no Mercurial repository here"
6465 raise error.RepoError(_("there is no Mercurial repository here"
6463 " (.hg not found)"))
6466 " (.hg not found)"))
6464 s = sshserver.sshserver(ui, repo)
6467 s = sshserver.sshserver(ui, repo)
6465 s.serve_forever()
6468 s.serve_forever()
6466
6469
6467 if opts["cmdserver"]:
6470 if opts["cmdserver"]:
6468 service = commandserver.createservice(ui, repo, opts)
6471 service = commandserver.createservice(ui, repo, opts)
6469 else:
6472 else:
6470 service = hgweb.createservice(ui, repo, opts)
6473 service = hgweb.createservice(ui, repo, opts)
6471 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6474 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6472
6475
6473 @command('^status|st',
6476 @command('^status|st',
6474 [('A', 'all', None, _('show status of all files')),
6477 [('A', 'all', None, _('show status of all files')),
6475 ('m', 'modified', None, _('show only modified files')),
6478 ('m', 'modified', None, _('show only modified files')),
6476 ('a', 'added', None, _('show only added files')),
6479 ('a', 'added', None, _('show only added files')),
6477 ('r', 'removed', None, _('show only removed files')),
6480 ('r', 'removed', None, _('show only removed files')),
6478 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6481 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6479 ('c', 'clean', None, _('show only files without changes')),
6482 ('c', 'clean', None, _('show only files without changes')),
6480 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6483 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6481 ('i', 'ignored', None, _('show only ignored files')),
6484 ('i', 'ignored', None, _('show only ignored files')),
6482 ('n', 'no-status', None, _('hide status prefix')),
6485 ('n', 'no-status', None, _('hide status prefix')),
6483 ('C', 'copies', None, _('show source of copied files')),
6486 ('C', 'copies', None, _('show source of copied files')),
6484 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6487 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6485 ('', 'rev', [], _('show difference from revision'), _('REV')),
6488 ('', 'rev', [], _('show difference from revision'), _('REV')),
6486 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6489 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6487 ] + walkopts + subrepoopts + formatteropts,
6490 ] + walkopts + subrepoopts + formatteropts,
6488 _('[OPTION]... [FILE]...'),
6491 _('[OPTION]... [FILE]...'),
6489 inferrepo=True)
6492 inferrepo=True)
6490 def status(ui, repo, *pats, **opts):
6493 def status(ui, repo, *pats, **opts):
6491 """show changed files in the working directory
6494 """show changed files in the working directory
6492
6495
6493 Show status of files in the repository. If names are given, only
6496 Show status of files in the repository. If names are given, only
6494 files that match are shown. Files that are clean or ignored or
6497 files that match are shown. Files that are clean or ignored or
6495 the source of a copy/move operation, are not listed unless
6498 the source of a copy/move operation, are not listed unless
6496 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6499 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6497 Unless options described with "show only ..." are given, the
6500 Unless options described with "show only ..." are given, the
6498 options -mardu are used.
6501 options -mardu are used.
6499
6502
6500 Option -q/--quiet hides untracked (unknown and ignored) files
6503 Option -q/--quiet hides untracked (unknown and ignored) files
6501 unless explicitly requested with -u/--unknown or -i/--ignored.
6504 unless explicitly requested with -u/--unknown or -i/--ignored.
6502
6505
6503 .. note::
6506 .. note::
6504
6507
6505 :hg:`status` may appear to disagree with diff if permissions have
6508 :hg:`status` may appear to disagree with diff if permissions have
6506 changed or a merge has occurred. The standard diff format does
6509 changed or a merge has occurred. The standard diff format does
6507 not report permission changes and diff only reports changes
6510 not report permission changes and diff only reports changes
6508 relative to one merge parent.
6511 relative to one merge parent.
6509
6512
6510 If one revision is given, it is used as the base revision.
6513 If one revision is given, it is used as the base revision.
6511 If two revisions are given, the differences between them are
6514 If two revisions are given, the differences between them are
6512 shown. The --change option can also be used as a shortcut to list
6515 shown. The --change option can also be used as a shortcut to list
6513 the changed files of a revision from its first parent.
6516 the changed files of a revision from its first parent.
6514
6517
6515 The codes used to show the status of files are::
6518 The codes used to show the status of files are::
6516
6519
6517 M = modified
6520 M = modified
6518 A = added
6521 A = added
6519 R = removed
6522 R = removed
6520 C = clean
6523 C = clean
6521 ! = missing (deleted by non-hg command, but still tracked)
6524 ! = missing (deleted by non-hg command, but still tracked)
6522 ? = not tracked
6525 ? = not tracked
6523 I = ignored
6526 I = ignored
6524 = origin of the previous file (with --copies)
6527 = origin of the previous file (with --copies)
6525
6528
6526 .. container:: verbose
6529 .. container:: verbose
6527
6530
6528 Examples:
6531 Examples:
6529
6532
6530 - show changes in the working directory relative to a
6533 - show changes in the working directory relative to a
6531 changeset::
6534 changeset::
6532
6535
6533 hg status --rev 9353
6536 hg status --rev 9353
6534
6537
6535 - show changes in the working directory relative to the
6538 - show changes in the working directory relative to the
6536 current directory (see :hg:`help patterns` for more information)::
6539 current directory (see :hg:`help patterns` for more information)::
6537
6540
6538 hg status re:
6541 hg status re:
6539
6542
6540 - show all changes including copies in an existing changeset::
6543 - show all changes including copies in an existing changeset::
6541
6544
6542 hg status --copies --change 9353
6545 hg status --copies --change 9353
6543
6546
6544 - get a NUL separated list of added files, suitable for xargs::
6547 - get a NUL separated list of added files, suitable for xargs::
6545
6548
6546 hg status -an0
6549 hg status -an0
6547
6550
6548 Returns 0 on success.
6551 Returns 0 on success.
6549 """
6552 """
6550
6553
6551 revs = opts.get('rev')
6554 revs = opts.get('rev')
6552 change = opts.get('change')
6555 change = opts.get('change')
6553
6556
6554 if revs and change:
6557 if revs and change:
6555 msg = _('cannot specify --rev and --change at the same time')
6558 msg = _('cannot specify --rev and --change at the same time')
6556 raise error.Abort(msg)
6559 raise error.Abort(msg)
6557 elif change:
6560 elif change:
6558 node2 = scmutil.revsingle(repo, change, None).node()
6561 node2 = scmutil.revsingle(repo, change, None).node()
6559 node1 = repo[node2].p1().node()
6562 node1 = repo[node2].p1().node()
6560 else:
6563 else:
6561 node1, node2 = scmutil.revpair(repo, revs)
6564 node1, node2 = scmutil.revpair(repo, revs)
6562
6565
6563 if pats:
6566 if pats:
6564 cwd = repo.getcwd()
6567 cwd = repo.getcwd()
6565 else:
6568 else:
6566 cwd = ''
6569 cwd = ''
6567
6570
6568 if opts.get('print0'):
6571 if opts.get('print0'):
6569 end = '\0'
6572 end = '\0'
6570 else:
6573 else:
6571 end = '\n'
6574 end = '\n'
6572 copy = {}
6575 copy = {}
6573 states = 'modified added removed deleted unknown ignored clean'.split()
6576 states = 'modified added removed deleted unknown ignored clean'.split()
6574 show = [k for k in states if opts.get(k)]
6577 show = [k for k in states if opts.get(k)]
6575 if opts.get('all'):
6578 if opts.get('all'):
6576 show += ui.quiet and (states[:4] + ['clean']) or states
6579 show += ui.quiet and (states[:4] + ['clean']) or states
6577 if not show:
6580 if not show:
6578 if ui.quiet:
6581 if ui.quiet:
6579 show = states[:4]
6582 show = states[:4]
6580 else:
6583 else:
6581 show = states[:5]
6584 show = states[:5]
6582
6585
6583 m = scmutil.match(repo[node2], pats, opts)
6586 m = scmutil.match(repo[node2], pats, opts)
6584 stat = repo.status(node1, node2, m,
6587 stat = repo.status(node1, node2, m,
6585 'ignored' in show, 'clean' in show, 'unknown' in show,
6588 'ignored' in show, 'clean' in show, 'unknown' in show,
6586 opts.get('subrepos'))
6589 opts.get('subrepos'))
6587 changestates = zip(states, 'MAR!?IC', stat)
6590 changestates = zip(states, 'MAR!?IC', stat)
6588
6591
6589 if (opts.get('all') or opts.get('copies')
6592 if (opts.get('all') or opts.get('copies')
6590 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6593 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6591 copy = copies.pathcopies(repo[node1], repo[node2], m)
6594 copy = copies.pathcopies(repo[node1], repo[node2], m)
6592
6595
6593 fm = ui.formatter('status', opts)
6596 fm = ui.formatter('status', opts)
6594 fmt = '%s' + end
6597 fmt = '%s' + end
6595 showchar = not opts.get('no_status')
6598 showchar = not opts.get('no_status')
6596
6599
6597 for state, char, files in changestates:
6600 for state, char, files in changestates:
6598 if state in show:
6601 if state in show:
6599 label = 'status.' + state
6602 label = 'status.' + state
6600 for f in files:
6603 for f in files:
6601 fm.startitem()
6604 fm.startitem()
6602 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6605 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6603 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6606 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6604 if f in copy:
6607 if f in copy:
6605 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6608 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6606 label='status.copied')
6609 label='status.copied')
6607 fm.end()
6610 fm.end()
6608
6611
6609 @command('^summary|sum',
6612 @command('^summary|sum',
6610 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6613 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6611 def summary(ui, repo, **opts):
6614 def summary(ui, repo, **opts):
6612 """summarize working directory state
6615 """summarize working directory state
6613
6616
6614 This generates a brief summary of the working directory state,
6617 This generates a brief summary of the working directory state,
6615 including parents, branch, commit status, phase and available updates.
6618 including parents, branch, commit status, phase and available updates.
6616
6619
6617 With the --remote option, this will check the default paths for
6620 With the --remote option, this will check the default paths for
6618 incoming and outgoing changes. This can be time-consuming.
6621 incoming and outgoing changes. This can be time-consuming.
6619
6622
6620 Returns 0 on success.
6623 Returns 0 on success.
6621 """
6624 """
6622
6625
6623 ctx = repo[None]
6626 ctx = repo[None]
6624 parents = ctx.parents()
6627 parents = ctx.parents()
6625 pnode = parents[0].node()
6628 pnode = parents[0].node()
6626 marks = []
6629 marks = []
6627
6630
6628 ms = None
6631 ms = None
6629 try:
6632 try:
6630 ms = mergemod.mergestate.read(repo)
6633 ms = mergemod.mergestate.read(repo)
6631 except error.UnsupportedMergeRecords as e:
6634 except error.UnsupportedMergeRecords as e:
6632 s = ' '.join(e.recordtypes)
6635 s = ' '.join(e.recordtypes)
6633 ui.warn(
6636 ui.warn(
6634 _('warning: merge state has unsupported record types: %s\n') % s)
6637 _('warning: merge state has unsupported record types: %s\n') % s)
6635 unresolved = 0
6638 unresolved = 0
6636 else:
6639 else:
6637 unresolved = [f for f in ms if ms[f] == 'u']
6640 unresolved = [f for f in ms if ms[f] == 'u']
6638
6641
6639 for p in parents:
6642 for p in parents:
6640 # label with log.changeset (instead of log.parent) since this
6643 # label with log.changeset (instead of log.parent) since this
6641 # shows a working directory parent *changeset*:
6644 # shows a working directory parent *changeset*:
6642 # i18n: column positioning for "hg summary"
6645 # i18n: column positioning for "hg summary"
6643 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6646 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6644 label='log.changeset changeset.%s' % p.phasestr())
6647 label='log.changeset changeset.%s' % p.phasestr())
6645 ui.write(' '.join(p.tags()), label='log.tag')
6648 ui.write(' '.join(p.tags()), label='log.tag')
6646 if p.bookmarks():
6649 if p.bookmarks():
6647 marks.extend(p.bookmarks())
6650 marks.extend(p.bookmarks())
6648 if p.rev() == -1:
6651 if p.rev() == -1:
6649 if not len(repo):
6652 if not len(repo):
6650 ui.write(_(' (empty repository)'))
6653 ui.write(_(' (empty repository)'))
6651 else:
6654 else:
6652 ui.write(_(' (no revision checked out)'))
6655 ui.write(_(' (no revision checked out)'))
6653 ui.write('\n')
6656 ui.write('\n')
6654 if p.description():
6657 if p.description():
6655 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6658 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6656 label='log.summary')
6659 label='log.summary')
6657
6660
6658 branch = ctx.branch()
6661 branch = ctx.branch()
6659 bheads = repo.branchheads(branch)
6662 bheads = repo.branchheads(branch)
6660 # i18n: column positioning for "hg summary"
6663 # i18n: column positioning for "hg summary"
6661 m = _('branch: %s\n') % branch
6664 m = _('branch: %s\n') % branch
6662 if branch != 'default':
6665 if branch != 'default':
6663 ui.write(m, label='log.branch')
6666 ui.write(m, label='log.branch')
6664 else:
6667 else:
6665 ui.status(m, label='log.branch')
6668 ui.status(m, label='log.branch')
6666
6669
6667 if marks:
6670 if marks:
6668 active = repo._activebookmark
6671 active = repo._activebookmark
6669 # i18n: column positioning for "hg summary"
6672 # i18n: column positioning for "hg summary"
6670 ui.write(_('bookmarks:'), label='log.bookmark')
6673 ui.write(_('bookmarks:'), label='log.bookmark')
6671 if active is not None:
6674 if active is not None:
6672 if active in marks:
6675 if active in marks:
6673 ui.write(' *' + active, label=activebookmarklabel)
6676 ui.write(' *' + active, label=activebookmarklabel)
6674 marks.remove(active)
6677 marks.remove(active)
6675 else:
6678 else:
6676 ui.write(' [%s]' % active, label=activebookmarklabel)
6679 ui.write(' [%s]' % active, label=activebookmarklabel)
6677 for m in marks:
6680 for m in marks:
6678 ui.write(' ' + m, label='log.bookmark')
6681 ui.write(' ' + m, label='log.bookmark')
6679 ui.write('\n', label='log.bookmark')
6682 ui.write('\n', label='log.bookmark')
6680
6683
6681 status = repo.status(unknown=True)
6684 status = repo.status(unknown=True)
6682
6685
6683 c = repo.dirstate.copies()
6686 c = repo.dirstate.copies()
6684 copied, renamed = [], []
6687 copied, renamed = [], []
6685 for d, s in c.iteritems():
6688 for d, s in c.iteritems():
6686 if s in status.removed:
6689 if s in status.removed:
6687 status.removed.remove(s)
6690 status.removed.remove(s)
6688 renamed.append(d)
6691 renamed.append(d)
6689 else:
6692 else:
6690 copied.append(d)
6693 copied.append(d)
6691 if d in status.added:
6694 if d in status.added:
6692 status.added.remove(d)
6695 status.added.remove(d)
6693
6696
6694 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6697 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6695
6698
6696 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6699 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6697 (ui.label(_('%d added'), 'status.added'), status.added),
6700 (ui.label(_('%d added'), 'status.added'), status.added),
6698 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6701 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6699 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6702 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6700 (ui.label(_('%d copied'), 'status.copied'), copied),
6703 (ui.label(_('%d copied'), 'status.copied'), copied),
6701 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6704 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6702 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6705 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6703 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6706 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6704 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6707 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6705 t = []
6708 t = []
6706 for l, s in labels:
6709 for l, s in labels:
6707 if s:
6710 if s:
6708 t.append(l % len(s))
6711 t.append(l % len(s))
6709
6712
6710 t = ', '.join(t)
6713 t = ', '.join(t)
6711 cleanworkdir = False
6714 cleanworkdir = False
6712
6715
6713 if repo.vfs.exists('graftstate'):
6716 if repo.vfs.exists('graftstate'):
6714 t += _(' (graft in progress)')
6717 t += _(' (graft in progress)')
6715 if repo.vfs.exists('updatestate'):
6718 if repo.vfs.exists('updatestate'):
6716 t += _(' (interrupted update)')
6719 t += _(' (interrupted update)')
6717 elif len(parents) > 1:
6720 elif len(parents) > 1:
6718 t += _(' (merge)')
6721 t += _(' (merge)')
6719 elif branch != parents[0].branch():
6722 elif branch != parents[0].branch():
6720 t += _(' (new branch)')
6723 t += _(' (new branch)')
6721 elif (parents[0].closesbranch() and
6724 elif (parents[0].closesbranch() and
6722 pnode in repo.branchheads(branch, closed=True)):
6725 pnode in repo.branchheads(branch, closed=True)):
6723 t += _(' (head closed)')
6726 t += _(' (head closed)')
6724 elif not (status.modified or status.added or status.removed or renamed or
6727 elif not (status.modified or status.added or status.removed or renamed or
6725 copied or subs):
6728 copied or subs):
6726 t += _(' (clean)')
6729 t += _(' (clean)')
6727 cleanworkdir = True
6730 cleanworkdir = True
6728 elif pnode not in bheads:
6731 elif pnode not in bheads:
6729 t += _(' (new branch head)')
6732 t += _(' (new branch head)')
6730
6733
6731 if parents:
6734 if parents:
6732 pendingphase = max(p.phase() for p in parents)
6735 pendingphase = max(p.phase() for p in parents)
6733 else:
6736 else:
6734 pendingphase = phases.public
6737 pendingphase = phases.public
6735
6738
6736 if pendingphase > phases.newcommitphase(ui):
6739 if pendingphase > phases.newcommitphase(ui):
6737 t += ' (%s)' % phases.phasenames[pendingphase]
6740 t += ' (%s)' % phases.phasenames[pendingphase]
6738
6741
6739 if cleanworkdir:
6742 if cleanworkdir:
6740 # i18n: column positioning for "hg summary"
6743 # i18n: column positioning for "hg summary"
6741 ui.status(_('commit: %s\n') % t.strip())
6744 ui.status(_('commit: %s\n') % t.strip())
6742 else:
6745 else:
6743 # i18n: column positioning for "hg summary"
6746 # i18n: column positioning for "hg summary"
6744 ui.write(_('commit: %s\n') % t.strip())
6747 ui.write(_('commit: %s\n') % t.strip())
6745
6748
6746 # all ancestors of branch heads - all ancestors of parent = new csets
6749 # all ancestors of branch heads - all ancestors of parent = new csets
6747 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6750 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6748 bheads))
6751 bheads))
6749
6752
6750 if new == 0:
6753 if new == 0:
6751 # i18n: column positioning for "hg summary"
6754 # i18n: column positioning for "hg summary"
6752 ui.status(_('update: (current)\n'))
6755 ui.status(_('update: (current)\n'))
6753 elif pnode not in bheads:
6756 elif pnode not in bheads:
6754 # i18n: column positioning for "hg summary"
6757 # i18n: column positioning for "hg summary"
6755 ui.write(_('update: %d new changesets (update)\n') % new)
6758 ui.write(_('update: %d new changesets (update)\n') % new)
6756 else:
6759 else:
6757 # i18n: column positioning for "hg summary"
6760 # i18n: column positioning for "hg summary"
6758 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6761 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6759 (new, len(bheads)))
6762 (new, len(bheads)))
6760
6763
6761 t = []
6764 t = []
6762 draft = len(repo.revs('draft()'))
6765 draft = len(repo.revs('draft()'))
6763 if draft:
6766 if draft:
6764 t.append(_('%d draft') % draft)
6767 t.append(_('%d draft') % draft)
6765 secret = len(repo.revs('secret()'))
6768 secret = len(repo.revs('secret()'))
6766 if secret:
6769 if secret:
6767 t.append(_('%d secret') % secret)
6770 t.append(_('%d secret') % secret)
6768
6771
6769 if draft or secret:
6772 if draft or secret:
6770 ui.status(_('phases: %s\n') % ', '.join(t))
6773 ui.status(_('phases: %s\n') % ', '.join(t))
6771
6774
6772 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6775 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6773 for trouble in ("unstable", "divergent", "bumped"):
6776 for trouble in ("unstable", "divergent", "bumped"):
6774 numtrouble = len(repo.revs(trouble + "()"))
6777 numtrouble = len(repo.revs(trouble + "()"))
6775 # We write all the possibilities to ease translation
6778 # We write all the possibilities to ease translation
6776 troublemsg = {
6779 troublemsg = {
6777 "unstable": _("unstable: %d changesets"),
6780 "unstable": _("unstable: %d changesets"),
6778 "divergent": _("divergent: %d changesets"),
6781 "divergent": _("divergent: %d changesets"),
6779 "bumped": _("bumped: %d changesets"),
6782 "bumped": _("bumped: %d changesets"),
6780 }
6783 }
6781 if numtrouble > 0:
6784 if numtrouble > 0:
6782 ui.status(troublemsg[trouble] % numtrouble + "\n")
6785 ui.status(troublemsg[trouble] % numtrouble + "\n")
6783
6786
6784 cmdutil.summaryhooks(ui, repo)
6787 cmdutil.summaryhooks(ui, repo)
6785
6788
6786 if opts.get('remote'):
6789 if opts.get('remote'):
6787 needsincoming, needsoutgoing = True, True
6790 needsincoming, needsoutgoing = True, True
6788 else:
6791 else:
6789 needsincoming, needsoutgoing = False, False
6792 needsincoming, needsoutgoing = False, False
6790 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6793 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6791 if i:
6794 if i:
6792 needsincoming = True
6795 needsincoming = True
6793 if o:
6796 if o:
6794 needsoutgoing = True
6797 needsoutgoing = True
6795 if not needsincoming and not needsoutgoing:
6798 if not needsincoming and not needsoutgoing:
6796 return
6799 return
6797
6800
6798 def getincoming():
6801 def getincoming():
6799 source, branches = hg.parseurl(ui.expandpath('default'))
6802 source, branches = hg.parseurl(ui.expandpath('default'))
6800 sbranch = branches[0]
6803 sbranch = branches[0]
6801 try:
6804 try:
6802 other = hg.peer(repo, {}, source)
6805 other = hg.peer(repo, {}, source)
6803 except error.RepoError:
6806 except error.RepoError:
6804 if opts.get('remote'):
6807 if opts.get('remote'):
6805 raise
6808 raise
6806 return source, sbranch, None, None, None
6809 return source, sbranch, None, None, None
6807 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6810 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6808 if revs:
6811 if revs:
6809 revs = [other.lookup(rev) for rev in revs]
6812 revs = [other.lookup(rev) for rev in revs]
6810 ui.debug('comparing with %s\n' % util.hidepassword(source))
6813 ui.debug('comparing with %s\n' % util.hidepassword(source))
6811 repo.ui.pushbuffer()
6814 repo.ui.pushbuffer()
6812 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6815 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6813 repo.ui.popbuffer()
6816 repo.ui.popbuffer()
6814 return source, sbranch, other, commoninc, commoninc[1]
6817 return source, sbranch, other, commoninc, commoninc[1]
6815
6818
6816 if needsincoming:
6819 if needsincoming:
6817 source, sbranch, sother, commoninc, incoming = getincoming()
6820 source, sbranch, sother, commoninc, incoming = getincoming()
6818 else:
6821 else:
6819 source = sbranch = sother = commoninc = incoming = None
6822 source = sbranch = sother = commoninc = incoming = None
6820
6823
6821 def getoutgoing():
6824 def getoutgoing():
6822 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6825 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6823 dbranch = branches[0]
6826 dbranch = branches[0]
6824 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6827 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6825 if source != dest:
6828 if source != dest:
6826 try:
6829 try:
6827 dother = hg.peer(repo, {}, dest)
6830 dother = hg.peer(repo, {}, dest)
6828 except error.RepoError:
6831 except error.RepoError:
6829 if opts.get('remote'):
6832 if opts.get('remote'):
6830 raise
6833 raise
6831 return dest, dbranch, None, None
6834 return dest, dbranch, None, None
6832 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6835 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6833 elif sother is None:
6836 elif sother is None:
6834 # there is no explicit destination peer, but source one is invalid
6837 # there is no explicit destination peer, but source one is invalid
6835 return dest, dbranch, None, None
6838 return dest, dbranch, None, None
6836 else:
6839 else:
6837 dother = sother
6840 dother = sother
6838 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6841 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6839 common = None
6842 common = None
6840 else:
6843 else:
6841 common = commoninc
6844 common = commoninc
6842 if revs:
6845 if revs:
6843 revs = [repo.lookup(rev) for rev in revs]
6846 revs = [repo.lookup(rev) for rev in revs]
6844 repo.ui.pushbuffer()
6847 repo.ui.pushbuffer()
6845 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6848 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6846 commoninc=common)
6849 commoninc=common)
6847 repo.ui.popbuffer()
6850 repo.ui.popbuffer()
6848 return dest, dbranch, dother, outgoing
6851 return dest, dbranch, dother, outgoing
6849
6852
6850 if needsoutgoing:
6853 if needsoutgoing:
6851 dest, dbranch, dother, outgoing = getoutgoing()
6854 dest, dbranch, dother, outgoing = getoutgoing()
6852 else:
6855 else:
6853 dest = dbranch = dother = outgoing = None
6856 dest = dbranch = dother = outgoing = None
6854
6857
6855 if opts.get('remote'):
6858 if opts.get('remote'):
6856 t = []
6859 t = []
6857 if incoming:
6860 if incoming:
6858 t.append(_('1 or more incoming'))
6861 t.append(_('1 or more incoming'))
6859 o = outgoing.missing
6862 o = outgoing.missing
6860 if o:
6863 if o:
6861 t.append(_('%d outgoing') % len(o))
6864 t.append(_('%d outgoing') % len(o))
6862 other = dother or sother
6865 other = dother or sother
6863 if 'bookmarks' in other.listkeys('namespaces'):
6866 if 'bookmarks' in other.listkeys('namespaces'):
6864 counts = bookmarks.summary(repo, other)
6867 counts = bookmarks.summary(repo, other)
6865 if counts[0] > 0:
6868 if counts[0] > 0:
6866 t.append(_('%d incoming bookmarks') % counts[0])
6869 t.append(_('%d incoming bookmarks') % counts[0])
6867 if counts[1] > 0:
6870 if counts[1] > 0:
6868 t.append(_('%d outgoing bookmarks') % counts[1])
6871 t.append(_('%d outgoing bookmarks') % counts[1])
6869
6872
6870 if t:
6873 if t:
6871 # i18n: column positioning for "hg summary"
6874 # i18n: column positioning for "hg summary"
6872 ui.write(_('remote: %s\n') % (', '.join(t)))
6875 ui.write(_('remote: %s\n') % (', '.join(t)))
6873 else:
6876 else:
6874 # i18n: column positioning for "hg summary"
6877 # i18n: column positioning for "hg summary"
6875 ui.status(_('remote: (synced)\n'))
6878 ui.status(_('remote: (synced)\n'))
6876
6879
6877 cmdutil.summaryremotehooks(ui, repo, opts,
6880 cmdutil.summaryremotehooks(ui, repo, opts,
6878 ((source, sbranch, sother, commoninc),
6881 ((source, sbranch, sother, commoninc),
6879 (dest, dbranch, dother, outgoing)))
6882 (dest, dbranch, dother, outgoing)))
6880
6883
6881 @command('tag',
6884 @command('tag',
6882 [('f', 'force', None, _('force tag')),
6885 [('f', 'force', None, _('force tag')),
6883 ('l', 'local', None, _('make the tag local')),
6886 ('l', 'local', None, _('make the tag local')),
6884 ('r', 'rev', '', _('revision to tag'), _('REV')),
6887 ('r', 'rev', '', _('revision to tag'), _('REV')),
6885 ('', 'remove', None, _('remove a tag')),
6888 ('', 'remove', None, _('remove a tag')),
6886 # -l/--local is already there, commitopts cannot be used
6889 # -l/--local is already there, commitopts cannot be used
6887 ('e', 'edit', None, _('invoke editor on commit messages')),
6890 ('e', 'edit', None, _('invoke editor on commit messages')),
6888 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6891 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6889 ] + commitopts2,
6892 ] + commitopts2,
6890 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6893 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6891 def tag(ui, repo, name1, *names, **opts):
6894 def tag(ui, repo, name1, *names, **opts):
6892 """add one or more tags for the current or given revision
6895 """add one or more tags for the current or given revision
6893
6896
6894 Name a particular revision using <name>.
6897 Name a particular revision using <name>.
6895
6898
6896 Tags are used to name particular revisions of the repository and are
6899 Tags are used to name particular revisions of the repository and are
6897 very useful to compare different revisions, to go back to significant
6900 very useful to compare different revisions, to go back to significant
6898 earlier versions or to mark branch points as releases, etc. Changing
6901 earlier versions or to mark branch points as releases, etc. Changing
6899 an existing tag is normally disallowed; use -f/--force to override.
6902 an existing tag is normally disallowed; use -f/--force to override.
6900
6903
6901 If no revision is given, the parent of the working directory is
6904 If no revision is given, the parent of the working directory is
6902 used.
6905 used.
6903
6906
6904 To facilitate version control, distribution, and merging of tags,
6907 To facilitate version control, distribution, and merging of tags,
6905 they are stored as a file named ".hgtags" which is managed similarly
6908 they are stored as a file named ".hgtags" which is managed similarly
6906 to other project files and can be hand-edited if necessary. This
6909 to other project files and can be hand-edited if necessary. This
6907 also means that tagging creates a new commit. The file
6910 also means that tagging creates a new commit. The file
6908 ".hg/localtags" is used for local tags (not shared among
6911 ".hg/localtags" is used for local tags (not shared among
6909 repositories).
6912 repositories).
6910
6913
6911 Tag commits are usually made at the head of a branch. If the parent
6914 Tag commits are usually made at the head of a branch. If the parent
6912 of the working directory is not a branch head, :hg:`tag` aborts; use
6915 of the working directory is not a branch head, :hg:`tag` aborts; use
6913 -f/--force to force the tag commit to be based on a non-head
6916 -f/--force to force the tag commit to be based on a non-head
6914 changeset.
6917 changeset.
6915
6918
6916 See :hg:`help dates` for a list of formats valid for -d/--date.
6919 See :hg:`help dates` for a list of formats valid for -d/--date.
6917
6920
6918 Since tag names have priority over branch names during revision
6921 Since tag names have priority over branch names during revision
6919 lookup, using an existing branch name as a tag name is discouraged.
6922 lookup, using an existing branch name as a tag name is discouraged.
6920
6923
6921 Returns 0 on success.
6924 Returns 0 on success.
6922 """
6925 """
6923 wlock = lock = None
6926 wlock = lock = None
6924 try:
6927 try:
6925 wlock = repo.wlock()
6928 wlock = repo.wlock()
6926 lock = repo.lock()
6929 lock = repo.lock()
6927 rev_ = "."
6930 rev_ = "."
6928 names = [t.strip() for t in (name1,) + names]
6931 names = [t.strip() for t in (name1,) + names]
6929 if len(names) != len(set(names)):
6932 if len(names) != len(set(names)):
6930 raise error.Abort(_('tag names must be unique'))
6933 raise error.Abort(_('tag names must be unique'))
6931 for n in names:
6934 for n in names:
6932 scmutil.checknewlabel(repo, n, 'tag')
6935 scmutil.checknewlabel(repo, n, 'tag')
6933 if not n:
6936 if not n:
6934 raise error.Abort(_('tag names cannot consist entirely of '
6937 raise error.Abort(_('tag names cannot consist entirely of '
6935 'whitespace'))
6938 'whitespace'))
6936 if opts.get('rev') and opts.get('remove'):
6939 if opts.get('rev') and opts.get('remove'):
6937 raise error.Abort(_("--rev and --remove are incompatible"))
6940 raise error.Abort(_("--rev and --remove are incompatible"))
6938 if opts.get('rev'):
6941 if opts.get('rev'):
6939 rev_ = opts['rev']
6942 rev_ = opts['rev']
6940 message = opts.get('message')
6943 message = opts.get('message')
6941 if opts.get('remove'):
6944 if opts.get('remove'):
6942 if opts.get('local'):
6945 if opts.get('local'):
6943 expectedtype = 'local'
6946 expectedtype = 'local'
6944 else:
6947 else:
6945 expectedtype = 'global'
6948 expectedtype = 'global'
6946
6949
6947 for n in names:
6950 for n in names:
6948 if not repo.tagtype(n):
6951 if not repo.tagtype(n):
6949 raise error.Abort(_("tag '%s' does not exist") % n)
6952 raise error.Abort(_("tag '%s' does not exist") % n)
6950 if repo.tagtype(n) != expectedtype:
6953 if repo.tagtype(n) != expectedtype:
6951 if expectedtype == 'global':
6954 if expectedtype == 'global':
6952 raise error.Abort(_("tag '%s' is not a global tag") % n)
6955 raise error.Abort(_("tag '%s' is not a global tag") % n)
6953 else:
6956 else:
6954 raise error.Abort(_("tag '%s' is not a local tag") % n)
6957 raise error.Abort(_("tag '%s' is not a local tag") % n)
6955 rev_ = 'null'
6958 rev_ = 'null'
6956 if not message:
6959 if not message:
6957 # we don't translate commit messages
6960 # we don't translate commit messages
6958 message = 'Removed tag %s' % ', '.join(names)
6961 message = 'Removed tag %s' % ', '.join(names)
6959 elif not opts.get('force'):
6962 elif not opts.get('force'):
6960 for n in names:
6963 for n in names:
6961 if n in repo.tags():
6964 if n in repo.tags():
6962 raise error.Abort(_("tag '%s' already exists "
6965 raise error.Abort(_("tag '%s' already exists "
6963 "(use -f to force)") % n)
6966 "(use -f to force)") % n)
6964 if not opts.get('local'):
6967 if not opts.get('local'):
6965 p1, p2 = repo.dirstate.parents()
6968 p1, p2 = repo.dirstate.parents()
6966 if p2 != nullid:
6969 if p2 != nullid:
6967 raise error.Abort(_('uncommitted merge'))
6970 raise error.Abort(_('uncommitted merge'))
6968 bheads = repo.branchheads()
6971 bheads = repo.branchheads()
6969 if not opts.get('force') and bheads and p1 not in bheads:
6972 if not opts.get('force') and bheads and p1 not in bheads:
6970 raise error.Abort(_('not at a branch head (use -f to force)'))
6973 raise error.Abort(_('not at a branch head (use -f to force)'))
6971 r = scmutil.revsingle(repo, rev_).node()
6974 r = scmutil.revsingle(repo, rev_).node()
6972
6975
6973 if not message:
6976 if not message:
6974 # we don't translate commit messages
6977 # we don't translate commit messages
6975 message = ('Added tag %s for changeset %s' %
6978 message = ('Added tag %s for changeset %s' %
6976 (', '.join(names), short(r)))
6979 (', '.join(names), short(r)))
6977
6980
6978 date = opts.get('date')
6981 date = opts.get('date')
6979 if date:
6982 if date:
6980 date = util.parsedate(date)
6983 date = util.parsedate(date)
6981
6984
6982 if opts.get('remove'):
6985 if opts.get('remove'):
6983 editform = 'tag.remove'
6986 editform = 'tag.remove'
6984 else:
6987 else:
6985 editform = 'tag.add'
6988 editform = 'tag.add'
6986 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6989 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6987
6990
6988 # don't allow tagging the null rev
6991 # don't allow tagging the null rev
6989 if (not opts.get('remove') and
6992 if (not opts.get('remove') and
6990 scmutil.revsingle(repo, rev_).rev() == nullrev):
6993 scmutil.revsingle(repo, rev_).rev() == nullrev):
6991 raise error.Abort(_("cannot tag null revision"))
6994 raise error.Abort(_("cannot tag null revision"))
6992
6995
6993 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6996 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6994 editor=editor)
6997 editor=editor)
6995 finally:
6998 finally:
6996 release(lock, wlock)
6999 release(lock, wlock)
6997
7000
6998 @command('tags', formatteropts, '')
7001 @command('tags', formatteropts, '')
6999 def tags(ui, repo, **opts):
7002 def tags(ui, repo, **opts):
7000 """list repository tags
7003 """list repository tags
7001
7004
7002 This lists both regular and local tags. When the -v/--verbose
7005 This lists both regular and local tags. When the -v/--verbose
7003 switch is used, a third column "local" is printed for local tags.
7006 switch is used, a third column "local" is printed for local tags.
7004 When the -q/--quiet switch is used, only the tag name is printed.
7007 When the -q/--quiet switch is used, only the tag name is printed.
7005
7008
7006 Returns 0 on success.
7009 Returns 0 on success.
7007 """
7010 """
7008
7011
7009 fm = ui.formatter('tags', opts)
7012 fm = ui.formatter('tags', opts)
7010 hexfunc = fm.hexfunc
7013 hexfunc = fm.hexfunc
7011 tagtype = ""
7014 tagtype = ""
7012
7015
7013 for t, n in reversed(repo.tagslist()):
7016 for t, n in reversed(repo.tagslist()):
7014 hn = hexfunc(n)
7017 hn = hexfunc(n)
7015 label = 'tags.normal'
7018 label = 'tags.normal'
7016 tagtype = ''
7019 tagtype = ''
7017 if repo.tagtype(t) == 'local':
7020 if repo.tagtype(t) == 'local':
7018 label = 'tags.local'
7021 label = 'tags.local'
7019 tagtype = 'local'
7022 tagtype = 'local'
7020
7023
7021 fm.startitem()
7024 fm.startitem()
7022 fm.write('tag', '%s', t, label=label)
7025 fm.write('tag', '%s', t, label=label)
7023 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7026 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7024 fm.condwrite(not ui.quiet, 'rev node', fmt,
7027 fm.condwrite(not ui.quiet, 'rev node', fmt,
7025 repo.changelog.rev(n), hn, label=label)
7028 repo.changelog.rev(n), hn, label=label)
7026 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7029 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7027 tagtype, label=label)
7030 tagtype, label=label)
7028 fm.plain('\n')
7031 fm.plain('\n')
7029 fm.end()
7032 fm.end()
7030
7033
7031 @command('tip',
7034 @command('tip',
7032 [('p', 'patch', None, _('show patch')),
7035 [('p', 'patch', None, _('show patch')),
7033 ('g', 'git', None, _('use git extended diff format')),
7036 ('g', 'git', None, _('use git extended diff format')),
7034 ] + templateopts,
7037 ] + templateopts,
7035 _('[-p] [-g]'))
7038 _('[-p] [-g]'))
7036 def tip(ui, repo, **opts):
7039 def tip(ui, repo, **opts):
7037 """show the tip revision (DEPRECATED)
7040 """show the tip revision (DEPRECATED)
7038
7041
7039 The tip revision (usually just called the tip) is the changeset
7042 The tip revision (usually just called the tip) is the changeset
7040 most recently added to the repository (and therefore the most
7043 most recently added to the repository (and therefore the most
7041 recently changed head).
7044 recently changed head).
7042
7045
7043 If you have just made a commit, that commit will be the tip. If
7046 If you have just made a commit, that commit will be the tip. If
7044 you have just pulled changes from another repository, the tip of
7047 you have just pulled changes from another repository, the tip of
7045 that repository becomes the current tip. The "tip" tag is special
7048 that repository becomes the current tip. The "tip" tag is special
7046 and cannot be renamed or assigned to a different changeset.
7049 and cannot be renamed or assigned to a different changeset.
7047
7050
7048 This command is deprecated, please use :hg:`heads` instead.
7051 This command is deprecated, please use :hg:`heads` instead.
7049
7052
7050 Returns 0 on success.
7053 Returns 0 on success.
7051 """
7054 """
7052 displayer = cmdutil.show_changeset(ui, repo, opts)
7055 displayer = cmdutil.show_changeset(ui, repo, opts)
7053 displayer.show(repo['tip'])
7056 displayer.show(repo['tip'])
7054 displayer.close()
7057 displayer.close()
7055
7058
7056 @command('unbundle',
7059 @command('unbundle',
7057 [('u', 'update', None,
7060 [('u', 'update', None,
7058 _('update to new branch head if changesets were unbundled'))],
7061 _('update to new branch head if changesets were unbundled'))],
7059 _('[-u] FILE...'))
7062 _('[-u] FILE...'))
7060 def unbundle(ui, repo, fname1, *fnames, **opts):
7063 def unbundle(ui, repo, fname1, *fnames, **opts):
7061 """apply one or more changegroup files
7064 """apply one or more changegroup files
7062
7065
7063 Apply one or more compressed changegroup files generated by the
7066 Apply one or more compressed changegroup files generated by the
7064 bundle command.
7067 bundle command.
7065
7068
7066 Returns 0 on success, 1 if an update has unresolved files.
7069 Returns 0 on success, 1 if an update has unresolved files.
7067 """
7070 """
7068 fnames = (fname1,) + fnames
7071 fnames = (fname1,) + fnames
7069
7072
7070 with repo.lock():
7073 with repo.lock():
7071 for fname in fnames:
7074 for fname in fnames:
7072 f = hg.openpath(ui, fname)
7075 f = hg.openpath(ui, fname)
7073 gen = exchange.readbundle(ui, f, fname)
7076 gen = exchange.readbundle(ui, f, fname)
7074 if isinstance(gen, bundle2.unbundle20):
7077 if isinstance(gen, bundle2.unbundle20):
7075 tr = repo.transaction('unbundle')
7078 tr = repo.transaction('unbundle')
7076 try:
7079 try:
7077 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7080 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7078 url='bundle:' + fname)
7081 url='bundle:' + fname)
7079 tr.close()
7082 tr.close()
7080 except error.BundleUnknownFeatureError as exc:
7083 except error.BundleUnknownFeatureError as exc:
7081 raise error.Abort(_('%s: unknown bundle feature, %s')
7084 raise error.Abort(_('%s: unknown bundle feature, %s')
7082 % (fname, exc),
7085 % (fname, exc),
7083 hint=_("see https://mercurial-scm.org/"
7086 hint=_("see https://mercurial-scm.org/"
7084 "wiki/BundleFeature for more "
7087 "wiki/BundleFeature for more "
7085 "information"))
7088 "information"))
7086 finally:
7089 finally:
7087 if tr:
7090 if tr:
7088 tr.release()
7091 tr.release()
7089 changes = [r.get('return', 0)
7092 changes = [r.get('return', 0)
7090 for r in op.records['changegroup']]
7093 for r in op.records['changegroup']]
7091 modheads = changegroup.combineresults(changes)
7094 modheads = changegroup.combineresults(changes)
7092 elif isinstance(gen, streamclone.streamcloneapplier):
7095 elif isinstance(gen, streamclone.streamcloneapplier):
7093 raise error.Abort(
7096 raise error.Abort(
7094 _('packed bundles cannot be applied with '
7097 _('packed bundles cannot be applied with '
7095 '"hg unbundle"'),
7098 '"hg unbundle"'),
7096 hint=_('use "hg debugapplystreamclonebundle"'))
7099 hint=_('use "hg debugapplystreamclonebundle"'))
7097 else:
7100 else:
7098 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7101 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7099
7102
7100 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7103 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7101
7104
7102 @command('^update|up|checkout|co',
7105 @command('^update|up|checkout|co',
7103 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7106 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7104 ('c', 'check', None, _('require clean working directory')),
7107 ('c', 'check', None, _('require clean working directory')),
7105 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7108 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7106 ('r', 'rev', '', _('revision'), _('REV'))
7109 ('r', 'rev', '', _('revision'), _('REV'))
7107 ] + mergetoolopts,
7110 ] + mergetoolopts,
7108 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7111 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7109 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7112 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7110 tool=None):
7113 tool=None):
7111 """update working directory (or switch revisions)
7114 """update working directory (or switch revisions)
7112
7115
7113 Update the repository's working directory to the specified
7116 Update the repository's working directory to the specified
7114 changeset. If no changeset is specified, update to the tip of the
7117 changeset. If no changeset is specified, update to the tip of the
7115 current named branch and move the active bookmark (see :hg:`help
7118 current named branch and move the active bookmark (see :hg:`help
7116 bookmarks`).
7119 bookmarks`).
7117
7120
7118 Update sets the working directory's parent revision to the specified
7121 Update sets the working directory's parent revision to the specified
7119 changeset (see :hg:`help parents`).
7122 changeset (see :hg:`help parents`).
7120
7123
7121 If the changeset is not a descendant or ancestor of the working
7124 If the changeset is not a descendant or ancestor of the working
7122 directory's parent, the update is aborted. With the -c/--check
7125 directory's parent, the update is aborted. With the -c/--check
7123 option, the working directory is checked for uncommitted changes; if
7126 option, the working directory is checked for uncommitted changes; if
7124 none are found, the working directory is updated to the specified
7127 none are found, the working directory is updated to the specified
7125 changeset.
7128 changeset.
7126
7129
7127 .. container:: verbose
7130 .. container:: verbose
7128
7131
7129 The following rules apply when the working directory contains
7132 The following rules apply when the working directory contains
7130 uncommitted changes:
7133 uncommitted changes:
7131
7134
7132 1. If neither -c/--check nor -C/--clean is specified, and if
7135 1. If neither -c/--check nor -C/--clean is specified, and if
7133 the requested changeset is an ancestor or descendant of
7136 the requested changeset is an ancestor or descendant of
7134 the working directory's parent, the uncommitted changes
7137 the working directory's parent, the uncommitted changes
7135 are merged into the requested changeset and the merged
7138 are merged into the requested changeset and the merged
7136 result is left uncommitted. If the requested changeset is
7139 result is left uncommitted. If the requested changeset is
7137 not an ancestor or descendant (that is, it is on another
7140 not an ancestor or descendant (that is, it is on another
7138 branch), the update is aborted and the uncommitted changes
7141 branch), the update is aborted and the uncommitted changes
7139 are preserved.
7142 are preserved.
7140
7143
7141 2. With the -c/--check option, the update is aborted and the
7144 2. With the -c/--check option, the update is aborted and the
7142 uncommitted changes are preserved.
7145 uncommitted changes are preserved.
7143
7146
7144 3. With the -C/--clean option, uncommitted changes are discarded and
7147 3. With the -C/--clean option, uncommitted changes are discarded and
7145 the working directory is updated to the requested changeset.
7148 the working directory is updated to the requested changeset.
7146
7149
7147 To cancel an uncommitted merge (and lose your changes), use
7150 To cancel an uncommitted merge (and lose your changes), use
7148 :hg:`update --clean .`.
7151 :hg:`update --clean .`.
7149
7152
7150 Use null as the changeset to remove the working directory (like
7153 Use null as the changeset to remove the working directory (like
7151 :hg:`clone -U`).
7154 :hg:`clone -U`).
7152
7155
7153 If you want to revert just one file to an older revision, use
7156 If you want to revert just one file to an older revision, use
7154 :hg:`revert [-r REV] NAME`.
7157 :hg:`revert [-r REV] NAME`.
7155
7158
7156 See :hg:`help dates` for a list of formats valid for -d/--date.
7159 See :hg:`help dates` for a list of formats valid for -d/--date.
7157
7160
7158 Returns 0 on success, 1 if there are unresolved files.
7161 Returns 0 on success, 1 if there are unresolved files.
7159 """
7162 """
7160 if rev and node:
7163 if rev and node:
7161 raise error.Abort(_("please specify just one revision"))
7164 raise error.Abort(_("please specify just one revision"))
7162
7165
7163 if rev is None or rev == '':
7166 if rev is None or rev == '':
7164 rev = node
7167 rev = node
7165
7168
7166 if date and rev is not None:
7169 if date and rev is not None:
7167 raise error.Abort(_("you can't specify a revision and a date"))
7170 raise error.Abort(_("you can't specify a revision and a date"))
7168
7171
7169 if check and clean:
7172 if check and clean:
7170 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7173 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7171
7174
7172 with repo.wlock():
7175 with repo.wlock():
7173 cmdutil.clearunfinished(repo)
7176 cmdutil.clearunfinished(repo)
7174
7177
7175 if date:
7178 if date:
7176 rev = cmdutil.finddate(ui, repo, date)
7179 rev = cmdutil.finddate(ui, repo, date)
7177
7180
7178 # if we defined a bookmark, we have to remember the original name
7181 # if we defined a bookmark, we have to remember the original name
7179 brev = rev
7182 brev = rev
7180 rev = scmutil.revsingle(repo, rev, rev).rev()
7183 rev = scmutil.revsingle(repo, rev, rev).rev()
7181
7184
7182 if check:
7185 if check:
7183 cmdutil.bailifchanged(repo, merge=False)
7186 cmdutil.bailifchanged(repo, merge=False)
7184
7187
7185 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7188 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7186
7189
7187 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7190 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7188
7191
7189 @command('verify', [])
7192 @command('verify', [])
7190 def verify(ui, repo):
7193 def verify(ui, repo):
7191 """verify the integrity of the repository
7194 """verify the integrity of the repository
7192
7195
7193 Verify the integrity of the current repository.
7196 Verify the integrity of the current repository.
7194
7197
7195 This will perform an extensive check of the repository's
7198 This will perform an extensive check of the repository's
7196 integrity, validating the hashes and checksums of each entry in
7199 integrity, validating the hashes and checksums of each entry in
7197 the changelog, manifest, and tracked files, as well as the
7200 the changelog, manifest, and tracked files, as well as the
7198 integrity of their crosslinks and indices.
7201 integrity of their crosslinks and indices.
7199
7202
7200 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7203 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7201 for more information about recovery from corruption of the
7204 for more information about recovery from corruption of the
7202 repository.
7205 repository.
7203
7206
7204 Returns 0 on success, 1 if errors are encountered.
7207 Returns 0 on success, 1 if errors are encountered.
7205 """
7208 """
7206 return hg.verify(repo)
7209 return hg.verify(repo)
7207
7210
7208 @command('version', [], norepo=True)
7211 @command('version', [], norepo=True)
7209 def version_(ui):
7212 def version_(ui):
7210 """output version and copyright information"""
7213 """output version and copyright information"""
7211 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7214 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7212 % util.version())
7215 % util.version())
7213 ui.status(_(
7216 ui.status(_(
7214 "(see https://mercurial-scm.org for more information)\n"
7217 "(see https://mercurial-scm.org for more information)\n"
7215 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7218 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7216 "This is free software; see the source for copying conditions. "
7219 "This is free software; see the source for copying conditions. "
7217 "There is NO\nwarranty; "
7220 "There is NO\nwarranty; "
7218 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7221 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7219 ))
7222 ))
7220
7223
7221 ui.note(_("\nEnabled extensions:\n\n"))
7224 ui.note(_("\nEnabled extensions:\n\n"))
7222 if ui.verbose:
7225 if ui.verbose:
7223 # format names and versions into columns
7226 # format names and versions into columns
7224 names = []
7227 names = []
7225 vers = []
7228 vers = []
7226 place = []
7229 place = []
7227 for name, module in extensions.extensions():
7230 for name, module in extensions.extensions():
7228 names.append(name)
7231 names.append(name)
7229 vers.append(extensions.moduleversion(module))
7232 vers.append(extensions.moduleversion(module))
7230 if extensions.ismoduleinternal(module):
7233 if extensions.ismoduleinternal(module):
7231 place.append(_("internal"))
7234 place.append(_("internal"))
7232 else:
7235 else:
7233 place.append(_("external"))
7236 place.append(_("external"))
7234 if names:
7237 if names:
7235 maxnamelen = max(len(n) for n in names)
7238 maxnamelen = max(len(n) for n in names)
7236 for i, name in enumerate(names):
7239 for i, name in enumerate(names):
7237 ui.write(" %-*s %s %s\n" %
7240 ui.write(" %-*s %s %s\n" %
7238 (maxnamelen, name, place[i], vers[i]))
7241 (maxnamelen, name, place[i], vers[i]))
7239
7242
7240 def loadcmdtable(ui, name, cmdtable):
7243 def loadcmdtable(ui, name, cmdtable):
7241 """Load command functions from specified cmdtable
7244 """Load command functions from specified cmdtable
7242 """
7245 """
7243 overrides = [cmd for cmd in cmdtable if cmd in table]
7246 overrides = [cmd for cmd in cmdtable if cmd in table]
7244 if overrides:
7247 if overrides:
7245 ui.warn(_("extension '%s' overrides commands: %s\n")
7248 ui.warn(_("extension '%s' overrides commands: %s\n")
7246 % (name, " ".join(overrides)))
7249 % (name, " ".join(overrides)))
7247 table.update(cmdtable)
7250 table.update(cmdtable)
@@ -1,2076 +1,2083
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 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
59 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
60 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
60 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
61 - ``/etc/mercurial/hgrc`` (per-system)
61 - ``/etc/mercurial/hgrc`` (per-system)
62 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
62 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
63 - ``<internal>/default.d/*.rc`` (defaults)
63 - ``<internal>/default.d/*.rc`` (defaults)
64
64
65 .. container:: verbose.windows
65 .. container:: verbose.windows
66
66
67 On Windows, the following files are consulted:
67 On Windows, the following files are consulted:
68
68
69 - ``<repo>/.hg/hgrc`` (per-repository)
69 - ``<repo>/.hg/hgrc`` (per-repository)
70 - ``%USERPROFILE%\.hgrc`` (per-user)
70 - ``%USERPROFILE%\.hgrc`` (per-user)
71 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
71 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
72 - ``%HOME%\.hgrc`` (per-user)
72 - ``%HOME%\.hgrc`` (per-user)
73 - ``%HOME%\Mercurial.ini`` (per-user)
73 - ``%HOME%\Mercurial.ini`` (per-user)
74 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
74 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
75 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
75 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
76 - ``<install-dir>\Mercurial.ini`` (per-installation)
76 - ``<install-dir>\Mercurial.ini`` (per-installation)
77 - ``<internal>/default.d/*.rc`` (defaults)
77 - ``<internal>/default.d/*.rc`` (defaults)
78
78
79 .. note::
79 .. note::
80
80
81 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
81 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
82 is used when running 32-bit Python on 64-bit Windows.
82 is used when running 32-bit Python on 64-bit Windows.
83
83
84 .. container:: windows
84 .. container:: windows
85
85
86 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
86 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
87
87
88 .. container:: verbose.plan9
88 .. container:: verbose.plan9
89
89
90 On Plan9, the following files are consulted:
90 On Plan9, the following files are consulted:
91
91
92 - ``<repo>/.hg/hgrc`` (per-repository)
92 - ``<repo>/.hg/hgrc`` (per-repository)
93 - ``$home/lib/hgrc`` (per-user)
93 - ``$home/lib/hgrc`` (per-user)
94 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
94 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
95 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
95 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
96 - ``/lib/mercurial/hgrc`` (per-system)
96 - ``/lib/mercurial/hgrc`` (per-system)
97 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
97 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
98 - ``<internal>/default.d/*.rc`` (defaults)
98 - ``<internal>/default.d/*.rc`` (defaults)
99
99
100 Per-repository configuration options only apply in a
100 Per-repository configuration options only apply in a
101 particular repository. This file is not version-controlled, and
101 particular repository. This file is not version-controlled, and
102 will not get transferred during a "clone" operation. Options in
102 will not get transferred during a "clone" operation. Options in
103 this file override options in all other configuration files.
103 this file override options in all other configuration files.
104
104
105 .. container:: unix.plan9
105 .. container:: unix.plan9
106
106
107 On Plan 9 and Unix, most of this file will be ignored if it doesn't
107 On Plan 9 and Unix, most of this file will be ignored if it doesn't
108 belong to a trusted user or to a trusted group. See
108 belong to a trusted user or to a trusted group. See
109 :hg:`help config.trusted` for more details.
109 :hg:`help config.trusted` for more details.
110
110
111 Per-user configuration file(s) are for the user running Mercurial. Options
111 Per-user configuration file(s) are for the user running Mercurial. Options
112 in these files apply to all Mercurial commands executed by this user in any
112 in these files apply to all Mercurial commands executed by this user in any
113 directory. Options in these files override per-system and per-installation
113 directory. Options in these files override per-system and per-installation
114 options.
114 options.
115
115
116 Per-installation configuration files are searched for in the
116 Per-installation configuration files are searched for in the
117 directory where Mercurial is installed. ``<install-root>`` is the
117 directory where Mercurial is installed. ``<install-root>`` is the
118 parent directory of the **hg** executable (or symlink) being run.
118 parent directory of the **hg** executable (or symlink) being run.
119
119
120 .. container:: unix.plan9
120 .. container:: unix.plan9
121
121
122 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
122 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
123 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
123 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
124 files apply to all Mercurial commands executed by any user in any
124 files apply to all Mercurial commands executed by any user in any
125 directory.
125 directory.
126
126
127 Per-installation configuration files are for the system on
127 Per-installation configuration files are for the system on
128 which Mercurial is running. Options in these files apply to all
128 which Mercurial is running. Options in these files apply to all
129 Mercurial commands executed by any user in any directory. Registry
129 Mercurial commands executed by any user in any directory. Registry
130 keys contain PATH-like strings, every part of which must reference
130 keys contain PATH-like strings, every part of which must reference
131 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
131 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
132 be read. Mercurial checks each of these locations in the specified
132 be read. Mercurial checks each of these locations in the specified
133 order until one or more configuration files are detected.
133 order until one or more configuration files are detected.
134
134
135 Per-system configuration files are for the system on which Mercurial
135 Per-system configuration files are for the system on which Mercurial
136 is running. Options in these files apply to all Mercurial commands
136 is running. Options in these files apply to all Mercurial commands
137 executed by any user in any directory. Options in these files
137 executed by any user in any directory. Options in these files
138 override per-installation options.
138 override per-installation options.
139
139
140 Mercurial comes with some default configuration. The default configuration
140 Mercurial comes with some default configuration. The default configuration
141 files are installed with Mercurial and will be overwritten on upgrades. Default
141 files are installed with Mercurial and will be overwritten on upgrades. Default
142 configuration files should never be edited by users or administrators but can
142 configuration files should never be edited by users or administrators but can
143 be overridden in other configuration files. So far the directory only contains
143 be overridden in other configuration files. So far the directory only contains
144 merge tool configuration but packagers can also put other default configuration
144 merge tool configuration but packagers can also put other default configuration
145 there.
145 there.
146
146
147 Syntax
147 Syntax
148 ======
148 ======
149
149
150 A configuration file consists of sections, led by a ``[section]`` header
150 A configuration file consists of sections, led by a ``[section]`` header
151 and followed by ``name = value`` entries (sometimes called
151 and followed by ``name = value`` entries (sometimes called
152 ``configuration keys``)::
152 ``configuration keys``)::
153
153
154 [spam]
154 [spam]
155 eggs=ham
155 eggs=ham
156 green=
156 green=
157 eggs
157 eggs
158
158
159 Each line contains one entry. If the lines that follow are indented,
159 Each line contains one entry. If the lines that follow are indented,
160 they are treated as continuations of that entry. Leading whitespace is
160 they are treated as continuations of that entry. Leading whitespace is
161 removed from values. Empty lines are skipped. Lines beginning with
161 removed from values. Empty lines are skipped. Lines beginning with
162 ``#`` or ``;`` are ignored and may be used to provide comments.
162 ``#`` or ``;`` are ignored and may be used to provide comments.
163
163
164 Configuration keys can be set multiple times, in which case Mercurial
164 Configuration keys can be set multiple times, in which case Mercurial
165 will use the value that was configured last. As an example::
165 will use the value that was configured last. As an example::
166
166
167 [spam]
167 [spam]
168 eggs=large
168 eggs=large
169 ham=serrano
169 ham=serrano
170 eggs=small
170 eggs=small
171
171
172 This would set the configuration key named ``eggs`` to ``small``.
172 This would set the configuration key named ``eggs`` to ``small``.
173
173
174 It is also possible to define a section multiple times. A section can
174 It is also possible to define a section multiple times. A section can
175 be redefined on the same and/or on different configuration files. For
175 be redefined on the same and/or on different configuration files. For
176 example::
176 example::
177
177
178 [foo]
178 [foo]
179 eggs=large
179 eggs=large
180 ham=serrano
180 ham=serrano
181 eggs=small
181 eggs=small
182
182
183 [bar]
183 [bar]
184 eggs=ham
184 eggs=ham
185 green=
185 green=
186 eggs
186 eggs
187
187
188 [foo]
188 [foo]
189 ham=prosciutto
189 ham=prosciutto
190 eggs=medium
190 eggs=medium
191 bread=toasted
191 bread=toasted
192
192
193 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
193 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
194 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
194 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
195 respectively. As you can see there only thing that matters is the last
195 respectively. As you can see there only thing that matters is the last
196 value that was set for each of the configuration keys.
196 value that was set for each of the configuration keys.
197
197
198 If a configuration key is set multiple times in different
198 If a configuration key is set multiple times in different
199 configuration files the final value will depend on the order in which
199 configuration files the final value will depend on the order in which
200 the different configuration files are read, with settings from earlier
200 the different configuration files are read, with settings from earlier
201 paths overriding later ones as described on the ``Files`` section
201 paths overriding later ones as described on the ``Files`` section
202 above.
202 above.
203
203
204 A line of the form ``%include file`` will include ``file`` into the
204 A line of the form ``%include file`` will include ``file`` into the
205 current configuration file. The inclusion is recursive, which means
205 current configuration file. The inclusion is recursive, which means
206 that included files can include other files. Filenames are relative to
206 that included files can include other files. Filenames are relative to
207 the configuration file in which the ``%include`` directive is found.
207 the configuration file in which the ``%include`` directive is found.
208 Environment variables and ``~user`` constructs are expanded in
208 Environment variables and ``~user`` constructs are expanded in
209 ``file``. This lets you do something like::
209 ``file``. This lets you do something like::
210
210
211 %include ~/.hgrc.d/$HOST.rc
211 %include ~/.hgrc.d/$HOST.rc
212
212
213 to include a different configuration file on each computer you use.
213 to include a different configuration file on each computer you use.
214
214
215 A line with ``%unset name`` will remove ``name`` from the current
215 A line with ``%unset name`` will remove ``name`` from the current
216 section, if it has been set previously.
216 section, if it has been set previously.
217
217
218 The values are either free-form text strings, lists of text strings,
218 The values are either free-form text strings, lists of text strings,
219 or Boolean values. Boolean values can be set to true using any of "1",
219 or Boolean values. Boolean values can be set to true using any of "1",
220 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
220 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
221 (all case insensitive).
221 (all case insensitive).
222
222
223 List values are separated by whitespace or comma, except when values are
223 List values are separated by whitespace or comma, except when values are
224 placed in double quotation marks::
224 placed in double quotation marks::
225
225
226 allow_read = "John Doe, PhD", brian, betty
226 allow_read = "John Doe, PhD", brian, betty
227
227
228 Quotation marks can be escaped by prefixing them with a backslash. Only
228 Quotation marks can be escaped by prefixing them with a backslash. Only
229 quotation marks at the beginning of a word is counted as a quotation
229 quotation marks at the beginning of a word is counted as a quotation
230 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
230 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
231
231
232 Sections
232 Sections
233 ========
233 ========
234
234
235 This section describes the different sections that may appear in a
235 This section describes the different sections that may appear in a
236 Mercurial configuration file, the purpose of each section, its possible
236 Mercurial configuration file, the purpose of each section, its possible
237 keys, and their possible values.
237 keys, and their possible values.
238
238
239 ``alias``
239 ``alias``
240 ---------
240 ---------
241
241
242 Defines command aliases.
242 Defines command aliases.
243
243
244 Aliases allow you to define your own commands in terms of other
244 Aliases allow you to define your own commands in terms of other
245 commands (or aliases), optionally including arguments. Positional
245 commands (or aliases), optionally including arguments. Positional
246 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
246 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
247 are expanded by Mercurial before execution. Positional arguments not
247 are expanded by Mercurial before execution. Positional arguments not
248 already used by ``$N`` in the definition are put at the end of the
248 already used by ``$N`` in the definition are put at the end of the
249 command to be executed.
249 command to be executed.
250
250
251 Alias definitions consist of lines of the form::
251 Alias definitions consist of lines of the form::
252
252
253 <alias> = <command> [<argument>]...
253 <alias> = <command> [<argument>]...
254
254
255 For example, this definition::
255 For example, this definition::
256
256
257 latest = log --limit 5
257 latest = log --limit 5
258
258
259 creates a new command ``latest`` that shows only the five most recent
259 creates a new command ``latest`` that shows only the five most recent
260 changesets. You can define subsequent aliases using earlier ones::
260 changesets. You can define subsequent aliases using earlier ones::
261
261
262 stable5 = latest -b stable
262 stable5 = latest -b stable
263
263
264 .. note::
264 .. note::
265
265
266 It is possible to create aliases with the same names as
266 It is possible to create aliases with the same names as
267 existing commands, which will then override the original
267 existing commands, which will then override the original
268 definitions. This is almost always a bad idea!
268 definitions. This is almost always a bad idea!
269
269
270 An alias can start with an exclamation point (``!``) to make it a
270 An alias can start with an exclamation point (``!``) to make it a
271 shell alias. A shell alias is executed with the shell and will let you
271 shell alias. A shell alias is executed with the shell and will let you
272 run arbitrary commands. As an example, ::
272 run arbitrary commands. As an example, ::
273
273
274 echo = !echo $@
274 echo = !echo $@
275
275
276 will let you do ``hg echo foo`` to have ``foo`` printed in your
276 will let you do ``hg echo foo`` to have ``foo`` printed in your
277 terminal. A better example might be::
277 terminal. A better example might be::
278
278
279 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm
279 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm
280
280
281 which will make ``hg purge`` delete all unknown files in the
281 which will make ``hg purge`` delete all unknown files in the
282 repository in the same manner as the purge extension.
282 repository in the same manner as the purge extension.
283
283
284 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
284 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
285 expand to the command arguments. Unmatched arguments are
285 expand to the command arguments. Unmatched arguments are
286 removed. ``$0`` expands to the alias name and ``$@`` expands to all
286 removed. ``$0`` expands to the alias name and ``$@`` expands to all
287 arguments separated by a space. ``"$@"`` (with quotes) expands to all
287 arguments separated by a space. ``"$@"`` (with quotes) expands to all
288 arguments quoted individually and separated by a space. These expansions
288 arguments quoted individually and separated by a space. These expansions
289 happen before the command is passed to the shell.
289 happen before the command is passed to the shell.
290
290
291 Shell aliases are executed in an environment where ``$HG`` expands to
291 Shell aliases are executed in an environment where ``$HG`` expands to
292 the path of the Mercurial that was used to execute the alias. This is
292 the path of the Mercurial that was used to execute the alias. This is
293 useful when you want to call further Mercurial commands in a shell
293 useful when you want to call further Mercurial commands in a shell
294 alias, as was done above for the purge alias. In addition,
294 alias, as was done above for the purge alias. In addition,
295 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
295 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
296 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
296 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
297
297
298 .. note::
298 .. note::
299
299
300 Some global configuration options such as ``-R`` are
300 Some global configuration options such as ``-R`` are
301 processed before shell aliases and will thus not be passed to
301 processed before shell aliases and will thus not be passed to
302 aliases.
302 aliases.
303
303
304
304
305 ``annotate``
305 ``annotate``
306 ------------
306 ------------
307
307
308 Settings used when displaying file annotations. All values are
308 Settings used when displaying file annotations. All values are
309 Booleans and default to False. See :hg:`help config.diff` for
309 Booleans and default to False. See :hg:`help config.diff` for
310 related options for the diff command.
310 related options for the diff command.
311
311
312 ``ignorews``
312 ``ignorews``
313 Ignore white space when comparing lines.
313 Ignore white space when comparing lines.
314
314
315 ``ignorewsamount``
315 ``ignorewsamount``
316 Ignore changes in the amount of white space.
316 Ignore changes in the amount of white space.
317
317
318 ``ignoreblanklines``
318 ``ignoreblanklines``
319 Ignore changes whose lines are all blank.
319 Ignore changes whose lines are all blank.
320
320
321
321
322 ``auth``
322 ``auth``
323 --------
323 --------
324
324
325 Authentication credentials for HTTP authentication. This section
325 Authentication credentials for HTTP authentication. This section
326 allows you to store usernames and passwords for use when logging
326 allows you to store usernames and passwords for use when logging
327 *into* HTTP servers. See :hg:`help config.web` if
327 *into* HTTP servers. See :hg:`help config.web` if
328 you want to configure *who* can login to your HTTP server.
328 you want to configure *who* can login to your HTTP server.
329
329
330 Each line has the following format::
330 Each line has the following format::
331
331
332 <name>.<argument> = <value>
332 <name>.<argument> = <value>
333
333
334 where ``<name>`` is used to group arguments into authentication
334 where ``<name>`` is used to group arguments into authentication
335 entries. Example::
335 entries. Example::
336
336
337 foo.prefix = hg.intevation.de/mercurial
337 foo.prefix = hg.intevation.de/mercurial
338 foo.username = foo
338 foo.username = foo
339 foo.password = bar
339 foo.password = bar
340 foo.schemes = http https
340 foo.schemes = http https
341
341
342 bar.prefix = secure.example.org
342 bar.prefix = secure.example.org
343 bar.key = path/to/file.key
343 bar.key = path/to/file.key
344 bar.cert = path/to/file.cert
344 bar.cert = path/to/file.cert
345 bar.schemes = https
345 bar.schemes = https
346
346
347 Supported arguments:
347 Supported arguments:
348
348
349 ``prefix``
349 ``prefix``
350 Either ``*`` or a URI prefix with or without the scheme part.
350 Either ``*`` or a URI prefix with or without the scheme part.
351 The authentication entry with the longest matching prefix is used
351 The authentication entry with the longest matching prefix is used
352 (where ``*`` matches everything and counts as a match of length
352 (where ``*`` matches everything and counts as a match of length
353 1). If the prefix doesn't include a scheme, the match is performed
353 1). If the prefix doesn't include a scheme, the match is performed
354 against the URI with its scheme stripped as well, and the schemes
354 against the URI with its scheme stripped as well, and the schemes
355 argument, q.v., is then subsequently consulted.
355 argument, q.v., is then subsequently consulted.
356
356
357 ``username``
357 ``username``
358 Optional. Username to authenticate with. If not given, and the
358 Optional. Username to authenticate with. If not given, and the
359 remote site requires basic or digest authentication, the user will
359 remote site requires basic or digest authentication, the user will
360 be prompted for it. Environment variables are expanded in the
360 be prompted for it. Environment variables are expanded in the
361 username letting you do ``foo.username = $USER``. If the URI
361 username letting you do ``foo.username = $USER``. If the URI
362 includes a username, only ``[auth]`` entries with a matching
362 includes a username, only ``[auth]`` entries with a matching
363 username or without a username will be considered.
363 username or without a username will be considered.
364
364
365 ``password``
365 ``password``
366 Optional. Password to authenticate with. If not given, and the
366 Optional. Password to authenticate with. If not given, and the
367 remote site requires basic or digest authentication, the user
367 remote site requires basic or digest authentication, the user
368 will be prompted for it.
368 will be prompted for it.
369
369
370 ``key``
370 ``key``
371 Optional. PEM encoded client certificate key file. Environment
371 Optional. PEM encoded client certificate key file. Environment
372 variables are expanded in the filename.
372 variables are expanded in the filename.
373
373
374 ``cert``
374 ``cert``
375 Optional. PEM encoded client certificate chain file. Environment
375 Optional. PEM encoded client certificate chain file. Environment
376 variables are expanded in the filename.
376 variables are expanded in the filename.
377
377
378 ``schemes``
378 ``schemes``
379 Optional. Space separated list of URI schemes to use this
379 Optional. Space separated list of URI schemes to use this
380 authentication entry with. Only used if the prefix doesn't include
380 authentication entry with. Only used if the prefix doesn't include
381 a scheme. Supported schemes are http and https. They will match
381 a scheme. Supported schemes are http and https. They will match
382 static-http and static-https respectively, as well.
382 static-http and static-https respectively, as well.
383 (default: https)
383 (default: https)
384
384
385 If no suitable authentication entry is found, the user is prompted
385 If no suitable authentication entry is found, the user is prompted
386 for credentials as usual if required by the remote.
386 for credentials as usual if required by the remote.
387
387
388
388
389 ``committemplate``
389 ``committemplate``
390 ------------------
390 ------------------
391
391
392 ``changeset``
392 ``changeset``
393 String: configuration in this section is used as the template to
393 String: configuration in this section is used as the template to
394 customize the text shown in the editor when committing.
394 customize the text shown in the editor when committing.
395
395
396 In addition to pre-defined template keywords, commit log specific one
396 In addition to pre-defined template keywords, commit log specific one
397 below can be used for customization:
397 below can be used for customization:
398
398
399 ``extramsg``
399 ``extramsg``
400 String: Extra message (typically 'Leave message empty to abort
400 String: Extra message (typically 'Leave message empty to abort
401 commit.'). This may be changed by some commands or extensions.
401 commit.'). This may be changed by some commands or extensions.
402
402
403 For example, the template configuration below shows as same text as
403 For example, the template configuration below shows as same text as
404 one shown by default::
404 one shown by default::
405
405
406 [committemplate]
406 [committemplate]
407 changeset = {desc}\n\n
407 changeset = {desc}\n\n
408 HG: Enter commit message. Lines beginning with 'HG:' are removed.
408 HG: Enter commit message. Lines beginning with 'HG:' are removed.
409 HG: {extramsg}
409 HG: {extramsg}
410 HG: --
410 HG: --
411 HG: user: {author}\n{ifeq(p2rev, "-1", "",
411 HG: user: {author}\n{ifeq(p2rev, "-1", "",
412 "HG: branch merge\n")
412 "HG: branch merge\n")
413 }HG: branch '{branch}'\n{if(activebookmark,
413 }HG: branch '{branch}'\n{if(activebookmark,
414 "HG: bookmark '{activebookmark}'\n") }{subrepos %
414 "HG: bookmark '{activebookmark}'\n") }{subrepos %
415 "HG: subrepo {subrepo}\n" }{file_adds %
415 "HG: subrepo {subrepo}\n" }{file_adds %
416 "HG: added {file}\n" }{file_mods %
416 "HG: added {file}\n" }{file_mods %
417 "HG: changed {file}\n" }{file_dels %
417 "HG: changed {file}\n" }{file_dels %
418 "HG: removed {file}\n" }{if(files, "",
418 "HG: removed {file}\n" }{if(files, "",
419 "HG: no files changed\n")}
419 "HG: no files changed\n")}
420
420
421 .. note::
421 .. note::
422
422
423 For some problematic encodings (see :hg:`help win32mbcs` for
423 For some problematic encodings (see :hg:`help win32mbcs` for
424 detail), this customization should be configured carefully, to
424 detail), this customization should be configured carefully, to
425 avoid showing broken characters.
425 avoid showing broken characters.
426
426
427 For example, if a multibyte character ending with backslash (0x5c) is
427 For example, if a multibyte character ending with backslash (0x5c) is
428 followed by the ASCII character 'n' in the customized template,
428 followed by the ASCII character 'n' in the customized template,
429 the sequence of backslash and 'n' is treated as line-feed unexpectedly
429 the sequence of backslash and 'n' is treated as line-feed unexpectedly
430 (and the multibyte character is broken, too).
430 (and the multibyte character is broken, too).
431
431
432 Customized template is used for commands below (``--edit`` may be
432 Customized template is used for commands below (``--edit`` may be
433 required):
433 required):
434
434
435 - :hg:`backout`
435 - :hg:`backout`
436 - :hg:`commit`
436 - :hg:`commit`
437 - :hg:`fetch` (for merge commit only)
437 - :hg:`fetch` (for merge commit only)
438 - :hg:`graft`
438 - :hg:`graft`
439 - :hg:`histedit`
439 - :hg:`histedit`
440 - :hg:`import`
440 - :hg:`import`
441 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
441 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
442 - :hg:`rebase`
442 - :hg:`rebase`
443 - :hg:`shelve`
443 - :hg:`shelve`
444 - :hg:`sign`
444 - :hg:`sign`
445 - :hg:`tag`
445 - :hg:`tag`
446 - :hg:`transplant`
446 - :hg:`transplant`
447
447
448 Configuring items below instead of ``changeset`` allows showing
448 Configuring items below instead of ``changeset`` allows showing
449 customized message only for specific actions, or showing different
449 customized message only for specific actions, or showing different
450 messages for each action.
450 messages for each action.
451
451
452 - ``changeset.backout`` for :hg:`backout`
452 - ``changeset.backout`` for :hg:`backout`
453 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
453 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
454 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
454 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
455 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
455 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
456 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
456 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
457 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
457 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
458 - ``changeset.gpg.sign`` for :hg:`sign`
458 - ``changeset.gpg.sign`` for :hg:`sign`
459 - ``changeset.graft`` for :hg:`graft`
459 - ``changeset.graft`` for :hg:`graft`
460 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
460 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
461 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
461 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
462 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
462 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
463 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
463 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
464 - ``changeset.import.bypass`` for :hg:`import --bypass`
464 - ``changeset.import.bypass`` for :hg:`import --bypass`
465 - ``changeset.import.normal.merge`` for :hg:`import` on merges
465 - ``changeset.import.normal.merge`` for :hg:`import` on merges
466 - ``changeset.import.normal.normal`` for :hg:`import` on other
466 - ``changeset.import.normal.normal`` for :hg:`import` on other
467 - ``changeset.mq.qnew`` for :hg:`qnew`
467 - ``changeset.mq.qnew`` for :hg:`qnew`
468 - ``changeset.mq.qfold`` for :hg:`qfold`
468 - ``changeset.mq.qfold`` for :hg:`qfold`
469 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
469 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
470 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
470 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
471 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
471 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
472 - ``changeset.rebase.normal`` for :hg:`rebase` on other
472 - ``changeset.rebase.normal`` for :hg:`rebase` on other
473 - ``changeset.shelve.shelve`` for :hg:`shelve`
473 - ``changeset.shelve.shelve`` for :hg:`shelve`
474 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
474 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
475 - ``changeset.tag.remove`` for :hg:`tag --remove`
475 - ``changeset.tag.remove`` for :hg:`tag --remove`
476 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
476 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
477 - ``changeset.transplant.normal`` for :hg:`transplant` on other
477 - ``changeset.transplant.normal`` for :hg:`transplant` on other
478
478
479 These dot-separated lists of names are treated as hierarchical ones.
479 These dot-separated lists of names are treated as hierarchical ones.
480 For example, ``changeset.tag.remove`` customizes the commit message
480 For example, ``changeset.tag.remove`` customizes the commit message
481 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
481 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
482 commit message for :hg:`tag` regardless of ``--remove`` option.
482 commit message for :hg:`tag` regardless of ``--remove`` option.
483
483
484 When the external editor is invoked for a commit, the corresponding
484 When the external editor is invoked for a commit, the corresponding
485 dot-separated list of names without the ``changeset.`` prefix
485 dot-separated list of names without the ``changeset.`` prefix
486 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
486 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
487 variable.
487 variable.
488
488
489 In this section, items other than ``changeset`` can be referred from
489 In this section, items other than ``changeset`` can be referred from
490 others. For example, the configuration to list committed files up
490 others. For example, the configuration to list committed files up
491 below can be referred as ``{listupfiles}``::
491 below can be referred as ``{listupfiles}``::
492
492
493 [committemplate]
493 [committemplate]
494 listupfiles = {file_adds %
494 listupfiles = {file_adds %
495 "HG: added {file}\n" }{file_mods %
495 "HG: added {file}\n" }{file_mods %
496 "HG: changed {file}\n" }{file_dels %
496 "HG: changed {file}\n" }{file_dels %
497 "HG: removed {file}\n" }{if(files, "",
497 "HG: removed {file}\n" }{if(files, "",
498 "HG: no files changed\n")}
498 "HG: no files changed\n")}
499
499
500 ``decode/encode``
500 ``decode/encode``
501 -----------------
501 -----------------
502
502
503 Filters for transforming files on checkout/checkin. This would
503 Filters for transforming files on checkout/checkin. This would
504 typically be used for newline processing or other
504 typically be used for newline processing or other
505 localization/canonicalization of files.
505 localization/canonicalization of files.
506
506
507 Filters consist of a filter pattern followed by a filter command.
507 Filters consist of a filter pattern followed by a filter command.
508 Filter patterns are globs by default, rooted at the repository root.
508 Filter patterns are globs by default, rooted at the repository root.
509 For example, to match any file ending in ``.txt`` in the root
509 For example, to match any file ending in ``.txt`` in the root
510 directory only, use the pattern ``*.txt``. To match any file ending
510 directory only, use the pattern ``*.txt``. To match any file ending
511 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
511 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
512 For each file only the first matching filter applies.
512 For each file only the first matching filter applies.
513
513
514 The filter command can start with a specifier, either ``pipe:`` or
514 The filter command can start with a specifier, either ``pipe:`` or
515 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
515 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
516
516
517 A ``pipe:`` command must accept data on stdin and return the transformed
517 A ``pipe:`` command must accept data on stdin and return the transformed
518 data on stdout.
518 data on stdout.
519
519
520 Pipe example::
520 Pipe example::
521
521
522 [encode]
522 [encode]
523 # uncompress gzip files on checkin to improve delta compression
523 # uncompress gzip files on checkin to improve delta compression
524 # note: not necessarily a good idea, just an example
524 # note: not necessarily a good idea, just an example
525 *.gz = pipe: gunzip
525 *.gz = pipe: gunzip
526
526
527 [decode]
527 [decode]
528 # recompress gzip files when writing them to the working dir (we
528 # recompress gzip files when writing them to the working dir (we
529 # can safely omit "pipe:", because it's the default)
529 # can safely omit "pipe:", because it's the default)
530 *.gz = gzip
530 *.gz = gzip
531
531
532 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
532 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
533 with the name of a temporary file that contains the data to be
533 with the name of a temporary file that contains the data to be
534 filtered by the command. The string ``OUTFILE`` is replaced with the name
534 filtered by the command. The string ``OUTFILE`` is replaced with the name
535 of an empty temporary file, where the filtered data must be written by
535 of an empty temporary file, where the filtered data must be written by
536 the command.
536 the command.
537
537
538 .. container:: windows
538 .. container:: windows
539
539
540 .. note::
540 .. note::
541
541
542 The tempfile mechanism is recommended for Windows systems,
542 The tempfile mechanism is recommended for Windows systems,
543 where the standard shell I/O redirection operators often have
543 where the standard shell I/O redirection operators often have
544 strange effects and may corrupt the contents of your files.
544 strange effects and may corrupt the contents of your files.
545
545
546 This filter mechanism is used internally by the ``eol`` extension to
546 This filter mechanism is used internally by the ``eol`` extension to
547 translate line ending characters between Windows (CRLF) and Unix (LF)
547 translate line ending characters between Windows (CRLF) and Unix (LF)
548 format. We suggest you use the ``eol`` extension for convenience.
548 format. We suggest you use the ``eol`` extension for convenience.
549
549
550
550
551 ``defaults``
551 ``defaults``
552 ------------
552 ------------
553
553
554 (defaults are deprecated. Don't use them. Use aliases instead.)
554 (defaults are deprecated. Don't use them. Use aliases instead.)
555
555
556 Use the ``[defaults]`` section to define command defaults, i.e. the
556 Use the ``[defaults]`` section to define command defaults, i.e. the
557 default options/arguments to pass to the specified commands.
557 default options/arguments to pass to the specified commands.
558
558
559 The following example makes :hg:`log` run in verbose mode, and
559 The following example makes :hg:`log` run in verbose mode, and
560 :hg:`status` show only the modified files, by default::
560 :hg:`status` show only the modified files, by default::
561
561
562 [defaults]
562 [defaults]
563 log = -v
563 log = -v
564 status = -m
564 status = -m
565
565
566 The actual commands, instead of their aliases, must be used when
566 The actual commands, instead of their aliases, must be used when
567 defining command defaults. The command defaults will also be applied
567 defining command defaults. The command defaults will also be applied
568 to the aliases of the commands defined.
568 to the aliases of the commands defined.
569
569
570
570
571 ``diff``
571 ``diff``
572 --------
572 --------
573
573
574 Settings used when displaying diffs. Everything except for ``unified``
574 Settings used when displaying diffs. Everything except for ``unified``
575 is a Boolean and defaults to False. See :hg:`help config.annotate`
575 is a Boolean and defaults to False. See :hg:`help config.annotate`
576 for related options for the annotate command.
576 for related options for the annotate command.
577
577
578 ``git``
578 ``git``
579 Use git extended diff format.
579 Use git extended diff format.
580
580
581 ``nobinary``
581 ``nobinary``
582 Omit git binary patches.
582 Omit git binary patches.
583
583
584 ``nodates``
584 ``nodates``
585 Don't include dates in diff headers.
585 Don't include dates in diff headers.
586
586
587 ``noprefix``
587 ``noprefix``
588 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
588 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
589
589
590 ``showfunc``
590 ``showfunc``
591 Show which function each change is in.
591 Show which function each change is in.
592
592
593 ``ignorews``
593 ``ignorews``
594 Ignore white space when comparing lines.
594 Ignore white space when comparing lines.
595
595
596 ``ignorewsamount``
596 ``ignorewsamount``
597 Ignore changes in the amount of white space.
597 Ignore changes in the amount of white space.
598
598
599 ``ignoreblanklines``
599 ``ignoreblanklines``
600 Ignore changes whose lines are all blank.
600 Ignore changes whose lines are all blank.
601
601
602 ``unified``
602 ``unified``
603 Number of lines of context to show.
603 Number of lines of context to show.
604
604
605 ``email``
605 ``email``
606 ---------
606 ---------
607
607
608 Settings for extensions that send email messages.
608 Settings for extensions that send email messages.
609
609
610 ``from``
610 ``from``
611 Optional. Email address to use in "From" header and SMTP envelope
611 Optional. Email address to use in "From" header and SMTP envelope
612 of outgoing messages.
612 of outgoing messages.
613
613
614 ``to``
614 ``to``
615 Optional. Comma-separated list of recipients' email addresses.
615 Optional. Comma-separated list of recipients' email addresses.
616
616
617 ``cc``
617 ``cc``
618 Optional. Comma-separated list of carbon copy recipients'
618 Optional. Comma-separated list of carbon copy recipients'
619 email addresses.
619 email addresses.
620
620
621 ``bcc``
621 ``bcc``
622 Optional. Comma-separated list of blind carbon copy recipients'
622 Optional. Comma-separated list of blind carbon copy recipients'
623 email addresses.
623 email addresses.
624
624
625 ``method``
625 ``method``
626 Optional. Method to use to send email messages. If value is ``smtp``
626 Optional. Method to use to send email messages. If value is ``smtp``
627 (default), use SMTP (see the ``[smtp]`` section for configuration).
627 (default), use SMTP (see the ``[smtp]`` section for configuration).
628 Otherwise, use as name of program to run that acts like sendmail
628 Otherwise, use as name of program to run that acts like sendmail
629 (takes ``-f`` option for sender, list of recipients on command line,
629 (takes ``-f`` option for sender, list of recipients on command line,
630 message on stdin). Normally, setting this to ``sendmail`` or
630 message on stdin). Normally, setting this to ``sendmail`` or
631 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
631 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
632
632
633 ``charsets``
633 ``charsets``
634 Optional. Comma-separated list of character sets considered
634 Optional. Comma-separated list of character sets considered
635 convenient for recipients. Addresses, headers, and parts not
635 convenient for recipients. Addresses, headers, and parts not
636 containing patches of outgoing messages will be encoded in the
636 containing patches of outgoing messages will be encoded in the
637 first character set to which conversion from local encoding
637 first character set to which conversion from local encoding
638 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
638 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
639 conversion fails, the text in question is sent as is.
639 conversion fails, the text in question is sent as is.
640 (default: '')
640 (default: '')
641
641
642 Order of outgoing email character sets:
642 Order of outgoing email character sets:
643
643
644 1. ``us-ascii``: always first, regardless of settings
644 1. ``us-ascii``: always first, regardless of settings
645 2. ``email.charsets``: in order given by user
645 2. ``email.charsets``: in order given by user
646 3. ``ui.fallbackencoding``: if not in email.charsets
646 3. ``ui.fallbackencoding``: if not in email.charsets
647 4. ``$HGENCODING``: if not in email.charsets
647 4. ``$HGENCODING``: if not in email.charsets
648 5. ``utf-8``: always last, regardless of settings
648 5. ``utf-8``: always last, regardless of settings
649
649
650 Email example::
650 Email example::
651
651
652 [email]
652 [email]
653 from = Joseph User <joe.user@example.com>
653 from = Joseph User <joe.user@example.com>
654 method = /usr/sbin/sendmail
654 method = /usr/sbin/sendmail
655 # charsets for western Europeans
655 # charsets for western Europeans
656 # us-ascii, utf-8 omitted, as they are tried first and last
656 # us-ascii, utf-8 omitted, as they are tried first and last
657 charsets = iso-8859-1, iso-8859-15, windows-1252
657 charsets = iso-8859-1, iso-8859-15, windows-1252
658
658
659
659
660 ``extensions``
660 ``extensions``
661 --------------
661 --------------
662
662
663 Mercurial has an extension mechanism for adding new features. To
663 Mercurial has an extension mechanism for adding new features. To
664 enable an extension, create an entry for it in this section.
664 enable an extension, create an entry for it in this section.
665
665
666 If you know that the extension is already in Python's search path,
666 If you know that the extension is already in Python's search path,
667 you can give the name of the module, followed by ``=``, with nothing
667 you can give the name of the module, followed by ``=``, with nothing
668 after the ``=``.
668 after the ``=``.
669
669
670 Otherwise, give a name that you choose, followed by ``=``, followed by
670 Otherwise, give a name that you choose, followed by ``=``, followed by
671 the path to the ``.py`` file (including the file name extension) that
671 the path to the ``.py`` file (including the file name extension) that
672 defines the extension.
672 defines the extension.
673
673
674 To explicitly disable an extension that is enabled in an hgrc of
674 To explicitly disable an extension that is enabled in an hgrc of
675 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
675 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
676 or ``foo = !`` when path is not supplied.
676 or ``foo = !`` when path is not supplied.
677
677
678 Example for ``~/.hgrc``::
678 Example for ``~/.hgrc``::
679
679
680 [extensions]
680 [extensions]
681 # (the color extension will get loaded from Mercurial's path)
681 # (the color extension will get loaded from Mercurial's path)
682 color =
682 color =
683 # (this extension will get loaded from the file specified)
683 # (this extension will get loaded from the file specified)
684 myfeature = ~/.hgext/myfeature.py
684 myfeature = ~/.hgext/myfeature.py
685
685
686
686
687 ``format``
687 ``format``
688 ----------
688 ----------
689
689
690 ``usegeneraldelta``
690 ``usegeneraldelta``
691 Enable or disable the "generaldelta" repository format which improves
691 Enable or disable the "generaldelta" repository format which improves
692 repository compression by allowing "revlog" to store delta against arbitrary
692 repository compression by allowing "revlog" to store delta against arbitrary
693 revision instead of the previous stored one. This provides significant
693 revision instead of the previous stored one. This provides significant
694 improvement for repositories with branches.
694 improvement for repositories with branches.
695
695
696 Repositories with this on-disk format require Mercurial version 1.9.
696 Repositories with this on-disk format require Mercurial version 1.9.
697
697
698 Enabled by default.
698 Enabled by default.
699
699
700 ``dotencode``
700 ``dotencode``
701 Enable or disable the "dotencode" repository format which enhances
701 Enable or disable the "dotencode" repository format which enhances
702 the "fncache" repository format (which has to be enabled to use
702 the "fncache" repository format (which has to be enabled to use
703 dotencode) to avoid issues with filenames starting with ._ on
703 dotencode) to avoid issues with filenames starting with ._ on
704 Mac OS X and spaces on Windows.
704 Mac OS X and spaces on Windows.
705
705
706 Repositories with this on-disk format require Mercurial version 1.7.
706 Repositories with this on-disk format require Mercurial version 1.7.
707
707
708 Enabled by default.
708 Enabled by default.
709
709
710 ``usefncache``
710 ``usefncache``
711 Enable or disable the "fncache" repository format which enhances
711 Enable or disable the "fncache" repository format which enhances
712 the "store" repository format (which has to be enabled to use
712 the "store" repository format (which has to be enabled to use
713 fncache) to allow longer filenames and avoids using Windows
713 fncache) to allow longer filenames and avoids using Windows
714 reserved names, e.g. "nul".
714 reserved names, e.g. "nul".
715
715
716 Repositories with this on-disk format require Mercurial version 1.1.
716 Repositories with this on-disk format require Mercurial version 1.1.
717
717
718 Enabled by default.
718 Enabled by default.
719
719
720 ``usestore``
720 ``usestore``
721 Enable or disable the "store" repository format which improves
721 Enable or disable the "store" repository format which improves
722 compatibility with systems that fold case or otherwise mangle
722 compatibility with systems that fold case or otherwise mangle
723 filenames. Disabling this option will allow you to store longer filenames
723 filenames. Disabling this option will allow you to store longer filenames
724 in some situations at the expense of compatibility.
724 in some situations at the expense of compatibility.
725
725
726 Repositories with this on-disk format require Mercurial version 0.9.4.
726 Repositories with this on-disk format require Mercurial version 0.9.4.
727
727
728 Enabled by default.
728 Enabled by default.
729
729
730 ``graph``
730 ``graph``
731 ---------
731 ---------
732
732
733 Web graph view configuration. This section let you change graph
733 Web graph view configuration. This section let you change graph
734 elements display properties by branches, for instance to make the
734 elements display properties by branches, for instance to make the
735 ``default`` branch stand out.
735 ``default`` branch stand out.
736
736
737 Each line has the following format::
737 Each line has the following format::
738
738
739 <branch>.<argument> = <value>
739 <branch>.<argument> = <value>
740
740
741 where ``<branch>`` is the name of the branch being
741 where ``<branch>`` is the name of the branch being
742 customized. Example::
742 customized. Example::
743
743
744 [graph]
744 [graph]
745 # 2px width
745 # 2px width
746 default.width = 2
746 default.width = 2
747 # red color
747 # red color
748 default.color = FF0000
748 default.color = FF0000
749
749
750 Supported arguments:
750 Supported arguments:
751
751
752 ``width``
752 ``width``
753 Set branch edges width in pixels.
753 Set branch edges width in pixels.
754
754
755 ``color``
755 ``color``
756 Set branch edges color in hexadecimal RGB notation.
756 Set branch edges color in hexadecimal RGB notation.
757
757
758 ``hooks``
758 ``hooks``
759 ---------
759 ---------
760
760
761 Commands or Python functions that get automatically executed by
761 Commands or Python functions that get automatically executed by
762 various actions such as starting or finishing a commit. Multiple
762 various actions such as starting or finishing a commit. Multiple
763 hooks can be run for the same action by appending a suffix to the
763 hooks can be run for the same action by appending a suffix to the
764 action. Overriding a site-wide hook can be done by changing its
764 action. Overriding a site-wide hook can be done by changing its
765 value or setting it to an empty string. Hooks can be prioritized
765 value or setting it to an empty string. Hooks can be prioritized
766 by adding a prefix of ``priority.`` to the hook name on a new line
766 by adding a prefix of ``priority.`` to the hook name on a new line
767 and setting the priority. The default priority is 0.
767 and setting the priority. The default priority is 0.
768
768
769 Example ``.hg/hgrc``::
769 Example ``.hg/hgrc``::
770
770
771 [hooks]
771 [hooks]
772 # update working directory after adding changesets
772 # update working directory after adding changesets
773 changegroup.update = hg update
773 changegroup.update = hg update
774 # do not use the site-wide hook
774 # do not use the site-wide hook
775 incoming =
775 incoming =
776 incoming.email = /my/email/hook
776 incoming.email = /my/email/hook
777 incoming.autobuild = /my/build/hook
777 incoming.autobuild = /my/build/hook
778 # force autobuild hook to run before other incoming hooks
778 # force autobuild hook to run before other incoming hooks
779 priority.incoming.autobuild = 1
779 priority.incoming.autobuild = 1
780
780
781 Most hooks are run with environment variables set that give useful
781 Most hooks are run with environment variables set that give useful
782 additional information. For each hook below, the environment
782 additional information. For each hook below, the environment
783 variables it is passed are listed with names of the form ``$HG_foo``.
783 variables it is passed are listed with names of the form ``$HG_foo``.
784
784
785 ``changegroup``
785 ``changegroup``
786 Run after a changegroup has been added via push, pull or unbundle. ID of the
786 Run after a changegroup has been added via push, pull or unbundle. ID of the
787 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
787 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
788 from which changes came is in ``$HG_URL``.
788 from which changes came is in ``$HG_URL``.
789
789
790 ``commit``
790 ``commit``
791 Run after a changeset has been created in the local repository. ID
791 Run after a changeset has been created in the local repository. ID
792 of the newly created changeset is in ``$HG_NODE``. Parent changeset
792 of the newly created changeset is in ``$HG_NODE``. Parent changeset
793 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
793 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
794
794
795 ``incoming``
795 ``incoming``
796 Run after a changeset has been pulled, pushed, or unbundled into
796 Run after a changeset has been pulled, pushed, or unbundled into
797 the local repository. The ID of the newly arrived changeset is in
797 the local repository. The ID of the newly arrived changeset is in
798 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
798 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
799
799
800 ``outgoing``
800 ``outgoing``
801 Run after sending changes from local repository to another. ID of
801 Run after sending changes from local repository to another. ID of
802 first changeset sent is in ``$HG_NODE``. Source of operation is in
802 first changeset sent is in ``$HG_NODE``. Source of operation is in
803 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
803 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
804
804
805 ``post-<command>``
805 ``post-<command>``
806 Run after successful invocations of the associated command. The
806 Run after successful invocations of the associated command. The
807 contents of the command line are passed as ``$HG_ARGS`` and the result
807 contents of the command line are passed as ``$HG_ARGS`` and the result
808 code in ``$HG_RESULT``. Parsed command line arguments are passed as
808 code in ``$HG_RESULT``. Parsed command line arguments are passed as
809 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
809 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
810 the python data internally passed to <command>. ``$HG_OPTS`` is a
810 the python data internally passed to <command>. ``$HG_OPTS`` is a
811 dictionary of options (with unspecified options set to their defaults).
811 dictionary of options (with unspecified options set to their defaults).
812 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
812 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
813
813
814 ``pre-<command>``
814 ``pre-<command>``
815 Run before executing the associated command. The contents of the
815 Run before executing the associated command. The contents of the
816 command line are passed as ``$HG_ARGS``. Parsed command line arguments
816 command line are passed as ``$HG_ARGS``. Parsed command line arguments
817 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
817 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
818 representations of the data internally passed to <command>. ``$HG_OPTS``
818 representations of the data internally passed to <command>. ``$HG_OPTS``
819 is a dictionary of options (with unspecified options set to their
819 is a dictionary of options (with unspecified options set to their
820 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
820 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
821 failure, the command doesn't execute and Mercurial returns the failure
821 failure, the command doesn't execute and Mercurial returns the failure
822 code.
822 code.
823
823
824 ``prechangegroup``
824 ``prechangegroup``
825 Run before a changegroup is added via push, pull or unbundle. Exit
825 Run before a changegroup is added via push, pull or unbundle. Exit
826 status 0 allows the changegroup to proceed. Non-zero status will
826 status 0 allows the changegroup to proceed. Non-zero status will
827 cause the push, pull or unbundle to fail. URL from which changes
827 cause the push, pull or unbundle to fail. URL from which changes
828 will come is in ``$HG_URL``.
828 will come is in ``$HG_URL``.
829
829
830 ``precommit``
830 ``precommit``
831 Run before starting a local commit. Exit status 0 allows the
831 Run before starting a local commit. Exit status 0 allows the
832 commit to proceed. Non-zero status will cause the commit to fail.
832 commit to proceed. Non-zero status will cause the commit to fail.
833 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
833 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
834
834
835 ``prelistkeys``
835 ``prelistkeys``
836 Run before listing pushkeys (like bookmarks) in the
836 Run before listing pushkeys (like bookmarks) in the
837 repository. Non-zero status will cause failure. The key namespace is
837 repository. Non-zero status will cause failure. The key namespace is
838 in ``$HG_NAMESPACE``.
838 in ``$HG_NAMESPACE``.
839
839
840 ``preoutgoing``
840 ``preoutgoing``
841 Run before collecting changes to send from the local repository to
841 Run before collecting changes to send from the local repository to
842 another. Non-zero status will cause failure. This lets you prevent
842 another. Non-zero status will cause failure. This lets you prevent
843 pull over HTTP or SSH. Also prevents against local pull, push
843 pull over HTTP or SSH. Also prevents against local pull, push
844 (outbound) or bundle commands, but not effective, since you can
844 (outbound) or bundle commands, but not effective, since you can
845 just copy files instead then. Source of operation is in
845 just copy files instead then. Source of operation is in
846 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
846 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
847 SSH or HTTP repository. If "push", "pull" or "bundle", operation
847 SSH or HTTP repository. If "push", "pull" or "bundle", operation
848 is happening on behalf of repository on same system.
848 is happening on behalf of repository on same system.
849
849
850 ``prepushkey``
850 ``prepushkey``
851 Run before a pushkey (like a bookmark) is added to the
851 Run before a pushkey (like a bookmark) is added to the
852 repository. Non-zero status will cause the key to be rejected. The
852 repository. Non-zero status will cause the key to be rejected. The
853 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
853 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
854 the old value (if any) is in ``$HG_OLD``, and the new value is in
854 the old value (if any) is in ``$HG_OLD``, and the new value is in
855 ``$HG_NEW``.
855 ``$HG_NEW``.
856
856
857 ``pretag``
857 ``pretag``
858 Run before creating a tag. Exit status 0 allows the tag to be
858 Run before creating a tag. Exit status 0 allows the tag to be
859 created. Non-zero status will cause the tag to fail. ID of
859 created. Non-zero status will cause the tag to fail. ID of
860 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
860 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
861 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
861 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
862
862
863 ``pretxnopen``
863 ``pretxnopen``
864 Run before any new repository transaction is open. The reason for the
864 Run before any new repository transaction is open. The reason for the
865 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
865 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
866 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
866 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
867 transaction from being opened.
867 transaction from being opened.
868
868
869 ``pretxnclose``
869 ``pretxnclose``
870 Run right before the transaction is actually finalized. Any repository change
870 Run right before the transaction is actually finalized. Any repository change
871 will be visible to the hook program. This lets you validate the transaction
871 will be visible to the hook program. This lets you validate the transaction
872 content or change it. Exit status 0 allows the commit to proceed. Non-zero
872 content or change it. Exit status 0 allows the commit to proceed. Non-zero
873 status will cause the transaction to be rolled back. The reason for the
873 status will cause the transaction to be rolled back. The reason for the
874 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
874 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
875 the transaction will be in ``HG_TXNID``. The rest of the available data will
875 the transaction will be in ``HG_TXNID``. The rest of the available data will
876 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
876 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
877 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
877 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
878 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
878 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
879 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
879 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
880
880
881 ``txnclose``
881 ``txnclose``
882 Run after any repository transaction has been committed. At this
882 Run after any repository transaction has been committed. At this
883 point, the transaction can no longer be rolled back. The hook will run
883 point, the transaction can no longer be rolled back. The hook will run
884 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
884 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
885 details about available variables.
885 details about available variables.
886
886
887 ``txnabort``
887 ``txnabort``
888 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
888 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
889 docs for details about available variables.
889 docs for details about available variables.
890
890
891 ``pretxnchangegroup``
891 ``pretxnchangegroup``
892 Run after a changegroup has been added via push, pull or unbundle, but before
892 Run after a changegroup has been added via push, pull or unbundle, but before
893 the transaction has been committed. Changegroup is visible to hook program.
893 the transaction has been committed. Changegroup is visible to hook program.
894 This lets you validate incoming changes before accepting them. Passed the ID
894 This lets you validate incoming changes before accepting them. Passed the ID
895 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
895 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
896 Exit status 0 allows the transaction to commit. Non-zero status will cause
896 Exit status 0 allows the transaction to commit. Non-zero status will cause
897 the transaction to be rolled back and the push, pull or unbundle will fail.
897 the transaction to be rolled back and the push, pull or unbundle will fail.
898 URL that was source of changes is in ``$HG_URL``.
898 URL that was source of changes is in ``$HG_URL``.
899
899
900 ``pretxncommit``
900 ``pretxncommit``
901 Run after a changeset has been created but the transaction not yet
901 Run after a changeset has been created but the transaction not yet
902 committed. Changeset is visible to hook program. This lets you
902 committed. Changeset is visible to hook program. This lets you
903 validate commit message and changes. Exit status 0 allows the
903 validate commit message and changes. Exit status 0 allows the
904 commit to proceed. Non-zero status will cause the transaction to
904 commit to proceed. Non-zero status will cause the transaction to
905 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
905 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
906 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
906 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
907
907
908 ``preupdate``
908 ``preupdate``
909 Run before updating the working directory. Exit status 0 allows
909 Run before updating the working directory. Exit status 0 allows
910 the update to proceed. Non-zero status will prevent the update.
910 the update to proceed. Non-zero status will prevent the update.
911 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
911 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
912 of second new parent is in ``$HG_PARENT2``.
912 of second new parent is in ``$HG_PARENT2``.
913
913
914 ``listkeys``
914 ``listkeys``
915 Run after listing pushkeys (like bookmarks) in the repository. The
915 Run after listing pushkeys (like bookmarks) in the repository. The
916 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
916 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
917 dictionary containing the keys and values.
917 dictionary containing the keys and values.
918
918
919 ``pushkey``
919 ``pushkey``
920 Run after a pushkey (like a bookmark) is added to the
920 Run after a pushkey (like a bookmark) is added to the
921 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
921 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
922 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
922 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
923 value is in ``$HG_NEW``.
923 value is in ``$HG_NEW``.
924
924
925 ``tag``
925 ``tag``
926 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
926 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
927 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
927 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
928 repository if ``$HG_LOCAL=0``.
928 repository if ``$HG_LOCAL=0``.
929
929
930 ``update``
930 ``update``
931 Run after updating the working directory. Changeset ID of first
931 Run after updating the working directory. Changeset ID of first
932 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
932 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
933 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
933 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
934 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
934 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
935
935
936 .. note::
936 .. note::
937
937
938 It is generally better to use standard hooks rather than the
938 It is generally better to use standard hooks rather than the
939 generic pre- and post- command hooks as they are guaranteed to be
939 generic pre- and post- command hooks as they are guaranteed to be
940 called in the appropriate contexts for influencing transactions.
940 called in the appropriate contexts for influencing transactions.
941 Also, hooks like "commit" will be called in all contexts that
941 Also, hooks like "commit" will be called in all contexts that
942 generate a commit (e.g. tag) and not just the commit command.
942 generate a commit (e.g. tag) and not just the commit command.
943
943
944 .. note::
944 .. note::
945
945
946 Environment variables with empty values may not be passed to
946 Environment variables with empty values may not be passed to
947 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
947 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
948 will have an empty value under Unix-like platforms for non-merge
948 will have an empty value under Unix-like platforms for non-merge
949 changesets, while it will not be available at all under Windows.
949 changesets, while it will not be available at all under Windows.
950
950
951 The syntax for Python hooks is as follows::
951 The syntax for Python hooks is as follows::
952
952
953 hookname = python:modulename.submodule.callable
953 hookname = python:modulename.submodule.callable
954 hookname = python:/path/to/python/module.py:callable
954 hookname = python:/path/to/python/module.py:callable
955
955
956 Python hooks are run within the Mercurial process. Each hook is
956 Python hooks are run within the Mercurial process. Each hook is
957 called with at least three keyword arguments: a ui object (keyword
957 called with at least three keyword arguments: a ui object (keyword
958 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
958 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
959 keyword that tells what kind of hook is used. Arguments listed as
959 keyword that tells what kind of hook is used. Arguments listed as
960 environment variables above are passed as keyword arguments, with no
960 environment variables above are passed as keyword arguments, with no
961 ``HG_`` prefix, and names in lower case.
961 ``HG_`` prefix, and names in lower case.
962
962
963 If a Python hook returns a "true" value or raises an exception, this
963 If a Python hook returns a "true" value or raises an exception, this
964 is treated as a failure.
964 is treated as a failure.
965
965
966
966
967 ``hostfingerprints``
967 ``hostfingerprints``
968 --------------------
968 --------------------
969
969
970 Fingerprints of the certificates of known HTTPS servers.
970 Fingerprints of the certificates of known HTTPS servers.
971
971
972 A HTTPS connection to a server with a fingerprint configured here will
972 A HTTPS connection to a server with a fingerprint configured here will
973 only succeed if the servers certificate matches the fingerprint.
973 only succeed if the servers certificate matches the fingerprint.
974 This is very similar to how ssh known hosts works.
974 This is very similar to how ssh known hosts works.
975
975
976 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
976 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
977 Multiple values can be specified (separated by spaces or commas). This can
977 Multiple values can be specified (separated by spaces or commas). This can
978 be used to define both old and new fingerprints while a host transitions
978 be used to define both old and new fingerprints while a host transitions
979 to a new certificate.
979 to a new certificate.
980
980
981 The CA chain and web.cacerts is not used for servers with a fingerprint.
981 The CA chain and web.cacerts is not used for servers with a fingerprint.
982
982
983 For example::
983 For example::
984
984
985 [hostfingerprints]
985 [hostfingerprints]
986 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
986 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
987 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
987 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
988
988
989 ``http_proxy``
989 ``http_proxy``
990 --------------
990 --------------
991
991
992 Used to access web-based Mercurial repositories through a HTTP
992 Used to access web-based Mercurial repositories through a HTTP
993 proxy.
993 proxy.
994
994
995 ``host``
995 ``host``
996 Host name and (optional) port of the proxy server, for example
996 Host name and (optional) port of the proxy server, for example
997 "myproxy:8000".
997 "myproxy:8000".
998
998
999 ``no``
999 ``no``
1000 Optional. Comma-separated list of host names that should bypass
1000 Optional. Comma-separated list of host names that should bypass
1001 the proxy.
1001 the proxy.
1002
1002
1003 ``passwd``
1003 ``passwd``
1004 Optional. Password to authenticate with at the proxy server.
1004 Optional. Password to authenticate with at the proxy server.
1005
1005
1006 ``user``
1006 ``user``
1007 Optional. User name to authenticate with at the proxy server.
1007 Optional. User name to authenticate with at the proxy server.
1008
1008
1009 ``always``
1009 ``always``
1010 Optional. Always use the proxy, even for localhost and any entries
1010 Optional. Always use the proxy, even for localhost and any entries
1011 in ``http_proxy.no``. (default: False)
1011 in ``http_proxy.no``. (default: False)
1012
1012
1013 ``merge``
1013 ``merge``
1014 ---------
1014 ---------
1015
1015
1016 This section specifies behavior during merges and updates.
1016 This section specifies behavior during merges and updates.
1017
1017
1018 ``checkignored``
1018 ``checkignored``
1019 Controls behavior when an ignored file on disk has the same name as a tracked
1019 Controls behavior when an ignored file on disk has the same name as a tracked
1020 file in the changeset being merged or updated to, and has different
1020 file in the changeset being merged or updated to, and has different
1021 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1021 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1022 abort on such files. With ``warn``, warn on such files and back them up as
1022 abort on such files. With ``warn``, warn on such files and back them up as
1023 ``.orig``. With ``ignore``, don't print a warning and back them up as
1023 ``.orig``. With ``ignore``, don't print a warning and back them up as
1024 ``.orig``. (default: ``abort``)
1024 ``.orig``. (default: ``abort``)
1025
1025
1026 ``checkunknown``
1026 ``checkunknown``
1027 Controls behavior when an unknown file that isn't ignored has the same name
1027 Controls behavior when an unknown file that isn't ignored has the same name
1028 as a tracked file in the changeset being merged or updated to, and has
1028 as a tracked file in the changeset being merged or updated to, and has
1029 different contents. Similar to ``merge.checkignored``, except for files that
1029 different contents. Similar to ``merge.checkignored``, except for files that
1030 are not ignored. (default: ``abort``)
1030 are not ignored. (default: ``abort``)
1031
1031
1032 ``merge-patterns``
1032 ``merge-patterns``
1033 ------------------
1033 ------------------
1034
1034
1035 This section specifies merge tools to associate with particular file
1035 This section specifies merge tools to associate with particular file
1036 patterns. Tools matched here will take precedence over the default
1036 patterns. Tools matched here will take precedence over the default
1037 merge tool. Patterns are globs by default, rooted at the repository
1037 merge tool. Patterns are globs by default, rooted at the repository
1038 root.
1038 root.
1039
1039
1040 Example::
1040 Example::
1041
1041
1042 [merge-patterns]
1042 [merge-patterns]
1043 **.c = kdiff3
1043 **.c = kdiff3
1044 **.jpg = myimgmerge
1044 **.jpg = myimgmerge
1045
1045
1046 ``merge-tools``
1046 ``merge-tools``
1047 ---------------
1047 ---------------
1048
1048
1049 This section configures external merge tools to use for file-level
1049 This section configures external merge tools to use for file-level
1050 merges. This section has likely been preconfigured at install time.
1050 merges. This section has likely been preconfigured at install time.
1051 Use :hg:`config merge-tools` to check the existing configuration.
1051 Use :hg:`config merge-tools` to check the existing configuration.
1052 Also see :hg:`help merge-tools` for more details.
1052 Also see :hg:`help merge-tools` for more details.
1053
1053
1054 Example ``~/.hgrc``::
1054 Example ``~/.hgrc``::
1055
1055
1056 [merge-tools]
1056 [merge-tools]
1057 # Override stock tool location
1057 # Override stock tool location
1058 kdiff3.executable = ~/bin/kdiff3
1058 kdiff3.executable = ~/bin/kdiff3
1059 # Specify command line
1059 # Specify command line
1060 kdiff3.args = $base $local $other -o $output
1060 kdiff3.args = $base $local $other -o $output
1061 # Give higher priority
1061 # Give higher priority
1062 kdiff3.priority = 1
1062 kdiff3.priority = 1
1063
1063
1064 # Changing the priority of preconfigured tool
1064 # Changing the priority of preconfigured tool
1065 meld.priority = 0
1065 meld.priority = 0
1066
1066
1067 # Disable a preconfigured tool
1067 # Disable a preconfigured tool
1068 vimdiff.disabled = yes
1068 vimdiff.disabled = yes
1069
1069
1070 # Define new tool
1070 # Define new tool
1071 myHtmlTool.args = -m $local $other $base $output
1071 myHtmlTool.args = -m $local $other $base $output
1072 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1072 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1073 myHtmlTool.priority = 1
1073 myHtmlTool.priority = 1
1074
1074
1075 Supported arguments:
1075 Supported arguments:
1076
1076
1077 ``priority``
1077 ``priority``
1078 The priority in which to evaluate this tool.
1078 The priority in which to evaluate this tool.
1079 (default: 0)
1079 (default: 0)
1080
1080
1081 ``executable``
1081 ``executable``
1082 Either just the name of the executable or its pathname.
1082 Either just the name of the executable or its pathname.
1083
1083
1084 .. container:: windows
1084 .. container:: windows
1085
1085
1086 On Windows, the path can use environment variables with ${ProgramFiles}
1086 On Windows, the path can use environment variables with ${ProgramFiles}
1087 syntax.
1087 syntax.
1088
1088
1089 (default: the tool name)
1089 (default: the tool name)
1090
1090
1091 ``args``
1091 ``args``
1092 The arguments to pass to the tool executable. You can refer to the
1092 The arguments to pass to the tool executable. You can refer to the
1093 files being merged as well as the output file through these
1093 files being merged as well as the output file through these
1094 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1094 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1095 of ``$local`` and ``$other`` can vary depending on which action is being
1095 of ``$local`` and ``$other`` can vary depending on which action is being
1096 performed. During and update or merge, ``$local`` represents the original
1096 performed. During and update or merge, ``$local`` represents the original
1097 state of the file, while ``$other`` represents the commit you are updating
1097 state of the file, while ``$other`` represents the commit you are updating
1098 to or the commit you are merging with. During a rebase ``$local``
1098 to or the commit you are merging with. During a rebase ``$local``
1099 represents the destination of the rebase, and ``$other`` represents the
1099 represents the destination of the rebase, and ``$other`` represents the
1100 commit being rebased.
1100 commit being rebased.
1101 (default: ``$local $base $other``)
1101 (default: ``$local $base $other``)
1102
1102
1103 ``premerge``
1103 ``premerge``
1104 Attempt to run internal non-interactive 3-way merge tool before
1104 Attempt to run internal non-interactive 3-way merge tool before
1105 launching external tool. Options are ``true``, ``false``, ``keep`` or
1105 launching external tool. Options are ``true``, ``false``, ``keep`` or
1106 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1106 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1107 premerge fails. The ``keep-merge3`` will do the same but include information
1107 premerge fails. The ``keep-merge3`` will do the same but include information
1108 about the base of the merge in the marker (see internal :merge3 in
1108 about the base of the merge in the marker (see internal :merge3 in
1109 :hg:`help merge-tools`).
1109 :hg:`help merge-tools`).
1110 (default: True)
1110 (default: True)
1111
1111
1112 ``binary``
1112 ``binary``
1113 This tool can merge binary files. (default: False, unless tool
1113 This tool can merge binary files. (default: False, unless tool
1114 was selected by file pattern match)
1114 was selected by file pattern match)
1115
1115
1116 ``symlink``
1116 ``symlink``
1117 This tool can merge symlinks. (default: False)
1117 This tool can merge symlinks. (default: False)
1118
1118
1119 ``check``
1119 ``check``
1120 A list of merge success-checking options:
1120 A list of merge success-checking options:
1121
1121
1122 ``changed``
1122 ``changed``
1123 Ask whether merge was successful when the merged file shows no changes.
1123 Ask whether merge was successful when the merged file shows no changes.
1124 ``conflicts``
1124 ``conflicts``
1125 Check whether there are conflicts even though the tool reported success.
1125 Check whether there are conflicts even though the tool reported success.
1126 ``prompt``
1126 ``prompt``
1127 Always prompt for merge success, regardless of success reported by tool.
1127 Always prompt for merge success, regardless of success reported by tool.
1128
1128
1129 ``fixeol``
1129 ``fixeol``
1130 Attempt to fix up EOL changes caused by the merge tool.
1130 Attempt to fix up EOL changes caused by the merge tool.
1131 (default: False)
1131 (default: False)
1132
1132
1133 ``gui``
1133 ``gui``
1134 This tool requires a graphical interface to run. (default: False)
1134 This tool requires a graphical interface to run. (default: False)
1135
1135
1136 .. container:: windows
1136 .. container:: windows
1137
1137
1138 ``regkey``
1138 ``regkey``
1139 Windows registry key which describes install location of this
1139 Windows registry key which describes install location of this
1140 tool. Mercurial will search for this key first under
1140 tool. Mercurial will search for this key first under
1141 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1141 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1142 (default: None)
1142 (default: None)
1143
1143
1144 ``regkeyalt``
1144 ``regkeyalt``
1145 An alternate Windows registry key to try if the first key is not
1145 An alternate Windows registry key to try if the first key is not
1146 found. The alternate key uses the same ``regname`` and ``regappend``
1146 found. The alternate key uses the same ``regname`` and ``regappend``
1147 semantics of the primary key. The most common use for this key
1147 semantics of the primary key. The most common use for this key
1148 is to search for 32bit applications on 64bit operating systems.
1148 is to search for 32bit applications on 64bit operating systems.
1149 (default: None)
1149 (default: None)
1150
1150
1151 ``regname``
1151 ``regname``
1152 Name of value to read from specified registry key.
1152 Name of value to read from specified registry key.
1153 (default: the unnamed (default) value)
1153 (default: the unnamed (default) value)
1154
1154
1155 ``regappend``
1155 ``regappend``
1156 String to append to the value read from the registry, typically
1156 String to append to the value read from the registry, typically
1157 the executable name of the tool.
1157 the executable name of the tool.
1158 (default: None)
1158 (default: None)
1159
1159
1160
1160
1161 ``patch``
1161 ``patch``
1162 ---------
1162 ---------
1163
1163
1164 Settings used when applying patches, for instance through the 'import'
1164 Settings used when applying patches, for instance through the 'import'
1165 command or with Mercurial Queues extension.
1165 command or with Mercurial Queues extension.
1166
1166
1167 ``eol``
1167 ``eol``
1168 When set to 'strict' patch content and patched files end of lines
1168 When set to 'strict' patch content and patched files end of lines
1169 are preserved. When set to ``lf`` or ``crlf``, both files end of
1169 are preserved. When set to ``lf`` or ``crlf``, both files end of
1170 lines are ignored when patching and the result line endings are
1170 lines are ignored when patching and the result line endings are
1171 normalized to either LF (Unix) or CRLF (Windows). When set to
1171 normalized to either LF (Unix) or CRLF (Windows). When set to
1172 ``auto``, end of lines are again ignored while patching but line
1172 ``auto``, end of lines are again ignored while patching but line
1173 endings in patched files are normalized to their original setting
1173 endings in patched files are normalized to their original setting
1174 on a per-file basis. If target file does not exist or has no end
1174 on a per-file basis. If target file does not exist or has no end
1175 of line, patch line endings are preserved.
1175 of line, patch line endings are preserved.
1176 (default: strict)
1176 (default: strict)
1177
1177
1178 ``fuzz``
1178 ``fuzz``
1179 The number of lines of 'fuzz' to allow when applying patches. This
1179 The number of lines of 'fuzz' to allow when applying patches. This
1180 controls how much context the patcher is allowed to ignore when
1180 controls how much context the patcher is allowed to ignore when
1181 trying to apply a patch.
1181 trying to apply a patch.
1182 (default: 2)
1182 (default: 2)
1183
1183
1184 ``paths``
1184 ``paths``
1185 ---------
1185 ---------
1186
1186
1187 Assigns symbolic names and behavior to repositories.
1187 Assigns symbolic names and behavior to repositories.
1188
1188
1189 Options are symbolic names defining the URL or directory that is the
1189 Options are symbolic names defining the URL or directory that is the
1190 location of the repository. Example::
1190 location of the repository. Example::
1191
1191
1192 [paths]
1192 [paths]
1193 my_server = https://example.com/my_repo
1193 my_server = https://example.com/my_repo
1194 local_path = /home/me/repo
1194 local_path = /home/me/repo
1195
1195
1196 These symbolic names can be used from the command line. To pull
1196 These symbolic names can be used from the command line. To pull
1197 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1197 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1198 :hg:`push local_path`.
1198 :hg:`push local_path`.
1199
1199
1200 Options containing colons (``:``) denote sub-options that can influence
1200 Options containing colons (``:``) denote sub-options that can influence
1201 behavior for that specific path. Example::
1201 behavior for that specific path. Example::
1202
1202
1203 [paths]
1203 [paths]
1204 my_server = https://example.com/my_path
1204 my_server = https://example.com/my_path
1205 my_server:pushurl = ssh://example.com/my_path
1205 my_server:pushurl = ssh://example.com/my_path
1206
1206
1207 The following sub-options can be defined:
1207 The following sub-options can be defined:
1208
1208
1209 ``pushurl``
1209 ``pushurl``
1210 The URL to use for push operations. If not defined, the location
1210 The URL to use for push operations. If not defined, the location
1211 defined by the path's main entry is used.
1211 defined by the path's main entry is used.
1212
1212
1213 The following special named paths exist:
1213 The following special named paths exist:
1214
1214
1215 ``default``
1215 ``default``
1216 The URL or directory to use when no source or remote is specified.
1216 The URL or directory to use when no source or remote is specified.
1217
1217
1218 :hg:`clone` will automatically define this path to the location the
1218 :hg:`clone` will automatically define this path to the location the
1219 repository was cloned from.
1219 repository was cloned from.
1220
1220
1221 ``default-push``
1221 ``default-push``
1222 (deprecated) The URL or directory for the default :hg:`push` location.
1222 (deprecated) The URL or directory for the default :hg:`push` location.
1223 ``default:pushurl`` should be used instead.
1223 ``default:pushurl`` should be used instead.
1224
1224
1225 ``phases``
1225 ``phases``
1226 ----------
1226 ----------
1227
1227
1228 Specifies default handling of phases. See :hg:`help phases` for more
1228 Specifies default handling of phases. See :hg:`help phases` for more
1229 information about working with phases.
1229 information about working with phases.
1230
1230
1231 ``publish``
1231 ``publish``
1232 Controls draft phase behavior when working as a server. When true,
1232 Controls draft phase behavior when working as a server. When true,
1233 pushed changesets are set to public in both client and server and
1233 pushed changesets are set to public in both client and server and
1234 pulled or cloned changesets are set to public in the client.
1234 pulled or cloned changesets are set to public in the client.
1235 (default: True)
1235 (default: True)
1236
1236
1237 ``new-commit``
1237 ``new-commit``
1238 Phase of newly-created commits.
1238 Phase of newly-created commits.
1239 (default: draft)
1239 (default: draft)
1240
1240
1241 ``checksubrepos``
1241 ``checksubrepos``
1242 Check the phase of the current revision of each subrepository. Allowed
1242 Check the phase of the current revision of each subrepository. Allowed
1243 values are "ignore", "follow" and "abort". For settings other than
1243 values are "ignore", "follow" and "abort". For settings other than
1244 "ignore", the phase of the current revision of each subrepository is
1244 "ignore", the phase of the current revision of each subrepository is
1245 checked before committing the parent repository. If any of those phases is
1245 checked before committing the parent repository. If any of those phases is
1246 greater than the phase of the parent repository (e.g. if a subrepo is in a
1246 greater than the phase of the parent repository (e.g. if a subrepo is in a
1247 "secret" phase while the parent repo is in "draft" phase), the commit is
1247 "secret" phase while the parent repo is in "draft" phase), the commit is
1248 either aborted (if checksubrepos is set to "abort") or the higher phase is
1248 either aborted (if checksubrepos is set to "abort") or the higher phase is
1249 used for the parent repository commit (if set to "follow").
1249 used for the parent repository commit (if set to "follow").
1250 (default: follow)
1250 (default: follow)
1251
1251
1252
1252
1253 ``profiling``
1253 ``profiling``
1254 -------------
1254 -------------
1255
1255
1256 Specifies profiling type, format, and file output. Two profilers are
1256 Specifies profiling type, format, and file output. Two profilers are
1257 supported: an instrumenting profiler (named ``ls``), and a sampling
1257 supported: an instrumenting profiler (named ``ls``), and a sampling
1258 profiler (named ``stat``).
1258 profiler (named ``stat``).
1259
1259
1260 In this section description, 'profiling data' stands for the raw data
1260 In this section description, 'profiling data' stands for the raw data
1261 collected during profiling, while 'profiling report' stands for a
1261 collected during profiling, while 'profiling report' stands for a
1262 statistical text report generated from the profiling data. The
1262 statistical text report generated from the profiling data. The
1263 profiling is done using lsprof.
1263 profiling is done using lsprof.
1264
1264
1265 ``type``
1265 ``type``
1266 The type of profiler to use.
1266 The type of profiler to use.
1267 (default: ls)
1267 (default: ls)
1268
1268
1269 ``ls``
1269 ``ls``
1270 Use Python's built-in instrumenting profiler. This profiler
1270 Use Python's built-in instrumenting profiler. This profiler
1271 works on all platforms, but each line number it reports is the
1271 works on all platforms, but each line number it reports is the
1272 first line of a function. This restriction makes it difficult to
1272 first line of a function. This restriction makes it difficult to
1273 identify the expensive parts of a non-trivial function.
1273 identify the expensive parts of a non-trivial function.
1274 ``stat``
1274 ``stat``
1275 Use a third-party statistical profiler, statprof. This profiler
1275 Use a third-party statistical profiler, statprof. This profiler
1276 currently runs only on Unix systems, and is most useful for
1276 currently runs only on Unix systems, and is most useful for
1277 profiling commands that run for longer than about 0.1 seconds.
1277 profiling commands that run for longer than about 0.1 seconds.
1278
1278
1279 ``format``
1279 ``format``
1280 Profiling format. Specific to the ``ls`` instrumenting profiler.
1280 Profiling format. Specific to the ``ls`` instrumenting profiler.
1281 (default: text)
1281 (default: text)
1282
1282
1283 ``text``
1283 ``text``
1284 Generate a profiling report. When saving to a file, it should be
1284 Generate a profiling report. When saving to a file, it should be
1285 noted that only the report is saved, and the profiling data is
1285 noted that only the report is saved, and the profiling data is
1286 not kept.
1286 not kept.
1287 ``kcachegrind``
1287 ``kcachegrind``
1288 Format profiling data for kcachegrind use: when saving to a
1288 Format profiling data for kcachegrind use: when saving to a
1289 file, the generated file can directly be loaded into
1289 file, the generated file can directly be loaded into
1290 kcachegrind.
1290 kcachegrind.
1291
1291
1292 ``frequency``
1292 ``frequency``
1293 Sampling frequency. Specific to the ``stat`` sampling profiler.
1293 Sampling frequency. Specific to the ``stat`` sampling profiler.
1294 (default: 1000)
1294 (default: 1000)
1295
1295
1296 ``output``
1296 ``output``
1297 File path where profiling data or report should be saved. If the
1297 File path where profiling data or report should be saved. If the
1298 file exists, it is replaced. (default: None, data is printed on
1298 file exists, it is replaced. (default: None, data is printed on
1299 stderr)
1299 stderr)
1300
1300
1301 ``sort``
1301 ``sort``
1302 Sort field. Specific to the ``ls`` instrumenting profiler.
1302 Sort field. Specific to the ``ls`` instrumenting profiler.
1303 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1303 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1304 ``inlinetime``.
1304 ``inlinetime``.
1305 (default: inlinetime)
1305 (default: inlinetime)
1306
1306
1307 ``limit``
1307 ``limit``
1308 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1308 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1309 (default: 30)
1309 (default: 30)
1310
1310
1311 ``nested``
1311 ``nested``
1312 Show at most this number of lines of drill-down info after each main entry.
1312 Show at most this number of lines of drill-down info after each main entry.
1313 This can help explain the difference between Total and Inline.
1313 This can help explain the difference between Total and Inline.
1314 Specific to the ``ls`` instrumenting profiler.
1314 Specific to the ``ls`` instrumenting profiler.
1315 (default: 5)
1315 (default: 5)
1316
1316
1317 ``progress``
1317 ``progress``
1318 ------------
1318 ------------
1319
1319
1320 Mercurial commands can draw progress bars that are as informative as
1320 Mercurial commands can draw progress bars that are as informative as
1321 possible. Some progress bars only offer indeterminate information, while others
1321 possible. Some progress bars only offer indeterminate information, while others
1322 have a definite end point.
1322 have a definite end point.
1323
1323
1324 ``delay``
1324 ``delay``
1325 Number of seconds (float) before showing the progress bar. (default: 3)
1325 Number of seconds (float) before showing the progress bar. (default: 3)
1326
1326
1327 ``changedelay``
1327 ``changedelay``
1328 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1328 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1329 that value will be used instead. (default: 1)
1329 that value will be used instead. (default: 1)
1330
1330
1331 ``refresh``
1331 ``refresh``
1332 Time in seconds between refreshes of the progress bar. (default: 0.1)
1332 Time in seconds between refreshes of the progress bar. (default: 0.1)
1333
1333
1334 ``format``
1334 ``format``
1335 Format of the progress bar.
1335 Format of the progress bar.
1336
1336
1337 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1337 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1338 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1338 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1339 last 20 characters of the item, but this can be changed by adding either
1339 last 20 characters of the item, but this can be changed by adding either
1340 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1340 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1341 first num characters.
1341 first num characters.
1342
1342
1343 (default: topic bar number estimate)
1343 (default: topic bar number estimate)
1344
1344
1345 ``width``
1345 ``width``
1346 If set, the maximum width of the progress information (that is, min(width,
1346 If set, the maximum width of the progress information (that is, min(width,
1347 term width) will be used).
1347 term width) will be used).
1348
1348
1349 ``clear-complete``
1349 ``clear-complete``
1350 Clear the progress bar after it's done. (default: True)
1350 Clear the progress bar after it's done. (default: True)
1351
1351
1352 ``disable``
1352 ``disable``
1353 If true, don't show a progress bar.
1353 If true, don't show a progress bar.
1354
1354
1355 ``assume-tty``
1355 ``assume-tty``
1356 If true, ALWAYS show a progress bar, unless disable is given.
1356 If true, ALWAYS show a progress bar, unless disable is given.
1357
1357
1358 ``rebase``
1358 ``rebase``
1359 ----------
1359 ----------
1360
1360
1361 ``allowdivergence``
1361 ``allowdivergence``
1362 Default to False, when True allow creating divergence when performing
1362 Default to False, when True allow creating divergence when performing
1363 rebase of obsolete changesets.
1363 rebase of obsolete changesets.
1364
1364
1365 ``revsetalias``
1365 ``revsetalias``
1366 ---------------
1366 ---------------
1367
1367
1368 Alias definitions for revsets. See :hg:`help revsets` for details.
1368 Alias definitions for revsets. See :hg:`help revsets` for details.
1369
1369
1370 ``server``
1370 ``server``
1371 ----------
1371 ----------
1372
1372
1373 Controls generic server settings.
1373 Controls generic server settings.
1374
1374
1375 ``uncompressed``
1375 ``uncompressed``
1376 Whether to allow clients to clone a repository using the
1376 Whether to allow clients to clone a repository using the
1377 uncompressed streaming protocol. This transfers about 40% more
1377 uncompressed streaming protocol. This transfers about 40% more
1378 data than a regular clone, but uses less memory and CPU on both
1378 data than a regular clone, but uses less memory and CPU on both
1379 server and client. Over a LAN (100 Mbps or better) or a very fast
1379 server and client. Over a LAN (100 Mbps or better) or a very fast
1380 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1380 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1381 regular clone. Over most WAN connections (anything slower than
1381 regular clone. Over most WAN connections (anything slower than
1382 about 6 Mbps), uncompressed streaming is slower, because of the
1382 about 6 Mbps), uncompressed streaming is slower, because of the
1383 extra data transfer overhead. This mode will also temporarily hold
1383 extra data transfer overhead. This mode will also temporarily hold
1384 the write lock while determining what data to transfer.
1384 the write lock while determining what data to transfer.
1385 (default: True)
1385 (default: True)
1386
1386
1387 ``preferuncompressed``
1387 ``preferuncompressed``
1388 When set, clients will try to use the uncompressed streaming
1388 When set, clients will try to use the uncompressed streaming
1389 protocol. (default: False)
1389 protocol. (default: False)
1390
1390
1391 ``validate``
1391 ``validate``
1392 Whether to validate the completeness of pushed changesets by
1392 Whether to validate the completeness of pushed changesets by
1393 checking that all new file revisions specified in manifests are
1393 checking that all new file revisions specified in manifests are
1394 present. (default: False)
1394 present. (default: False)
1395
1395
1396 ``maxhttpheaderlen``
1396 ``maxhttpheaderlen``
1397 Instruct HTTP clients not to send request headers longer than this
1397 Instruct HTTP clients not to send request headers longer than this
1398 many bytes. (default: 1024)
1398 many bytes. (default: 1024)
1399
1399
1400 ``bundle1``
1400 ``bundle1``
1401 Whether to allow clients to push and pull using the legacy bundle1
1401 Whether to allow clients to push and pull using the legacy bundle1
1402 exchange format. (default: True)
1402 exchange format. (default: True)
1403
1403
1404 ``bundle1gd``
1404 ``bundle1gd``
1405 Like ``bundle1`` but only used if the repository is using the
1405 Like ``bundle1`` but only used if the repository is using the
1406 *generaldelta* storage format. (default: True)
1406 *generaldelta* storage format. (default: True)
1407
1407
1408 ``bundle1.push``
1408 ``bundle1.push``
1409 Whether to allow clients to push using the legacy bundle1 exchange
1409 Whether to allow clients to push using the legacy bundle1 exchange
1410 format. (default: True)
1410 format. (default: True)
1411
1411
1412 ``bundle1gd.push``
1412 ``bundle1gd.push``
1413 Like ``bundle1.push`` but only used if the repository is using the
1413 Like ``bundle1.push`` but only used if the repository is using the
1414 *generaldelta* storage format. (default: True)
1414 *generaldelta* storage format. (default: True)
1415
1415
1416 ``bundle1.pull``
1416 ``bundle1.pull``
1417 Whether to allow clients to pull using the legacy bundle1 exchange
1417 Whether to allow clients to pull using the legacy bundle1 exchange
1418 format. (default: True)
1418 format. (default: True)
1419
1419
1420 ``bundle1gd.pull``
1420 ``bundle1gd.pull``
1421 Like ``bundle1.pull`` but only used if the repository is using the
1421 Like ``bundle1.pull`` but only used if the repository is using the
1422 *generaldelta* storage format. (default: True)
1422 *generaldelta* storage format. (default: True)
1423
1423
1424 Large repositories using the *generaldelta* storage format should
1424 Large repositories using the *generaldelta* storage format should
1425 consider setting this option because converting *generaldelta*
1425 consider setting this option because converting *generaldelta*
1426 repositories to the exchange format required by the bundle1 data
1426 repositories to the exchange format required by the bundle1 data
1427 format can consume a lot of CPU.
1427 format can consume a lot of CPU.
1428
1428
1429 ``smtp``
1429 ``smtp``
1430 --------
1430 --------
1431
1431
1432 Configuration for extensions that need to send email messages.
1432 Configuration for extensions that need to send email messages.
1433
1433
1434 ``host``
1434 ``host``
1435 Host name of mail server, e.g. "mail.example.com".
1435 Host name of mail server, e.g. "mail.example.com".
1436
1436
1437 ``port``
1437 ``port``
1438 Optional. Port to connect to on mail server. (default: 465 if
1438 Optional. Port to connect to on mail server. (default: 465 if
1439 ``tls`` is smtps; 25 otherwise)
1439 ``tls`` is smtps; 25 otherwise)
1440
1440
1441 ``tls``
1441 ``tls``
1442 Optional. Method to enable TLS when connecting to mail server: starttls,
1442 Optional. Method to enable TLS when connecting to mail server: starttls,
1443 smtps or none. (default: none)
1443 smtps or none. (default: none)
1444
1444
1445 ``verifycert``
1445 ``verifycert``
1446 Optional. Verification for the certificate of mail server, when
1446 Optional. Verification for the certificate of mail server, when
1447 ``tls`` is starttls or smtps. "strict", "loose" or False. For
1447 ``tls`` is starttls or smtps. "strict", "loose" or False. For
1448 "strict" or "loose", the certificate is verified as same as the
1448 "strict" or "loose", the certificate is verified as same as the
1449 verification for HTTPS connections (see ``[hostfingerprints]`` and
1449 verification for HTTPS connections (see ``[hostfingerprints]`` and
1450 ``[web] cacerts`` also). For "strict", sending email is also
1450 ``[web] cacerts`` also). For "strict", sending email is also
1451 aborted, if there is no configuration for mail server in
1451 aborted, if there is no configuration for mail server in
1452 ``[hostfingerprints]`` and ``[web] cacerts``. --insecure for
1452 ``[hostfingerprints]`` and ``[web] cacerts``. --insecure for
1453 :hg:`email` overwrites this as "loose". (default: strict)
1453 :hg:`email` overwrites this as "loose". (default: strict)
1454
1454
1455 ``username``
1455 ``username``
1456 Optional. User name for authenticating with the SMTP server.
1456 Optional. User name for authenticating with the SMTP server.
1457 (default: None)
1457 (default: None)
1458
1458
1459 ``password``
1459 ``password``
1460 Optional. Password for authenticating with the SMTP server. If not
1460 Optional. Password for authenticating with the SMTP server. If not
1461 specified, interactive sessions will prompt the user for a
1461 specified, interactive sessions will prompt the user for a
1462 password; non-interactive sessions will fail. (default: None)
1462 password; non-interactive sessions will fail. (default: None)
1463
1463
1464 ``local_hostname``
1464 ``local_hostname``
1465 Optional. The hostname that the sender can use to identify
1465 Optional. The hostname that the sender can use to identify
1466 itself to the MTA.
1466 itself to the MTA.
1467
1467
1468
1468
1469 ``subpaths``
1469 ``subpaths``
1470 ------------
1470 ------------
1471
1471
1472 Subrepository source URLs can go stale if a remote server changes name
1472 Subrepository source URLs can go stale if a remote server changes name
1473 or becomes temporarily unavailable. This section lets you define
1473 or becomes temporarily unavailable. This section lets you define
1474 rewrite rules of the form::
1474 rewrite rules of the form::
1475
1475
1476 <pattern> = <replacement>
1476 <pattern> = <replacement>
1477
1477
1478 where ``pattern`` is a regular expression matching a subrepository
1478 where ``pattern`` is a regular expression matching a subrepository
1479 source URL and ``replacement`` is the replacement string used to
1479 source URL and ``replacement`` is the replacement string used to
1480 rewrite it. Groups can be matched in ``pattern`` and referenced in
1480 rewrite it. Groups can be matched in ``pattern`` and referenced in
1481 ``replacements``. For instance::
1481 ``replacements``. For instance::
1482
1482
1483 http://server/(.*)-hg/ = http://hg.server/\1/
1483 http://server/(.*)-hg/ = http://hg.server/\1/
1484
1484
1485 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1485 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1486
1486
1487 Relative subrepository paths are first made absolute, and the
1487 Relative subrepository paths are first made absolute, and the
1488 rewrite rules are then applied on the full (absolute) path. The rules
1488 rewrite rules are then applied on the full (absolute) path. The rules
1489 are applied in definition order.
1489 are applied in definition order.
1490
1490
1491 ``templatealias``
1491 ``templatealias``
1492 -----------------
1492 -----------------
1493
1493
1494 Alias definitions for templates. See :hg:`help templates` for details.
1494 Alias definitions for templates. See :hg:`help templates` for details.
1495
1495
1496 ``trusted``
1496 ``trusted``
1497 -----------
1497 -----------
1498
1498
1499 Mercurial will not use the settings in the
1499 Mercurial will not use the settings in the
1500 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1500 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1501 user or to a trusted group, as various hgrc features allow arbitrary
1501 user or to a trusted group, as various hgrc features allow arbitrary
1502 commands to be run. This issue is often encountered when configuring
1502 commands to be run. This issue is often encountered when configuring
1503 hooks or extensions for shared repositories or servers. However,
1503 hooks or extensions for shared repositories or servers. However,
1504 the web interface will use some safe settings from the ``[web]``
1504 the web interface will use some safe settings from the ``[web]``
1505 section.
1505 section.
1506
1506
1507 This section specifies what users and groups are trusted. The
1507 This section specifies what users and groups are trusted. The
1508 current user is always trusted. To trust everybody, list a user or a
1508 current user is always trusted. To trust everybody, list a user or a
1509 group with name ``*``. These settings must be placed in an
1509 group with name ``*``. These settings must be placed in an
1510 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1510 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1511 user or service running Mercurial.
1511 user or service running Mercurial.
1512
1512
1513 ``users``
1513 ``users``
1514 Comma-separated list of trusted users.
1514 Comma-separated list of trusted users.
1515
1515
1516 ``groups``
1516 ``groups``
1517 Comma-separated list of trusted groups.
1517 Comma-separated list of trusted groups.
1518
1518
1519
1519
1520 ``ui``
1520 ``ui``
1521 ------
1521 ------
1522
1522
1523 User interface controls.
1523 User interface controls.
1524
1524
1525 ``archivemeta``
1525 ``archivemeta``
1526 Whether to include the .hg_archival.txt file containing meta data
1526 Whether to include the .hg_archival.txt file containing meta data
1527 (hashes for the repository base and for tip) in archives created
1527 (hashes for the repository base and for tip) in archives created
1528 by the :hg:`archive` command or downloaded via hgweb.
1528 by the :hg:`archive` command or downloaded via hgweb.
1529 (default: True)
1529 (default: True)
1530
1530
1531 ``askusername``
1531 ``askusername``
1532 Whether to prompt for a username when committing. If True, and
1532 Whether to prompt for a username when committing. If True, and
1533 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1533 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1534 be prompted to enter a username. If no username is entered, the
1534 be prompted to enter a username. If no username is entered, the
1535 default ``USER@HOST`` is used instead.
1535 default ``USER@HOST`` is used instead.
1536 (default: False)
1536 (default: False)
1537
1537
1538 ``clonebundles``
1538 ``clonebundles``
1539 Whether the "clone bundles" feature is enabled.
1539 Whether the "clone bundles" feature is enabled.
1540
1540
1541 When enabled, :hg:`clone` may download and apply a server-advertised
1541 When enabled, :hg:`clone` may download and apply a server-advertised
1542 bundle file from a URL instead of using the normal exchange mechanism.
1542 bundle file from a URL instead of using the normal exchange mechanism.
1543
1543
1544 This can likely result in faster and more reliable clones.
1544 This can likely result in faster and more reliable clones.
1545
1545
1546 (default: True)
1546 (default: True)
1547
1547
1548 ``clonebundlefallback``
1548 ``clonebundlefallback``
1549 Whether failure to apply an advertised "clone bundle" from a server
1549 Whether failure to apply an advertised "clone bundle" from a server
1550 should result in fallback to a regular clone.
1550 should result in fallback to a regular clone.
1551
1551
1552 This is disabled by default because servers advertising "clone
1552 This is disabled by default because servers advertising "clone
1553 bundles" often do so to reduce server load. If advertised bundles
1553 bundles" often do so to reduce server load. If advertised bundles
1554 start mass failing and clients automatically fall back to a regular
1554 start mass failing and clients automatically fall back to a regular
1555 clone, this would add significant and unexpected load to the server
1555 clone, this would add significant and unexpected load to the server
1556 since the server is expecting clone operations to be offloaded to
1556 since the server is expecting clone operations to be offloaded to
1557 pre-generated bundles. Failing fast (the default behavior) ensures
1557 pre-generated bundles. Failing fast (the default behavior) ensures
1558 clients don't overwhelm the server when "clone bundle" application
1558 clients don't overwhelm the server when "clone bundle" application
1559 fails.
1559 fails.
1560
1560
1561 (default: False)
1561 (default: False)
1562
1562
1563 ``clonebundleprefers``
1563 ``clonebundleprefers``
1564 Defines preferences for which "clone bundles" to use.
1564 Defines preferences for which "clone bundles" to use.
1565
1565
1566 Servers advertising "clone bundles" may advertise multiple available
1566 Servers advertising "clone bundles" may advertise multiple available
1567 bundles. Each bundle may have different attributes, such as the bundle
1567 bundles. Each bundle may have different attributes, such as the bundle
1568 type and compression format. This option is used to prefer a particular
1568 type and compression format. This option is used to prefer a particular
1569 bundle over another.
1569 bundle over another.
1570
1570
1571 The following keys are defined by Mercurial:
1571 The following keys are defined by Mercurial:
1572
1572
1573 BUNDLESPEC
1573 BUNDLESPEC
1574 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1574 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1575 e.g. ``gzip-v2`` or ``bzip2-v1``.
1575 e.g. ``gzip-v2`` or ``bzip2-v1``.
1576
1576
1577 COMPRESSION
1577 COMPRESSION
1578 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1578 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1579
1579
1580 Server operators may define custom keys.
1580 Server operators may define custom keys.
1581
1581
1582 Example values: ``COMPRESSION=bzip2``,
1582 Example values: ``COMPRESSION=bzip2``,
1583 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1583 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1584
1584
1585 By default, the first bundle advertised by the server is used.
1585 By default, the first bundle advertised by the server is used.
1586
1586
1587 ``commitsubrepos``
1587 ``commitsubrepos``
1588 Whether to commit modified subrepositories when committing the
1588 Whether to commit modified subrepositories when committing the
1589 parent repository. If False and one subrepository has uncommitted
1589 parent repository. If False and one subrepository has uncommitted
1590 changes, abort the commit.
1590 changes, abort the commit.
1591 (default: False)
1591 (default: False)
1592
1592
1593 ``debug``
1593 ``debug``
1594 Print debugging information. (default: False)
1594 Print debugging information. (default: False)
1595
1595
1596 ``editor``
1596 ``editor``
1597 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1597 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1598
1598
1599 ``fallbackencoding``
1599 ``fallbackencoding``
1600 Encoding to try if it's not possible to decode the changelog using
1600 Encoding to try if it's not possible to decode the changelog using
1601 UTF-8. (default: ISO-8859-1)
1601 UTF-8. (default: ISO-8859-1)
1602
1602
1603 ``graphnodetemplate``
1603 ``graphnodetemplate``
1604 The template used to print changeset nodes in an ASCII revision graph.
1604 The template used to print changeset nodes in an ASCII revision graph.
1605 (default: ``{graphnode}``)
1605 (default: ``{graphnode}``)
1606
1606
1607 ``ignore``
1607 ``ignore``
1608 A file to read per-user ignore patterns from. This file should be
1608 A file to read per-user ignore patterns from. This file should be
1609 in the same format as a repository-wide .hgignore file. Filenames
1609 in the same format as a repository-wide .hgignore file. Filenames
1610 are relative to the repository root. This option supports hook syntax,
1610 are relative to the repository root. This option supports hook syntax,
1611 so if you want to specify multiple ignore files, you can do so by
1611 so if you want to specify multiple ignore files, you can do so by
1612 setting something like ``ignore.other = ~/.hgignore2``. For details
1612 setting something like ``ignore.other = ~/.hgignore2``. For details
1613 of the ignore file format, see the ``hgignore(5)`` man page.
1613 of the ignore file format, see the ``hgignore(5)`` man page.
1614
1614
1615 ``interactive``
1615 ``interactive``
1616 Allow to prompt the user. (default: True)
1616 Allow to prompt the user. (default: True)
1617
1617
1618 ``interface``
1618 ``interface``
1619 Select the default interface for interactive features (default: text).
1619 Select the default interface for interactive features (default: text).
1620 Possible values are 'text' and 'curses'.
1620 Possible values are 'text' and 'curses'.
1621
1621
1622 ``interface.chunkselector``
1622 ``interface.chunkselector``
1623 Select the interface for change recording (e.g. :hg:`commit` -i).
1623 Select the interface for change recording (e.g. :hg:`commit` -i).
1624 Possible values are 'text' and 'curses'.
1624 Possible values are 'text' and 'curses'.
1625 This config overrides the interface specified by ui.interface.
1625 This config overrides the interface specified by ui.interface.
1626
1626
1627 ``logtemplate``
1627 ``logtemplate``
1628 Template string for commands that print changesets.
1628 Template string for commands that print changesets.
1629
1629
1630 ``merge``
1630 ``merge``
1631 The conflict resolution program to use during a manual merge.
1631 The conflict resolution program to use during a manual merge.
1632 For more information on merge tools see :hg:`help merge-tools`.
1632 For more information on merge tools see :hg:`help merge-tools`.
1633 For configuring merge tools see the ``[merge-tools]`` section.
1633 For configuring merge tools see the ``[merge-tools]`` section.
1634
1634
1635 ``mergemarkers``
1635 ``mergemarkers``
1636 Sets the merge conflict marker label styling. The ``detailed``
1636 Sets the merge conflict marker label styling. The ``detailed``
1637 style uses the ``mergemarkertemplate`` setting to style the labels.
1637 style uses the ``mergemarkertemplate`` setting to style the labels.
1638 The ``basic`` style just uses 'local' and 'other' as the marker label.
1638 The ``basic`` style just uses 'local' and 'other' as the marker label.
1639 One of ``basic`` or ``detailed``.
1639 One of ``basic`` or ``detailed``.
1640 (default: ``basic``)
1640 (default: ``basic``)
1641
1641
1642 ``mergemarkertemplate``
1642 ``mergemarkertemplate``
1643 The template used to print the commit description next to each conflict
1643 The template used to print the commit description next to each conflict
1644 marker during merge conflicts. See :hg:`help templates` for the template
1644 marker during merge conflicts. See :hg:`help templates` for the template
1645 format.
1645 format.
1646
1646
1647 Defaults to showing the hash, tags, branches, bookmarks, author, and
1647 Defaults to showing the hash, tags, branches, bookmarks, author, and
1648 the first line of the commit description.
1648 the first line of the commit description.
1649
1649
1650 If you use non-ASCII characters in names for tags, branches, bookmarks,
1650 If you use non-ASCII characters in names for tags, branches, bookmarks,
1651 authors, and/or commit descriptions, you must pay attention to encodings of
1651 authors, and/or commit descriptions, you must pay attention to encodings of
1652 managed files. At template expansion, non-ASCII characters use the encoding
1652 managed files. At template expansion, non-ASCII characters use the encoding
1653 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1653 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1654 environment variables that govern your locale. If the encoding of the merge
1654 environment variables that govern your locale. If the encoding of the merge
1655 markers is different from the encoding of the merged files,
1655 markers is different from the encoding of the merged files,
1656 serious problems may occur.
1656 serious problems may occur.
1657
1657
1658 ``origbackuppath``
1658 ``origbackuppath``
1659 The path to a directory used to store generated .orig files. If the path is
1659 The path to a directory used to store generated .orig files. If the path is
1660 not a directory, one will be created.
1660 not a directory, one will be created.
1661
1661
1662 ``patch``
1662 ``patch``
1663 An optional external tool that ``hg import`` and some extensions
1663 An optional external tool that ``hg import`` and some extensions
1664 will use for applying patches. By default Mercurial uses an
1664 will use for applying patches. By default Mercurial uses an
1665 internal patch utility. The external tool must work as the common
1665 internal patch utility. The external tool must work as the common
1666 Unix ``patch`` program. In particular, it must accept a ``-p``
1666 Unix ``patch`` program. In particular, it must accept a ``-p``
1667 argument to strip patch headers, a ``-d`` argument to specify the
1667 argument to strip patch headers, a ``-d`` argument to specify the
1668 current directory, a file name to patch, and a patch file to take
1668 current directory, a file name to patch, and a patch file to take
1669 from stdin.
1669 from stdin.
1670
1670
1671 It is possible to specify a patch tool together with extra
1671 It is possible to specify a patch tool together with extra
1672 arguments. For example, setting this option to ``patch --merge``
1672 arguments. For example, setting this option to ``patch --merge``
1673 will use the ``patch`` program with its 2-way merge option.
1673 will use the ``patch`` program with its 2-way merge option.
1674
1674
1675 ``portablefilenames``
1675 ``portablefilenames``
1676 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1676 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1677 (default: ``warn``)
1677 (default: ``warn``)
1678
1678
1679 ``warn``
1679 ``warn``
1680 Print a warning message on POSIX platforms, if a file with a non-portable
1680 Print a warning message on POSIX platforms, if a file with a non-portable
1681 filename is added (e.g. a file with a name that can't be created on
1681 filename is added (e.g. a file with a name that can't be created on
1682 Windows because it contains reserved parts like ``AUX``, reserved
1682 Windows because it contains reserved parts like ``AUX``, reserved
1683 characters like ``:``, or would cause a case collision with an existing
1683 characters like ``:``, or would cause a case collision with an existing
1684 file).
1684 file).
1685
1685
1686 ``ignore``
1686 ``ignore``
1687 Don't print a warning.
1687 Don't print a warning.
1688
1688
1689 ``abort``
1689 ``abort``
1690 The command is aborted.
1690 The command is aborted.
1691
1691
1692 ``true``
1692 ``true``
1693 Alias for ``warn``.
1693 Alias for ``warn``.
1694
1694
1695 ``false``
1695 ``false``
1696 Alias for ``ignore``.
1696 Alias for ``ignore``.
1697
1697
1698 .. container:: windows
1698 .. container:: windows
1699
1699
1700 On Windows, this configuration option is ignored and the command aborted.
1700 On Windows, this configuration option is ignored and the command aborted.
1701
1701
1702 ``quiet``
1702 ``quiet``
1703 Reduce the amount of output printed.
1703 Reduce the amount of output printed.
1704 (default: False)
1704 (default: False)
1705
1705
1706 ``remotecmd``
1706 ``remotecmd``
1707 Remote command to use for clone/push/pull operations.
1707 Remote command to use for clone/push/pull operations.
1708 (default: ``hg``)
1708 (default: ``hg``)
1709
1709
1710 ``report_untrusted``
1710 ``report_untrusted``
1711 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1711 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1712 trusted user or group.
1712 trusted user or group.
1713 (default: True)
1713 (default: True)
1714
1714
1715 ``slash``
1715 ``slash``
1716 Display paths using a slash (``/``) as the path separator. This
1716 Display paths using a slash (``/``) as the path separator. This
1717 only makes a difference on systems where the default path
1717 only makes a difference on systems where the default path
1718 separator is not the slash character (e.g. Windows uses the
1718 separator is not the slash character (e.g. Windows uses the
1719 backslash character (``\``)).
1719 backslash character (``\``)).
1720 (default: False)
1720 (default: False)
1721
1721
1722 ``statuscopies``
1722 ``statuscopies``
1723 Display copies in the status command.
1723 Display copies in the status command.
1724
1724
1725 ``ssh``
1725 ``ssh``
1726 Command to use for SSH connections. (default: ``ssh``)
1726 Command to use for SSH connections. (default: ``ssh``)
1727
1727
1728 ``strict``
1728 ``strict``
1729 Require exact command names, instead of allowing unambiguous
1729 Require exact command names, instead of allowing unambiguous
1730 abbreviations. (default: False)
1730 abbreviations. (default: False)
1731
1731
1732 ``style``
1732 ``style``
1733 Name of style to use for command output.
1733 Name of style to use for command output.
1734
1734
1735 ``supportcontact``
1735 ``supportcontact``
1736 A URL where users should report a Mercurial traceback. Use this if you are a
1736 A URL where users should report a Mercurial traceback. Use this if you are a
1737 large organisation with its own Mercurial deployment process and crash
1737 large organisation with its own Mercurial deployment process and crash
1738 reports should be addressed to your internal support.
1738 reports should be addressed to your internal support.
1739
1739
1740 ``textwidth``
1741 Maximum width of help text. A longer line generated by ``hg help`` or
1742 ``hg subcommand --help`` will be broken after white space to get this
1743 width or the terminal width, whichever comes first.
1744 A non-positive value will disable this and the terminal width will be
1745 used. (default: 78)
1746
1740 ``timeout``
1747 ``timeout``
1741 The timeout used when a lock is held (in seconds), a negative value
1748 The timeout used when a lock is held (in seconds), a negative value
1742 means no timeout. (default: 600)
1749 means no timeout. (default: 600)
1743
1750
1744 ``traceback``
1751 ``traceback``
1745 Mercurial always prints a traceback when an unknown exception
1752 Mercurial always prints a traceback when an unknown exception
1746 occurs. Setting this to True will make Mercurial print a traceback
1753 occurs. Setting this to True will make Mercurial print a traceback
1747 on all exceptions, even those recognized by Mercurial (such as
1754 on all exceptions, even those recognized by Mercurial (such as
1748 IOError or MemoryError). (default: False)
1755 IOError or MemoryError). (default: False)
1749
1756
1750 ``username``
1757 ``username``
1751 The committer of a changeset created when running "commit".
1758 The committer of a changeset created when running "commit".
1752 Typically a person's name and email address, e.g. ``Fred Widget
1759 Typically a person's name and email address, e.g. ``Fred Widget
1753 <fred@example.com>``. Environment variables in the
1760 <fred@example.com>``. Environment variables in the
1754 username are expanded.
1761 username are expanded.
1755
1762
1756 (default: ``$EMAIL`` or ``username@hostname``. If the username in
1763 (default: ``$EMAIL`` or ``username@hostname``. If the username in
1757 hgrc is empty, e.g. if the system admin set ``username =`` in the
1764 hgrc is empty, e.g. if the system admin set ``username =`` in the
1758 system hgrc, it has to be specified manually or in a different
1765 system hgrc, it has to be specified manually or in a different
1759 hgrc file)
1766 hgrc file)
1760
1767
1761 ``verbose``
1768 ``verbose``
1762 Increase the amount of output printed. (default: False)
1769 Increase the amount of output printed. (default: False)
1763
1770
1764
1771
1765 ``web``
1772 ``web``
1766 -------
1773 -------
1767
1774
1768 Web interface configuration. The settings in this section apply to
1775 Web interface configuration. The settings in this section apply to
1769 both the builtin webserver (started by :hg:`serve`) and the script you
1776 both the builtin webserver (started by :hg:`serve`) and the script you
1770 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
1777 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
1771 and WSGI).
1778 and WSGI).
1772
1779
1773 The Mercurial webserver does no authentication (it does not prompt for
1780 The Mercurial webserver does no authentication (it does not prompt for
1774 usernames and passwords to validate *who* users are), but it does do
1781 usernames and passwords to validate *who* users are), but it does do
1775 authorization (it grants or denies access for *authenticated users*
1782 authorization (it grants or denies access for *authenticated users*
1776 based on settings in this section). You must either configure your
1783 based on settings in this section). You must either configure your
1777 webserver to do authentication for you, or disable the authorization
1784 webserver to do authentication for you, or disable the authorization
1778 checks.
1785 checks.
1779
1786
1780 For a quick setup in a trusted environment, e.g., a private LAN, where
1787 For a quick setup in a trusted environment, e.g., a private LAN, where
1781 you want it to accept pushes from anybody, you can use the following
1788 you want it to accept pushes from anybody, you can use the following
1782 command line::
1789 command line::
1783
1790
1784 $ hg --config web.allow_push=* --config web.push_ssl=False serve
1791 $ hg --config web.allow_push=* --config web.push_ssl=False serve
1785
1792
1786 Note that this will allow anybody to push anything to the server and
1793 Note that this will allow anybody to push anything to the server and
1787 that this should not be used for public servers.
1794 that this should not be used for public servers.
1788
1795
1789 The full set of options is:
1796 The full set of options is:
1790
1797
1791 ``accesslog``
1798 ``accesslog``
1792 Where to output the access log. (default: stdout)
1799 Where to output the access log. (default: stdout)
1793
1800
1794 ``address``
1801 ``address``
1795 Interface address to bind to. (default: all)
1802 Interface address to bind to. (default: all)
1796
1803
1797 ``allow_archive``
1804 ``allow_archive``
1798 List of archive format (bz2, gz, zip) allowed for downloading.
1805 List of archive format (bz2, gz, zip) allowed for downloading.
1799 (default: empty)
1806 (default: empty)
1800
1807
1801 ``allowbz2``
1808 ``allowbz2``
1802 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
1809 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
1803 revisions.
1810 revisions.
1804 (default: False)
1811 (default: False)
1805
1812
1806 ``allowgz``
1813 ``allowgz``
1807 (DEPRECATED) Whether to allow .tar.gz downloading of repository
1814 (DEPRECATED) Whether to allow .tar.gz downloading of repository
1808 revisions.
1815 revisions.
1809 (default: False)
1816 (default: False)
1810
1817
1811 ``allowpull``
1818 ``allowpull``
1812 Whether to allow pulling from the repository. (default: True)
1819 Whether to allow pulling from the repository. (default: True)
1813
1820
1814 ``allow_push``
1821 ``allow_push``
1815 Whether to allow pushing to the repository. If empty or not set,
1822 Whether to allow pushing to the repository. If empty or not set,
1816 pushing is not allowed. If the special value ``*``, any remote
1823 pushing is not allowed. If the special value ``*``, any remote
1817 user can push, including unauthenticated users. Otherwise, the
1824 user can push, including unauthenticated users. Otherwise, the
1818 remote user must have been authenticated, and the authenticated
1825 remote user must have been authenticated, and the authenticated
1819 user name must be present in this list. The contents of the
1826 user name must be present in this list. The contents of the
1820 allow_push list are examined after the deny_push list.
1827 allow_push list are examined after the deny_push list.
1821
1828
1822 ``allow_read``
1829 ``allow_read``
1823 If the user has not already been denied repository access due to
1830 If the user has not already been denied repository access due to
1824 the contents of deny_read, this list determines whether to grant
1831 the contents of deny_read, this list determines whether to grant
1825 repository access to the user. If this list is not empty, and the
1832 repository access to the user. If this list is not empty, and the
1826 user is unauthenticated or not present in the list, then access is
1833 user is unauthenticated or not present in the list, then access is
1827 denied for the user. If the list is empty or not set, then access
1834 denied for the user. If the list is empty or not set, then access
1828 is permitted to all users by default. Setting allow_read to the
1835 is permitted to all users by default. Setting allow_read to the
1829 special value ``*`` is equivalent to it not being set (i.e. access
1836 special value ``*`` is equivalent to it not being set (i.e. access
1830 is permitted to all users). The contents of the allow_read list are
1837 is permitted to all users). The contents of the allow_read list are
1831 examined after the deny_read list.
1838 examined after the deny_read list.
1832
1839
1833 ``allowzip``
1840 ``allowzip``
1834 (DEPRECATED) Whether to allow .zip downloading of repository
1841 (DEPRECATED) Whether to allow .zip downloading of repository
1835 revisions. This feature creates temporary files.
1842 revisions. This feature creates temporary files.
1836 (default: False)
1843 (default: False)
1837
1844
1838 ``archivesubrepos``
1845 ``archivesubrepos``
1839 Whether to recurse into subrepositories when archiving.
1846 Whether to recurse into subrepositories when archiving.
1840 (default: False)
1847 (default: False)
1841
1848
1842 ``baseurl``
1849 ``baseurl``
1843 Base URL to use when publishing URLs in other locations, so
1850 Base URL to use when publishing URLs in other locations, so
1844 third-party tools like email notification hooks can construct
1851 third-party tools like email notification hooks can construct
1845 URLs. Example: ``http://hgserver/repos/``.
1852 URLs. Example: ``http://hgserver/repos/``.
1846
1853
1847 ``cacerts``
1854 ``cacerts``
1848 Path to file containing a list of PEM encoded certificate
1855 Path to file containing a list of PEM encoded certificate
1849 authority certificates. Environment variables and ``~user``
1856 authority certificates. Environment variables and ``~user``
1850 constructs are expanded in the filename. If specified on the
1857 constructs are expanded in the filename. If specified on the
1851 client, then it will verify the identity of remote HTTPS servers
1858 client, then it will verify the identity of remote HTTPS servers
1852 with these certificates.
1859 with these certificates.
1853
1860
1854 To disable SSL verification temporarily, specify ``--insecure`` from
1861 To disable SSL verification temporarily, specify ``--insecure`` from
1855 command line.
1862 command line.
1856
1863
1857 You can use OpenSSL's CA certificate file if your platform has
1864 You can use OpenSSL's CA certificate file if your platform has
1858 one. On most Linux systems this will be
1865 one. On most Linux systems this will be
1859 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
1866 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
1860 generate this file manually. The form must be as follows::
1867 generate this file manually. The form must be as follows::
1861
1868
1862 -----BEGIN CERTIFICATE-----
1869 -----BEGIN CERTIFICATE-----
1863 ... (certificate in base64 PEM encoding) ...
1870 ... (certificate in base64 PEM encoding) ...
1864 -----END CERTIFICATE-----
1871 -----END CERTIFICATE-----
1865 -----BEGIN CERTIFICATE-----
1872 -----BEGIN CERTIFICATE-----
1866 ... (certificate in base64 PEM encoding) ...
1873 ... (certificate in base64 PEM encoding) ...
1867 -----END CERTIFICATE-----
1874 -----END CERTIFICATE-----
1868
1875
1869 ``cache``
1876 ``cache``
1870 Whether to support caching in hgweb. (default: True)
1877 Whether to support caching in hgweb. (default: True)
1871
1878
1872 ``certificate``
1879 ``certificate``
1873 Certificate to use when running :hg:`serve`.
1880 Certificate to use when running :hg:`serve`.
1874
1881
1875 ``collapse``
1882 ``collapse``
1876 With ``descend`` enabled, repositories in subdirectories are shown at
1883 With ``descend`` enabled, repositories in subdirectories are shown at
1877 a single level alongside repositories in the current path. With
1884 a single level alongside repositories in the current path. With
1878 ``collapse`` also enabled, repositories residing at a deeper level than
1885 ``collapse`` also enabled, repositories residing at a deeper level than
1879 the current path are grouped behind navigable directory entries that
1886 the current path are grouped behind navigable directory entries that
1880 lead to the locations of these repositories. In effect, this setting
1887 lead to the locations of these repositories. In effect, this setting
1881 collapses each collection of repositories found within a subdirectory
1888 collapses each collection of repositories found within a subdirectory
1882 into a single entry for that subdirectory. (default: False)
1889 into a single entry for that subdirectory. (default: False)
1883
1890
1884 ``comparisoncontext``
1891 ``comparisoncontext``
1885 Number of lines of context to show in side-by-side file comparison. If
1892 Number of lines of context to show in side-by-side file comparison. If
1886 negative or the value ``full``, whole files are shown. (default: 5)
1893 negative or the value ``full``, whole files are shown. (default: 5)
1887
1894
1888 This setting can be overridden by a ``context`` request parameter to the
1895 This setting can be overridden by a ``context`` request parameter to the
1889 ``comparison`` command, taking the same values.
1896 ``comparison`` command, taking the same values.
1890
1897
1891 ``contact``
1898 ``contact``
1892 Name or email address of the person in charge of the repository.
1899 Name or email address of the person in charge of the repository.
1893 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
1900 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
1894
1901
1895 ``deny_push``
1902 ``deny_push``
1896 Whether to deny pushing to the repository. If empty or not set,
1903 Whether to deny pushing to the repository. If empty or not set,
1897 push is not denied. If the special value ``*``, all remote users are
1904 push is not denied. If the special value ``*``, all remote users are
1898 denied push. Otherwise, unauthenticated users are all denied, and
1905 denied push. Otherwise, unauthenticated users are all denied, and
1899 any authenticated user name present in this list is also denied. The
1906 any authenticated user name present in this list is also denied. The
1900 contents of the deny_push list are examined before the allow_push list.
1907 contents of the deny_push list are examined before the allow_push list.
1901
1908
1902 ``deny_read``
1909 ``deny_read``
1903 Whether to deny reading/viewing of the repository. If this list is
1910 Whether to deny reading/viewing of the repository. If this list is
1904 not empty, unauthenticated users are all denied, and any
1911 not empty, unauthenticated users are all denied, and any
1905 authenticated user name present in this list is also denied access to
1912 authenticated user name present in this list is also denied access to
1906 the repository. If set to the special value ``*``, all remote users
1913 the repository. If set to the special value ``*``, all remote users
1907 are denied access (rarely needed ;). If deny_read is empty or not set,
1914 are denied access (rarely needed ;). If deny_read is empty or not set,
1908 the determination of repository access depends on the presence and
1915 the determination of repository access depends on the presence and
1909 content of the allow_read list (see description). If both
1916 content of the allow_read list (see description). If both
1910 deny_read and allow_read are empty or not set, then access is
1917 deny_read and allow_read are empty or not set, then access is
1911 permitted to all users by default. If the repository is being
1918 permitted to all users by default. If the repository is being
1912 served via hgwebdir, denied users will not be able to see it in
1919 served via hgwebdir, denied users will not be able to see it in
1913 the list of repositories. The contents of the deny_read list have
1920 the list of repositories. The contents of the deny_read list have
1914 priority over (are examined before) the contents of the allow_read
1921 priority over (are examined before) the contents of the allow_read
1915 list.
1922 list.
1916
1923
1917 ``descend``
1924 ``descend``
1918 hgwebdir indexes will not descend into subdirectories. Only repositories
1925 hgwebdir indexes will not descend into subdirectories. Only repositories
1919 directly in the current path will be shown (other repositories are still
1926 directly in the current path will be shown (other repositories are still
1920 available from the index corresponding to their containing path).
1927 available from the index corresponding to their containing path).
1921
1928
1922 ``description``
1929 ``description``
1923 Textual description of the repository's purpose or contents.
1930 Textual description of the repository's purpose or contents.
1924 (default: "unknown")
1931 (default: "unknown")
1925
1932
1926 ``encoding``
1933 ``encoding``
1927 Character encoding name. (default: the current locale charset)
1934 Character encoding name. (default: the current locale charset)
1928 Example: "UTF-8".
1935 Example: "UTF-8".
1929
1936
1930 ``errorlog``
1937 ``errorlog``
1931 Where to output the error log. (default: stderr)
1938 Where to output the error log. (default: stderr)
1932
1939
1933 ``guessmime``
1940 ``guessmime``
1934 Control MIME types for raw download of file content.
1941 Control MIME types for raw download of file content.
1935 Set to True to let hgweb guess the content type from the file
1942 Set to True to let hgweb guess the content type from the file
1936 extension. This will serve HTML files as ``text/html`` and might
1943 extension. This will serve HTML files as ``text/html`` and might
1937 allow cross-site scripting attacks when serving untrusted
1944 allow cross-site scripting attacks when serving untrusted
1938 repositories. (default: False)
1945 repositories. (default: False)
1939
1946
1940 ``hidden``
1947 ``hidden``
1941 Whether to hide the repository in the hgwebdir index.
1948 Whether to hide the repository in the hgwebdir index.
1942 (default: False)
1949 (default: False)
1943
1950
1944 ``ipv6``
1951 ``ipv6``
1945 Whether to use IPv6. (default: False)
1952 Whether to use IPv6. (default: False)
1946
1953
1947 ``logoimg``
1954 ``logoimg``
1948 File name of the logo image that some templates display on each page.
1955 File name of the logo image that some templates display on each page.
1949 The file name is relative to ``staticurl``. That is, the full path to
1956 The file name is relative to ``staticurl``. That is, the full path to
1950 the logo image is "staticurl/logoimg".
1957 the logo image is "staticurl/logoimg".
1951 If unset, ``hglogo.png`` will be used.
1958 If unset, ``hglogo.png`` will be used.
1952
1959
1953 ``logourl``
1960 ``logourl``
1954 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
1961 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
1955 will be used.
1962 will be used.
1956
1963
1957 ``maxchanges``
1964 ``maxchanges``
1958 Maximum number of changes to list on the changelog. (default: 10)
1965 Maximum number of changes to list on the changelog. (default: 10)
1959
1966
1960 ``maxfiles``
1967 ``maxfiles``
1961 Maximum number of files to list per changeset. (default: 10)
1968 Maximum number of files to list per changeset. (default: 10)
1962
1969
1963 ``maxshortchanges``
1970 ``maxshortchanges``
1964 Maximum number of changes to list on the shortlog, graph or filelog
1971 Maximum number of changes to list on the shortlog, graph or filelog
1965 pages. (default: 60)
1972 pages. (default: 60)
1966
1973
1967 ``name``
1974 ``name``
1968 Repository name to use in the web interface.
1975 Repository name to use in the web interface.
1969 (default: current working directory)
1976 (default: current working directory)
1970
1977
1971 ``port``
1978 ``port``
1972 Port to listen on. (default: 8000)
1979 Port to listen on. (default: 8000)
1973
1980
1974 ``prefix``
1981 ``prefix``
1975 Prefix path to serve from. (default: '' (server root))
1982 Prefix path to serve from. (default: '' (server root))
1976
1983
1977 ``push_ssl``
1984 ``push_ssl``
1978 Whether to require that inbound pushes be transported over SSL to
1985 Whether to require that inbound pushes be transported over SSL to
1979 prevent password sniffing. (default: True)
1986 prevent password sniffing. (default: True)
1980
1987
1981 ``refreshinterval``
1988 ``refreshinterval``
1982 How frequently directory listings re-scan the filesystem for new
1989 How frequently directory listings re-scan the filesystem for new
1983 repositories, in seconds. This is relevant when wildcards are used
1990 repositories, in seconds. This is relevant when wildcards are used
1984 to define paths. Depending on how much filesystem traversal is
1991 to define paths. Depending on how much filesystem traversal is
1985 required, refreshing may negatively impact performance.
1992 required, refreshing may negatively impact performance.
1986
1993
1987 Values less than or equal to 0 always refresh.
1994 Values less than or equal to 0 always refresh.
1988 (default: 20)
1995 (default: 20)
1989
1996
1990 ``staticurl``
1997 ``staticurl``
1991 Base URL to use for static files. If unset, static files (e.g. the
1998 Base URL to use for static files. If unset, static files (e.g. the
1992 hgicon.png favicon) will be served by the CGI script itself. Use
1999 hgicon.png favicon) will be served by the CGI script itself. Use
1993 this setting to serve them directly with the HTTP server.
2000 this setting to serve them directly with the HTTP server.
1994 Example: ``http://hgserver/static/``.
2001 Example: ``http://hgserver/static/``.
1995
2002
1996 ``stripes``
2003 ``stripes``
1997 How many lines a "zebra stripe" should span in multi-line output.
2004 How many lines a "zebra stripe" should span in multi-line output.
1998 Set to 0 to disable. (default: 1)
2005 Set to 0 to disable. (default: 1)
1999
2006
2000 ``style``
2007 ``style``
2001 Which template map style to use. The available options are the names of
2008 Which template map style to use. The available options are the names of
2002 subdirectories in the HTML templates path. (default: ``paper``)
2009 subdirectories in the HTML templates path. (default: ``paper``)
2003 Example: ``monoblue``.
2010 Example: ``monoblue``.
2004
2011
2005 ``templates``
2012 ``templates``
2006 Where to find the HTML templates. The default path to the HTML templates
2013 Where to find the HTML templates. The default path to the HTML templates
2007 can be obtained from ``hg debuginstall``.
2014 can be obtained from ``hg debuginstall``.
2008
2015
2009 ``websub``
2016 ``websub``
2010 ----------
2017 ----------
2011
2018
2012 Web substitution filter definition. You can use this section to
2019 Web substitution filter definition. You can use this section to
2013 define a set of regular expression substitution patterns which
2020 define a set of regular expression substitution patterns which
2014 let you automatically modify the hgweb server output.
2021 let you automatically modify the hgweb server output.
2015
2022
2016 The default hgweb templates only apply these substitution patterns
2023 The default hgweb templates only apply these substitution patterns
2017 on the revision description fields. You can apply them anywhere
2024 on the revision description fields. You can apply them anywhere
2018 you want when you create your own templates by adding calls to the
2025 you want when you create your own templates by adding calls to the
2019 "websub" filter (usually after calling the "escape" filter).
2026 "websub" filter (usually after calling the "escape" filter).
2020
2027
2021 This can be used, for example, to convert issue references to links
2028 This can be used, for example, to convert issue references to links
2022 to your issue tracker, or to convert "markdown-like" syntax into
2029 to your issue tracker, or to convert "markdown-like" syntax into
2023 HTML (see the examples below).
2030 HTML (see the examples below).
2024
2031
2025 Each entry in this section names a substitution filter.
2032 Each entry in this section names a substitution filter.
2026 The value of each entry defines the substitution expression itself.
2033 The value of each entry defines the substitution expression itself.
2027 The websub expressions follow the old interhg extension syntax,
2034 The websub expressions follow the old interhg extension syntax,
2028 which in turn imitates the Unix sed replacement syntax::
2035 which in turn imitates the Unix sed replacement syntax::
2029
2036
2030 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2037 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2031
2038
2032 You can use any separator other than "/". The final "i" is optional
2039 You can use any separator other than "/". The final "i" is optional
2033 and indicates that the search must be case insensitive.
2040 and indicates that the search must be case insensitive.
2034
2041
2035 Examples::
2042 Examples::
2036
2043
2037 [websub]
2044 [websub]
2038 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2045 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2039 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2046 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2040 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2047 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2041
2048
2042 ``worker``
2049 ``worker``
2043 ----------
2050 ----------
2044
2051
2045 Parallel master/worker configuration. We currently perform working
2052 Parallel master/worker configuration. We currently perform working
2046 directory updates in parallel on Unix-like systems, which greatly
2053 directory updates in parallel on Unix-like systems, which greatly
2047 helps performance.
2054 helps performance.
2048
2055
2049 ``numcpus``
2056 ``numcpus``
2050 Number of CPUs to use for parallel operations. A zero or
2057 Number of CPUs to use for parallel operations. A zero or
2051 negative value is treated as ``use the default``.
2058 negative value is treated as ``use the default``.
2052 (default: 4 or the number of CPUs on the system, whichever is larger)
2059 (default: 4 or the number of CPUs on the system, whichever is larger)
2053
2060
2054 ``backgroundclose``
2061 ``backgroundclose``
2055 Whether to enable closing file handles on background threads during certain
2062 Whether to enable closing file handles on background threads during certain
2056 operations. Some platforms aren't very efficient at closing file
2063 operations. Some platforms aren't very efficient at closing file
2057 handles that have been written or appended to. By performing file closing
2064 handles that have been written or appended to. By performing file closing
2058 on background threads, file write rate can increase substantially.
2065 on background threads, file write rate can increase substantially.
2059 (default: true on Windows, false elsewhere)
2066 (default: true on Windows, false elsewhere)
2060
2067
2061 ``backgroundcloseminfilecount``
2068 ``backgroundcloseminfilecount``
2062 Minimum number of files required to trigger background file closing.
2069 Minimum number of files required to trigger background file closing.
2063 Operations not writing this many files won't start background close
2070 Operations not writing this many files won't start background close
2064 threads.
2071 threads.
2065 (default: 2048)
2072 (default: 2048)
2066
2073
2067 ``backgroundclosemaxqueue``
2074 ``backgroundclosemaxqueue``
2068 The maximum number of opened file handles waiting to be closed in the
2075 The maximum number of opened file handles waiting to be closed in the
2069 background. This option only has an effect if ``backgroundclose`` is
2076 background. This option only has an effect if ``backgroundclose`` is
2070 enabled.
2077 enabled.
2071 (default: 384)
2078 (default: 384)
2072
2079
2073 ``backgroundclosethreadcount``
2080 ``backgroundclosethreadcount``
2074 Number of threads to process background file closes. Only relevant if
2081 Number of threads to process background file closes. Only relevant if
2075 ``backgroundclose`` is enabled.
2082 ``backgroundclose`` is enabled.
2076 (default: 4)
2083 (default: 4)
@@ -1,3057 +1,3073
1 Short help:
1 Short help:
2
2
3 $ hg
3 $ hg
4 Mercurial Distributed SCM
4 Mercurial Distributed SCM
5
5
6 basic commands:
6 basic commands:
7
7
8 add add the specified files on the next commit
8 add add the specified files on the next commit
9 annotate show changeset information by line for each file
9 annotate show changeset information by line for each file
10 clone make a copy of an existing repository
10 clone make a copy of an existing repository
11 commit commit the specified files or all outstanding changes
11 commit commit the specified files or all outstanding changes
12 diff diff repository (or selected files)
12 diff diff repository (or selected files)
13 export dump the header and diffs for one or more changesets
13 export dump the header and diffs for one or more changesets
14 forget forget the specified files on the next commit
14 forget forget the specified files on the next commit
15 init create a new repository in the given directory
15 init create a new repository in the given directory
16 log show revision history of entire repository or files
16 log show revision history of entire repository or files
17 merge merge another revision into working directory
17 merge merge another revision into working directory
18 pull pull changes from the specified source
18 pull pull changes from the specified source
19 push push changes to the specified destination
19 push push changes to the specified destination
20 remove remove the specified files on the next commit
20 remove remove the specified files on the next commit
21 serve start stand-alone webserver
21 serve start stand-alone webserver
22 status show changed files in the working directory
22 status show changed files in the working directory
23 summary summarize working directory state
23 summary summarize working directory state
24 update update working directory (or switch revisions)
24 update update working directory (or switch revisions)
25
25
26 (use "hg help" for the full list of commands or "hg -v" for details)
26 (use "hg help" for the full list of commands or "hg -v" for details)
27
27
28 $ hg -q
28 $ hg -q
29 add add the specified files on the next commit
29 add add the specified files on the next commit
30 annotate show changeset information by line for each file
30 annotate show changeset information by line for each file
31 clone make a copy of an existing repository
31 clone make a copy of an existing repository
32 commit commit the specified files or all outstanding changes
32 commit commit the specified files or all outstanding changes
33 diff diff repository (or selected files)
33 diff diff repository (or selected files)
34 export dump the header and diffs for one or more changesets
34 export dump the header and diffs for one or more changesets
35 forget forget the specified files on the next commit
35 forget forget the specified files on the next commit
36 init create a new repository in the given directory
36 init create a new repository in the given directory
37 log show revision history of entire repository or files
37 log show revision history of entire repository or files
38 merge merge another revision into working directory
38 merge merge another revision into working directory
39 pull pull changes from the specified source
39 pull pull changes from the specified source
40 push push changes to the specified destination
40 push push changes to the specified destination
41 remove remove the specified files on the next commit
41 remove remove the specified files on the next commit
42 serve start stand-alone webserver
42 serve start stand-alone webserver
43 status show changed files in the working directory
43 status show changed files in the working directory
44 summary summarize working directory state
44 summary summarize working directory state
45 update update working directory (or switch revisions)
45 update update working directory (or switch revisions)
46
46
47 $ hg help
47 $ hg help
48 Mercurial Distributed SCM
48 Mercurial Distributed SCM
49
49
50 list of commands:
50 list of commands:
51
51
52 add add the specified files on the next commit
52 add add the specified files on the next commit
53 addremove add all new files, delete all missing files
53 addremove add all new files, delete all missing files
54 annotate show changeset information by line for each file
54 annotate show changeset information by line for each file
55 archive create an unversioned archive of a repository revision
55 archive create an unversioned archive of a repository revision
56 backout reverse effect of earlier changeset
56 backout reverse effect of earlier changeset
57 bisect subdivision search of changesets
57 bisect subdivision search of changesets
58 bookmarks create a new bookmark or list existing bookmarks
58 bookmarks create a new bookmark or list existing bookmarks
59 branch set or show the current branch name
59 branch set or show the current branch name
60 branches list repository named branches
60 branches list repository named branches
61 bundle create a changegroup file
61 bundle create a changegroup file
62 cat output the current or given revision of files
62 cat output the current or given revision of files
63 clone make a copy of an existing repository
63 clone make a copy of an existing repository
64 commit commit the specified files or all outstanding changes
64 commit commit the specified files or all outstanding changes
65 config show combined config settings from all hgrc files
65 config show combined config settings from all hgrc files
66 copy mark files as copied for the next commit
66 copy mark files as copied for the next commit
67 diff diff repository (or selected files)
67 diff diff repository (or selected files)
68 export dump the header and diffs for one or more changesets
68 export dump the header and diffs for one or more changesets
69 files list tracked files
69 files list tracked files
70 forget forget the specified files on the next commit
70 forget forget the specified files on the next commit
71 graft copy changes from other branches onto the current branch
71 graft copy changes from other branches onto the current branch
72 grep search for a pattern in specified files and revisions
72 grep search for a pattern in specified files and revisions
73 heads show branch heads
73 heads show branch heads
74 help show help for a given topic or a help overview
74 help show help for a given topic or a help overview
75 identify identify the working directory or specified revision
75 identify identify the working directory or specified revision
76 import import an ordered set of patches
76 import import an ordered set of patches
77 incoming show new changesets found in source
77 incoming show new changesets found in source
78 init create a new repository in the given directory
78 init create a new repository in the given directory
79 log show revision history of entire repository or files
79 log show revision history of entire repository or files
80 manifest output the current or given revision of the project manifest
80 manifest output the current or given revision of the project manifest
81 merge merge another revision into working directory
81 merge merge another revision into working directory
82 outgoing show changesets not found in the destination
82 outgoing show changesets not found in the destination
83 paths show aliases for remote repositories
83 paths show aliases for remote repositories
84 phase set or show the current phase name
84 phase set or show the current phase name
85 pull pull changes from the specified source
85 pull pull changes from the specified source
86 push push changes to the specified destination
86 push push changes to the specified destination
87 recover roll back an interrupted transaction
87 recover roll back an interrupted transaction
88 remove remove the specified files on the next commit
88 remove remove the specified files on the next commit
89 rename rename files; equivalent of copy + remove
89 rename rename files; equivalent of copy + remove
90 resolve redo merges or set/view the merge status of files
90 resolve redo merges or set/view the merge status of files
91 revert restore files to their checkout state
91 revert restore files to their checkout state
92 root print the root (top) of the current working directory
92 root print the root (top) of the current working directory
93 serve start stand-alone webserver
93 serve start stand-alone webserver
94 status show changed files in the working directory
94 status show changed files in the working directory
95 summary summarize working directory state
95 summary summarize working directory state
96 tag add one or more tags for the current or given revision
96 tag add one or more tags for the current or given revision
97 tags list repository tags
97 tags list repository tags
98 unbundle apply one or more changegroup files
98 unbundle apply one or more changegroup files
99 update update working directory (or switch revisions)
99 update update working directory (or switch revisions)
100 verify verify the integrity of the repository
100 verify verify the integrity of the repository
101 version output version and copyright information
101 version output version and copyright information
102
102
103 additional help topics:
103 additional help topics:
104
104
105 config Configuration Files
105 config Configuration Files
106 dates Date Formats
106 dates Date Formats
107 diffs Diff Formats
107 diffs Diff Formats
108 environment Environment Variables
108 environment Environment Variables
109 extensions Using Additional Features
109 extensions Using Additional Features
110 filesets Specifying File Sets
110 filesets Specifying File Sets
111 glossary Glossary
111 glossary Glossary
112 hgignore Syntax for Mercurial Ignore Files
112 hgignore Syntax for Mercurial Ignore Files
113 hgweb Configuring hgweb
113 hgweb Configuring hgweb
114 internals Technical implementation topics
114 internals Technical implementation topics
115 merge-tools Merge Tools
115 merge-tools Merge Tools
116 multirevs Specifying Multiple Revisions
116 multirevs Specifying Multiple Revisions
117 patterns File Name Patterns
117 patterns File Name Patterns
118 phases Working with Phases
118 phases Working with Phases
119 revisions Specifying Single Revisions
119 revisions Specifying Single Revisions
120 revsets Specifying Revision Sets
120 revsets Specifying Revision Sets
121 scripting Using Mercurial from scripts and automation
121 scripting Using Mercurial from scripts and automation
122 subrepos Subrepositories
122 subrepos Subrepositories
123 templating Template Usage
123 templating Template Usage
124 urls URL Paths
124 urls URL Paths
125
125
126 (use "hg help -v" to show built-in aliases and global options)
126 (use "hg help -v" to show built-in aliases and global options)
127
127
128 $ hg -q help
128 $ hg -q help
129 add add the specified files on the next commit
129 add add the specified files on the next commit
130 addremove add all new files, delete all missing files
130 addremove add all new files, delete all missing files
131 annotate show changeset information by line for each file
131 annotate show changeset information by line for each file
132 archive create an unversioned archive of a repository revision
132 archive create an unversioned archive of a repository revision
133 backout reverse effect of earlier changeset
133 backout reverse effect of earlier changeset
134 bisect subdivision search of changesets
134 bisect subdivision search of changesets
135 bookmarks create a new bookmark or list existing bookmarks
135 bookmarks create a new bookmark or list existing bookmarks
136 branch set or show the current branch name
136 branch set or show the current branch name
137 branches list repository named branches
137 branches list repository named branches
138 bundle create a changegroup file
138 bundle create a changegroup file
139 cat output the current or given revision of files
139 cat output the current or given revision of files
140 clone make a copy of an existing repository
140 clone make a copy of an existing repository
141 commit commit the specified files or all outstanding changes
141 commit commit the specified files or all outstanding changes
142 config show combined config settings from all hgrc files
142 config show combined config settings from all hgrc files
143 copy mark files as copied for the next commit
143 copy mark files as copied for the next commit
144 diff diff repository (or selected files)
144 diff diff repository (or selected files)
145 export dump the header and diffs for one or more changesets
145 export dump the header and diffs for one or more changesets
146 files list tracked files
146 files list tracked files
147 forget forget the specified files on the next commit
147 forget forget the specified files on the next commit
148 graft copy changes from other branches onto the current branch
148 graft copy changes from other branches onto the current branch
149 grep search for a pattern in specified files and revisions
149 grep search for a pattern in specified files and revisions
150 heads show branch heads
150 heads show branch heads
151 help show help for a given topic or a help overview
151 help show help for a given topic or a help overview
152 identify identify the working directory or specified revision
152 identify identify the working directory or specified revision
153 import import an ordered set of patches
153 import import an ordered set of patches
154 incoming show new changesets found in source
154 incoming show new changesets found in source
155 init create a new repository in the given directory
155 init create a new repository in the given directory
156 log show revision history of entire repository or files
156 log show revision history of entire repository or files
157 manifest output the current or given revision of the project manifest
157 manifest output the current or given revision of the project manifest
158 merge merge another revision into working directory
158 merge merge another revision into working directory
159 outgoing show changesets not found in the destination
159 outgoing show changesets not found in the destination
160 paths show aliases for remote repositories
160 paths show aliases for remote repositories
161 phase set or show the current phase name
161 phase set or show the current phase name
162 pull pull changes from the specified source
162 pull pull changes from the specified source
163 push push changes to the specified destination
163 push push changes to the specified destination
164 recover roll back an interrupted transaction
164 recover roll back an interrupted transaction
165 remove remove the specified files on the next commit
165 remove remove the specified files on the next commit
166 rename rename files; equivalent of copy + remove
166 rename rename files; equivalent of copy + remove
167 resolve redo merges or set/view the merge status of files
167 resolve redo merges or set/view the merge status of files
168 revert restore files to their checkout state
168 revert restore files to their checkout state
169 root print the root (top) of the current working directory
169 root print the root (top) of the current working directory
170 serve start stand-alone webserver
170 serve start stand-alone webserver
171 status show changed files in the working directory
171 status show changed files in the working directory
172 summary summarize working directory state
172 summary summarize working directory state
173 tag add one or more tags for the current or given revision
173 tag add one or more tags for the current or given revision
174 tags list repository tags
174 tags list repository tags
175 unbundle apply one or more changegroup files
175 unbundle apply one or more changegroup files
176 update update working directory (or switch revisions)
176 update update working directory (or switch revisions)
177 verify verify the integrity of the repository
177 verify verify the integrity of the repository
178 version output version and copyright information
178 version output version and copyright information
179
179
180 additional help topics:
180 additional help topics:
181
181
182 config Configuration Files
182 config Configuration Files
183 dates Date Formats
183 dates Date Formats
184 diffs Diff Formats
184 diffs Diff Formats
185 environment Environment Variables
185 environment Environment Variables
186 extensions Using Additional Features
186 extensions Using Additional Features
187 filesets Specifying File Sets
187 filesets Specifying File Sets
188 glossary Glossary
188 glossary Glossary
189 hgignore Syntax for Mercurial Ignore Files
189 hgignore Syntax for Mercurial Ignore Files
190 hgweb Configuring hgweb
190 hgweb Configuring hgweb
191 internals Technical implementation topics
191 internals Technical implementation topics
192 merge-tools Merge Tools
192 merge-tools Merge Tools
193 multirevs Specifying Multiple Revisions
193 multirevs Specifying Multiple Revisions
194 patterns File Name Patterns
194 patterns File Name Patterns
195 phases Working with Phases
195 phases Working with Phases
196 revisions Specifying Single Revisions
196 revisions Specifying Single Revisions
197 revsets Specifying Revision Sets
197 revsets Specifying Revision Sets
198 scripting Using Mercurial from scripts and automation
198 scripting Using Mercurial from scripts and automation
199 subrepos Subrepositories
199 subrepos Subrepositories
200 templating Template Usage
200 templating Template Usage
201 urls URL Paths
201 urls URL Paths
202
202
203 Test extension help:
203 Test extension help:
204 $ hg help extensions --config extensions.rebase= --config extensions.children=
204 $ hg help extensions --config extensions.rebase= --config extensions.children=
205 Using Additional Features
205 Using Additional Features
206 """""""""""""""""""""""""
206 """""""""""""""""""""""""
207
207
208 Mercurial has the ability to add new features through the use of
208 Mercurial has the ability to add new features through the use of
209 extensions. Extensions may add new commands, add options to existing
209 extensions. Extensions may add new commands, add options to existing
210 commands, change the default behavior of commands, or implement hooks.
210 commands, change the default behavior of commands, or implement hooks.
211
211
212 To enable the "foo" extension, either shipped with Mercurial or in the
212 To enable the "foo" extension, either shipped with Mercurial or in the
213 Python search path, create an entry for it in your configuration file,
213 Python search path, create an entry for it in your configuration file,
214 like this:
214 like this:
215
215
216 [extensions]
216 [extensions]
217 foo =
217 foo =
218
218
219 You may also specify the full path to an extension:
219 You may also specify the full path to an extension:
220
220
221 [extensions]
221 [extensions]
222 myfeature = ~/.hgext/myfeature.py
222 myfeature = ~/.hgext/myfeature.py
223
223
224 See 'hg help config' for more information on configuration files.
224 See 'hg help config' for more information on configuration files.
225
225
226 Extensions are not loaded by default for a variety of reasons: they can
226 Extensions are not loaded by default for a variety of reasons: they can
227 increase startup overhead; they may be meant for advanced usage only; they
227 increase startup overhead; they may be meant for advanced usage only; they
228 may provide potentially dangerous abilities (such as letting you destroy
228 may provide potentially dangerous abilities (such as letting you destroy
229 or modify history); they might not be ready for prime time; or they may
229 or modify history); they might not be ready for prime time; or they may
230 alter some usual behaviors of stock Mercurial. It is thus up to the user
230 alter some usual behaviors of stock Mercurial. It is thus up to the user
231 to activate extensions as needed.
231 to activate extensions as needed.
232
232
233 To explicitly disable an extension enabled in a configuration file of
233 To explicitly disable an extension enabled in a configuration file of
234 broader scope, prepend its path with !:
234 broader scope, prepend its path with !:
235
235
236 [extensions]
236 [extensions]
237 # disabling extension bar residing in /path/to/extension/bar.py
237 # disabling extension bar residing in /path/to/extension/bar.py
238 bar = !/path/to/extension/bar.py
238 bar = !/path/to/extension/bar.py
239 # ditto, but no path was supplied for extension baz
239 # ditto, but no path was supplied for extension baz
240 baz = !
240 baz = !
241
241
242 enabled extensions:
242 enabled extensions:
243
243
244 chgserver command server extension for cHg (EXPERIMENTAL) (?)
244 chgserver command server extension for cHg (EXPERIMENTAL) (?)
245 children command to display child changesets (DEPRECATED)
245 children command to display child changesets (DEPRECATED)
246 rebase command to move sets of revisions to a different ancestor
246 rebase command to move sets of revisions to a different ancestor
247
247
248 disabled extensions:
248 disabled extensions:
249
249
250 acl hooks for controlling repository access
250 acl hooks for controlling repository access
251 blackbox log repository events to a blackbox for debugging
251 blackbox log repository events to a blackbox for debugging
252 bugzilla hooks for integrating with the Bugzilla bug tracker
252 bugzilla hooks for integrating with the Bugzilla bug tracker
253 censor erase file content at a given revision
253 censor erase file content at a given revision
254 churn command to display statistics about repository history
254 churn command to display statistics about repository history
255 clonebundles advertise pre-generated bundles to seed clones
255 clonebundles advertise pre-generated bundles to seed clones
256 color colorize output from some commands
256 color colorize output from some commands
257 convert import revisions from foreign VCS repositories into
257 convert import revisions from foreign VCS repositories into
258 Mercurial
258 Mercurial
259 eol automatically manage newlines in repository files
259 eol automatically manage newlines in repository files
260 extdiff command to allow external programs to compare revisions
260 extdiff command to allow external programs to compare revisions
261 factotum http authentication with factotum
261 factotum http authentication with factotum
262 gpg commands to sign and verify changesets
262 gpg commands to sign and verify changesets
263 hgcia hooks for integrating with the CIA.vc notification service
263 hgcia hooks for integrating with the CIA.vc notification service
264 hgk browse the repository in a graphical way
264 hgk browse the repository in a graphical way
265 highlight syntax highlighting for hgweb (requires Pygments)
265 highlight syntax highlighting for hgweb (requires Pygments)
266 histedit interactive history editing
266 histedit interactive history editing
267 keyword expand keywords in tracked files
267 keyword expand keywords in tracked files
268 largefiles track large binary files
268 largefiles track large binary files
269 mq manage a stack of patches
269 mq manage a stack of patches
270 notify hooks for sending email push notifications
270 notify hooks for sending email push notifications
271 pager browse command output with an external pager
271 pager browse command output with an external pager
272 patchbomb command to send changesets as (a series of) patch emails
272 patchbomb command to send changesets as (a series of) patch emails
273 purge command to delete untracked files from the working
273 purge command to delete untracked files from the working
274 directory
274 directory
275 relink recreates hardlinks between repository clones
275 relink recreates hardlinks between repository clones
276 schemes extend schemes with shortcuts to repository swarms
276 schemes extend schemes with shortcuts to repository swarms
277 share share a common history between several working directories
277 share share a common history between several working directories
278 shelve save and restore changes to the working directory
278 shelve save and restore changes to the working directory
279 strip strip changesets and their descendants from history
279 strip strip changesets and their descendants from history
280 transplant command to transplant changesets from another branch
280 transplant command to transplant changesets from another branch
281 win32mbcs allow the use of MBCS paths with problematic encodings
281 win32mbcs allow the use of MBCS paths with problematic encodings
282 zeroconf discover and advertise repositories on the local network
282 zeroconf discover and advertise repositories on the local network
283
283
284 Verify that extension keywords appear in help templates
284 Verify that extension keywords appear in help templates
285
285
286 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
286 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
287
287
288 Test short command list with verbose option
288 Test short command list with verbose option
289
289
290 $ hg -v help shortlist
290 $ hg -v help shortlist
291 Mercurial Distributed SCM
291 Mercurial Distributed SCM
292
292
293 basic commands:
293 basic commands:
294
294
295 add add the specified files on the next commit
295 add add the specified files on the next commit
296 annotate, blame
296 annotate, blame
297 show changeset information by line for each file
297 show changeset information by line for each file
298 clone make a copy of an existing repository
298 clone make a copy of an existing repository
299 commit, ci commit the specified files or all outstanding changes
299 commit, ci commit the specified files or all outstanding changes
300 diff diff repository (or selected files)
300 diff diff repository (or selected files)
301 export dump the header and diffs for one or more changesets
301 export dump the header and diffs for one or more changesets
302 forget forget the specified files on the next commit
302 forget forget the specified files on the next commit
303 init create a new repository in the given directory
303 init create a new repository in the given directory
304 log, history show revision history of entire repository or files
304 log, history show revision history of entire repository or files
305 merge merge another revision into working directory
305 merge merge another revision into working directory
306 pull pull changes from the specified source
306 pull pull changes from the specified source
307 push push changes to the specified destination
307 push push changes to the specified destination
308 remove, rm remove the specified files on the next commit
308 remove, rm remove the specified files on the next commit
309 serve start stand-alone webserver
309 serve start stand-alone webserver
310 status, st show changed files in the working directory
310 status, st show changed files in the working directory
311 summary, sum summarize working directory state
311 summary, sum summarize working directory state
312 update, up, checkout, co
312 update, up, checkout, co
313 update working directory (or switch revisions)
313 update working directory (or switch revisions)
314
314
315 global options ([+] can be repeated):
315 global options ([+] can be repeated):
316
316
317 -R --repository REPO repository root directory or name of overlay bundle
317 -R --repository REPO repository root directory or name of overlay bundle
318 file
318 file
319 --cwd DIR change working directory
319 --cwd DIR change working directory
320 -y --noninteractive do not prompt, automatically pick the first choice for
320 -y --noninteractive do not prompt, automatically pick the first choice for
321 all prompts
321 all prompts
322 -q --quiet suppress output
322 -q --quiet suppress output
323 -v --verbose enable additional output
323 -v --verbose enable additional output
324 --config CONFIG [+] set/override config option (use 'section.name=value')
324 --config CONFIG [+] set/override config option (use 'section.name=value')
325 --debug enable debugging output
325 --debug enable debugging output
326 --debugger start debugger
326 --debugger start debugger
327 --encoding ENCODE set the charset encoding (default: ascii)
327 --encoding ENCODE set the charset encoding (default: ascii)
328 --encodingmode MODE set the charset encoding mode (default: strict)
328 --encodingmode MODE set the charset encoding mode (default: strict)
329 --traceback always print a traceback on exception
329 --traceback always print a traceback on exception
330 --time time how long the command takes
330 --time time how long the command takes
331 --profile print command execution profile
331 --profile print command execution profile
332 --version output version information and exit
332 --version output version information and exit
333 -h --help display help and exit
333 -h --help display help and exit
334 --hidden consider hidden changesets
334 --hidden consider hidden changesets
335
335
336 (use "hg help" for the full list of commands)
336 (use "hg help" for the full list of commands)
337
337
338 $ hg add -h
338 $ hg add -h
339 hg add [OPTION]... [FILE]...
339 hg add [OPTION]... [FILE]...
340
340
341 add the specified files on the next commit
341 add the specified files on the next commit
342
342
343 Schedule files to be version controlled and added to the repository.
343 Schedule files to be version controlled and added to the repository.
344
344
345 The files will be added to the repository at the next commit. To undo an
345 The files will be added to the repository at the next commit. To undo an
346 add before that, see 'hg forget'.
346 add before that, see 'hg forget'.
347
347
348 If no names are given, add all files to the repository (except files
348 If no names are given, add all files to the repository (except files
349 matching ".hgignore").
349 matching ".hgignore").
350
350
351 Returns 0 if all files are successfully added.
351 Returns 0 if all files are successfully added.
352
352
353 options ([+] can be repeated):
353 options ([+] can be repeated):
354
354
355 -I --include PATTERN [+] include names matching the given patterns
355 -I --include PATTERN [+] include names matching the given patterns
356 -X --exclude PATTERN [+] exclude names matching the given patterns
356 -X --exclude PATTERN [+] exclude names matching the given patterns
357 -S --subrepos recurse into subrepositories
357 -S --subrepos recurse into subrepositories
358 -n --dry-run do not perform actions, just print output
358 -n --dry-run do not perform actions, just print output
359
359
360 (some details hidden, use --verbose to show complete help)
360 (some details hidden, use --verbose to show complete help)
361
361
362 Verbose help for add
362 Verbose help for add
363
363
364 $ hg add -hv
364 $ hg add -hv
365 hg add [OPTION]... [FILE]...
365 hg add [OPTION]... [FILE]...
366
366
367 add the specified files on the next commit
367 add the specified files on the next commit
368
368
369 Schedule files to be version controlled and added to the repository.
369 Schedule files to be version controlled and added to the repository.
370
370
371 The files will be added to the repository at the next commit. To undo an
371 The files will be added to the repository at the next commit. To undo an
372 add before that, see 'hg forget'.
372 add before that, see 'hg forget'.
373
373
374 If no names are given, add all files to the repository (except files
374 If no names are given, add all files to the repository (except files
375 matching ".hgignore").
375 matching ".hgignore").
376
376
377 Examples:
377 Examples:
378
378
379 - New (unknown) files are added automatically by 'hg add':
379 - New (unknown) files are added automatically by 'hg add':
380
380
381 $ ls
381 $ ls
382 foo.c
382 foo.c
383 $ hg status
383 $ hg status
384 ? foo.c
384 ? foo.c
385 $ hg add
385 $ hg add
386 adding foo.c
386 adding foo.c
387 $ hg status
387 $ hg status
388 A foo.c
388 A foo.c
389
389
390 - Specific files to be added can be specified:
390 - Specific files to be added can be specified:
391
391
392 $ ls
392 $ ls
393 bar.c foo.c
393 bar.c foo.c
394 $ hg status
394 $ hg status
395 ? bar.c
395 ? bar.c
396 ? foo.c
396 ? foo.c
397 $ hg add bar.c
397 $ hg add bar.c
398 $ hg status
398 $ hg status
399 A bar.c
399 A bar.c
400 ? foo.c
400 ? foo.c
401
401
402 Returns 0 if all files are successfully added.
402 Returns 0 if all files are successfully added.
403
403
404 options ([+] can be repeated):
404 options ([+] can be repeated):
405
405
406 -I --include PATTERN [+] include names matching the given patterns
406 -I --include PATTERN [+] include names matching the given patterns
407 -X --exclude PATTERN [+] exclude names matching the given patterns
407 -X --exclude PATTERN [+] exclude names matching the given patterns
408 -S --subrepos recurse into subrepositories
408 -S --subrepos recurse into subrepositories
409 -n --dry-run do not perform actions, just print output
409 -n --dry-run do not perform actions, just print output
410
410
411 global options ([+] can be repeated):
411 global options ([+] can be repeated):
412
412
413 -R --repository REPO repository root directory or name of overlay bundle
413 -R --repository REPO repository root directory or name of overlay bundle
414 file
414 file
415 --cwd DIR change working directory
415 --cwd DIR change working directory
416 -y --noninteractive do not prompt, automatically pick the first choice for
416 -y --noninteractive do not prompt, automatically pick the first choice for
417 all prompts
417 all prompts
418 -q --quiet suppress output
418 -q --quiet suppress output
419 -v --verbose enable additional output
419 -v --verbose enable additional output
420 --config CONFIG [+] set/override config option (use 'section.name=value')
420 --config CONFIG [+] set/override config option (use 'section.name=value')
421 --debug enable debugging output
421 --debug enable debugging output
422 --debugger start debugger
422 --debugger start debugger
423 --encoding ENCODE set the charset encoding (default: ascii)
423 --encoding ENCODE set the charset encoding (default: ascii)
424 --encodingmode MODE set the charset encoding mode (default: strict)
424 --encodingmode MODE set the charset encoding mode (default: strict)
425 --traceback always print a traceback on exception
425 --traceback always print a traceback on exception
426 --time time how long the command takes
426 --time time how long the command takes
427 --profile print command execution profile
427 --profile print command execution profile
428 --version output version information and exit
428 --version output version information and exit
429 -h --help display help and exit
429 -h --help display help and exit
430 --hidden consider hidden changesets
430 --hidden consider hidden changesets
431
431
432 Test the textwidth config option
433
434 $ hg root -h --config ui.textwidth=50
435 hg root
436
437 print the root (top) of the current working
438 directory
439
440 Print the root directory of the current
441 repository.
442
443 Returns 0 on success.
444
445 (some details hidden, use --verbose to show
446 complete help)
447
432 Test help option with version option
448 Test help option with version option
433
449
434 $ hg add -h --version
450 $ hg add -h --version
435 Mercurial Distributed SCM (version *) (glob)
451 Mercurial Distributed SCM (version *) (glob)
436 (see https://mercurial-scm.org for more information)
452 (see https://mercurial-scm.org for more information)
437
453
438 Copyright (C) 2005-2016 Matt Mackall and others
454 Copyright (C) 2005-2016 Matt Mackall and others
439 This is free software; see the source for copying conditions. There is NO
455 This is free software; see the source for copying conditions. There is NO
440 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
456 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
441
457
442 $ hg add --skjdfks
458 $ hg add --skjdfks
443 hg add: option --skjdfks not recognized
459 hg add: option --skjdfks not recognized
444 hg add [OPTION]... [FILE]...
460 hg add [OPTION]... [FILE]...
445
461
446 add the specified files on the next commit
462 add the specified files on the next commit
447
463
448 options ([+] can be repeated):
464 options ([+] can be repeated):
449
465
450 -I --include PATTERN [+] include names matching the given patterns
466 -I --include PATTERN [+] include names matching the given patterns
451 -X --exclude PATTERN [+] exclude names matching the given patterns
467 -X --exclude PATTERN [+] exclude names matching the given patterns
452 -S --subrepos recurse into subrepositories
468 -S --subrepos recurse into subrepositories
453 -n --dry-run do not perform actions, just print output
469 -n --dry-run do not perform actions, just print output
454
470
455 (use "hg add -h" to show more help)
471 (use "hg add -h" to show more help)
456 [255]
472 [255]
457
473
458 Test ambiguous command help
474 Test ambiguous command help
459
475
460 $ hg help ad
476 $ hg help ad
461 list of commands:
477 list of commands:
462
478
463 add add the specified files on the next commit
479 add add the specified files on the next commit
464 addremove add all new files, delete all missing files
480 addremove add all new files, delete all missing files
465
481
466 (use "hg help -v ad" to show built-in aliases and global options)
482 (use "hg help -v ad" to show built-in aliases and global options)
467
483
468 Test command without options
484 Test command without options
469
485
470 $ hg help verify
486 $ hg help verify
471 hg verify
487 hg verify
472
488
473 verify the integrity of the repository
489 verify the integrity of the repository
474
490
475 Verify the integrity of the current repository.
491 Verify the integrity of the current repository.
476
492
477 This will perform an extensive check of the repository's integrity,
493 This will perform an extensive check of the repository's integrity,
478 validating the hashes and checksums of each entry in the changelog,
494 validating the hashes and checksums of each entry in the changelog,
479 manifest, and tracked files, as well as the integrity of their crosslinks
495 manifest, and tracked files, as well as the integrity of their crosslinks
480 and indices.
496 and indices.
481
497
482 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
498 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
483 information about recovery from corruption of the repository.
499 information about recovery from corruption of the repository.
484
500
485 Returns 0 on success, 1 if errors are encountered.
501 Returns 0 on success, 1 if errors are encountered.
486
502
487 (some details hidden, use --verbose to show complete help)
503 (some details hidden, use --verbose to show complete help)
488
504
489 $ hg help diff
505 $ hg help diff
490 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
506 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
491
507
492 diff repository (or selected files)
508 diff repository (or selected files)
493
509
494 Show differences between revisions for the specified files.
510 Show differences between revisions for the specified files.
495
511
496 Differences between files are shown using the unified diff format.
512 Differences between files are shown using the unified diff format.
497
513
498 Note:
514 Note:
499 'hg diff' may generate unexpected results for merges, as it will
515 'hg diff' may generate unexpected results for merges, as it will
500 default to comparing against the working directory's first parent
516 default to comparing against the working directory's first parent
501 changeset if no revisions are specified.
517 changeset if no revisions are specified.
502
518
503 When two revision arguments are given, then changes are shown between
519 When two revision arguments are given, then changes are shown between
504 those revisions. If only one revision is specified then that revision is
520 those revisions. If only one revision is specified then that revision is
505 compared to the working directory, and, when no revisions are specified,
521 compared to the working directory, and, when no revisions are specified,
506 the working directory files are compared to its first parent.
522 the working directory files are compared to its first parent.
507
523
508 Alternatively you can specify -c/--change with a revision to see the
524 Alternatively you can specify -c/--change with a revision to see the
509 changes in that changeset relative to its first parent.
525 changes in that changeset relative to its first parent.
510
526
511 Without the -a/--text option, diff will avoid generating diffs of files it
527 Without the -a/--text option, diff will avoid generating diffs of files it
512 detects as binary. With -a, diff will generate a diff anyway, probably
528 detects as binary. With -a, diff will generate a diff anyway, probably
513 with undesirable results.
529 with undesirable results.
514
530
515 Use the -g/--git option to generate diffs in the git extended diff format.
531 Use the -g/--git option to generate diffs in the git extended diff format.
516 For more information, read 'hg help diffs'.
532 For more information, read 'hg help diffs'.
517
533
518 Returns 0 on success.
534 Returns 0 on success.
519
535
520 options ([+] can be repeated):
536 options ([+] can be repeated):
521
537
522 -r --rev REV [+] revision
538 -r --rev REV [+] revision
523 -c --change REV change made by revision
539 -c --change REV change made by revision
524 -a --text treat all files as text
540 -a --text treat all files as text
525 -g --git use git extended diff format
541 -g --git use git extended diff format
526 --nodates omit dates from diff headers
542 --nodates omit dates from diff headers
527 --noprefix omit a/ and b/ prefixes from filenames
543 --noprefix omit a/ and b/ prefixes from filenames
528 -p --show-function show which function each change is in
544 -p --show-function show which function each change is in
529 --reverse produce a diff that undoes the changes
545 --reverse produce a diff that undoes the changes
530 -w --ignore-all-space ignore white space when comparing lines
546 -w --ignore-all-space ignore white space when comparing lines
531 -b --ignore-space-change ignore changes in the amount of white space
547 -b --ignore-space-change ignore changes in the amount of white space
532 -B --ignore-blank-lines ignore changes whose lines are all blank
548 -B --ignore-blank-lines ignore changes whose lines are all blank
533 -U --unified NUM number of lines of context to show
549 -U --unified NUM number of lines of context to show
534 --stat output diffstat-style summary of changes
550 --stat output diffstat-style summary of changes
535 --root DIR produce diffs relative to subdirectory
551 --root DIR produce diffs relative to subdirectory
536 -I --include PATTERN [+] include names matching the given patterns
552 -I --include PATTERN [+] include names matching the given patterns
537 -X --exclude PATTERN [+] exclude names matching the given patterns
553 -X --exclude PATTERN [+] exclude names matching the given patterns
538 -S --subrepos recurse into subrepositories
554 -S --subrepos recurse into subrepositories
539
555
540 (some details hidden, use --verbose to show complete help)
556 (some details hidden, use --verbose to show complete help)
541
557
542 $ hg help status
558 $ hg help status
543 hg status [OPTION]... [FILE]...
559 hg status [OPTION]... [FILE]...
544
560
545 aliases: st
561 aliases: st
546
562
547 show changed files in the working directory
563 show changed files in the working directory
548
564
549 Show status of files in the repository. If names are given, only files
565 Show status of files in the repository. If names are given, only files
550 that match are shown. Files that are clean or ignored or the source of a
566 that match are shown. Files that are clean or ignored or the source of a
551 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
567 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
552 -C/--copies or -A/--all are given. Unless options described with "show
568 -C/--copies or -A/--all are given. Unless options described with "show
553 only ..." are given, the options -mardu are used.
569 only ..." are given, the options -mardu are used.
554
570
555 Option -q/--quiet hides untracked (unknown and ignored) files unless
571 Option -q/--quiet hides untracked (unknown and ignored) files unless
556 explicitly requested with -u/--unknown or -i/--ignored.
572 explicitly requested with -u/--unknown or -i/--ignored.
557
573
558 Note:
574 Note:
559 'hg status' may appear to disagree with diff if permissions have
575 'hg status' may appear to disagree with diff if permissions have
560 changed or a merge has occurred. The standard diff format does not
576 changed or a merge has occurred. The standard diff format does not
561 report permission changes and diff only reports changes relative to one
577 report permission changes and diff only reports changes relative to one
562 merge parent.
578 merge parent.
563
579
564 If one revision is given, it is used as the base revision. If two
580 If one revision is given, it is used as the base revision. If two
565 revisions are given, the differences between them are shown. The --change
581 revisions are given, the differences between them are shown. The --change
566 option can also be used as a shortcut to list the changed files of a
582 option can also be used as a shortcut to list the changed files of a
567 revision from its first parent.
583 revision from its first parent.
568
584
569 The codes used to show the status of files are:
585 The codes used to show the status of files are:
570
586
571 M = modified
587 M = modified
572 A = added
588 A = added
573 R = removed
589 R = removed
574 C = clean
590 C = clean
575 ! = missing (deleted by non-hg command, but still tracked)
591 ! = missing (deleted by non-hg command, but still tracked)
576 ? = not tracked
592 ? = not tracked
577 I = ignored
593 I = ignored
578 = origin of the previous file (with --copies)
594 = origin of the previous file (with --copies)
579
595
580 Returns 0 on success.
596 Returns 0 on success.
581
597
582 options ([+] can be repeated):
598 options ([+] can be repeated):
583
599
584 -A --all show status of all files
600 -A --all show status of all files
585 -m --modified show only modified files
601 -m --modified show only modified files
586 -a --added show only added files
602 -a --added show only added files
587 -r --removed show only removed files
603 -r --removed show only removed files
588 -d --deleted show only deleted (but tracked) files
604 -d --deleted show only deleted (but tracked) files
589 -c --clean show only files without changes
605 -c --clean show only files without changes
590 -u --unknown show only unknown (not tracked) files
606 -u --unknown show only unknown (not tracked) files
591 -i --ignored show only ignored files
607 -i --ignored show only ignored files
592 -n --no-status hide status prefix
608 -n --no-status hide status prefix
593 -C --copies show source of copied files
609 -C --copies show source of copied files
594 -0 --print0 end filenames with NUL, for use with xargs
610 -0 --print0 end filenames with NUL, for use with xargs
595 --rev REV [+] show difference from revision
611 --rev REV [+] show difference from revision
596 --change REV list the changed files of a revision
612 --change REV list the changed files of a revision
597 -I --include PATTERN [+] include names matching the given patterns
613 -I --include PATTERN [+] include names matching the given patterns
598 -X --exclude PATTERN [+] exclude names matching the given patterns
614 -X --exclude PATTERN [+] exclude names matching the given patterns
599 -S --subrepos recurse into subrepositories
615 -S --subrepos recurse into subrepositories
600
616
601 (some details hidden, use --verbose to show complete help)
617 (some details hidden, use --verbose to show complete help)
602
618
603 $ hg -q help status
619 $ hg -q help status
604 hg status [OPTION]... [FILE]...
620 hg status [OPTION]... [FILE]...
605
621
606 show changed files in the working directory
622 show changed files in the working directory
607
623
608 $ hg help foo
624 $ hg help foo
609 abort: no such help topic: foo
625 abort: no such help topic: foo
610 (try "hg help --keyword foo")
626 (try "hg help --keyword foo")
611 [255]
627 [255]
612
628
613 $ hg skjdfks
629 $ hg skjdfks
614 hg: unknown command 'skjdfks'
630 hg: unknown command 'skjdfks'
615 Mercurial Distributed SCM
631 Mercurial Distributed SCM
616
632
617 basic commands:
633 basic commands:
618
634
619 add add the specified files on the next commit
635 add add the specified files on the next commit
620 annotate show changeset information by line for each file
636 annotate show changeset information by line for each file
621 clone make a copy of an existing repository
637 clone make a copy of an existing repository
622 commit commit the specified files or all outstanding changes
638 commit commit the specified files or all outstanding changes
623 diff diff repository (or selected files)
639 diff diff repository (or selected files)
624 export dump the header and diffs for one or more changesets
640 export dump the header and diffs for one or more changesets
625 forget forget the specified files on the next commit
641 forget forget the specified files on the next commit
626 init create a new repository in the given directory
642 init create a new repository in the given directory
627 log show revision history of entire repository or files
643 log show revision history of entire repository or files
628 merge merge another revision into working directory
644 merge merge another revision into working directory
629 pull pull changes from the specified source
645 pull pull changes from the specified source
630 push push changes to the specified destination
646 push push changes to the specified destination
631 remove remove the specified files on the next commit
647 remove remove the specified files on the next commit
632 serve start stand-alone webserver
648 serve start stand-alone webserver
633 status show changed files in the working directory
649 status show changed files in the working directory
634 summary summarize working directory state
650 summary summarize working directory state
635 update update working directory (or switch revisions)
651 update update working directory (or switch revisions)
636
652
637 (use "hg help" for the full list of commands or "hg -v" for details)
653 (use "hg help" for the full list of commands or "hg -v" for details)
638 [255]
654 [255]
639
655
640
656
641 Make sure that we don't run afoul of the help system thinking that
657 Make sure that we don't run afoul of the help system thinking that
642 this is a section and erroring out weirdly.
658 this is a section and erroring out weirdly.
643
659
644 $ hg .log
660 $ hg .log
645 hg: unknown command '.log'
661 hg: unknown command '.log'
646 (did you mean log?)
662 (did you mean log?)
647 [255]
663 [255]
648
664
649 $ hg log.
665 $ hg log.
650 hg: unknown command 'log.'
666 hg: unknown command 'log.'
651 (did you mean log?)
667 (did you mean log?)
652 [255]
668 [255]
653 $ hg pu.lh
669 $ hg pu.lh
654 hg: unknown command 'pu.lh'
670 hg: unknown command 'pu.lh'
655 (did you mean one of pull, push?)
671 (did you mean one of pull, push?)
656 [255]
672 [255]
657
673
658 $ cat > helpext.py <<EOF
674 $ cat > helpext.py <<EOF
659 > import os
675 > import os
660 > from mercurial import cmdutil, commands
676 > from mercurial import cmdutil, commands
661 >
677 >
662 > cmdtable = {}
678 > cmdtable = {}
663 > command = cmdutil.command(cmdtable)
679 > command = cmdutil.command(cmdtable)
664 >
680 >
665 > @command('nohelp',
681 > @command('nohelp',
666 > [('', 'longdesc', 3, 'x'*90),
682 > [('', 'longdesc', 3, 'x'*90),
667 > ('n', '', None, 'normal desc'),
683 > ('n', '', None, 'normal desc'),
668 > ('', 'newline', '', 'line1\nline2')],
684 > ('', 'newline', '', 'line1\nline2')],
669 > 'hg nohelp',
685 > 'hg nohelp',
670 > norepo=True)
686 > norepo=True)
671 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
687 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
672 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
688 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
673 > def nohelp(ui, *args, **kwargs):
689 > def nohelp(ui, *args, **kwargs):
674 > pass
690 > pass
675 >
691 >
676 > def uisetup(ui):
692 > def uisetup(ui):
677 > ui.setconfig('alias', 'shellalias', '!echo hi', 'helpext')
693 > ui.setconfig('alias', 'shellalias', '!echo hi', 'helpext')
678 > ui.setconfig('alias', 'hgalias', 'summary', 'helpext')
694 > ui.setconfig('alias', 'hgalias', 'summary', 'helpext')
679 >
695 >
680 > EOF
696 > EOF
681 $ echo '[extensions]' >> $HGRCPATH
697 $ echo '[extensions]' >> $HGRCPATH
682 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
698 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
683
699
684 Test for aliases
700 Test for aliases
685
701
686 $ hg help hgalias
702 $ hg help hgalias
687 hg hgalias [--remote]
703 hg hgalias [--remote]
688
704
689 alias for: hg summary
705 alias for: hg summary
690
706
691 summarize working directory state
707 summarize working directory state
692
708
693 This generates a brief summary of the working directory state, including
709 This generates a brief summary of the working directory state, including
694 parents, branch, commit status, phase and available updates.
710 parents, branch, commit status, phase and available updates.
695
711
696 With the --remote option, this will check the default paths for incoming
712 With the --remote option, this will check the default paths for incoming
697 and outgoing changes. This can be time-consuming.
713 and outgoing changes. This can be time-consuming.
698
714
699 Returns 0 on success.
715 Returns 0 on success.
700
716
701 defined by: helpext
717 defined by: helpext
702
718
703 options:
719 options:
704
720
705 --remote check for push and pull
721 --remote check for push and pull
706
722
707 (some details hidden, use --verbose to show complete help)
723 (some details hidden, use --verbose to show complete help)
708
724
709 $ hg help shellalias
725 $ hg help shellalias
710 hg shellalias
726 hg shellalias
711
727
712 shell alias for:
728 shell alias for:
713
729
714 echo hi
730 echo hi
715
731
716 defined by: helpext
732 defined by: helpext
717
733
718 (some details hidden, use --verbose to show complete help)
734 (some details hidden, use --verbose to show complete help)
719
735
720 Test command with no help text
736 Test command with no help text
721
737
722 $ hg help nohelp
738 $ hg help nohelp
723 hg nohelp
739 hg nohelp
724
740
725 (no help text available)
741 (no help text available)
726
742
727 options:
743 options:
728
744
729 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
745 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
730 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
746 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
731 -n -- normal desc
747 -n -- normal desc
732 --newline VALUE line1 line2
748 --newline VALUE line1 line2
733
749
734 (some details hidden, use --verbose to show complete help)
750 (some details hidden, use --verbose to show complete help)
735
751
736 $ hg help -k nohelp
752 $ hg help -k nohelp
737 Commands:
753 Commands:
738
754
739 nohelp hg nohelp
755 nohelp hg nohelp
740
756
741 Extension Commands:
757 Extension Commands:
742
758
743 nohelp (no help text available)
759 nohelp (no help text available)
744
760
745 Test that default list of commands omits extension commands
761 Test that default list of commands omits extension commands
746
762
747 $ hg help
763 $ hg help
748 Mercurial Distributed SCM
764 Mercurial Distributed SCM
749
765
750 list of commands:
766 list of commands:
751
767
752 add add the specified files on the next commit
768 add add the specified files on the next commit
753 addremove add all new files, delete all missing files
769 addremove add all new files, delete all missing files
754 annotate show changeset information by line for each file
770 annotate show changeset information by line for each file
755 archive create an unversioned archive of a repository revision
771 archive create an unversioned archive of a repository revision
756 backout reverse effect of earlier changeset
772 backout reverse effect of earlier changeset
757 bisect subdivision search of changesets
773 bisect subdivision search of changesets
758 bookmarks create a new bookmark or list existing bookmarks
774 bookmarks create a new bookmark or list existing bookmarks
759 branch set or show the current branch name
775 branch set or show the current branch name
760 branches list repository named branches
776 branches list repository named branches
761 bundle create a changegroup file
777 bundle create a changegroup file
762 cat output the current or given revision of files
778 cat output the current or given revision of files
763 clone make a copy of an existing repository
779 clone make a copy of an existing repository
764 commit commit the specified files or all outstanding changes
780 commit commit the specified files or all outstanding changes
765 config show combined config settings from all hgrc files
781 config show combined config settings from all hgrc files
766 copy mark files as copied for the next commit
782 copy mark files as copied for the next commit
767 diff diff repository (or selected files)
783 diff diff repository (or selected files)
768 export dump the header and diffs for one or more changesets
784 export dump the header and diffs for one or more changesets
769 files list tracked files
785 files list tracked files
770 forget forget the specified files on the next commit
786 forget forget the specified files on the next commit
771 graft copy changes from other branches onto the current branch
787 graft copy changes from other branches onto the current branch
772 grep search for a pattern in specified files and revisions
788 grep search for a pattern in specified files and revisions
773 heads show branch heads
789 heads show branch heads
774 help show help for a given topic or a help overview
790 help show help for a given topic or a help overview
775 identify identify the working directory or specified revision
791 identify identify the working directory or specified revision
776 import import an ordered set of patches
792 import import an ordered set of patches
777 incoming show new changesets found in source
793 incoming show new changesets found in source
778 init create a new repository in the given directory
794 init create a new repository in the given directory
779 log show revision history of entire repository or files
795 log show revision history of entire repository or files
780 manifest output the current or given revision of the project manifest
796 manifest output the current or given revision of the project manifest
781 merge merge another revision into working directory
797 merge merge another revision into working directory
782 outgoing show changesets not found in the destination
798 outgoing show changesets not found in the destination
783 paths show aliases for remote repositories
799 paths show aliases for remote repositories
784 phase set or show the current phase name
800 phase set or show the current phase name
785 pull pull changes from the specified source
801 pull pull changes from the specified source
786 push push changes to the specified destination
802 push push changes to the specified destination
787 recover roll back an interrupted transaction
803 recover roll back an interrupted transaction
788 remove remove the specified files on the next commit
804 remove remove the specified files on the next commit
789 rename rename files; equivalent of copy + remove
805 rename rename files; equivalent of copy + remove
790 resolve redo merges or set/view the merge status of files
806 resolve redo merges or set/view the merge status of files
791 revert restore files to their checkout state
807 revert restore files to their checkout state
792 root print the root (top) of the current working directory
808 root print the root (top) of the current working directory
793 serve start stand-alone webserver
809 serve start stand-alone webserver
794 status show changed files in the working directory
810 status show changed files in the working directory
795 summary summarize working directory state
811 summary summarize working directory state
796 tag add one or more tags for the current or given revision
812 tag add one or more tags for the current or given revision
797 tags list repository tags
813 tags list repository tags
798 unbundle apply one or more changegroup files
814 unbundle apply one or more changegroup files
799 update update working directory (or switch revisions)
815 update update working directory (or switch revisions)
800 verify verify the integrity of the repository
816 verify verify the integrity of the repository
801 version output version and copyright information
817 version output version and copyright information
802
818
803 enabled extensions:
819 enabled extensions:
804
820
805 helpext (no help text available)
821 helpext (no help text available)
806
822
807 additional help topics:
823 additional help topics:
808
824
809 config Configuration Files
825 config Configuration Files
810 dates Date Formats
826 dates Date Formats
811 diffs Diff Formats
827 diffs Diff Formats
812 environment Environment Variables
828 environment Environment Variables
813 extensions Using Additional Features
829 extensions Using Additional Features
814 filesets Specifying File Sets
830 filesets Specifying File Sets
815 glossary Glossary
831 glossary Glossary
816 hgignore Syntax for Mercurial Ignore Files
832 hgignore Syntax for Mercurial Ignore Files
817 hgweb Configuring hgweb
833 hgweb Configuring hgweb
818 internals Technical implementation topics
834 internals Technical implementation topics
819 merge-tools Merge Tools
835 merge-tools Merge Tools
820 multirevs Specifying Multiple Revisions
836 multirevs Specifying Multiple Revisions
821 patterns File Name Patterns
837 patterns File Name Patterns
822 phases Working with Phases
838 phases Working with Phases
823 revisions Specifying Single Revisions
839 revisions Specifying Single Revisions
824 revsets Specifying Revision Sets
840 revsets Specifying Revision Sets
825 scripting Using Mercurial from scripts and automation
841 scripting Using Mercurial from scripts and automation
826 subrepos Subrepositories
842 subrepos Subrepositories
827 templating Template Usage
843 templating Template Usage
828 urls URL Paths
844 urls URL Paths
829
845
830 (use "hg help -v" to show built-in aliases and global options)
846 (use "hg help -v" to show built-in aliases and global options)
831
847
832
848
833 Test list of internal help commands
849 Test list of internal help commands
834
850
835 $ hg help debug
851 $ hg help debug
836 debug commands (internal and unsupported):
852 debug commands (internal and unsupported):
837
853
838 debugancestor
854 debugancestor
839 find the ancestor revision of two revisions in a given index
855 find the ancestor revision of two revisions in a given index
840 debugapplystreamclonebundle
856 debugapplystreamclonebundle
841 apply a stream clone bundle file
857 apply a stream clone bundle file
842 debugbuilddag
858 debugbuilddag
843 builds a repo with a given DAG from scratch in the current
859 builds a repo with a given DAG from scratch in the current
844 empty repo
860 empty repo
845 debugbundle lists the contents of a bundle
861 debugbundle lists the contents of a bundle
846 debugcheckstate
862 debugcheckstate
847 validate the correctness of the current dirstate
863 validate the correctness of the current dirstate
848 debugcommands
864 debugcommands
849 list all available commands and options
865 list all available commands and options
850 debugcomplete
866 debugcomplete
851 returns the completion list associated with the given command
867 returns the completion list associated with the given command
852 debugcreatestreamclonebundle
868 debugcreatestreamclonebundle
853 create a stream clone bundle file
869 create a stream clone bundle file
854 debugdag format the changelog or an index DAG as a concise textual
870 debugdag format the changelog or an index DAG as a concise textual
855 description
871 description
856 debugdata dump the contents of a data file revision
872 debugdata dump the contents of a data file revision
857 debugdate parse and display a date
873 debugdate parse and display a date
858 debugdeltachain
874 debugdeltachain
859 dump information about delta chains in a revlog
875 dump information about delta chains in a revlog
860 debugdirstate
876 debugdirstate
861 show the contents of the current dirstate
877 show the contents of the current dirstate
862 debugdiscovery
878 debugdiscovery
863 runs the changeset discovery protocol in isolation
879 runs the changeset discovery protocol in isolation
864 debugextensions
880 debugextensions
865 show information about active extensions
881 show information about active extensions
866 debugfileset parse and apply a fileset specification
882 debugfileset parse and apply a fileset specification
867 debugfsinfo show information detected about current filesystem
883 debugfsinfo show information detected about current filesystem
868 debuggetbundle
884 debuggetbundle
869 retrieves a bundle from a repo
885 retrieves a bundle from a repo
870 debugignore display the combined ignore pattern and information about
886 debugignore display the combined ignore pattern and information about
871 ignored files
887 ignored files
872 debugindex dump the contents of an index file
888 debugindex dump the contents of an index file
873 debugindexdot
889 debugindexdot
874 dump an index DAG as a graphviz dot file
890 dump an index DAG as a graphviz dot file
875 debuginstall test Mercurial installation
891 debuginstall test Mercurial installation
876 debugknown test whether node ids are known to a repo
892 debugknown test whether node ids are known to a repo
877 debuglocks show or modify state of locks
893 debuglocks show or modify state of locks
878 debugmergestate
894 debugmergestate
879 print merge state
895 print merge state
880 debugnamecomplete
896 debugnamecomplete
881 complete "names" - tags, open branch names, bookmark names
897 complete "names" - tags, open branch names, bookmark names
882 debugobsolete
898 debugobsolete
883 create arbitrary obsolete marker
899 create arbitrary obsolete marker
884 debugoptDEP (no help text available)
900 debugoptDEP (no help text available)
885 debugoptEXP (no help text available)
901 debugoptEXP (no help text available)
886 debugpathcomplete
902 debugpathcomplete
887 complete part or all of a tracked path
903 complete part or all of a tracked path
888 debugpushkey access the pushkey key/value protocol
904 debugpushkey access the pushkey key/value protocol
889 debugpvec (no help text available)
905 debugpvec (no help text available)
890 debugrebuilddirstate
906 debugrebuilddirstate
891 rebuild the dirstate as it would look like for the given
907 rebuild the dirstate as it would look like for the given
892 revision
908 revision
893 debugrebuildfncache
909 debugrebuildfncache
894 rebuild the fncache file
910 rebuild the fncache file
895 debugrename dump rename information
911 debugrename dump rename information
896 debugrevlog show data and statistics about a revlog
912 debugrevlog show data and statistics about a revlog
897 debugrevspec parse and apply a revision specification
913 debugrevspec parse and apply a revision specification
898 debugsetparents
914 debugsetparents
899 manually set the parents of the current working directory
915 manually set the parents of the current working directory
900 debugsub (no help text available)
916 debugsub (no help text available)
901 debugsuccessorssets
917 debugsuccessorssets
902 show set of successors for revision
918 show set of successors for revision
903 debugtemplate
919 debugtemplate
904 parse and apply a template
920 parse and apply a template
905 debugwalk show how files match on given patterns
921 debugwalk show how files match on given patterns
906 debugwireargs
922 debugwireargs
907 (no help text available)
923 (no help text available)
908
924
909 (use "hg help -v debug" to show built-in aliases and global options)
925 (use "hg help -v debug" to show built-in aliases and global options)
910
926
911 internals topic renders index of available sub-topics
927 internals topic renders index of available sub-topics
912
928
913 $ hg help internals
929 $ hg help internals
914 Technical implementation topics
930 Technical implementation topics
915 """""""""""""""""""""""""""""""
931 """""""""""""""""""""""""""""""
916
932
917 bundles container for exchange of repository data
933 bundles container for exchange of repository data
918 changegroups representation of revlog data
934 changegroups representation of revlog data
919 requirements repository requirements
935 requirements repository requirements
920 revlogs revision storage mechanism
936 revlogs revision storage mechanism
921
937
922 sub-topics can be accessed
938 sub-topics can be accessed
923
939
924 $ hg help internals.changegroups
940 $ hg help internals.changegroups
925 Changegroups
941 Changegroups
926 ============
942 ============
927
943
928 Changegroups are representations of repository revlog data, specifically
944 Changegroups are representations of repository revlog data, specifically
929 the changelog, manifest, and filelogs.
945 the changelog, manifest, and filelogs.
930
946
931 There are 3 versions of changegroups: "1", "2", and "3". From a high-
947 There are 3 versions of changegroups: "1", "2", and "3". From a high-
932 level, versions "1" and "2" are almost exactly the same, with the only
948 level, versions "1" and "2" are almost exactly the same, with the only
933 difference being a header on entries in the changeset segment. Version "3"
949 difference being a header on entries in the changeset segment. Version "3"
934 adds support for exchanging treemanifests and includes revlog flags in the
950 adds support for exchanging treemanifests and includes revlog flags in the
935 delta header.
951 delta header.
936
952
937 Changegroups consists of 3 logical segments:
953 Changegroups consists of 3 logical segments:
938
954
939 +---------------------------------+
955 +---------------------------------+
940 | | | |
956 | | | |
941 | changeset | manifest | filelogs |
957 | changeset | manifest | filelogs |
942 | | | |
958 | | | |
943 +---------------------------------+
959 +---------------------------------+
944
960
945 The principle building block of each segment is a *chunk*. A *chunk* is a
961 The principle building block of each segment is a *chunk*. A *chunk* is a
946 framed piece of data:
962 framed piece of data:
947
963
948 +---------------------------------------+
964 +---------------------------------------+
949 | | |
965 | | |
950 | length | data |
966 | length | data |
951 | (32 bits) | <length> bytes |
967 | (32 bits) | <length> bytes |
952 | | |
968 | | |
953 +---------------------------------------+
969 +---------------------------------------+
954
970
955 Each chunk starts with a 32-bit big-endian signed integer indicating the
971 Each chunk starts with a 32-bit big-endian signed integer indicating the
956 length of the raw data that follows.
972 length of the raw data that follows.
957
973
958 There is a special case chunk that has 0 length ("0x00000000"). We call
974 There is a special case chunk that has 0 length ("0x00000000"). We call
959 this an *empty chunk*.
975 this an *empty chunk*.
960
976
961 Delta Groups
977 Delta Groups
962 ------------
978 ------------
963
979
964 A *delta group* expresses the content of a revlog as a series of deltas,
980 A *delta group* expresses the content of a revlog as a series of deltas,
965 or patches against previous revisions.
981 or patches against previous revisions.
966
982
967 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
983 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
968 to signal the end of the delta group:
984 to signal the end of the delta group:
969
985
970 +------------------------------------------------------------------------+
986 +------------------------------------------------------------------------+
971 | | | | | |
987 | | | | | |
972 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
988 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
973 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
989 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
974 | | | | | |
990 | | | | | |
975 +------------------------------------------------------------+-----------+
991 +------------------------------------------------------------+-----------+
976
992
977 Each *chunk*'s data consists of the following:
993 Each *chunk*'s data consists of the following:
978
994
979 +-----------------------------------------+
995 +-----------------------------------------+
980 | | | |
996 | | | |
981 | delta header | mdiff header | delta |
997 | delta header | mdiff header | delta |
982 | (various) | (12 bytes) | (various) |
998 | (various) | (12 bytes) | (various) |
983 | | | |
999 | | | |
984 +-----------------------------------------+
1000 +-----------------------------------------+
985
1001
986 The *length* field is the byte length of the remaining 3 logical pieces of
1002 The *length* field is the byte length of the remaining 3 logical pieces of
987 data. The *delta* is a diff from an existing entry in the changelog.
1003 data. The *delta* is a diff from an existing entry in the changelog.
988
1004
989 The *delta header* is different between versions "1", "2", and "3" of the
1005 The *delta header* is different between versions "1", "2", and "3" of the
990 changegroup format.
1006 changegroup format.
991
1007
992 Version 1:
1008 Version 1:
993
1009
994 +------------------------------------------------------+
1010 +------------------------------------------------------+
995 | | | | |
1011 | | | | |
996 | node | p1 node | p2 node | link node |
1012 | node | p1 node | p2 node | link node |
997 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1013 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
998 | | | | |
1014 | | | | |
999 +------------------------------------------------------+
1015 +------------------------------------------------------+
1000
1016
1001 Version 2:
1017 Version 2:
1002
1018
1003 +------------------------------------------------------------------+
1019 +------------------------------------------------------------------+
1004 | | | | | |
1020 | | | | | |
1005 | node | p1 node | p2 node | base node | link node |
1021 | node | p1 node | p2 node | base node | link node |
1006 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1022 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1007 | | | | | |
1023 | | | | | |
1008 +------------------------------------------------------------------+
1024 +------------------------------------------------------------------+
1009
1025
1010 Version 3:
1026 Version 3:
1011
1027
1012 +------------------------------------------------------------------------------+
1028 +------------------------------------------------------------------------------+
1013 | | | | | | |
1029 | | | | | | |
1014 | node | p1 node | p2 node | base node | link node | flags |
1030 | node | p1 node | p2 node | base node | link node | flags |
1015 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1031 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1016 | | | | | | |
1032 | | | | | | |
1017 +------------------------------------------------------------------------------+
1033 +------------------------------------------------------------------------------+
1018
1034
1019 The *mdiff header* consists of 3 32-bit big-endian signed integers
1035 The *mdiff header* consists of 3 32-bit big-endian signed integers
1020 describing offsets at which to apply the following delta content:
1036 describing offsets at which to apply the following delta content:
1021
1037
1022 +-------------------------------------+
1038 +-------------------------------------+
1023 | | | |
1039 | | | |
1024 | offset | old length | new length |
1040 | offset | old length | new length |
1025 | (32 bits) | (32 bits) | (32 bits) |
1041 | (32 bits) | (32 bits) | (32 bits) |
1026 | | | |
1042 | | | |
1027 +-------------------------------------+
1043 +-------------------------------------+
1028
1044
1029 In version 1, the delta is always applied against the previous node from
1045 In version 1, the delta is always applied against the previous node from
1030 the changegroup or the first parent if this is the first entry in the
1046 the changegroup or the first parent if this is the first entry in the
1031 changegroup.
1047 changegroup.
1032
1048
1033 In version 2, the delta base node is encoded in the entry in the
1049 In version 2, the delta base node is encoded in the entry in the
1034 changegroup. This allows the delta to be expressed against any parent,
1050 changegroup. This allows the delta to be expressed against any parent,
1035 which can result in smaller deltas and more efficient encoding of data.
1051 which can result in smaller deltas and more efficient encoding of data.
1036
1052
1037 Changeset Segment
1053 Changeset Segment
1038 -----------------
1054 -----------------
1039
1055
1040 The *changeset segment* consists of a single *delta group* holding
1056 The *changeset segment* consists of a single *delta group* holding
1041 changelog data. It is followed by an *empty chunk* to denote the boundary
1057 changelog data. It is followed by an *empty chunk* to denote the boundary
1042 to the *manifests segment*.
1058 to the *manifests segment*.
1043
1059
1044 Manifest Segment
1060 Manifest Segment
1045 ----------------
1061 ----------------
1046
1062
1047 The *manifest segment* consists of a single *delta group* holding manifest
1063 The *manifest segment* consists of a single *delta group* holding manifest
1048 data. It is followed by an *empty chunk* to denote the boundary to the
1064 data. It is followed by an *empty chunk* to denote the boundary to the
1049 *filelogs segment*.
1065 *filelogs segment*.
1050
1066
1051 Filelogs Segment
1067 Filelogs Segment
1052 ----------------
1068 ----------------
1053
1069
1054 The *filelogs* segment consists of multiple sub-segments, each
1070 The *filelogs* segment consists of multiple sub-segments, each
1055 corresponding to an individual file whose data is being described:
1071 corresponding to an individual file whose data is being described:
1056
1072
1057 +--------------------------------------+
1073 +--------------------------------------+
1058 | | | | |
1074 | | | | |
1059 | filelog0 | filelog1 | filelog2 | ... |
1075 | filelog0 | filelog1 | filelog2 | ... |
1060 | | | | |
1076 | | | | |
1061 +--------------------------------------+
1077 +--------------------------------------+
1062
1078
1063 In version "3" of the changegroup format, filelogs may include directory
1079 In version "3" of the changegroup format, filelogs may include directory
1064 logs when treemanifests are in use. directory logs are identified by
1080 logs when treemanifests are in use. directory logs are identified by
1065 having a trailing '/' on their filename (see below).
1081 having a trailing '/' on their filename (see below).
1066
1082
1067 The final filelog sub-segment is followed by an *empty chunk* to denote
1083 The final filelog sub-segment is followed by an *empty chunk* to denote
1068 the end of the segment and the overall changegroup.
1084 the end of the segment and the overall changegroup.
1069
1085
1070 Each filelog sub-segment consists of the following:
1086 Each filelog sub-segment consists of the following:
1071
1087
1072 +------------------------------------------+
1088 +------------------------------------------+
1073 | | | |
1089 | | | |
1074 | filename size | filename | delta group |
1090 | filename size | filename | delta group |
1075 | (32 bits) | (various) | (various) |
1091 | (32 bits) | (various) | (various) |
1076 | | | |
1092 | | | |
1077 +------------------------------------------+
1093 +------------------------------------------+
1078
1094
1079 That is, a *chunk* consisting of the filename (not terminated or padded)
1095 That is, a *chunk* consisting of the filename (not terminated or padded)
1080 followed by N chunks constituting the *delta group* for this file.
1096 followed by N chunks constituting the *delta group* for this file.
1081
1097
1082 Test list of commands with command with no help text
1098 Test list of commands with command with no help text
1083
1099
1084 $ hg help helpext
1100 $ hg help helpext
1085 helpext extension - no help text available
1101 helpext extension - no help text available
1086
1102
1087 list of commands:
1103 list of commands:
1088
1104
1089 nohelp (no help text available)
1105 nohelp (no help text available)
1090
1106
1091 (use "hg help -v helpext" to show built-in aliases and global options)
1107 (use "hg help -v helpext" to show built-in aliases and global options)
1092
1108
1093
1109
1094 test deprecated and experimental options are hidden in command help
1110 test deprecated and experimental options are hidden in command help
1095 $ hg help debugoptDEP
1111 $ hg help debugoptDEP
1096 hg debugoptDEP
1112 hg debugoptDEP
1097
1113
1098 (no help text available)
1114 (no help text available)
1099
1115
1100 options:
1116 options:
1101
1117
1102 (some details hidden, use --verbose to show complete help)
1118 (some details hidden, use --verbose to show complete help)
1103
1119
1104 $ hg help debugoptEXP
1120 $ hg help debugoptEXP
1105 hg debugoptEXP
1121 hg debugoptEXP
1106
1122
1107 (no help text available)
1123 (no help text available)
1108
1124
1109 options:
1125 options:
1110
1126
1111 (some details hidden, use --verbose to show complete help)
1127 (some details hidden, use --verbose to show complete help)
1112
1128
1113 test deprecated and experimental options is shown with -v
1129 test deprecated and experimental options is shown with -v
1114 $ hg help -v debugoptDEP | grep dopt
1130 $ hg help -v debugoptDEP | grep dopt
1115 --dopt option is (DEPRECATED)
1131 --dopt option is (DEPRECATED)
1116 $ hg help -v debugoptEXP | grep eopt
1132 $ hg help -v debugoptEXP | grep eopt
1117 --eopt option is (EXPERIMENTAL)
1133 --eopt option is (EXPERIMENTAL)
1118
1134
1119 #if gettext
1135 #if gettext
1120 test deprecated option is hidden with translation with untranslated description
1136 test deprecated option is hidden with translation with untranslated description
1121 (use many globy for not failing on changed transaction)
1137 (use many globy for not failing on changed transaction)
1122 $ LANGUAGE=sv hg help debugoptDEP
1138 $ LANGUAGE=sv hg help debugoptDEP
1123 hg debugoptDEP
1139 hg debugoptDEP
1124
1140
1125 (*) (glob)
1141 (*) (glob)
1126
1142
1127 options:
1143 options:
1128
1144
1129 (some details hidden, use --verbose to show complete help)
1145 (some details hidden, use --verbose to show complete help)
1130 #endif
1146 #endif
1131
1147
1132 Test commands that collide with topics (issue4240)
1148 Test commands that collide with topics (issue4240)
1133
1149
1134 $ hg config -hq
1150 $ hg config -hq
1135 hg config [-u] [NAME]...
1151 hg config [-u] [NAME]...
1136
1152
1137 show combined config settings from all hgrc files
1153 show combined config settings from all hgrc files
1138 $ hg showconfig -hq
1154 $ hg showconfig -hq
1139 hg config [-u] [NAME]...
1155 hg config [-u] [NAME]...
1140
1156
1141 show combined config settings from all hgrc files
1157 show combined config settings from all hgrc files
1142
1158
1143 Test a help topic
1159 Test a help topic
1144
1160
1145 $ hg help revs
1161 $ hg help revs
1146 Specifying Single Revisions
1162 Specifying Single Revisions
1147 """""""""""""""""""""""""""
1163 """""""""""""""""""""""""""
1148
1164
1149 Mercurial supports several ways to specify individual revisions.
1165 Mercurial supports several ways to specify individual revisions.
1150
1166
1151 A plain integer is treated as a revision number. Negative integers are
1167 A plain integer is treated as a revision number. Negative integers are
1152 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1168 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1153 denoting the revision prior to the tip, and so forth.
1169 denoting the revision prior to the tip, and so forth.
1154
1170
1155 A 40-digit hexadecimal string is treated as a unique revision identifier.
1171 A 40-digit hexadecimal string is treated as a unique revision identifier.
1156
1172
1157 A hexadecimal string less than 40 characters long is treated as a unique
1173 A hexadecimal string less than 40 characters long is treated as a unique
1158 revision identifier and is referred to as a short-form identifier. A
1174 revision identifier and is referred to as a short-form identifier. A
1159 short-form identifier is only valid if it is the prefix of exactly one
1175 short-form identifier is only valid if it is the prefix of exactly one
1160 full-length identifier.
1176 full-length identifier.
1161
1177
1162 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1178 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1163 is a movable pointer to a revision. A tag is a permanent name associated
1179 is a movable pointer to a revision. A tag is a permanent name associated
1164 with a revision. A branch name denotes the tipmost open branch head of
1180 with a revision. A branch name denotes the tipmost open branch head of
1165 that branch - or if they are all closed, the tipmost closed head of the
1181 that branch - or if they are all closed, the tipmost closed head of the
1166 branch. Bookmark, tag, and branch names must not contain the ":"
1182 branch. Bookmark, tag, and branch names must not contain the ":"
1167 character.
1183 character.
1168
1184
1169 The reserved name "tip" always identifies the most recent revision.
1185 The reserved name "tip" always identifies the most recent revision.
1170
1186
1171 The reserved name "null" indicates the null revision. This is the revision
1187 The reserved name "null" indicates the null revision. This is the revision
1172 of an empty repository, and the parent of revision 0.
1188 of an empty repository, and the parent of revision 0.
1173
1189
1174 The reserved name "." indicates the working directory parent. If no
1190 The reserved name "." indicates the working directory parent. If no
1175 working directory is checked out, it is equivalent to null. If an
1191 working directory is checked out, it is equivalent to null. If an
1176 uncommitted merge is in progress, "." is the revision of the first parent.
1192 uncommitted merge is in progress, "." is the revision of the first parent.
1177
1193
1178 Test repeated config section name
1194 Test repeated config section name
1179
1195
1180 $ hg help config.host
1196 $ hg help config.host
1181 "http_proxy.host"
1197 "http_proxy.host"
1182 Host name and (optional) port of the proxy server, for example
1198 Host name and (optional) port of the proxy server, for example
1183 "myproxy:8000".
1199 "myproxy:8000".
1184
1200
1185 "smtp.host"
1201 "smtp.host"
1186 Host name of mail server, e.g. "mail.example.com".
1202 Host name of mail server, e.g. "mail.example.com".
1187
1203
1188 Unrelated trailing paragraphs shouldn't be included
1204 Unrelated trailing paragraphs shouldn't be included
1189
1205
1190 $ hg help config.extramsg | grep '^$'
1206 $ hg help config.extramsg | grep '^$'
1191
1207
1192
1208
1193 Test capitalized section name
1209 Test capitalized section name
1194
1210
1195 $ hg help scripting.HGPLAIN > /dev/null
1211 $ hg help scripting.HGPLAIN > /dev/null
1196
1212
1197 Help subsection:
1213 Help subsection:
1198
1214
1199 $ hg help config.charsets |grep "Email example:" > /dev/null
1215 $ hg help config.charsets |grep "Email example:" > /dev/null
1200 [1]
1216 [1]
1201
1217
1202 Show nested definitions
1218 Show nested definitions
1203 ("profiling.type"[break]"ls"[break]"stat"[break])
1219 ("profiling.type"[break]"ls"[break]"stat"[break])
1204
1220
1205 $ hg help config.type | egrep '^$'|wc -l
1221 $ hg help config.type | egrep '^$'|wc -l
1206 \s*3 (re)
1222 \s*3 (re)
1207
1223
1208 Separate sections from subsections
1224 Separate sections from subsections
1209
1225
1210 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1226 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1211 "format"
1227 "format"
1212 --------
1228 --------
1213
1229
1214 "usegeneraldelta"
1230 "usegeneraldelta"
1215
1231
1216 "dotencode"
1232 "dotencode"
1217
1233
1218 "usefncache"
1234 "usefncache"
1219
1235
1220 "usestore"
1236 "usestore"
1221
1237
1222 "profiling"
1238 "profiling"
1223 -----------
1239 -----------
1224
1240
1225 "format"
1241 "format"
1226
1242
1227 "progress"
1243 "progress"
1228 ----------
1244 ----------
1229
1245
1230 "format"
1246 "format"
1231
1247
1232
1248
1233 Last item in help config.*:
1249 Last item in help config.*:
1234
1250
1235 $ hg help config.`hg help config|grep '^ "'| \
1251 $ hg help config.`hg help config|grep '^ "'| \
1236 > tail -1|sed 's![ "]*!!g'`| \
1252 > tail -1|sed 's![ "]*!!g'`| \
1237 > grep "hg help -c config" > /dev/null
1253 > grep "hg help -c config" > /dev/null
1238 [1]
1254 [1]
1239
1255
1240 note to use help -c for general hg help config:
1256 note to use help -c for general hg help config:
1241
1257
1242 $ hg help config |grep "hg help -c config" > /dev/null
1258 $ hg help config |grep "hg help -c config" > /dev/null
1243
1259
1244 Test templating help
1260 Test templating help
1245
1261
1246 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1262 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1247 desc String. The text of the changeset description.
1263 desc String. The text of the changeset description.
1248 diffstat String. Statistics of changes with the following format:
1264 diffstat String. Statistics of changes with the following format:
1249 firstline Any text. Returns the first line of text.
1265 firstline Any text. Returns the first line of text.
1250 nonempty Any text. Returns '(none)' if the string is empty.
1266 nonempty Any text. Returns '(none)' if the string is empty.
1251
1267
1252 Test deprecated items
1268 Test deprecated items
1253
1269
1254 $ hg help -v templating | grep currentbookmark
1270 $ hg help -v templating | grep currentbookmark
1255 currentbookmark
1271 currentbookmark
1256 $ hg help templating | (grep currentbookmark || true)
1272 $ hg help templating | (grep currentbookmark || true)
1257
1273
1258 Test help hooks
1274 Test help hooks
1259
1275
1260 $ cat > helphook1.py <<EOF
1276 $ cat > helphook1.py <<EOF
1261 > from mercurial import help
1277 > from mercurial import help
1262 >
1278 >
1263 > def rewrite(ui, topic, doc):
1279 > def rewrite(ui, topic, doc):
1264 > return doc + '\nhelphook1\n'
1280 > return doc + '\nhelphook1\n'
1265 >
1281 >
1266 > def extsetup(ui):
1282 > def extsetup(ui):
1267 > help.addtopichook('revsets', rewrite)
1283 > help.addtopichook('revsets', rewrite)
1268 > EOF
1284 > EOF
1269 $ cat > helphook2.py <<EOF
1285 $ cat > helphook2.py <<EOF
1270 > from mercurial import help
1286 > from mercurial import help
1271 >
1287 >
1272 > def rewrite(ui, topic, doc):
1288 > def rewrite(ui, topic, doc):
1273 > return doc + '\nhelphook2\n'
1289 > return doc + '\nhelphook2\n'
1274 >
1290 >
1275 > def extsetup(ui):
1291 > def extsetup(ui):
1276 > help.addtopichook('revsets', rewrite)
1292 > help.addtopichook('revsets', rewrite)
1277 > EOF
1293 > EOF
1278 $ echo '[extensions]' >> $HGRCPATH
1294 $ echo '[extensions]' >> $HGRCPATH
1279 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1295 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1280 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1296 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1281 $ hg help revsets | grep helphook
1297 $ hg help revsets | grep helphook
1282 helphook1
1298 helphook1
1283 helphook2
1299 helphook2
1284
1300
1285 help -c should only show debug --debug
1301 help -c should only show debug --debug
1286
1302
1287 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1303 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1288 [1]
1304 [1]
1289
1305
1290 help -c should only show deprecated for -v
1306 help -c should only show deprecated for -v
1291
1307
1292 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1308 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1293 [1]
1309 [1]
1294
1310
1295 Test -s / --system
1311 Test -s / --system
1296
1312
1297 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1313 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1298 > wc -l | sed -e 's/ //g'
1314 > wc -l | sed -e 's/ //g'
1299 0
1315 0
1300 $ hg help config.files --system unix | grep 'USER' | \
1316 $ hg help config.files --system unix | grep 'USER' | \
1301 > wc -l | sed -e 's/ //g'
1317 > wc -l | sed -e 's/ //g'
1302 0
1318 0
1303
1319
1304 Test -e / -c / -k combinations
1320 Test -e / -c / -k combinations
1305
1321
1306 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1322 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1307 Commands:
1323 Commands:
1308 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1324 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1309 Extensions:
1325 Extensions:
1310 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1326 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1311 Topics:
1327 Topics:
1312 Commands:
1328 Commands:
1313 Extensions:
1329 Extensions:
1314 Extension Commands:
1330 Extension Commands:
1315 $ hg help -c schemes
1331 $ hg help -c schemes
1316 abort: no such help topic: schemes
1332 abort: no such help topic: schemes
1317 (try "hg help --keyword schemes")
1333 (try "hg help --keyword schemes")
1318 [255]
1334 [255]
1319 $ hg help -e schemes |head -1
1335 $ hg help -e schemes |head -1
1320 schemes extension - extend schemes with shortcuts to repository swarms
1336 schemes extension - extend schemes with shortcuts to repository swarms
1321 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1337 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1322 Commands:
1338 Commands:
1323 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1339 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1324 Extensions:
1340 Extensions:
1325 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1341 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1326 Extensions:
1342 Extensions:
1327 Commands:
1343 Commands:
1328 $ hg help -c commit > /dev/null
1344 $ hg help -c commit > /dev/null
1329 $ hg help -e -c commit > /dev/null
1345 $ hg help -e -c commit > /dev/null
1330 $ hg help -e commit > /dev/null
1346 $ hg help -e commit > /dev/null
1331 abort: no such help topic: commit
1347 abort: no such help topic: commit
1332 (try "hg help --keyword commit")
1348 (try "hg help --keyword commit")
1333 [255]
1349 [255]
1334
1350
1335 Test keyword search help
1351 Test keyword search help
1336
1352
1337 $ cat > prefixedname.py <<EOF
1353 $ cat > prefixedname.py <<EOF
1338 > '''matched against word "clone"
1354 > '''matched against word "clone"
1339 > '''
1355 > '''
1340 > EOF
1356 > EOF
1341 $ echo '[extensions]' >> $HGRCPATH
1357 $ echo '[extensions]' >> $HGRCPATH
1342 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1358 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1343 $ hg help -k clone
1359 $ hg help -k clone
1344 Topics:
1360 Topics:
1345
1361
1346 config Configuration Files
1362 config Configuration Files
1347 extensions Using Additional Features
1363 extensions Using Additional Features
1348 glossary Glossary
1364 glossary Glossary
1349 phases Working with Phases
1365 phases Working with Phases
1350 subrepos Subrepositories
1366 subrepos Subrepositories
1351 urls URL Paths
1367 urls URL Paths
1352
1368
1353 Commands:
1369 Commands:
1354
1370
1355 bookmarks create a new bookmark or list existing bookmarks
1371 bookmarks create a new bookmark or list existing bookmarks
1356 clone make a copy of an existing repository
1372 clone make a copy of an existing repository
1357 paths show aliases for remote repositories
1373 paths show aliases for remote repositories
1358 update update working directory (or switch revisions)
1374 update update working directory (or switch revisions)
1359
1375
1360 Extensions:
1376 Extensions:
1361
1377
1362 clonebundles advertise pre-generated bundles to seed clones
1378 clonebundles advertise pre-generated bundles to seed clones
1363 prefixedname matched against word "clone"
1379 prefixedname matched against word "clone"
1364 relink recreates hardlinks between repository clones
1380 relink recreates hardlinks between repository clones
1365
1381
1366 Extension Commands:
1382 Extension Commands:
1367
1383
1368 qclone clone main and patch repository at same time
1384 qclone clone main and patch repository at same time
1369
1385
1370 Test unfound topic
1386 Test unfound topic
1371
1387
1372 $ hg help nonexistingtopicthatwillneverexisteverever
1388 $ hg help nonexistingtopicthatwillneverexisteverever
1373 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1389 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1374 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1390 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1375 [255]
1391 [255]
1376
1392
1377 Test unfound keyword
1393 Test unfound keyword
1378
1394
1379 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1395 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1380 abort: no matches
1396 abort: no matches
1381 (try "hg help" for a list of topics)
1397 (try "hg help" for a list of topics)
1382 [255]
1398 [255]
1383
1399
1384 Test omit indicating for help
1400 Test omit indicating for help
1385
1401
1386 $ cat > addverboseitems.py <<EOF
1402 $ cat > addverboseitems.py <<EOF
1387 > '''extension to test omit indicating.
1403 > '''extension to test omit indicating.
1388 >
1404 >
1389 > This paragraph is never omitted (for extension)
1405 > This paragraph is never omitted (for extension)
1390 >
1406 >
1391 > .. container:: verbose
1407 > .. container:: verbose
1392 >
1408 >
1393 > This paragraph is omitted,
1409 > This paragraph is omitted,
1394 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1410 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1395 >
1411 >
1396 > This paragraph is never omitted, too (for extension)
1412 > This paragraph is never omitted, too (for extension)
1397 > '''
1413 > '''
1398 >
1414 >
1399 > from mercurial import help, commands
1415 > from mercurial import help, commands
1400 > testtopic = """This paragraph is never omitted (for topic).
1416 > testtopic = """This paragraph is never omitted (for topic).
1401 >
1417 >
1402 > .. container:: verbose
1418 > .. container:: verbose
1403 >
1419 >
1404 > This paragraph is omitted,
1420 > This paragraph is omitted,
1405 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1421 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1406 >
1422 >
1407 > This paragraph is never omitted, too (for topic)
1423 > This paragraph is never omitted, too (for topic)
1408 > """
1424 > """
1409 > def extsetup(ui):
1425 > def extsetup(ui):
1410 > help.helptable.append((["topic-containing-verbose"],
1426 > help.helptable.append((["topic-containing-verbose"],
1411 > "This is the topic to test omit indicating.",
1427 > "This is the topic to test omit indicating.",
1412 > lambda ui: testtopic))
1428 > lambda ui: testtopic))
1413 > EOF
1429 > EOF
1414 $ echo '[extensions]' >> $HGRCPATH
1430 $ echo '[extensions]' >> $HGRCPATH
1415 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1431 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1416 $ hg help addverboseitems
1432 $ hg help addverboseitems
1417 addverboseitems extension - extension to test omit indicating.
1433 addverboseitems extension - extension to test omit indicating.
1418
1434
1419 This paragraph is never omitted (for extension)
1435 This paragraph is never omitted (for extension)
1420
1436
1421 This paragraph is never omitted, too (for extension)
1437 This paragraph is never omitted, too (for extension)
1422
1438
1423 (some details hidden, use --verbose to show complete help)
1439 (some details hidden, use --verbose to show complete help)
1424
1440
1425 no commands defined
1441 no commands defined
1426 $ hg help -v addverboseitems
1442 $ hg help -v addverboseitems
1427 addverboseitems extension - extension to test omit indicating.
1443 addverboseitems extension - extension to test omit indicating.
1428
1444
1429 This paragraph is never omitted (for extension)
1445 This paragraph is never omitted (for extension)
1430
1446
1431 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1447 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1432 extension)
1448 extension)
1433
1449
1434 This paragraph is never omitted, too (for extension)
1450 This paragraph is never omitted, too (for extension)
1435
1451
1436 no commands defined
1452 no commands defined
1437 $ hg help topic-containing-verbose
1453 $ hg help topic-containing-verbose
1438 This is the topic to test omit indicating.
1454 This is the topic to test omit indicating.
1439 """"""""""""""""""""""""""""""""""""""""""
1455 """"""""""""""""""""""""""""""""""""""""""
1440
1456
1441 This paragraph is never omitted (for topic).
1457 This paragraph is never omitted (for topic).
1442
1458
1443 This paragraph is never omitted, too (for topic)
1459 This paragraph is never omitted, too (for topic)
1444
1460
1445 (some details hidden, use --verbose to show complete help)
1461 (some details hidden, use --verbose to show complete help)
1446 $ hg help -v topic-containing-verbose
1462 $ hg help -v topic-containing-verbose
1447 This is the topic to test omit indicating.
1463 This is the topic to test omit indicating.
1448 """"""""""""""""""""""""""""""""""""""""""
1464 """"""""""""""""""""""""""""""""""""""""""
1449
1465
1450 This paragraph is never omitted (for topic).
1466 This paragraph is never omitted (for topic).
1451
1467
1452 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1468 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1453 topic)
1469 topic)
1454
1470
1455 This paragraph is never omitted, too (for topic)
1471 This paragraph is never omitted, too (for topic)
1456
1472
1457 Test section lookup
1473 Test section lookup
1458
1474
1459 $ hg help revset.merge
1475 $ hg help revset.merge
1460 "merge()"
1476 "merge()"
1461 Changeset is a merge changeset.
1477 Changeset is a merge changeset.
1462
1478
1463 $ hg help glossary.dag
1479 $ hg help glossary.dag
1464 DAG
1480 DAG
1465 The repository of changesets of a distributed version control system
1481 The repository of changesets of a distributed version control system
1466 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1482 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1467 of nodes and edges, where nodes correspond to changesets and edges
1483 of nodes and edges, where nodes correspond to changesets and edges
1468 imply a parent -> child relation. This graph can be visualized by
1484 imply a parent -> child relation. This graph can be visualized by
1469 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1485 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1470 limited by the requirement for children to have at most two parents.
1486 limited by the requirement for children to have at most two parents.
1471
1487
1472
1488
1473 $ hg help hgrc.paths
1489 $ hg help hgrc.paths
1474 "paths"
1490 "paths"
1475 -------
1491 -------
1476
1492
1477 Assigns symbolic names and behavior to repositories.
1493 Assigns symbolic names and behavior to repositories.
1478
1494
1479 Options are symbolic names defining the URL or directory that is the
1495 Options are symbolic names defining the URL or directory that is the
1480 location of the repository. Example:
1496 location of the repository. Example:
1481
1497
1482 [paths]
1498 [paths]
1483 my_server = https://example.com/my_repo
1499 my_server = https://example.com/my_repo
1484 local_path = /home/me/repo
1500 local_path = /home/me/repo
1485
1501
1486 These symbolic names can be used from the command line. To pull from
1502 These symbolic names can be used from the command line. To pull from
1487 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1503 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1488 local_path'.
1504 local_path'.
1489
1505
1490 Options containing colons (":") denote sub-options that can influence
1506 Options containing colons (":") denote sub-options that can influence
1491 behavior for that specific path. Example:
1507 behavior for that specific path. Example:
1492
1508
1493 [paths]
1509 [paths]
1494 my_server = https://example.com/my_path
1510 my_server = https://example.com/my_path
1495 my_server:pushurl = ssh://example.com/my_path
1511 my_server:pushurl = ssh://example.com/my_path
1496
1512
1497 The following sub-options can be defined:
1513 The following sub-options can be defined:
1498
1514
1499 "pushurl"
1515 "pushurl"
1500 The URL to use for push operations. If not defined, the location
1516 The URL to use for push operations. If not defined, the location
1501 defined by the path's main entry is used.
1517 defined by the path's main entry is used.
1502
1518
1503 The following special named paths exist:
1519 The following special named paths exist:
1504
1520
1505 "default"
1521 "default"
1506 The URL or directory to use when no source or remote is specified.
1522 The URL or directory to use when no source or remote is specified.
1507
1523
1508 'hg clone' will automatically define this path to the location the
1524 'hg clone' will automatically define this path to the location the
1509 repository was cloned from.
1525 repository was cloned from.
1510
1526
1511 "default-push"
1527 "default-push"
1512 (deprecated) The URL or directory for the default 'hg push' location.
1528 (deprecated) The URL or directory for the default 'hg push' location.
1513 "default:pushurl" should be used instead.
1529 "default:pushurl" should be used instead.
1514
1530
1515 $ hg help glossary.mcguffin
1531 $ hg help glossary.mcguffin
1516 abort: help section not found
1532 abort: help section not found
1517 [255]
1533 [255]
1518
1534
1519 $ hg help glossary.mc.guffin
1535 $ hg help glossary.mc.guffin
1520 abort: help section not found
1536 abort: help section not found
1521 [255]
1537 [255]
1522
1538
1523 $ hg help template.files
1539 $ hg help template.files
1524 files List of strings. All files modified, added, or removed by
1540 files List of strings. All files modified, added, or removed by
1525 this changeset.
1541 this changeset.
1526
1542
1527 Test dynamic list of merge tools only shows up once
1543 Test dynamic list of merge tools only shows up once
1528 $ hg help merge-tools
1544 $ hg help merge-tools
1529 Merge Tools
1545 Merge Tools
1530 """""""""""
1546 """""""""""
1531
1547
1532 To merge files Mercurial uses merge tools.
1548 To merge files Mercurial uses merge tools.
1533
1549
1534 A merge tool combines two different versions of a file into a merged file.
1550 A merge tool combines two different versions of a file into a merged file.
1535 Merge tools are given the two files and the greatest common ancestor of
1551 Merge tools are given the two files and the greatest common ancestor of
1536 the two file versions, so they can determine the changes made on both
1552 the two file versions, so they can determine the changes made on both
1537 branches.
1553 branches.
1538
1554
1539 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1555 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1540 backout' and in several extensions.
1556 backout' and in several extensions.
1541
1557
1542 Usually, the merge tool tries to automatically reconcile the files by
1558 Usually, the merge tool tries to automatically reconcile the files by
1543 combining all non-overlapping changes that occurred separately in the two
1559 combining all non-overlapping changes that occurred separately in the two
1544 different evolutions of the same initial base file. Furthermore, some
1560 different evolutions of the same initial base file. Furthermore, some
1545 interactive merge programs make it easier to manually resolve conflicting
1561 interactive merge programs make it easier to manually resolve conflicting
1546 merges, either in a graphical way, or by inserting some conflict markers.
1562 merges, either in a graphical way, or by inserting some conflict markers.
1547 Mercurial does not include any interactive merge programs but relies on
1563 Mercurial does not include any interactive merge programs but relies on
1548 external tools for that.
1564 external tools for that.
1549
1565
1550 Available merge tools
1566 Available merge tools
1551 =====================
1567 =====================
1552
1568
1553 External merge tools and their properties are configured in the merge-
1569 External merge tools and their properties are configured in the merge-
1554 tools configuration section - see hgrc(5) - but they can often just be
1570 tools configuration section - see hgrc(5) - but they can often just be
1555 named by their executable.
1571 named by their executable.
1556
1572
1557 A merge tool is generally usable if its executable can be found on the
1573 A merge tool is generally usable if its executable can be found on the
1558 system and if it can handle the merge. The executable is found if it is an
1574 system and if it can handle the merge. The executable is found if it is an
1559 absolute or relative executable path or the name of an application in the
1575 absolute or relative executable path or the name of an application in the
1560 executable search path. The tool is assumed to be able to handle the merge
1576 executable search path. The tool is assumed to be able to handle the merge
1561 if it can handle symlinks if the file is a symlink, if it can handle
1577 if it can handle symlinks if the file is a symlink, if it can handle
1562 binary files if the file is binary, and if a GUI is available if the tool
1578 binary files if the file is binary, and if a GUI is available if the tool
1563 requires a GUI.
1579 requires a GUI.
1564
1580
1565 There are some internal merge tools which can be used. The internal merge
1581 There are some internal merge tools which can be used. The internal merge
1566 tools are:
1582 tools are:
1567
1583
1568 ":dump"
1584 ":dump"
1569 Creates three versions of the files to merge, containing the contents of
1585 Creates three versions of the files to merge, containing the contents of
1570 local, other and base. These files can then be used to perform a merge
1586 local, other and base. These files can then be used to perform a merge
1571 manually. If the file to be merged is named "a.txt", these files will
1587 manually. If the file to be merged is named "a.txt", these files will
1572 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1588 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1573 they will be placed in the same directory as "a.txt".
1589 they will be placed in the same directory as "a.txt".
1574
1590
1575 ":fail"
1591 ":fail"
1576 Rather than attempting to merge files that were modified on both
1592 Rather than attempting to merge files that were modified on both
1577 branches, it marks them as unresolved. The resolve command must be used
1593 branches, it marks them as unresolved. The resolve command must be used
1578 to resolve these conflicts.
1594 to resolve these conflicts.
1579
1595
1580 ":local"
1596 ":local"
1581 Uses the local 'p1()' version of files as the merged version.
1597 Uses the local 'p1()' version of files as the merged version.
1582
1598
1583 ":merge"
1599 ":merge"
1584 Uses the internal non-interactive simple merge algorithm for merging
1600 Uses the internal non-interactive simple merge algorithm for merging
1585 files. It will fail if there are any conflicts and leave markers in the
1601 files. It will fail if there are any conflicts and leave markers in the
1586 partially merged file. Markers will have two sections, one for each side
1602 partially merged file. Markers will have two sections, one for each side
1587 of merge.
1603 of merge.
1588
1604
1589 ":merge-local"
1605 ":merge-local"
1590 Like :merge, but resolve all conflicts non-interactively in favor of the
1606 Like :merge, but resolve all conflicts non-interactively in favor of the
1591 local 'p1()' changes.
1607 local 'p1()' changes.
1592
1608
1593 ":merge-other"
1609 ":merge-other"
1594 Like :merge, but resolve all conflicts non-interactively in favor of the
1610 Like :merge, but resolve all conflicts non-interactively in favor of the
1595 other 'p2()' changes.
1611 other 'p2()' changes.
1596
1612
1597 ":merge3"
1613 ":merge3"
1598 Uses the internal non-interactive simple merge algorithm for merging
1614 Uses the internal non-interactive simple merge algorithm for merging
1599 files. It will fail if there are any conflicts and leave markers in the
1615 files. It will fail if there are any conflicts and leave markers in the
1600 partially merged file. Marker will have three sections, one from each
1616 partially merged file. Marker will have three sections, one from each
1601 side of the merge and one for the base content.
1617 side of the merge and one for the base content.
1602
1618
1603 ":other"
1619 ":other"
1604 Uses the other 'p2()' version of files as the merged version.
1620 Uses the other 'p2()' version of files as the merged version.
1605
1621
1606 ":prompt"
1622 ":prompt"
1607 Asks the user which of the local 'p1()' or the other 'p2()' version to
1623 Asks the user which of the local 'p1()' or the other 'p2()' version to
1608 keep as the merged version.
1624 keep as the merged version.
1609
1625
1610 ":tagmerge"
1626 ":tagmerge"
1611 Uses the internal tag merge algorithm (experimental).
1627 Uses the internal tag merge algorithm (experimental).
1612
1628
1613 ":union"
1629 ":union"
1614 Uses the internal non-interactive simple merge algorithm for merging
1630 Uses the internal non-interactive simple merge algorithm for merging
1615 files. It will use both left and right sides for conflict regions. No
1631 files. It will use both left and right sides for conflict regions. No
1616 markers are inserted.
1632 markers are inserted.
1617
1633
1618 Internal tools are always available and do not require a GUI but will by
1634 Internal tools are always available and do not require a GUI but will by
1619 default not handle symlinks or binary files.
1635 default not handle symlinks or binary files.
1620
1636
1621 Choosing a merge tool
1637 Choosing a merge tool
1622 =====================
1638 =====================
1623
1639
1624 Mercurial uses these rules when deciding which merge tool to use:
1640 Mercurial uses these rules when deciding which merge tool to use:
1625
1641
1626 1. If a tool has been specified with the --tool option to merge or
1642 1. If a tool has been specified with the --tool option to merge or
1627 resolve, it is used. If it is the name of a tool in the merge-tools
1643 resolve, it is used. If it is the name of a tool in the merge-tools
1628 configuration, its configuration is used. Otherwise the specified tool
1644 configuration, its configuration is used. Otherwise the specified tool
1629 must be executable by the shell.
1645 must be executable by the shell.
1630 2. If the "HGMERGE" environment variable is present, its value is used and
1646 2. If the "HGMERGE" environment variable is present, its value is used and
1631 must be executable by the shell.
1647 must be executable by the shell.
1632 3. If the filename of the file to be merged matches any of the patterns in
1648 3. If the filename of the file to be merged matches any of the patterns in
1633 the merge-patterns configuration section, the first usable merge tool
1649 the merge-patterns configuration section, the first usable merge tool
1634 corresponding to a matching pattern is used. Here, binary capabilities
1650 corresponding to a matching pattern is used. Here, binary capabilities
1635 of the merge tool are not considered.
1651 of the merge tool are not considered.
1636 4. If ui.merge is set it will be considered next. If the value is not the
1652 4. If ui.merge is set it will be considered next. If the value is not the
1637 name of a configured tool, the specified value is used and must be
1653 name of a configured tool, the specified value is used and must be
1638 executable by the shell. Otherwise the named tool is used if it is
1654 executable by the shell. Otherwise the named tool is used if it is
1639 usable.
1655 usable.
1640 5. If any usable merge tools are present in the merge-tools configuration
1656 5. If any usable merge tools are present in the merge-tools configuration
1641 section, the one with the highest priority is used.
1657 section, the one with the highest priority is used.
1642 6. If a program named "hgmerge" can be found on the system, it is used -
1658 6. If a program named "hgmerge" can be found on the system, it is used -
1643 but it will by default not be used for symlinks and binary files.
1659 but it will by default not be used for symlinks and binary files.
1644 7. If the file to be merged is not binary and is not a symlink, then
1660 7. If the file to be merged is not binary and is not a symlink, then
1645 internal ":merge" is used.
1661 internal ":merge" is used.
1646 8. The merge of the file fails and must be resolved before commit.
1662 8. The merge of the file fails and must be resolved before commit.
1647
1663
1648 Note:
1664 Note:
1649 After selecting a merge program, Mercurial will by default attempt to
1665 After selecting a merge program, Mercurial will by default attempt to
1650 merge the files using a simple merge algorithm first. Only if it
1666 merge the files using a simple merge algorithm first. Only if it
1651 doesn't succeed because of conflicting changes Mercurial will actually
1667 doesn't succeed because of conflicting changes Mercurial will actually
1652 execute the merge program. Whether to use the simple merge algorithm
1668 execute the merge program. Whether to use the simple merge algorithm
1653 first can be controlled by the premerge setting of the merge tool.
1669 first can be controlled by the premerge setting of the merge tool.
1654 Premerge is enabled by default unless the file is binary or a symlink.
1670 Premerge is enabled by default unless the file is binary or a symlink.
1655
1671
1656 See the merge-tools and ui sections of hgrc(5) for details on the
1672 See the merge-tools and ui sections of hgrc(5) for details on the
1657 configuration of merge tools.
1673 configuration of merge tools.
1658
1674
1659 Test usage of section marks in help documents
1675 Test usage of section marks in help documents
1660
1676
1661 $ cd "$TESTDIR"/../doc
1677 $ cd "$TESTDIR"/../doc
1662 $ python check-seclevel.py
1678 $ python check-seclevel.py
1663 $ cd $TESTTMP
1679 $ cd $TESTTMP
1664
1680
1665 #if serve
1681 #if serve
1666
1682
1667 Test the help pages in hgweb.
1683 Test the help pages in hgweb.
1668
1684
1669 Dish up an empty repo; serve it cold.
1685 Dish up an empty repo; serve it cold.
1670
1686
1671 $ hg init "$TESTTMP/test"
1687 $ hg init "$TESTTMP/test"
1672 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1688 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1673 $ cat hg.pid >> $DAEMON_PIDS
1689 $ cat hg.pid >> $DAEMON_PIDS
1674
1690
1675 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1691 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1676 200 Script output follows
1692 200 Script output follows
1677
1693
1678 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1694 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1679 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1695 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1680 <head>
1696 <head>
1681 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1697 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1682 <meta name="robots" content="index, nofollow" />
1698 <meta name="robots" content="index, nofollow" />
1683 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1699 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1684 <script type="text/javascript" src="/static/mercurial.js"></script>
1700 <script type="text/javascript" src="/static/mercurial.js"></script>
1685
1701
1686 <title>Help: Index</title>
1702 <title>Help: Index</title>
1687 </head>
1703 </head>
1688 <body>
1704 <body>
1689
1705
1690 <div class="container">
1706 <div class="container">
1691 <div class="menu">
1707 <div class="menu">
1692 <div class="logo">
1708 <div class="logo">
1693 <a href="https://mercurial-scm.org/">
1709 <a href="https://mercurial-scm.org/">
1694 <img src="/static/hglogo.png" alt="mercurial" /></a>
1710 <img src="/static/hglogo.png" alt="mercurial" /></a>
1695 </div>
1711 </div>
1696 <ul>
1712 <ul>
1697 <li><a href="/shortlog">log</a></li>
1713 <li><a href="/shortlog">log</a></li>
1698 <li><a href="/graph">graph</a></li>
1714 <li><a href="/graph">graph</a></li>
1699 <li><a href="/tags">tags</a></li>
1715 <li><a href="/tags">tags</a></li>
1700 <li><a href="/bookmarks">bookmarks</a></li>
1716 <li><a href="/bookmarks">bookmarks</a></li>
1701 <li><a href="/branches">branches</a></li>
1717 <li><a href="/branches">branches</a></li>
1702 </ul>
1718 </ul>
1703 <ul>
1719 <ul>
1704 <li class="active">help</li>
1720 <li class="active">help</li>
1705 </ul>
1721 </ul>
1706 </div>
1722 </div>
1707
1723
1708 <div class="main">
1724 <div class="main">
1709 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1725 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1710 <form class="search" action="/log">
1726 <form class="search" action="/log">
1711
1727
1712 <p><input name="rev" id="search1" type="text" size="30" /></p>
1728 <p><input name="rev" id="search1" type="text" size="30" /></p>
1713 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1729 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1714 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1730 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1715 </form>
1731 </form>
1716 <table class="bigtable">
1732 <table class="bigtable">
1717 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1733 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1718
1734
1719 <tr><td>
1735 <tr><td>
1720 <a href="/help/config">
1736 <a href="/help/config">
1721 config
1737 config
1722 </a>
1738 </a>
1723 </td><td>
1739 </td><td>
1724 Configuration Files
1740 Configuration Files
1725 </td></tr>
1741 </td></tr>
1726 <tr><td>
1742 <tr><td>
1727 <a href="/help/dates">
1743 <a href="/help/dates">
1728 dates
1744 dates
1729 </a>
1745 </a>
1730 </td><td>
1746 </td><td>
1731 Date Formats
1747 Date Formats
1732 </td></tr>
1748 </td></tr>
1733 <tr><td>
1749 <tr><td>
1734 <a href="/help/diffs">
1750 <a href="/help/diffs">
1735 diffs
1751 diffs
1736 </a>
1752 </a>
1737 </td><td>
1753 </td><td>
1738 Diff Formats
1754 Diff Formats
1739 </td></tr>
1755 </td></tr>
1740 <tr><td>
1756 <tr><td>
1741 <a href="/help/environment">
1757 <a href="/help/environment">
1742 environment
1758 environment
1743 </a>
1759 </a>
1744 </td><td>
1760 </td><td>
1745 Environment Variables
1761 Environment Variables
1746 </td></tr>
1762 </td></tr>
1747 <tr><td>
1763 <tr><td>
1748 <a href="/help/extensions">
1764 <a href="/help/extensions">
1749 extensions
1765 extensions
1750 </a>
1766 </a>
1751 </td><td>
1767 </td><td>
1752 Using Additional Features
1768 Using Additional Features
1753 </td></tr>
1769 </td></tr>
1754 <tr><td>
1770 <tr><td>
1755 <a href="/help/filesets">
1771 <a href="/help/filesets">
1756 filesets
1772 filesets
1757 </a>
1773 </a>
1758 </td><td>
1774 </td><td>
1759 Specifying File Sets
1775 Specifying File Sets
1760 </td></tr>
1776 </td></tr>
1761 <tr><td>
1777 <tr><td>
1762 <a href="/help/glossary">
1778 <a href="/help/glossary">
1763 glossary
1779 glossary
1764 </a>
1780 </a>
1765 </td><td>
1781 </td><td>
1766 Glossary
1782 Glossary
1767 </td></tr>
1783 </td></tr>
1768 <tr><td>
1784 <tr><td>
1769 <a href="/help/hgignore">
1785 <a href="/help/hgignore">
1770 hgignore
1786 hgignore
1771 </a>
1787 </a>
1772 </td><td>
1788 </td><td>
1773 Syntax for Mercurial Ignore Files
1789 Syntax for Mercurial Ignore Files
1774 </td></tr>
1790 </td></tr>
1775 <tr><td>
1791 <tr><td>
1776 <a href="/help/hgweb">
1792 <a href="/help/hgweb">
1777 hgweb
1793 hgweb
1778 </a>
1794 </a>
1779 </td><td>
1795 </td><td>
1780 Configuring hgweb
1796 Configuring hgweb
1781 </td></tr>
1797 </td></tr>
1782 <tr><td>
1798 <tr><td>
1783 <a href="/help/internals">
1799 <a href="/help/internals">
1784 internals
1800 internals
1785 </a>
1801 </a>
1786 </td><td>
1802 </td><td>
1787 Technical implementation topics
1803 Technical implementation topics
1788 </td></tr>
1804 </td></tr>
1789 <tr><td>
1805 <tr><td>
1790 <a href="/help/merge-tools">
1806 <a href="/help/merge-tools">
1791 merge-tools
1807 merge-tools
1792 </a>
1808 </a>
1793 </td><td>
1809 </td><td>
1794 Merge Tools
1810 Merge Tools
1795 </td></tr>
1811 </td></tr>
1796 <tr><td>
1812 <tr><td>
1797 <a href="/help/multirevs">
1813 <a href="/help/multirevs">
1798 multirevs
1814 multirevs
1799 </a>
1815 </a>
1800 </td><td>
1816 </td><td>
1801 Specifying Multiple Revisions
1817 Specifying Multiple Revisions
1802 </td></tr>
1818 </td></tr>
1803 <tr><td>
1819 <tr><td>
1804 <a href="/help/patterns">
1820 <a href="/help/patterns">
1805 patterns
1821 patterns
1806 </a>
1822 </a>
1807 </td><td>
1823 </td><td>
1808 File Name Patterns
1824 File Name Patterns
1809 </td></tr>
1825 </td></tr>
1810 <tr><td>
1826 <tr><td>
1811 <a href="/help/phases">
1827 <a href="/help/phases">
1812 phases
1828 phases
1813 </a>
1829 </a>
1814 </td><td>
1830 </td><td>
1815 Working with Phases
1831 Working with Phases
1816 </td></tr>
1832 </td></tr>
1817 <tr><td>
1833 <tr><td>
1818 <a href="/help/revisions">
1834 <a href="/help/revisions">
1819 revisions
1835 revisions
1820 </a>
1836 </a>
1821 </td><td>
1837 </td><td>
1822 Specifying Single Revisions
1838 Specifying Single Revisions
1823 </td></tr>
1839 </td></tr>
1824 <tr><td>
1840 <tr><td>
1825 <a href="/help/revsets">
1841 <a href="/help/revsets">
1826 revsets
1842 revsets
1827 </a>
1843 </a>
1828 </td><td>
1844 </td><td>
1829 Specifying Revision Sets
1845 Specifying Revision Sets
1830 </td></tr>
1846 </td></tr>
1831 <tr><td>
1847 <tr><td>
1832 <a href="/help/scripting">
1848 <a href="/help/scripting">
1833 scripting
1849 scripting
1834 </a>
1850 </a>
1835 </td><td>
1851 </td><td>
1836 Using Mercurial from scripts and automation
1852 Using Mercurial from scripts and automation
1837 </td></tr>
1853 </td></tr>
1838 <tr><td>
1854 <tr><td>
1839 <a href="/help/subrepos">
1855 <a href="/help/subrepos">
1840 subrepos
1856 subrepos
1841 </a>
1857 </a>
1842 </td><td>
1858 </td><td>
1843 Subrepositories
1859 Subrepositories
1844 </td></tr>
1860 </td></tr>
1845 <tr><td>
1861 <tr><td>
1846 <a href="/help/templating">
1862 <a href="/help/templating">
1847 templating
1863 templating
1848 </a>
1864 </a>
1849 </td><td>
1865 </td><td>
1850 Template Usage
1866 Template Usage
1851 </td></tr>
1867 </td></tr>
1852 <tr><td>
1868 <tr><td>
1853 <a href="/help/urls">
1869 <a href="/help/urls">
1854 urls
1870 urls
1855 </a>
1871 </a>
1856 </td><td>
1872 </td><td>
1857 URL Paths
1873 URL Paths
1858 </td></tr>
1874 </td></tr>
1859 <tr><td>
1875 <tr><td>
1860 <a href="/help/topic-containing-verbose">
1876 <a href="/help/topic-containing-verbose">
1861 topic-containing-verbose
1877 topic-containing-verbose
1862 </a>
1878 </a>
1863 </td><td>
1879 </td><td>
1864 This is the topic to test omit indicating.
1880 This is the topic to test omit indicating.
1865 </td></tr>
1881 </td></tr>
1866
1882
1867
1883
1868 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1884 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1869
1885
1870 <tr><td>
1886 <tr><td>
1871 <a href="/help/add">
1887 <a href="/help/add">
1872 add
1888 add
1873 </a>
1889 </a>
1874 </td><td>
1890 </td><td>
1875 add the specified files on the next commit
1891 add the specified files on the next commit
1876 </td></tr>
1892 </td></tr>
1877 <tr><td>
1893 <tr><td>
1878 <a href="/help/annotate">
1894 <a href="/help/annotate">
1879 annotate
1895 annotate
1880 </a>
1896 </a>
1881 </td><td>
1897 </td><td>
1882 show changeset information by line for each file
1898 show changeset information by line for each file
1883 </td></tr>
1899 </td></tr>
1884 <tr><td>
1900 <tr><td>
1885 <a href="/help/clone">
1901 <a href="/help/clone">
1886 clone
1902 clone
1887 </a>
1903 </a>
1888 </td><td>
1904 </td><td>
1889 make a copy of an existing repository
1905 make a copy of an existing repository
1890 </td></tr>
1906 </td></tr>
1891 <tr><td>
1907 <tr><td>
1892 <a href="/help/commit">
1908 <a href="/help/commit">
1893 commit
1909 commit
1894 </a>
1910 </a>
1895 </td><td>
1911 </td><td>
1896 commit the specified files or all outstanding changes
1912 commit the specified files or all outstanding changes
1897 </td></tr>
1913 </td></tr>
1898 <tr><td>
1914 <tr><td>
1899 <a href="/help/diff">
1915 <a href="/help/diff">
1900 diff
1916 diff
1901 </a>
1917 </a>
1902 </td><td>
1918 </td><td>
1903 diff repository (or selected files)
1919 diff repository (or selected files)
1904 </td></tr>
1920 </td></tr>
1905 <tr><td>
1921 <tr><td>
1906 <a href="/help/export">
1922 <a href="/help/export">
1907 export
1923 export
1908 </a>
1924 </a>
1909 </td><td>
1925 </td><td>
1910 dump the header and diffs for one or more changesets
1926 dump the header and diffs for one or more changesets
1911 </td></tr>
1927 </td></tr>
1912 <tr><td>
1928 <tr><td>
1913 <a href="/help/forget">
1929 <a href="/help/forget">
1914 forget
1930 forget
1915 </a>
1931 </a>
1916 </td><td>
1932 </td><td>
1917 forget the specified files on the next commit
1933 forget the specified files on the next commit
1918 </td></tr>
1934 </td></tr>
1919 <tr><td>
1935 <tr><td>
1920 <a href="/help/init">
1936 <a href="/help/init">
1921 init
1937 init
1922 </a>
1938 </a>
1923 </td><td>
1939 </td><td>
1924 create a new repository in the given directory
1940 create a new repository in the given directory
1925 </td></tr>
1941 </td></tr>
1926 <tr><td>
1942 <tr><td>
1927 <a href="/help/log">
1943 <a href="/help/log">
1928 log
1944 log
1929 </a>
1945 </a>
1930 </td><td>
1946 </td><td>
1931 show revision history of entire repository or files
1947 show revision history of entire repository or files
1932 </td></tr>
1948 </td></tr>
1933 <tr><td>
1949 <tr><td>
1934 <a href="/help/merge">
1950 <a href="/help/merge">
1935 merge
1951 merge
1936 </a>
1952 </a>
1937 </td><td>
1953 </td><td>
1938 merge another revision into working directory
1954 merge another revision into working directory
1939 </td></tr>
1955 </td></tr>
1940 <tr><td>
1956 <tr><td>
1941 <a href="/help/pull">
1957 <a href="/help/pull">
1942 pull
1958 pull
1943 </a>
1959 </a>
1944 </td><td>
1960 </td><td>
1945 pull changes from the specified source
1961 pull changes from the specified source
1946 </td></tr>
1962 </td></tr>
1947 <tr><td>
1963 <tr><td>
1948 <a href="/help/push">
1964 <a href="/help/push">
1949 push
1965 push
1950 </a>
1966 </a>
1951 </td><td>
1967 </td><td>
1952 push changes to the specified destination
1968 push changes to the specified destination
1953 </td></tr>
1969 </td></tr>
1954 <tr><td>
1970 <tr><td>
1955 <a href="/help/remove">
1971 <a href="/help/remove">
1956 remove
1972 remove
1957 </a>
1973 </a>
1958 </td><td>
1974 </td><td>
1959 remove the specified files on the next commit
1975 remove the specified files on the next commit
1960 </td></tr>
1976 </td></tr>
1961 <tr><td>
1977 <tr><td>
1962 <a href="/help/serve">
1978 <a href="/help/serve">
1963 serve
1979 serve
1964 </a>
1980 </a>
1965 </td><td>
1981 </td><td>
1966 start stand-alone webserver
1982 start stand-alone webserver
1967 </td></tr>
1983 </td></tr>
1968 <tr><td>
1984 <tr><td>
1969 <a href="/help/status">
1985 <a href="/help/status">
1970 status
1986 status
1971 </a>
1987 </a>
1972 </td><td>
1988 </td><td>
1973 show changed files in the working directory
1989 show changed files in the working directory
1974 </td></tr>
1990 </td></tr>
1975 <tr><td>
1991 <tr><td>
1976 <a href="/help/summary">
1992 <a href="/help/summary">
1977 summary
1993 summary
1978 </a>
1994 </a>
1979 </td><td>
1995 </td><td>
1980 summarize working directory state
1996 summarize working directory state
1981 </td></tr>
1997 </td></tr>
1982 <tr><td>
1998 <tr><td>
1983 <a href="/help/update">
1999 <a href="/help/update">
1984 update
2000 update
1985 </a>
2001 </a>
1986 </td><td>
2002 </td><td>
1987 update working directory (or switch revisions)
2003 update working directory (or switch revisions)
1988 </td></tr>
2004 </td></tr>
1989
2005
1990
2006
1991
2007
1992 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2008 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1993
2009
1994 <tr><td>
2010 <tr><td>
1995 <a href="/help/addremove">
2011 <a href="/help/addremove">
1996 addremove
2012 addremove
1997 </a>
2013 </a>
1998 </td><td>
2014 </td><td>
1999 add all new files, delete all missing files
2015 add all new files, delete all missing files
2000 </td></tr>
2016 </td></tr>
2001 <tr><td>
2017 <tr><td>
2002 <a href="/help/archive">
2018 <a href="/help/archive">
2003 archive
2019 archive
2004 </a>
2020 </a>
2005 </td><td>
2021 </td><td>
2006 create an unversioned archive of a repository revision
2022 create an unversioned archive of a repository revision
2007 </td></tr>
2023 </td></tr>
2008 <tr><td>
2024 <tr><td>
2009 <a href="/help/backout">
2025 <a href="/help/backout">
2010 backout
2026 backout
2011 </a>
2027 </a>
2012 </td><td>
2028 </td><td>
2013 reverse effect of earlier changeset
2029 reverse effect of earlier changeset
2014 </td></tr>
2030 </td></tr>
2015 <tr><td>
2031 <tr><td>
2016 <a href="/help/bisect">
2032 <a href="/help/bisect">
2017 bisect
2033 bisect
2018 </a>
2034 </a>
2019 </td><td>
2035 </td><td>
2020 subdivision search of changesets
2036 subdivision search of changesets
2021 </td></tr>
2037 </td></tr>
2022 <tr><td>
2038 <tr><td>
2023 <a href="/help/bookmarks">
2039 <a href="/help/bookmarks">
2024 bookmarks
2040 bookmarks
2025 </a>
2041 </a>
2026 </td><td>
2042 </td><td>
2027 create a new bookmark or list existing bookmarks
2043 create a new bookmark or list existing bookmarks
2028 </td></tr>
2044 </td></tr>
2029 <tr><td>
2045 <tr><td>
2030 <a href="/help/branch">
2046 <a href="/help/branch">
2031 branch
2047 branch
2032 </a>
2048 </a>
2033 </td><td>
2049 </td><td>
2034 set or show the current branch name
2050 set or show the current branch name
2035 </td></tr>
2051 </td></tr>
2036 <tr><td>
2052 <tr><td>
2037 <a href="/help/branches">
2053 <a href="/help/branches">
2038 branches
2054 branches
2039 </a>
2055 </a>
2040 </td><td>
2056 </td><td>
2041 list repository named branches
2057 list repository named branches
2042 </td></tr>
2058 </td></tr>
2043 <tr><td>
2059 <tr><td>
2044 <a href="/help/bundle">
2060 <a href="/help/bundle">
2045 bundle
2061 bundle
2046 </a>
2062 </a>
2047 </td><td>
2063 </td><td>
2048 create a changegroup file
2064 create a changegroup file
2049 </td></tr>
2065 </td></tr>
2050 <tr><td>
2066 <tr><td>
2051 <a href="/help/cat">
2067 <a href="/help/cat">
2052 cat
2068 cat
2053 </a>
2069 </a>
2054 </td><td>
2070 </td><td>
2055 output the current or given revision of files
2071 output the current or given revision of files
2056 </td></tr>
2072 </td></tr>
2057 <tr><td>
2073 <tr><td>
2058 <a href="/help/config">
2074 <a href="/help/config">
2059 config
2075 config
2060 </a>
2076 </a>
2061 </td><td>
2077 </td><td>
2062 show combined config settings from all hgrc files
2078 show combined config settings from all hgrc files
2063 </td></tr>
2079 </td></tr>
2064 <tr><td>
2080 <tr><td>
2065 <a href="/help/copy">
2081 <a href="/help/copy">
2066 copy
2082 copy
2067 </a>
2083 </a>
2068 </td><td>
2084 </td><td>
2069 mark files as copied for the next commit
2085 mark files as copied for the next commit
2070 </td></tr>
2086 </td></tr>
2071 <tr><td>
2087 <tr><td>
2072 <a href="/help/files">
2088 <a href="/help/files">
2073 files
2089 files
2074 </a>
2090 </a>
2075 </td><td>
2091 </td><td>
2076 list tracked files
2092 list tracked files
2077 </td></tr>
2093 </td></tr>
2078 <tr><td>
2094 <tr><td>
2079 <a href="/help/graft">
2095 <a href="/help/graft">
2080 graft
2096 graft
2081 </a>
2097 </a>
2082 </td><td>
2098 </td><td>
2083 copy changes from other branches onto the current branch
2099 copy changes from other branches onto the current branch
2084 </td></tr>
2100 </td></tr>
2085 <tr><td>
2101 <tr><td>
2086 <a href="/help/grep">
2102 <a href="/help/grep">
2087 grep
2103 grep
2088 </a>
2104 </a>
2089 </td><td>
2105 </td><td>
2090 search for a pattern in specified files and revisions
2106 search for a pattern in specified files and revisions
2091 </td></tr>
2107 </td></tr>
2092 <tr><td>
2108 <tr><td>
2093 <a href="/help/heads">
2109 <a href="/help/heads">
2094 heads
2110 heads
2095 </a>
2111 </a>
2096 </td><td>
2112 </td><td>
2097 show branch heads
2113 show branch heads
2098 </td></tr>
2114 </td></tr>
2099 <tr><td>
2115 <tr><td>
2100 <a href="/help/help">
2116 <a href="/help/help">
2101 help
2117 help
2102 </a>
2118 </a>
2103 </td><td>
2119 </td><td>
2104 show help for a given topic or a help overview
2120 show help for a given topic or a help overview
2105 </td></tr>
2121 </td></tr>
2106 <tr><td>
2122 <tr><td>
2107 <a href="/help/hgalias">
2123 <a href="/help/hgalias">
2108 hgalias
2124 hgalias
2109 </a>
2125 </a>
2110 </td><td>
2126 </td><td>
2111 summarize working directory state
2127 summarize working directory state
2112 </td></tr>
2128 </td></tr>
2113 <tr><td>
2129 <tr><td>
2114 <a href="/help/identify">
2130 <a href="/help/identify">
2115 identify
2131 identify
2116 </a>
2132 </a>
2117 </td><td>
2133 </td><td>
2118 identify the working directory or specified revision
2134 identify the working directory or specified revision
2119 </td></tr>
2135 </td></tr>
2120 <tr><td>
2136 <tr><td>
2121 <a href="/help/import">
2137 <a href="/help/import">
2122 import
2138 import
2123 </a>
2139 </a>
2124 </td><td>
2140 </td><td>
2125 import an ordered set of patches
2141 import an ordered set of patches
2126 </td></tr>
2142 </td></tr>
2127 <tr><td>
2143 <tr><td>
2128 <a href="/help/incoming">
2144 <a href="/help/incoming">
2129 incoming
2145 incoming
2130 </a>
2146 </a>
2131 </td><td>
2147 </td><td>
2132 show new changesets found in source
2148 show new changesets found in source
2133 </td></tr>
2149 </td></tr>
2134 <tr><td>
2150 <tr><td>
2135 <a href="/help/manifest">
2151 <a href="/help/manifest">
2136 manifest
2152 manifest
2137 </a>
2153 </a>
2138 </td><td>
2154 </td><td>
2139 output the current or given revision of the project manifest
2155 output the current or given revision of the project manifest
2140 </td></tr>
2156 </td></tr>
2141 <tr><td>
2157 <tr><td>
2142 <a href="/help/nohelp">
2158 <a href="/help/nohelp">
2143 nohelp
2159 nohelp
2144 </a>
2160 </a>
2145 </td><td>
2161 </td><td>
2146 (no help text available)
2162 (no help text available)
2147 </td></tr>
2163 </td></tr>
2148 <tr><td>
2164 <tr><td>
2149 <a href="/help/outgoing">
2165 <a href="/help/outgoing">
2150 outgoing
2166 outgoing
2151 </a>
2167 </a>
2152 </td><td>
2168 </td><td>
2153 show changesets not found in the destination
2169 show changesets not found in the destination
2154 </td></tr>
2170 </td></tr>
2155 <tr><td>
2171 <tr><td>
2156 <a href="/help/paths">
2172 <a href="/help/paths">
2157 paths
2173 paths
2158 </a>
2174 </a>
2159 </td><td>
2175 </td><td>
2160 show aliases for remote repositories
2176 show aliases for remote repositories
2161 </td></tr>
2177 </td></tr>
2162 <tr><td>
2178 <tr><td>
2163 <a href="/help/phase">
2179 <a href="/help/phase">
2164 phase
2180 phase
2165 </a>
2181 </a>
2166 </td><td>
2182 </td><td>
2167 set or show the current phase name
2183 set or show the current phase name
2168 </td></tr>
2184 </td></tr>
2169 <tr><td>
2185 <tr><td>
2170 <a href="/help/recover">
2186 <a href="/help/recover">
2171 recover
2187 recover
2172 </a>
2188 </a>
2173 </td><td>
2189 </td><td>
2174 roll back an interrupted transaction
2190 roll back an interrupted transaction
2175 </td></tr>
2191 </td></tr>
2176 <tr><td>
2192 <tr><td>
2177 <a href="/help/rename">
2193 <a href="/help/rename">
2178 rename
2194 rename
2179 </a>
2195 </a>
2180 </td><td>
2196 </td><td>
2181 rename files; equivalent of copy + remove
2197 rename files; equivalent of copy + remove
2182 </td></tr>
2198 </td></tr>
2183 <tr><td>
2199 <tr><td>
2184 <a href="/help/resolve">
2200 <a href="/help/resolve">
2185 resolve
2201 resolve
2186 </a>
2202 </a>
2187 </td><td>
2203 </td><td>
2188 redo merges or set/view the merge status of files
2204 redo merges or set/view the merge status of files
2189 </td></tr>
2205 </td></tr>
2190 <tr><td>
2206 <tr><td>
2191 <a href="/help/revert">
2207 <a href="/help/revert">
2192 revert
2208 revert
2193 </a>
2209 </a>
2194 </td><td>
2210 </td><td>
2195 restore files to their checkout state
2211 restore files to their checkout state
2196 </td></tr>
2212 </td></tr>
2197 <tr><td>
2213 <tr><td>
2198 <a href="/help/root">
2214 <a href="/help/root">
2199 root
2215 root
2200 </a>
2216 </a>
2201 </td><td>
2217 </td><td>
2202 print the root (top) of the current working directory
2218 print the root (top) of the current working directory
2203 </td></tr>
2219 </td></tr>
2204 <tr><td>
2220 <tr><td>
2205 <a href="/help/shellalias">
2221 <a href="/help/shellalias">
2206 shellalias
2222 shellalias
2207 </a>
2223 </a>
2208 </td><td>
2224 </td><td>
2209 (no help text available)
2225 (no help text available)
2210 </td></tr>
2226 </td></tr>
2211 <tr><td>
2227 <tr><td>
2212 <a href="/help/tag">
2228 <a href="/help/tag">
2213 tag
2229 tag
2214 </a>
2230 </a>
2215 </td><td>
2231 </td><td>
2216 add one or more tags for the current or given revision
2232 add one or more tags for the current or given revision
2217 </td></tr>
2233 </td></tr>
2218 <tr><td>
2234 <tr><td>
2219 <a href="/help/tags">
2235 <a href="/help/tags">
2220 tags
2236 tags
2221 </a>
2237 </a>
2222 </td><td>
2238 </td><td>
2223 list repository tags
2239 list repository tags
2224 </td></tr>
2240 </td></tr>
2225 <tr><td>
2241 <tr><td>
2226 <a href="/help/unbundle">
2242 <a href="/help/unbundle">
2227 unbundle
2243 unbundle
2228 </a>
2244 </a>
2229 </td><td>
2245 </td><td>
2230 apply one or more changegroup files
2246 apply one or more changegroup files
2231 </td></tr>
2247 </td></tr>
2232 <tr><td>
2248 <tr><td>
2233 <a href="/help/verify">
2249 <a href="/help/verify">
2234 verify
2250 verify
2235 </a>
2251 </a>
2236 </td><td>
2252 </td><td>
2237 verify the integrity of the repository
2253 verify the integrity of the repository
2238 </td></tr>
2254 </td></tr>
2239 <tr><td>
2255 <tr><td>
2240 <a href="/help/version">
2256 <a href="/help/version">
2241 version
2257 version
2242 </a>
2258 </a>
2243 </td><td>
2259 </td><td>
2244 output version and copyright information
2260 output version and copyright information
2245 </td></tr>
2261 </td></tr>
2246
2262
2247
2263
2248 </table>
2264 </table>
2249 </div>
2265 </div>
2250 </div>
2266 </div>
2251
2267
2252 <script type="text/javascript">process_dates()</script>
2268 <script type="text/javascript">process_dates()</script>
2253
2269
2254
2270
2255 </body>
2271 </body>
2256 </html>
2272 </html>
2257
2273
2258
2274
2259 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2275 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2260 200 Script output follows
2276 200 Script output follows
2261
2277
2262 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2278 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2263 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2279 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2264 <head>
2280 <head>
2265 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2281 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2266 <meta name="robots" content="index, nofollow" />
2282 <meta name="robots" content="index, nofollow" />
2267 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2283 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2268 <script type="text/javascript" src="/static/mercurial.js"></script>
2284 <script type="text/javascript" src="/static/mercurial.js"></script>
2269
2285
2270 <title>Help: add</title>
2286 <title>Help: add</title>
2271 </head>
2287 </head>
2272 <body>
2288 <body>
2273
2289
2274 <div class="container">
2290 <div class="container">
2275 <div class="menu">
2291 <div class="menu">
2276 <div class="logo">
2292 <div class="logo">
2277 <a href="https://mercurial-scm.org/">
2293 <a href="https://mercurial-scm.org/">
2278 <img src="/static/hglogo.png" alt="mercurial" /></a>
2294 <img src="/static/hglogo.png" alt="mercurial" /></a>
2279 </div>
2295 </div>
2280 <ul>
2296 <ul>
2281 <li><a href="/shortlog">log</a></li>
2297 <li><a href="/shortlog">log</a></li>
2282 <li><a href="/graph">graph</a></li>
2298 <li><a href="/graph">graph</a></li>
2283 <li><a href="/tags">tags</a></li>
2299 <li><a href="/tags">tags</a></li>
2284 <li><a href="/bookmarks">bookmarks</a></li>
2300 <li><a href="/bookmarks">bookmarks</a></li>
2285 <li><a href="/branches">branches</a></li>
2301 <li><a href="/branches">branches</a></li>
2286 </ul>
2302 </ul>
2287 <ul>
2303 <ul>
2288 <li class="active"><a href="/help">help</a></li>
2304 <li class="active"><a href="/help">help</a></li>
2289 </ul>
2305 </ul>
2290 </div>
2306 </div>
2291
2307
2292 <div class="main">
2308 <div class="main">
2293 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2309 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2294 <h3>Help: add</h3>
2310 <h3>Help: add</h3>
2295
2311
2296 <form class="search" action="/log">
2312 <form class="search" action="/log">
2297
2313
2298 <p><input name="rev" id="search1" type="text" size="30" /></p>
2314 <p><input name="rev" id="search1" type="text" size="30" /></p>
2299 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2315 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2300 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2316 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2301 </form>
2317 </form>
2302 <div id="doc">
2318 <div id="doc">
2303 <p>
2319 <p>
2304 hg add [OPTION]... [FILE]...
2320 hg add [OPTION]... [FILE]...
2305 </p>
2321 </p>
2306 <p>
2322 <p>
2307 add the specified files on the next commit
2323 add the specified files on the next commit
2308 </p>
2324 </p>
2309 <p>
2325 <p>
2310 Schedule files to be version controlled and added to the
2326 Schedule files to be version controlled and added to the
2311 repository.
2327 repository.
2312 </p>
2328 </p>
2313 <p>
2329 <p>
2314 The files will be added to the repository at the next commit. To
2330 The files will be added to the repository at the next commit. To
2315 undo an add before that, see 'hg forget'.
2331 undo an add before that, see 'hg forget'.
2316 </p>
2332 </p>
2317 <p>
2333 <p>
2318 If no names are given, add all files to the repository (except
2334 If no names are given, add all files to the repository (except
2319 files matching &quot;.hgignore&quot;).
2335 files matching &quot;.hgignore&quot;).
2320 </p>
2336 </p>
2321 <p>
2337 <p>
2322 Examples:
2338 Examples:
2323 </p>
2339 </p>
2324 <ul>
2340 <ul>
2325 <li> New (unknown) files are added automatically by 'hg add':
2341 <li> New (unknown) files are added automatically by 'hg add':
2326 <pre>
2342 <pre>
2327 \$ ls (re)
2343 \$ ls (re)
2328 foo.c
2344 foo.c
2329 \$ hg status (re)
2345 \$ hg status (re)
2330 ? foo.c
2346 ? foo.c
2331 \$ hg add (re)
2347 \$ hg add (re)
2332 adding foo.c
2348 adding foo.c
2333 \$ hg status (re)
2349 \$ hg status (re)
2334 A foo.c
2350 A foo.c
2335 </pre>
2351 </pre>
2336 <li> Specific files to be added can be specified:
2352 <li> Specific files to be added can be specified:
2337 <pre>
2353 <pre>
2338 \$ ls (re)
2354 \$ ls (re)
2339 bar.c foo.c
2355 bar.c foo.c
2340 \$ hg status (re)
2356 \$ hg status (re)
2341 ? bar.c
2357 ? bar.c
2342 ? foo.c
2358 ? foo.c
2343 \$ hg add bar.c (re)
2359 \$ hg add bar.c (re)
2344 \$ hg status (re)
2360 \$ hg status (re)
2345 A bar.c
2361 A bar.c
2346 ? foo.c
2362 ? foo.c
2347 </pre>
2363 </pre>
2348 </ul>
2364 </ul>
2349 <p>
2365 <p>
2350 Returns 0 if all files are successfully added.
2366 Returns 0 if all files are successfully added.
2351 </p>
2367 </p>
2352 <p>
2368 <p>
2353 options ([+] can be repeated):
2369 options ([+] can be repeated):
2354 </p>
2370 </p>
2355 <table>
2371 <table>
2356 <tr><td>-I</td>
2372 <tr><td>-I</td>
2357 <td>--include PATTERN [+]</td>
2373 <td>--include PATTERN [+]</td>
2358 <td>include names matching the given patterns</td></tr>
2374 <td>include names matching the given patterns</td></tr>
2359 <tr><td>-X</td>
2375 <tr><td>-X</td>
2360 <td>--exclude PATTERN [+]</td>
2376 <td>--exclude PATTERN [+]</td>
2361 <td>exclude names matching the given patterns</td></tr>
2377 <td>exclude names matching the given patterns</td></tr>
2362 <tr><td>-S</td>
2378 <tr><td>-S</td>
2363 <td>--subrepos</td>
2379 <td>--subrepos</td>
2364 <td>recurse into subrepositories</td></tr>
2380 <td>recurse into subrepositories</td></tr>
2365 <tr><td>-n</td>
2381 <tr><td>-n</td>
2366 <td>--dry-run</td>
2382 <td>--dry-run</td>
2367 <td>do not perform actions, just print output</td></tr>
2383 <td>do not perform actions, just print output</td></tr>
2368 </table>
2384 </table>
2369 <p>
2385 <p>
2370 global options ([+] can be repeated):
2386 global options ([+] can be repeated):
2371 </p>
2387 </p>
2372 <table>
2388 <table>
2373 <tr><td>-R</td>
2389 <tr><td>-R</td>
2374 <td>--repository REPO</td>
2390 <td>--repository REPO</td>
2375 <td>repository root directory or name of overlay bundle file</td></tr>
2391 <td>repository root directory or name of overlay bundle file</td></tr>
2376 <tr><td></td>
2392 <tr><td></td>
2377 <td>--cwd DIR</td>
2393 <td>--cwd DIR</td>
2378 <td>change working directory</td></tr>
2394 <td>change working directory</td></tr>
2379 <tr><td>-y</td>
2395 <tr><td>-y</td>
2380 <td>--noninteractive</td>
2396 <td>--noninteractive</td>
2381 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2397 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2382 <tr><td>-q</td>
2398 <tr><td>-q</td>
2383 <td>--quiet</td>
2399 <td>--quiet</td>
2384 <td>suppress output</td></tr>
2400 <td>suppress output</td></tr>
2385 <tr><td>-v</td>
2401 <tr><td>-v</td>
2386 <td>--verbose</td>
2402 <td>--verbose</td>
2387 <td>enable additional output</td></tr>
2403 <td>enable additional output</td></tr>
2388 <tr><td></td>
2404 <tr><td></td>
2389 <td>--config CONFIG [+]</td>
2405 <td>--config CONFIG [+]</td>
2390 <td>set/override config option (use 'section.name=value')</td></tr>
2406 <td>set/override config option (use 'section.name=value')</td></tr>
2391 <tr><td></td>
2407 <tr><td></td>
2392 <td>--debug</td>
2408 <td>--debug</td>
2393 <td>enable debugging output</td></tr>
2409 <td>enable debugging output</td></tr>
2394 <tr><td></td>
2410 <tr><td></td>
2395 <td>--debugger</td>
2411 <td>--debugger</td>
2396 <td>start debugger</td></tr>
2412 <td>start debugger</td></tr>
2397 <tr><td></td>
2413 <tr><td></td>
2398 <td>--encoding ENCODE</td>
2414 <td>--encoding ENCODE</td>
2399 <td>set the charset encoding (default: ascii)</td></tr>
2415 <td>set the charset encoding (default: ascii)</td></tr>
2400 <tr><td></td>
2416 <tr><td></td>
2401 <td>--encodingmode MODE</td>
2417 <td>--encodingmode MODE</td>
2402 <td>set the charset encoding mode (default: strict)</td></tr>
2418 <td>set the charset encoding mode (default: strict)</td></tr>
2403 <tr><td></td>
2419 <tr><td></td>
2404 <td>--traceback</td>
2420 <td>--traceback</td>
2405 <td>always print a traceback on exception</td></tr>
2421 <td>always print a traceback on exception</td></tr>
2406 <tr><td></td>
2422 <tr><td></td>
2407 <td>--time</td>
2423 <td>--time</td>
2408 <td>time how long the command takes</td></tr>
2424 <td>time how long the command takes</td></tr>
2409 <tr><td></td>
2425 <tr><td></td>
2410 <td>--profile</td>
2426 <td>--profile</td>
2411 <td>print command execution profile</td></tr>
2427 <td>print command execution profile</td></tr>
2412 <tr><td></td>
2428 <tr><td></td>
2413 <td>--version</td>
2429 <td>--version</td>
2414 <td>output version information and exit</td></tr>
2430 <td>output version information and exit</td></tr>
2415 <tr><td>-h</td>
2431 <tr><td>-h</td>
2416 <td>--help</td>
2432 <td>--help</td>
2417 <td>display help and exit</td></tr>
2433 <td>display help and exit</td></tr>
2418 <tr><td></td>
2434 <tr><td></td>
2419 <td>--hidden</td>
2435 <td>--hidden</td>
2420 <td>consider hidden changesets</td></tr>
2436 <td>consider hidden changesets</td></tr>
2421 </table>
2437 </table>
2422
2438
2423 </div>
2439 </div>
2424 </div>
2440 </div>
2425 </div>
2441 </div>
2426
2442
2427 <script type="text/javascript">process_dates()</script>
2443 <script type="text/javascript">process_dates()</script>
2428
2444
2429
2445
2430 </body>
2446 </body>
2431 </html>
2447 </html>
2432
2448
2433
2449
2434 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2450 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2435 200 Script output follows
2451 200 Script output follows
2436
2452
2437 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2453 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2438 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2454 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2439 <head>
2455 <head>
2440 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2456 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2441 <meta name="robots" content="index, nofollow" />
2457 <meta name="robots" content="index, nofollow" />
2442 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2458 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2443 <script type="text/javascript" src="/static/mercurial.js"></script>
2459 <script type="text/javascript" src="/static/mercurial.js"></script>
2444
2460
2445 <title>Help: remove</title>
2461 <title>Help: remove</title>
2446 </head>
2462 </head>
2447 <body>
2463 <body>
2448
2464
2449 <div class="container">
2465 <div class="container">
2450 <div class="menu">
2466 <div class="menu">
2451 <div class="logo">
2467 <div class="logo">
2452 <a href="https://mercurial-scm.org/">
2468 <a href="https://mercurial-scm.org/">
2453 <img src="/static/hglogo.png" alt="mercurial" /></a>
2469 <img src="/static/hglogo.png" alt="mercurial" /></a>
2454 </div>
2470 </div>
2455 <ul>
2471 <ul>
2456 <li><a href="/shortlog">log</a></li>
2472 <li><a href="/shortlog">log</a></li>
2457 <li><a href="/graph">graph</a></li>
2473 <li><a href="/graph">graph</a></li>
2458 <li><a href="/tags">tags</a></li>
2474 <li><a href="/tags">tags</a></li>
2459 <li><a href="/bookmarks">bookmarks</a></li>
2475 <li><a href="/bookmarks">bookmarks</a></li>
2460 <li><a href="/branches">branches</a></li>
2476 <li><a href="/branches">branches</a></li>
2461 </ul>
2477 </ul>
2462 <ul>
2478 <ul>
2463 <li class="active"><a href="/help">help</a></li>
2479 <li class="active"><a href="/help">help</a></li>
2464 </ul>
2480 </ul>
2465 </div>
2481 </div>
2466
2482
2467 <div class="main">
2483 <div class="main">
2468 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2484 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2469 <h3>Help: remove</h3>
2485 <h3>Help: remove</h3>
2470
2486
2471 <form class="search" action="/log">
2487 <form class="search" action="/log">
2472
2488
2473 <p><input name="rev" id="search1" type="text" size="30" /></p>
2489 <p><input name="rev" id="search1" type="text" size="30" /></p>
2474 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2490 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2475 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2491 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2476 </form>
2492 </form>
2477 <div id="doc">
2493 <div id="doc">
2478 <p>
2494 <p>
2479 hg remove [OPTION]... FILE...
2495 hg remove [OPTION]... FILE...
2480 </p>
2496 </p>
2481 <p>
2497 <p>
2482 aliases: rm
2498 aliases: rm
2483 </p>
2499 </p>
2484 <p>
2500 <p>
2485 remove the specified files on the next commit
2501 remove the specified files on the next commit
2486 </p>
2502 </p>
2487 <p>
2503 <p>
2488 Schedule the indicated files for removal from the current branch.
2504 Schedule the indicated files for removal from the current branch.
2489 </p>
2505 </p>
2490 <p>
2506 <p>
2491 This command schedules the files to be removed at the next commit.
2507 This command schedules the files to be removed at the next commit.
2492 To undo a remove before that, see 'hg revert'. To undo added
2508 To undo a remove before that, see 'hg revert'. To undo added
2493 files, see 'hg forget'.
2509 files, see 'hg forget'.
2494 </p>
2510 </p>
2495 <p>
2511 <p>
2496 -A/--after can be used to remove only files that have already
2512 -A/--after can be used to remove only files that have already
2497 been deleted, -f/--force can be used to force deletion, and -Af
2513 been deleted, -f/--force can be used to force deletion, and -Af
2498 can be used to remove files from the next revision without
2514 can be used to remove files from the next revision without
2499 deleting them from the working directory.
2515 deleting them from the working directory.
2500 </p>
2516 </p>
2501 <p>
2517 <p>
2502 The following table details the behavior of remove for different
2518 The following table details the behavior of remove for different
2503 file states (columns) and option combinations (rows). The file
2519 file states (columns) and option combinations (rows). The file
2504 states are Added [A], Clean [C], Modified [M] and Missing [!]
2520 states are Added [A], Clean [C], Modified [M] and Missing [!]
2505 (as reported by 'hg status'). The actions are Warn, Remove
2521 (as reported by 'hg status'). The actions are Warn, Remove
2506 (from branch) and Delete (from disk):
2522 (from branch) and Delete (from disk):
2507 </p>
2523 </p>
2508 <table>
2524 <table>
2509 <tr><td>opt/state</td>
2525 <tr><td>opt/state</td>
2510 <td>A</td>
2526 <td>A</td>
2511 <td>C</td>
2527 <td>C</td>
2512 <td>M</td>
2528 <td>M</td>
2513 <td>!</td></tr>
2529 <td>!</td></tr>
2514 <tr><td>none</td>
2530 <tr><td>none</td>
2515 <td>W</td>
2531 <td>W</td>
2516 <td>RD</td>
2532 <td>RD</td>
2517 <td>W</td>
2533 <td>W</td>
2518 <td>R</td></tr>
2534 <td>R</td></tr>
2519 <tr><td>-f</td>
2535 <tr><td>-f</td>
2520 <td>R</td>
2536 <td>R</td>
2521 <td>RD</td>
2537 <td>RD</td>
2522 <td>RD</td>
2538 <td>RD</td>
2523 <td>R</td></tr>
2539 <td>R</td></tr>
2524 <tr><td>-A</td>
2540 <tr><td>-A</td>
2525 <td>W</td>
2541 <td>W</td>
2526 <td>W</td>
2542 <td>W</td>
2527 <td>W</td>
2543 <td>W</td>
2528 <td>R</td></tr>
2544 <td>R</td></tr>
2529 <tr><td>-Af</td>
2545 <tr><td>-Af</td>
2530 <td>R</td>
2546 <td>R</td>
2531 <td>R</td>
2547 <td>R</td>
2532 <td>R</td>
2548 <td>R</td>
2533 <td>R</td></tr>
2549 <td>R</td></tr>
2534 </table>
2550 </table>
2535 <p>
2551 <p>
2536 <b>Note:</b>
2552 <b>Note:</b>
2537 </p>
2553 </p>
2538 <p>
2554 <p>
2539 'hg remove' never deletes files in Added [A] state from the
2555 'hg remove' never deletes files in Added [A] state from the
2540 working directory, not even if &quot;--force&quot; is specified.
2556 working directory, not even if &quot;--force&quot; is specified.
2541 </p>
2557 </p>
2542 <p>
2558 <p>
2543 Returns 0 on success, 1 if any warnings encountered.
2559 Returns 0 on success, 1 if any warnings encountered.
2544 </p>
2560 </p>
2545 <p>
2561 <p>
2546 options ([+] can be repeated):
2562 options ([+] can be repeated):
2547 </p>
2563 </p>
2548 <table>
2564 <table>
2549 <tr><td>-A</td>
2565 <tr><td>-A</td>
2550 <td>--after</td>
2566 <td>--after</td>
2551 <td>record delete for missing files</td></tr>
2567 <td>record delete for missing files</td></tr>
2552 <tr><td>-f</td>
2568 <tr><td>-f</td>
2553 <td>--force</td>
2569 <td>--force</td>
2554 <td>forget added files, delete modified files</td></tr>
2570 <td>forget added files, delete modified files</td></tr>
2555 <tr><td>-S</td>
2571 <tr><td>-S</td>
2556 <td>--subrepos</td>
2572 <td>--subrepos</td>
2557 <td>recurse into subrepositories</td></tr>
2573 <td>recurse into subrepositories</td></tr>
2558 <tr><td>-I</td>
2574 <tr><td>-I</td>
2559 <td>--include PATTERN [+]</td>
2575 <td>--include PATTERN [+]</td>
2560 <td>include names matching the given patterns</td></tr>
2576 <td>include names matching the given patterns</td></tr>
2561 <tr><td>-X</td>
2577 <tr><td>-X</td>
2562 <td>--exclude PATTERN [+]</td>
2578 <td>--exclude PATTERN [+]</td>
2563 <td>exclude names matching the given patterns</td></tr>
2579 <td>exclude names matching the given patterns</td></tr>
2564 </table>
2580 </table>
2565 <p>
2581 <p>
2566 global options ([+] can be repeated):
2582 global options ([+] can be repeated):
2567 </p>
2583 </p>
2568 <table>
2584 <table>
2569 <tr><td>-R</td>
2585 <tr><td>-R</td>
2570 <td>--repository REPO</td>
2586 <td>--repository REPO</td>
2571 <td>repository root directory or name of overlay bundle file</td></tr>
2587 <td>repository root directory or name of overlay bundle file</td></tr>
2572 <tr><td></td>
2588 <tr><td></td>
2573 <td>--cwd DIR</td>
2589 <td>--cwd DIR</td>
2574 <td>change working directory</td></tr>
2590 <td>change working directory</td></tr>
2575 <tr><td>-y</td>
2591 <tr><td>-y</td>
2576 <td>--noninteractive</td>
2592 <td>--noninteractive</td>
2577 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2593 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2578 <tr><td>-q</td>
2594 <tr><td>-q</td>
2579 <td>--quiet</td>
2595 <td>--quiet</td>
2580 <td>suppress output</td></tr>
2596 <td>suppress output</td></tr>
2581 <tr><td>-v</td>
2597 <tr><td>-v</td>
2582 <td>--verbose</td>
2598 <td>--verbose</td>
2583 <td>enable additional output</td></tr>
2599 <td>enable additional output</td></tr>
2584 <tr><td></td>
2600 <tr><td></td>
2585 <td>--config CONFIG [+]</td>
2601 <td>--config CONFIG [+]</td>
2586 <td>set/override config option (use 'section.name=value')</td></tr>
2602 <td>set/override config option (use 'section.name=value')</td></tr>
2587 <tr><td></td>
2603 <tr><td></td>
2588 <td>--debug</td>
2604 <td>--debug</td>
2589 <td>enable debugging output</td></tr>
2605 <td>enable debugging output</td></tr>
2590 <tr><td></td>
2606 <tr><td></td>
2591 <td>--debugger</td>
2607 <td>--debugger</td>
2592 <td>start debugger</td></tr>
2608 <td>start debugger</td></tr>
2593 <tr><td></td>
2609 <tr><td></td>
2594 <td>--encoding ENCODE</td>
2610 <td>--encoding ENCODE</td>
2595 <td>set the charset encoding (default: ascii)</td></tr>
2611 <td>set the charset encoding (default: ascii)</td></tr>
2596 <tr><td></td>
2612 <tr><td></td>
2597 <td>--encodingmode MODE</td>
2613 <td>--encodingmode MODE</td>
2598 <td>set the charset encoding mode (default: strict)</td></tr>
2614 <td>set the charset encoding mode (default: strict)</td></tr>
2599 <tr><td></td>
2615 <tr><td></td>
2600 <td>--traceback</td>
2616 <td>--traceback</td>
2601 <td>always print a traceback on exception</td></tr>
2617 <td>always print a traceback on exception</td></tr>
2602 <tr><td></td>
2618 <tr><td></td>
2603 <td>--time</td>
2619 <td>--time</td>
2604 <td>time how long the command takes</td></tr>
2620 <td>time how long the command takes</td></tr>
2605 <tr><td></td>
2621 <tr><td></td>
2606 <td>--profile</td>
2622 <td>--profile</td>
2607 <td>print command execution profile</td></tr>
2623 <td>print command execution profile</td></tr>
2608 <tr><td></td>
2624 <tr><td></td>
2609 <td>--version</td>
2625 <td>--version</td>
2610 <td>output version information and exit</td></tr>
2626 <td>output version information and exit</td></tr>
2611 <tr><td>-h</td>
2627 <tr><td>-h</td>
2612 <td>--help</td>
2628 <td>--help</td>
2613 <td>display help and exit</td></tr>
2629 <td>display help and exit</td></tr>
2614 <tr><td></td>
2630 <tr><td></td>
2615 <td>--hidden</td>
2631 <td>--hidden</td>
2616 <td>consider hidden changesets</td></tr>
2632 <td>consider hidden changesets</td></tr>
2617 </table>
2633 </table>
2618
2634
2619 </div>
2635 </div>
2620 </div>
2636 </div>
2621 </div>
2637 </div>
2622
2638
2623 <script type="text/javascript">process_dates()</script>
2639 <script type="text/javascript">process_dates()</script>
2624
2640
2625
2641
2626 </body>
2642 </body>
2627 </html>
2643 </html>
2628
2644
2629
2645
2630 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2646 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2631 200 Script output follows
2647 200 Script output follows
2632
2648
2633 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2649 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2634 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2650 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2635 <head>
2651 <head>
2636 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2652 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2637 <meta name="robots" content="index, nofollow" />
2653 <meta name="robots" content="index, nofollow" />
2638 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2654 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2639 <script type="text/javascript" src="/static/mercurial.js"></script>
2655 <script type="text/javascript" src="/static/mercurial.js"></script>
2640
2656
2641 <title>Help: revisions</title>
2657 <title>Help: revisions</title>
2642 </head>
2658 </head>
2643 <body>
2659 <body>
2644
2660
2645 <div class="container">
2661 <div class="container">
2646 <div class="menu">
2662 <div class="menu">
2647 <div class="logo">
2663 <div class="logo">
2648 <a href="https://mercurial-scm.org/">
2664 <a href="https://mercurial-scm.org/">
2649 <img src="/static/hglogo.png" alt="mercurial" /></a>
2665 <img src="/static/hglogo.png" alt="mercurial" /></a>
2650 </div>
2666 </div>
2651 <ul>
2667 <ul>
2652 <li><a href="/shortlog">log</a></li>
2668 <li><a href="/shortlog">log</a></li>
2653 <li><a href="/graph">graph</a></li>
2669 <li><a href="/graph">graph</a></li>
2654 <li><a href="/tags">tags</a></li>
2670 <li><a href="/tags">tags</a></li>
2655 <li><a href="/bookmarks">bookmarks</a></li>
2671 <li><a href="/bookmarks">bookmarks</a></li>
2656 <li><a href="/branches">branches</a></li>
2672 <li><a href="/branches">branches</a></li>
2657 </ul>
2673 </ul>
2658 <ul>
2674 <ul>
2659 <li class="active"><a href="/help">help</a></li>
2675 <li class="active"><a href="/help">help</a></li>
2660 </ul>
2676 </ul>
2661 </div>
2677 </div>
2662
2678
2663 <div class="main">
2679 <div class="main">
2664 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2680 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2665 <h3>Help: revisions</h3>
2681 <h3>Help: revisions</h3>
2666
2682
2667 <form class="search" action="/log">
2683 <form class="search" action="/log">
2668
2684
2669 <p><input name="rev" id="search1" type="text" size="30" /></p>
2685 <p><input name="rev" id="search1" type="text" size="30" /></p>
2670 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2686 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2671 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2687 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2672 </form>
2688 </form>
2673 <div id="doc">
2689 <div id="doc">
2674 <h1>Specifying Single Revisions</h1>
2690 <h1>Specifying Single Revisions</h1>
2675 <p>
2691 <p>
2676 Mercurial supports several ways to specify individual revisions.
2692 Mercurial supports several ways to specify individual revisions.
2677 </p>
2693 </p>
2678 <p>
2694 <p>
2679 A plain integer is treated as a revision number. Negative integers are
2695 A plain integer is treated as a revision number. Negative integers are
2680 treated as sequential offsets from the tip, with -1 denoting the tip,
2696 treated as sequential offsets from the tip, with -1 denoting the tip,
2681 -2 denoting the revision prior to the tip, and so forth.
2697 -2 denoting the revision prior to the tip, and so forth.
2682 </p>
2698 </p>
2683 <p>
2699 <p>
2684 A 40-digit hexadecimal string is treated as a unique revision
2700 A 40-digit hexadecimal string is treated as a unique revision
2685 identifier.
2701 identifier.
2686 </p>
2702 </p>
2687 <p>
2703 <p>
2688 A hexadecimal string less than 40 characters long is treated as a
2704 A hexadecimal string less than 40 characters long is treated as a
2689 unique revision identifier and is referred to as a short-form
2705 unique revision identifier and is referred to as a short-form
2690 identifier. A short-form identifier is only valid if it is the prefix
2706 identifier. A short-form identifier is only valid if it is the prefix
2691 of exactly one full-length identifier.
2707 of exactly one full-length identifier.
2692 </p>
2708 </p>
2693 <p>
2709 <p>
2694 Any other string is treated as a bookmark, tag, or branch name. A
2710 Any other string is treated as a bookmark, tag, or branch name. A
2695 bookmark is a movable pointer to a revision. A tag is a permanent name
2711 bookmark is a movable pointer to a revision. A tag is a permanent name
2696 associated with a revision. A branch name denotes the tipmost open branch head
2712 associated with a revision. A branch name denotes the tipmost open branch head
2697 of that branch - or if they are all closed, the tipmost closed head of the
2713 of that branch - or if they are all closed, the tipmost closed head of the
2698 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2714 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2699 </p>
2715 </p>
2700 <p>
2716 <p>
2701 The reserved name &quot;tip&quot; always identifies the most recent revision.
2717 The reserved name &quot;tip&quot; always identifies the most recent revision.
2702 </p>
2718 </p>
2703 <p>
2719 <p>
2704 The reserved name &quot;null&quot; indicates the null revision. This is the
2720 The reserved name &quot;null&quot; indicates the null revision. This is the
2705 revision of an empty repository, and the parent of revision 0.
2721 revision of an empty repository, and the parent of revision 0.
2706 </p>
2722 </p>
2707 <p>
2723 <p>
2708 The reserved name &quot;.&quot; indicates the working directory parent. If no
2724 The reserved name &quot;.&quot; indicates the working directory parent. If no
2709 working directory is checked out, it is equivalent to null. If an
2725 working directory is checked out, it is equivalent to null. If an
2710 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2726 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2711 parent.
2727 parent.
2712 </p>
2728 </p>
2713
2729
2714 </div>
2730 </div>
2715 </div>
2731 </div>
2716 </div>
2732 </div>
2717
2733
2718 <script type="text/javascript">process_dates()</script>
2734 <script type="text/javascript">process_dates()</script>
2719
2735
2720
2736
2721 </body>
2737 </body>
2722 </html>
2738 </html>
2723
2739
2724
2740
2725 Sub-topic indexes rendered properly
2741 Sub-topic indexes rendered properly
2726
2742
2727 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals"
2743 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals"
2728 200 Script output follows
2744 200 Script output follows
2729
2745
2730 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2746 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2731 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2747 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2732 <head>
2748 <head>
2733 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2749 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2734 <meta name="robots" content="index, nofollow" />
2750 <meta name="robots" content="index, nofollow" />
2735 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2751 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2736 <script type="text/javascript" src="/static/mercurial.js"></script>
2752 <script type="text/javascript" src="/static/mercurial.js"></script>
2737
2753
2738 <title>Help: internals</title>
2754 <title>Help: internals</title>
2739 </head>
2755 </head>
2740 <body>
2756 <body>
2741
2757
2742 <div class="container">
2758 <div class="container">
2743 <div class="menu">
2759 <div class="menu">
2744 <div class="logo">
2760 <div class="logo">
2745 <a href="https://mercurial-scm.org/">
2761 <a href="https://mercurial-scm.org/">
2746 <img src="/static/hglogo.png" alt="mercurial" /></a>
2762 <img src="/static/hglogo.png" alt="mercurial" /></a>
2747 </div>
2763 </div>
2748 <ul>
2764 <ul>
2749 <li><a href="/shortlog">log</a></li>
2765 <li><a href="/shortlog">log</a></li>
2750 <li><a href="/graph">graph</a></li>
2766 <li><a href="/graph">graph</a></li>
2751 <li><a href="/tags">tags</a></li>
2767 <li><a href="/tags">tags</a></li>
2752 <li><a href="/bookmarks">bookmarks</a></li>
2768 <li><a href="/bookmarks">bookmarks</a></li>
2753 <li><a href="/branches">branches</a></li>
2769 <li><a href="/branches">branches</a></li>
2754 </ul>
2770 </ul>
2755 <ul>
2771 <ul>
2756 <li><a href="/help">help</a></li>
2772 <li><a href="/help">help</a></li>
2757 </ul>
2773 </ul>
2758 </div>
2774 </div>
2759
2775
2760 <div class="main">
2776 <div class="main">
2761 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2777 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2762 <form class="search" action="/log">
2778 <form class="search" action="/log">
2763
2779
2764 <p><input name="rev" id="search1" type="text" size="30" /></p>
2780 <p><input name="rev" id="search1" type="text" size="30" /></p>
2765 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2781 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2766 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2782 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2767 </form>
2783 </form>
2768 <table class="bigtable">
2784 <table class="bigtable">
2769 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
2785 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
2770
2786
2771 <tr><td>
2787 <tr><td>
2772 <a href="/help/internals.bundles">
2788 <a href="/help/internals.bundles">
2773 bundles
2789 bundles
2774 </a>
2790 </a>
2775 </td><td>
2791 </td><td>
2776 container for exchange of repository data
2792 container for exchange of repository data
2777 </td></tr>
2793 </td></tr>
2778 <tr><td>
2794 <tr><td>
2779 <a href="/help/internals.changegroups">
2795 <a href="/help/internals.changegroups">
2780 changegroups
2796 changegroups
2781 </a>
2797 </a>
2782 </td><td>
2798 </td><td>
2783 representation of revlog data
2799 representation of revlog data
2784 </td></tr>
2800 </td></tr>
2785 <tr><td>
2801 <tr><td>
2786 <a href="/help/internals.requirements">
2802 <a href="/help/internals.requirements">
2787 requirements
2803 requirements
2788 </a>
2804 </a>
2789 </td><td>
2805 </td><td>
2790 repository requirements
2806 repository requirements
2791 </td></tr>
2807 </td></tr>
2792 <tr><td>
2808 <tr><td>
2793 <a href="/help/internals.revlogs">
2809 <a href="/help/internals.revlogs">
2794 revlogs
2810 revlogs
2795 </a>
2811 </a>
2796 </td><td>
2812 </td><td>
2797 revision storage mechanism
2813 revision storage mechanism
2798 </td></tr>
2814 </td></tr>
2799
2815
2800
2816
2801
2817
2802
2818
2803
2819
2804 </table>
2820 </table>
2805 </div>
2821 </div>
2806 </div>
2822 </div>
2807
2823
2808 <script type="text/javascript">process_dates()</script>
2824 <script type="text/javascript">process_dates()</script>
2809
2825
2810
2826
2811 </body>
2827 </body>
2812 </html>
2828 </html>
2813
2829
2814
2830
2815 Sub-topic topics rendered properly
2831 Sub-topic topics rendered properly
2816
2832
2817 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals.changegroups"
2833 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals.changegroups"
2818 200 Script output follows
2834 200 Script output follows
2819
2835
2820 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2836 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2821 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2837 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2822 <head>
2838 <head>
2823 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2839 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2824 <meta name="robots" content="index, nofollow" />
2840 <meta name="robots" content="index, nofollow" />
2825 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2841 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2826 <script type="text/javascript" src="/static/mercurial.js"></script>
2842 <script type="text/javascript" src="/static/mercurial.js"></script>
2827
2843
2828 <title>Help: internals.changegroups</title>
2844 <title>Help: internals.changegroups</title>
2829 </head>
2845 </head>
2830 <body>
2846 <body>
2831
2847
2832 <div class="container">
2848 <div class="container">
2833 <div class="menu">
2849 <div class="menu">
2834 <div class="logo">
2850 <div class="logo">
2835 <a href="https://mercurial-scm.org/">
2851 <a href="https://mercurial-scm.org/">
2836 <img src="/static/hglogo.png" alt="mercurial" /></a>
2852 <img src="/static/hglogo.png" alt="mercurial" /></a>
2837 </div>
2853 </div>
2838 <ul>
2854 <ul>
2839 <li><a href="/shortlog">log</a></li>
2855 <li><a href="/shortlog">log</a></li>
2840 <li><a href="/graph">graph</a></li>
2856 <li><a href="/graph">graph</a></li>
2841 <li><a href="/tags">tags</a></li>
2857 <li><a href="/tags">tags</a></li>
2842 <li><a href="/bookmarks">bookmarks</a></li>
2858 <li><a href="/bookmarks">bookmarks</a></li>
2843 <li><a href="/branches">branches</a></li>
2859 <li><a href="/branches">branches</a></li>
2844 </ul>
2860 </ul>
2845 <ul>
2861 <ul>
2846 <li class="active"><a href="/help">help</a></li>
2862 <li class="active"><a href="/help">help</a></li>
2847 </ul>
2863 </ul>
2848 </div>
2864 </div>
2849
2865
2850 <div class="main">
2866 <div class="main">
2851 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2867 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2852 <h3>Help: internals.changegroups</h3>
2868 <h3>Help: internals.changegroups</h3>
2853
2869
2854 <form class="search" action="/log">
2870 <form class="search" action="/log">
2855
2871
2856 <p><input name="rev" id="search1" type="text" size="30" /></p>
2872 <p><input name="rev" id="search1" type="text" size="30" /></p>
2857 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2873 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2858 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2874 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2859 </form>
2875 </form>
2860 <div id="doc">
2876 <div id="doc">
2861 <h1>representation of revlog data</h1>
2877 <h1>representation of revlog data</h1>
2862 <h2>Changegroups</h2>
2878 <h2>Changegroups</h2>
2863 <p>
2879 <p>
2864 Changegroups are representations of repository revlog data, specifically
2880 Changegroups are representations of repository revlog data, specifically
2865 the changelog, manifest, and filelogs.
2881 the changelog, manifest, and filelogs.
2866 </p>
2882 </p>
2867 <p>
2883 <p>
2868 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
2884 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
2869 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with
2885 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with
2870 the only difference being a header on entries in the changeset
2886 the only difference being a header on entries in the changeset
2871 segment. Version &quot;3&quot; adds support for exchanging treemanifests and
2887 segment. Version &quot;3&quot; adds support for exchanging treemanifests and
2872 includes revlog flags in the delta header.
2888 includes revlog flags in the delta header.
2873 </p>
2889 </p>
2874 <p>
2890 <p>
2875 Changegroups consists of 3 logical segments:
2891 Changegroups consists of 3 logical segments:
2876 </p>
2892 </p>
2877 <pre>
2893 <pre>
2878 +---------------------------------+
2894 +---------------------------------+
2879 | | | |
2895 | | | |
2880 | changeset | manifest | filelogs |
2896 | changeset | manifest | filelogs |
2881 | | | |
2897 | | | |
2882 +---------------------------------+
2898 +---------------------------------+
2883 </pre>
2899 </pre>
2884 <p>
2900 <p>
2885 The principle building block of each segment is a *chunk*. A *chunk*
2901 The principle building block of each segment is a *chunk*. A *chunk*
2886 is a framed piece of data:
2902 is a framed piece of data:
2887 </p>
2903 </p>
2888 <pre>
2904 <pre>
2889 +---------------------------------------+
2905 +---------------------------------------+
2890 | | |
2906 | | |
2891 | length | data |
2907 | length | data |
2892 | (32 bits) | &lt;length&gt; bytes |
2908 | (32 bits) | &lt;length&gt; bytes |
2893 | | |
2909 | | |
2894 +---------------------------------------+
2910 +---------------------------------------+
2895 </pre>
2911 </pre>
2896 <p>
2912 <p>
2897 Each chunk starts with a 32-bit big-endian signed integer indicating
2913 Each chunk starts with a 32-bit big-endian signed integer indicating
2898 the length of the raw data that follows.
2914 the length of the raw data that follows.
2899 </p>
2915 </p>
2900 <p>
2916 <p>
2901 There is a special case chunk that has 0 length (&quot;0x00000000&quot;). We
2917 There is a special case chunk that has 0 length (&quot;0x00000000&quot;). We
2902 call this an *empty chunk*.
2918 call this an *empty chunk*.
2903 </p>
2919 </p>
2904 <h3>Delta Groups</h3>
2920 <h3>Delta Groups</h3>
2905 <p>
2921 <p>
2906 A *delta group* expresses the content of a revlog as a series of deltas,
2922 A *delta group* expresses the content of a revlog as a series of deltas,
2907 or patches against previous revisions.
2923 or patches against previous revisions.
2908 </p>
2924 </p>
2909 <p>
2925 <p>
2910 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
2926 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
2911 to signal the end of the delta group:
2927 to signal the end of the delta group:
2912 </p>
2928 </p>
2913 <pre>
2929 <pre>
2914 +------------------------------------------------------------------------+
2930 +------------------------------------------------------------------------+
2915 | | | | | |
2931 | | | | | |
2916 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
2932 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
2917 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
2933 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
2918 | | | | | |
2934 | | | | | |
2919 +------------------------------------------------------------+-----------+
2935 +------------------------------------------------------------+-----------+
2920 </pre>
2936 </pre>
2921 <p>
2937 <p>
2922 Each *chunk*'s data consists of the following:
2938 Each *chunk*'s data consists of the following:
2923 </p>
2939 </p>
2924 <pre>
2940 <pre>
2925 +-----------------------------------------+
2941 +-----------------------------------------+
2926 | | | |
2942 | | | |
2927 | delta header | mdiff header | delta |
2943 | delta header | mdiff header | delta |
2928 | (various) | (12 bytes) | (various) |
2944 | (various) | (12 bytes) | (various) |
2929 | | | |
2945 | | | |
2930 +-----------------------------------------+
2946 +-----------------------------------------+
2931 </pre>
2947 </pre>
2932 <p>
2948 <p>
2933 The *length* field is the byte length of the remaining 3 logical pieces
2949 The *length* field is the byte length of the remaining 3 logical pieces
2934 of data. The *delta* is a diff from an existing entry in the changelog.
2950 of data. The *delta* is a diff from an existing entry in the changelog.
2935 </p>
2951 </p>
2936 <p>
2952 <p>
2937 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
2953 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
2938 &quot;3&quot; of the changegroup format.
2954 &quot;3&quot; of the changegroup format.
2939 </p>
2955 </p>
2940 <p>
2956 <p>
2941 Version 1:
2957 Version 1:
2942 </p>
2958 </p>
2943 <pre>
2959 <pre>
2944 +------------------------------------------------------+
2960 +------------------------------------------------------+
2945 | | | | |
2961 | | | | |
2946 | node | p1 node | p2 node | link node |
2962 | node | p1 node | p2 node | link node |
2947 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2963 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2948 | | | | |
2964 | | | | |
2949 +------------------------------------------------------+
2965 +------------------------------------------------------+
2950 </pre>
2966 </pre>
2951 <p>
2967 <p>
2952 Version 2:
2968 Version 2:
2953 </p>
2969 </p>
2954 <pre>
2970 <pre>
2955 +------------------------------------------------------------------+
2971 +------------------------------------------------------------------+
2956 | | | | | |
2972 | | | | | |
2957 | node | p1 node | p2 node | base node | link node |
2973 | node | p1 node | p2 node | base node | link node |
2958 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2974 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2959 | | | | | |
2975 | | | | | |
2960 +------------------------------------------------------------------+
2976 +------------------------------------------------------------------+
2961 </pre>
2977 </pre>
2962 <p>
2978 <p>
2963 Version 3:
2979 Version 3:
2964 </p>
2980 </p>
2965 <pre>
2981 <pre>
2966 +------------------------------------------------------------------------------+
2982 +------------------------------------------------------------------------------+
2967 | | | | | | |
2983 | | | | | | |
2968 | node | p1 node | p2 node | base node | link node | flags |
2984 | node | p1 node | p2 node | base node | link node | flags |
2969 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
2985 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
2970 | | | | | | |
2986 | | | | | | |
2971 +------------------------------------------------------------------------------+
2987 +------------------------------------------------------------------------------+
2972 </pre>
2988 </pre>
2973 <p>
2989 <p>
2974 The *mdiff header* consists of 3 32-bit big-endian signed integers
2990 The *mdiff header* consists of 3 32-bit big-endian signed integers
2975 describing offsets at which to apply the following delta content:
2991 describing offsets at which to apply the following delta content:
2976 </p>
2992 </p>
2977 <pre>
2993 <pre>
2978 +-------------------------------------+
2994 +-------------------------------------+
2979 | | | |
2995 | | | |
2980 | offset | old length | new length |
2996 | offset | old length | new length |
2981 | (32 bits) | (32 bits) | (32 bits) |
2997 | (32 bits) | (32 bits) | (32 bits) |
2982 | | | |
2998 | | | |
2983 +-------------------------------------+
2999 +-------------------------------------+
2984 </pre>
3000 </pre>
2985 <p>
3001 <p>
2986 In version 1, the delta is always applied against the previous node from
3002 In version 1, the delta is always applied against the previous node from
2987 the changegroup or the first parent if this is the first entry in the
3003 the changegroup or the first parent if this is the first entry in the
2988 changegroup.
3004 changegroup.
2989 </p>
3005 </p>
2990 <p>
3006 <p>
2991 In version 2, the delta base node is encoded in the entry in the
3007 In version 2, the delta base node is encoded in the entry in the
2992 changegroup. This allows the delta to be expressed against any parent,
3008 changegroup. This allows the delta to be expressed against any parent,
2993 which can result in smaller deltas and more efficient encoding of data.
3009 which can result in smaller deltas and more efficient encoding of data.
2994 </p>
3010 </p>
2995 <h3>Changeset Segment</h3>
3011 <h3>Changeset Segment</h3>
2996 <p>
3012 <p>
2997 The *changeset segment* consists of a single *delta group* holding
3013 The *changeset segment* consists of a single *delta group* holding
2998 changelog data. It is followed by an *empty chunk* to denote the
3014 changelog data. It is followed by an *empty chunk* to denote the
2999 boundary to the *manifests segment*.
3015 boundary to the *manifests segment*.
3000 </p>
3016 </p>
3001 <h3>Manifest Segment</h3>
3017 <h3>Manifest Segment</h3>
3002 <p>
3018 <p>
3003 The *manifest segment* consists of a single *delta group* holding
3019 The *manifest segment* consists of a single *delta group* holding
3004 manifest data. It is followed by an *empty chunk* to denote the boundary
3020 manifest data. It is followed by an *empty chunk* to denote the boundary
3005 to the *filelogs segment*.
3021 to the *filelogs segment*.
3006 </p>
3022 </p>
3007 <h3>Filelogs Segment</h3>
3023 <h3>Filelogs Segment</h3>
3008 <p>
3024 <p>
3009 The *filelogs* segment consists of multiple sub-segments, each
3025 The *filelogs* segment consists of multiple sub-segments, each
3010 corresponding to an individual file whose data is being described:
3026 corresponding to an individual file whose data is being described:
3011 </p>
3027 </p>
3012 <pre>
3028 <pre>
3013 +--------------------------------------+
3029 +--------------------------------------+
3014 | | | | |
3030 | | | | |
3015 | filelog0 | filelog1 | filelog2 | ... |
3031 | filelog0 | filelog1 | filelog2 | ... |
3016 | | | | |
3032 | | | | |
3017 +--------------------------------------+
3033 +--------------------------------------+
3018 </pre>
3034 </pre>
3019 <p>
3035 <p>
3020 In version &quot;3&quot; of the changegroup format, filelogs may include
3036 In version &quot;3&quot; of the changegroup format, filelogs may include
3021 directory logs when treemanifests are in use. directory logs are
3037 directory logs when treemanifests are in use. directory logs are
3022 identified by having a trailing '/' on their filename (see below).
3038 identified by having a trailing '/' on their filename (see below).
3023 </p>
3039 </p>
3024 <p>
3040 <p>
3025 The final filelog sub-segment is followed by an *empty chunk* to denote
3041 The final filelog sub-segment is followed by an *empty chunk* to denote
3026 the end of the segment and the overall changegroup.
3042 the end of the segment and the overall changegroup.
3027 </p>
3043 </p>
3028 <p>
3044 <p>
3029 Each filelog sub-segment consists of the following:
3045 Each filelog sub-segment consists of the following:
3030 </p>
3046 </p>
3031 <pre>
3047 <pre>
3032 +------------------------------------------+
3048 +------------------------------------------+
3033 | | | |
3049 | | | |
3034 | filename size | filename | delta group |
3050 | filename size | filename | delta group |
3035 | (32 bits) | (various) | (various) |
3051 | (32 bits) | (various) | (various) |
3036 | | | |
3052 | | | |
3037 +------------------------------------------+
3053 +------------------------------------------+
3038 </pre>
3054 </pre>
3039 <p>
3055 <p>
3040 That is, a *chunk* consisting of the filename (not terminated or padded)
3056 That is, a *chunk* consisting of the filename (not terminated or padded)
3041 followed by N chunks constituting the *delta group* for this file.
3057 followed by N chunks constituting the *delta group* for this file.
3042 </p>
3058 </p>
3043
3059
3044 </div>
3060 </div>
3045 </div>
3061 </div>
3046 </div>
3062 </div>
3047
3063
3048 <script type="text/javascript">process_dates()</script>
3064 <script type="text/javascript">process_dates()</script>
3049
3065
3050
3066
3051 </body>
3067 </body>
3052 </html>
3068 </html>
3053
3069
3054
3070
3055 $ killdaemons.py
3071 $ killdaemons.py
3056
3072
3057 #endif
3073 #endif
General Comments 0
You need to be logged in to leave comments. Login now