##// END OF EJS Templates
update: add flag to require update destination...
Ryan McElroy -
r31557:79d98e1b default
parent child Browse files
Show More
@@ -1,5454 +1,5459 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import difflib
11 11 import errno
12 12 import os
13 13 import re
14 14
15 15 from .i18n import _
16 16 from .node import (
17 17 hex,
18 18 nullid,
19 19 nullrev,
20 20 short,
21 21 )
22 22 from . import (
23 23 archival,
24 24 bookmarks,
25 25 bundle2,
26 26 changegroup,
27 27 cmdutil,
28 28 copies,
29 29 destutil,
30 30 dirstateguard,
31 31 discovery,
32 32 encoding,
33 33 error,
34 34 exchange,
35 35 extensions,
36 36 graphmod,
37 37 hbisect,
38 38 help,
39 39 hg,
40 40 lock as lockmod,
41 41 merge as mergemod,
42 42 obsolete,
43 43 patch,
44 44 phases,
45 45 pycompat,
46 46 revsetlang,
47 47 scmutil,
48 48 server,
49 49 sshserver,
50 50 streamclone,
51 51 templatekw,
52 52 ui as uimod,
53 53 util,
54 54 )
55 55
56 56 release = lockmod.release
57 57
58 58 table = {}
59 59
60 60 command = cmdutil.command(table)
61 61
62 62 # label constants
63 63 # until 3.5, bookmarks.current was the advertised name, not
64 64 # bookmarks.active, so we must use both to avoid breaking old
65 65 # custom styles
66 66 activebookmarklabel = 'bookmarks.active bookmarks.current'
67 67
68 68 # common command options
69 69
70 70 globalopts = [
71 71 ('R', 'repository', '',
72 72 _('repository root directory or name of overlay bundle file'),
73 73 _('REPO')),
74 74 ('', 'cwd', '',
75 75 _('change working directory'), _('DIR')),
76 76 ('y', 'noninteractive', None,
77 77 _('do not prompt, automatically pick the first choice for all prompts')),
78 78 ('q', 'quiet', None, _('suppress output')),
79 79 ('v', 'verbose', None, _('enable additional output')),
80 80 ('', 'color', '',
81 81 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
82 82 # and should not be translated
83 83 _("when to colorize (boolean, always, auto, never, or debug)"),
84 84 _('TYPE')),
85 85 ('', 'config', [],
86 86 _('set/override config option (use \'section.name=value\')'),
87 87 _('CONFIG')),
88 88 ('', 'debug', None, _('enable debugging output')),
89 89 ('', 'debugger', None, _('start debugger')),
90 90 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
91 91 _('ENCODE')),
92 92 ('', 'encodingmode', encoding.encodingmode,
93 93 _('set the charset encoding mode'), _('MODE')),
94 94 ('', 'traceback', None, _('always print a traceback on exception')),
95 95 ('', 'time', None, _('time how long the command takes')),
96 96 ('', 'profile', None, _('print command execution profile')),
97 97 ('', 'version', None, _('output version information and exit')),
98 98 ('h', 'help', None, _('display help and exit')),
99 99 ('', 'hidden', False, _('consider hidden changesets')),
100 100 ('', 'pager', 'auto',
101 101 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
102 102 ]
103 103
104 104 dryrunopts = [('n', 'dry-run', None,
105 105 _('do not perform actions, just print output'))]
106 106
107 107 remoteopts = [
108 108 ('e', 'ssh', '',
109 109 _('specify ssh command to use'), _('CMD')),
110 110 ('', 'remotecmd', '',
111 111 _('specify hg command to run on the remote side'), _('CMD')),
112 112 ('', 'insecure', None,
113 113 _('do not verify server certificate (ignoring web.cacerts config)')),
114 114 ]
115 115
116 116 walkopts = [
117 117 ('I', 'include', [],
118 118 _('include names matching the given patterns'), _('PATTERN')),
119 119 ('X', 'exclude', [],
120 120 _('exclude names matching the given patterns'), _('PATTERN')),
121 121 ]
122 122
123 123 commitopts = [
124 124 ('m', 'message', '',
125 125 _('use text as commit message'), _('TEXT')),
126 126 ('l', 'logfile', '',
127 127 _('read commit message from file'), _('FILE')),
128 128 ]
129 129
130 130 commitopts2 = [
131 131 ('d', 'date', '',
132 132 _('record the specified date as commit date'), _('DATE')),
133 133 ('u', 'user', '',
134 134 _('record the specified user as committer'), _('USER')),
135 135 ]
136 136
137 137 # hidden for now
138 138 formatteropts = [
139 139 ('T', 'template', '',
140 140 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
141 141 ]
142 142
143 143 templateopts = [
144 144 ('', 'style', '',
145 145 _('display using template map file (DEPRECATED)'), _('STYLE')),
146 146 ('T', 'template', '',
147 147 _('display with template'), _('TEMPLATE')),
148 148 ]
149 149
150 150 logopts = [
151 151 ('p', 'patch', None, _('show patch')),
152 152 ('g', 'git', None, _('use git extended diff format')),
153 153 ('l', 'limit', '',
154 154 _('limit number of changes displayed'), _('NUM')),
155 155 ('M', 'no-merges', None, _('do not show merges')),
156 156 ('', 'stat', None, _('output diffstat-style summary of changes')),
157 157 ('G', 'graph', None, _("show the revision DAG")),
158 158 ] + templateopts
159 159
160 160 diffopts = [
161 161 ('a', 'text', None, _('treat all files as text')),
162 162 ('g', 'git', None, _('use git extended diff format')),
163 163 ('', 'nodates', None, _('omit dates from diff headers'))
164 164 ]
165 165
166 166 diffwsopts = [
167 167 ('w', 'ignore-all-space', None,
168 168 _('ignore white space when comparing lines')),
169 169 ('b', 'ignore-space-change', None,
170 170 _('ignore changes in the amount of white space')),
171 171 ('B', 'ignore-blank-lines', None,
172 172 _('ignore changes whose lines are all blank')),
173 173 ]
174 174
175 175 diffopts2 = [
176 176 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
177 177 ('p', 'show-function', None, _('show which function each change is in')),
178 178 ('', 'reverse', None, _('produce a diff that undoes the changes')),
179 179 ] + diffwsopts + [
180 180 ('U', 'unified', '',
181 181 _('number of lines of context to show'), _('NUM')),
182 182 ('', 'stat', None, _('output diffstat-style summary of changes')),
183 183 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
184 184 ]
185 185
186 186 mergetoolopts = [
187 187 ('t', 'tool', '', _('specify merge tool')),
188 188 ]
189 189
190 190 similarityopts = [
191 191 ('s', 'similarity', '',
192 192 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
193 193 ]
194 194
195 195 subrepoopts = [
196 196 ('S', 'subrepos', None,
197 197 _('recurse into subrepositories'))
198 198 ]
199 199
200 200 debugrevlogopts = [
201 201 ('c', 'changelog', False, _('open changelog')),
202 202 ('m', 'manifest', False, _('open manifest')),
203 203 ('', 'dir', '', _('open directory manifest')),
204 204 ]
205 205
206 206 # Commands start here, listed alphabetically
207 207
208 208 @command('^add',
209 209 walkopts + subrepoopts + dryrunopts,
210 210 _('[OPTION]... [FILE]...'),
211 211 inferrepo=True)
212 212 def add(ui, repo, *pats, **opts):
213 213 """add the specified files on the next commit
214 214
215 215 Schedule files to be version controlled and added to the
216 216 repository.
217 217
218 218 The files will be added to the repository at the next commit. To
219 219 undo an add before that, see :hg:`forget`.
220 220
221 221 If no names are given, add all files to the repository (except
222 222 files matching ``.hgignore``).
223 223
224 224 .. container:: verbose
225 225
226 226 Examples:
227 227
228 228 - New (unknown) files are added
229 229 automatically by :hg:`add`::
230 230
231 231 $ ls
232 232 foo.c
233 233 $ hg status
234 234 ? foo.c
235 235 $ hg add
236 236 adding foo.c
237 237 $ hg status
238 238 A foo.c
239 239
240 240 - Specific files to be added can be specified::
241 241
242 242 $ ls
243 243 bar.c foo.c
244 244 $ hg status
245 245 ? bar.c
246 246 ? foo.c
247 247 $ hg add bar.c
248 248 $ hg status
249 249 A bar.c
250 250 ? foo.c
251 251
252 252 Returns 0 if all files are successfully added.
253 253 """
254 254
255 255 m = scmutil.match(repo[None], pats, opts)
256 256 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
257 257 return rejected and 1 or 0
258 258
259 259 @command('addremove',
260 260 similarityopts + subrepoopts + walkopts + dryrunopts,
261 261 _('[OPTION]... [FILE]...'),
262 262 inferrepo=True)
263 263 def addremove(ui, repo, *pats, **opts):
264 264 """add all new files, delete all missing files
265 265
266 266 Add all new files and remove all missing files from the
267 267 repository.
268 268
269 269 Unless names are given, new files are ignored if they match any of
270 270 the patterns in ``.hgignore``. As with add, these changes take
271 271 effect at the next commit.
272 272
273 273 Use the -s/--similarity option to detect renamed files. This
274 274 option takes a percentage between 0 (disabled) and 100 (files must
275 275 be identical) as its parameter. With a parameter greater than 0,
276 276 this compares every removed file with every added file and records
277 277 those similar enough as renames. Detecting renamed files this way
278 278 can be expensive. After using this option, :hg:`status -C` can be
279 279 used to check which files were identified as moved or renamed. If
280 280 not specified, -s/--similarity defaults to 100 and only renames of
281 281 identical files are detected.
282 282
283 283 .. container:: verbose
284 284
285 285 Examples:
286 286
287 287 - A number of files (bar.c and foo.c) are new,
288 288 while foobar.c has been removed (without using :hg:`remove`)
289 289 from the repository::
290 290
291 291 $ ls
292 292 bar.c foo.c
293 293 $ hg status
294 294 ! foobar.c
295 295 ? bar.c
296 296 ? foo.c
297 297 $ hg addremove
298 298 adding bar.c
299 299 adding foo.c
300 300 removing foobar.c
301 301 $ hg status
302 302 A bar.c
303 303 A foo.c
304 304 R foobar.c
305 305
306 306 - A file foobar.c was moved to foo.c without using :hg:`rename`.
307 307 Afterwards, it was edited slightly::
308 308
309 309 $ ls
310 310 foo.c
311 311 $ hg status
312 312 ! foobar.c
313 313 ? foo.c
314 314 $ hg addremove --similarity 90
315 315 removing foobar.c
316 316 adding foo.c
317 317 recording removal of foobar.c as rename to foo.c (94% similar)
318 318 $ hg status -C
319 319 A foo.c
320 320 foobar.c
321 321 R foobar.c
322 322
323 323 Returns 0 if all files are successfully added.
324 324 """
325 325 try:
326 326 sim = float(opts.get('similarity') or 100)
327 327 except ValueError:
328 328 raise error.Abort(_('similarity must be a number'))
329 329 if sim < 0 or sim > 100:
330 330 raise error.Abort(_('similarity must be between 0 and 100'))
331 331 matcher = scmutil.match(repo[None], pats, opts)
332 332 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
333 333
334 334 @command('^annotate|blame',
335 335 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
336 336 ('', 'follow', None,
337 337 _('follow copies/renames and list the filename (DEPRECATED)')),
338 338 ('', 'no-follow', None, _("don't follow copies and renames")),
339 339 ('a', 'text', None, _('treat all files as text')),
340 340 ('u', 'user', None, _('list the author (long with -v)')),
341 341 ('f', 'file', None, _('list the filename')),
342 342 ('d', 'date', None, _('list the date (short with -q)')),
343 343 ('n', 'number', None, _('list the revision number (default)')),
344 344 ('c', 'changeset', None, _('list the changeset')),
345 345 ('l', 'line-number', None, _('show line number at the first appearance'))
346 346 ] + diffwsopts + walkopts + formatteropts,
347 347 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
348 348 inferrepo=True)
349 349 def annotate(ui, repo, *pats, **opts):
350 350 """show changeset information by line for each file
351 351
352 352 List changes in files, showing the revision id responsible for
353 353 each line.
354 354
355 355 This command is useful for discovering when a change was made and
356 356 by whom.
357 357
358 358 If you include --file, --user, or --date, the revision number is
359 359 suppressed unless you also include --number.
360 360
361 361 Without the -a/--text option, annotate will avoid processing files
362 362 it detects as binary. With -a, annotate will annotate the file
363 363 anyway, although the results will probably be neither useful
364 364 nor desirable.
365 365
366 366 Returns 0 on success.
367 367 """
368 368 if not pats:
369 369 raise error.Abort(_('at least one filename or pattern is required'))
370 370
371 371 if opts.get('follow'):
372 372 # --follow is deprecated and now just an alias for -f/--file
373 373 # to mimic the behavior of Mercurial before version 1.5
374 374 opts['file'] = True
375 375
376 376 ctx = scmutil.revsingle(repo, opts.get('rev'))
377 377
378 378 fm = ui.formatter('annotate', opts)
379 379 if ui.quiet:
380 380 datefunc = util.shortdate
381 381 else:
382 382 datefunc = util.datestr
383 383 if ctx.rev() is None:
384 384 def hexfn(node):
385 385 if node is None:
386 386 return None
387 387 else:
388 388 return fm.hexfunc(node)
389 389 if opts.get('changeset'):
390 390 # omit "+" suffix which is appended to node hex
391 391 def formatrev(rev):
392 392 if rev is None:
393 393 return '%d' % ctx.p1().rev()
394 394 else:
395 395 return '%d' % rev
396 396 else:
397 397 def formatrev(rev):
398 398 if rev is None:
399 399 return '%d+' % ctx.p1().rev()
400 400 else:
401 401 return '%d ' % rev
402 402 def formathex(hex):
403 403 if hex is None:
404 404 return '%s+' % fm.hexfunc(ctx.p1().node())
405 405 else:
406 406 return '%s ' % hex
407 407 else:
408 408 hexfn = fm.hexfunc
409 409 formatrev = formathex = str
410 410
411 411 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
412 412 ('number', ' ', lambda x: x[0].rev(), formatrev),
413 413 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
414 414 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
415 415 ('file', ' ', lambda x: x[0].path(), str),
416 416 ('line_number', ':', lambda x: x[1], str),
417 417 ]
418 418 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
419 419
420 420 if (not opts.get('user') and not opts.get('changeset')
421 421 and not opts.get('date') and not opts.get('file')):
422 422 opts['number'] = True
423 423
424 424 linenumber = opts.get('line_number') is not None
425 425 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
426 426 raise error.Abort(_('at least one of -n/-c is required for -l'))
427 427
428 428 ui.pager('annotate')
429 429
430 430 if fm.isplain():
431 431 def makefunc(get, fmt):
432 432 return lambda x: fmt(get(x))
433 433 else:
434 434 def makefunc(get, fmt):
435 435 return get
436 436 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
437 437 if opts.get(op)]
438 438 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
439 439 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
440 440 if opts.get(op))
441 441
442 442 def bad(x, y):
443 443 raise error.Abort("%s: %s" % (x, y))
444 444
445 445 m = scmutil.match(ctx, pats, opts, badfn=bad)
446 446
447 447 follow = not opts.get('no_follow')
448 448 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
449 449 whitespace=True)
450 450 for abs in ctx.walk(m):
451 451 fctx = ctx[abs]
452 452 if not opts.get('text') and util.binary(fctx.data()):
453 453 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
454 454 continue
455 455
456 456 lines = fctx.annotate(follow=follow, linenumber=linenumber,
457 457 diffopts=diffopts)
458 458 if not lines:
459 459 continue
460 460 formats = []
461 461 pieces = []
462 462
463 463 for f, sep in funcmap:
464 464 l = [f(n) for n, dummy in lines]
465 465 if fm.isplain():
466 466 sizes = [encoding.colwidth(x) for x in l]
467 467 ml = max(sizes)
468 468 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
469 469 else:
470 470 formats.append(['%s' for x in l])
471 471 pieces.append(l)
472 472
473 473 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
474 474 fm.startitem()
475 475 fm.write(fields, "".join(f), *p)
476 476 fm.write('line', ": %s", l[1])
477 477
478 478 if not lines[-1][1].endswith('\n'):
479 479 fm.plain('\n')
480 480
481 481 fm.end()
482 482
483 483 @command('archive',
484 484 [('', 'no-decode', None, _('do not pass files through decoders')),
485 485 ('p', 'prefix', '', _('directory prefix for files in archive'),
486 486 _('PREFIX')),
487 487 ('r', 'rev', '', _('revision to distribute'), _('REV')),
488 488 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
489 489 ] + subrepoopts + walkopts,
490 490 _('[OPTION]... DEST'))
491 491 def archive(ui, repo, dest, **opts):
492 492 '''create an unversioned archive of a repository revision
493 493
494 494 By default, the revision used is the parent of the working
495 495 directory; use -r/--rev to specify a different revision.
496 496
497 497 The archive type is automatically detected based on file
498 498 extension (to override, use -t/--type).
499 499
500 500 .. container:: verbose
501 501
502 502 Examples:
503 503
504 504 - create a zip file containing the 1.0 release::
505 505
506 506 hg archive -r 1.0 project-1.0.zip
507 507
508 508 - create a tarball excluding .hg files::
509 509
510 510 hg archive project.tar.gz -X ".hg*"
511 511
512 512 Valid types are:
513 513
514 514 :``files``: a directory full of files (default)
515 515 :``tar``: tar archive, uncompressed
516 516 :``tbz2``: tar archive, compressed using bzip2
517 517 :``tgz``: tar archive, compressed using gzip
518 518 :``uzip``: zip archive, uncompressed
519 519 :``zip``: zip archive, compressed using deflate
520 520
521 521 The exact name of the destination archive or directory is given
522 522 using a format string; see :hg:`help export` for details.
523 523
524 524 Each member added to an archive file has a directory prefix
525 525 prepended. Use -p/--prefix to specify a format string for the
526 526 prefix. The default is the basename of the archive, with suffixes
527 527 removed.
528 528
529 529 Returns 0 on success.
530 530 '''
531 531
532 532 ctx = scmutil.revsingle(repo, opts.get('rev'))
533 533 if not ctx:
534 534 raise error.Abort(_('no working directory: please specify a revision'))
535 535 node = ctx.node()
536 536 dest = cmdutil.makefilename(repo, dest, node)
537 537 if os.path.realpath(dest) == repo.root:
538 538 raise error.Abort(_('repository root cannot be destination'))
539 539
540 540 kind = opts.get('type') or archival.guesskind(dest) or 'files'
541 541 prefix = opts.get('prefix')
542 542
543 543 if dest == '-':
544 544 if kind == 'files':
545 545 raise error.Abort(_('cannot archive plain files to stdout'))
546 546 dest = cmdutil.makefileobj(repo, dest)
547 547 if not prefix:
548 548 prefix = os.path.basename(repo.root) + '-%h'
549 549
550 550 prefix = cmdutil.makefilename(repo, prefix, node)
551 551 matchfn = scmutil.match(ctx, [], opts)
552 552 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
553 553 matchfn, prefix, subrepos=opts.get('subrepos'))
554 554
555 555 @command('backout',
556 556 [('', 'merge', None, _('merge with old dirstate parent after backout')),
557 557 ('', 'commit', None,
558 558 _('commit if no conflicts were encountered (DEPRECATED)')),
559 559 ('', 'no-commit', None, _('do not commit')),
560 560 ('', 'parent', '',
561 561 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
562 562 ('r', 'rev', '', _('revision to backout'), _('REV')),
563 563 ('e', 'edit', False, _('invoke editor on commit messages')),
564 564 ] + mergetoolopts + walkopts + commitopts + commitopts2,
565 565 _('[OPTION]... [-r] REV'))
566 566 def backout(ui, repo, node=None, rev=None, **opts):
567 567 '''reverse effect of earlier changeset
568 568
569 569 Prepare a new changeset with the effect of REV undone in the
570 570 current working directory. If no conflicts were encountered,
571 571 it will be committed immediately.
572 572
573 573 If REV is the parent of the working directory, then this new changeset
574 574 is committed automatically (unless --no-commit is specified).
575 575
576 576 .. note::
577 577
578 578 :hg:`backout` cannot be used to fix either an unwanted or
579 579 incorrect merge.
580 580
581 581 .. container:: verbose
582 582
583 583 Examples:
584 584
585 585 - Reverse the effect of the parent of the working directory.
586 586 This backout will be committed immediately::
587 587
588 588 hg backout -r .
589 589
590 590 - Reverse the effect of previous bad revision 23::
591 591
592 592 hg backout -r 23
593 593
594 594 - Reverse the effect of previous bad revision 23 and
595 595 leave changes uncommitted::
596 596
597 597 hg backout -r 23 --no-commit
598 598 hg commit -m "Backout revision 23"
599 599
600 600 By default, the pending changeset will have one parent,
601 601 maintaining a linear history. With --merge, the pending
602 602 changeset will instead have two parents: the old parent of the
603 603 working directory and a new child of REV that simply undoes REV.
604 604
605 605 Before version 1.7, the behavior without --merge was equivalent
606 606 to specifying --merge followed by :hg:`update --clean .` to
607 607 cancel the merge and leave the child of REV as a head to be
608 608 merged separately.
609 609
610 610 See :hg:`help dates` for a list of formats valid for -d/--date.
611 611
612 612 See :hg:`help revert` for a way to restore files to the state
613 613 of another revision.
614 614
615 615 Returns 0 on success, 1 if nothing to backout or there are unresolved
616 616 files.
617 617 '''
618 618 wlock = lock = None
619 619 try:
620 620 wlock = repo.wlock()
621 621 lock = repo.lock()
622 622 return _dobackout(ui, repo, node, rev, **opts)
623 623 finally:
624 624 release(lock, wlock)
625 625
626 626 def _dobackout(ui, repo, node=None, rev=None, **opts):
627 627 if opts.get('commit') and opts.get('no_commit'):
628 628 raise error.Abort(_("cannot use --commit with --no-commit"))
629 629 if opts.get('merge') and opts.get('no_commit'):
630 630 raise error.Abort(_("cannot use --merge with --no-commit"))
631 631
632 632 if rev and node:
633 633 raise error.Abort(_("please specify just one revision"))
634 634
635 635 if not rev:
636 636 rev = node
637 637
638 638 if not rev:
639 639 raise error.Abort(_("please specify a revision to backout"))
640 640
641 641 date = opts.get('date')
642 642 if date:
643 643 opts['date'] = util.parsedate(date)
644 644
645 645 cmdutil.checkunfinished(repo)
646 646 cmdutil.bailifchanged(repo)
647 647 node = scmutil.revsingle(repo, rev).node()
648 648
649 649 op1, op2 = repo.dirstate.parents()
650 650 if not repo.changelog.isancestor(node, op1):
651 651 raise error.Abort(_('cannot backout change that is not an ancestor'))
652 652
653 653 p1, p2 = repo.changelog.parents(node)
654 654 if p1 == nullid:
655 655 raise error.Abort(_('cannot backout a change with no parents'))
656 656 if p2 != nullid:
657 657 if not opts.get('parent'):
658 658 raise error.Abort(_('cannot backout a merge changeset'))
659 659 p = repo.lookup(opts['parent'])
660 660 if p not in (p1, p2):
661 661 raise error.Abort(_('%s is not a parent of %s') %
662 662 (short(p), short(node)))
663 663 parent = p
664 664 else:
665 665 if opts.get('parent'):
666 666 raise error.Abort(_('cannot use --parent on non-merge changeset'))
667 667 parent = p1
668 668
669 669 # the backout should appear on the same branch
670 670 branch = repo.dirstate.branch()
671 671 bheads = repo.branchheads(branch)
672 672 rctx = scmutil.revsingle(repo, hex(parent))
673 673 if not opts.get('merge') and op1 != node:
674 674 dsguard = dirstateguard.dirstateguard(repo, 'backout')
675 675 try:
676 676 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
677 677 'backout')
678 678 stats = mergemod.update(repo, parent, True, True, node, False)
679 679 repo.setparents(op1, op2)
680 680 dsguard.close()
681 681 hg._showstats(repo, stats)
682 682 if stats[3]:
683 683 repo.ui.status(_("use 'hg resolve' to retry unresolved "
684 684 "file merges\n"))
685 685 return 1
686 686 finally:
687 687 ui.setconfig('ui', 'forcemerge', '', '')
688 688 lockmod.release(dsguard)
689 689 else:
690 690 hg.clean(repo, node, show_stats=False)
691 691 repo.dirstate.setbranch(branch)
692 692 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
693 693
694 694 if opts.get('no_commit'):
695 695 msg = _("changeset %s backed out, "
696 696 "don't forget to commit.\n")
697 697 ui.status(msg % short(node))
698 698 return 0
699 699
700 700 def commitfunc(ui, repo, message, match, opts):
701 701 editform = 'backout'
702 702 e = cmdutil.getcommiteditor(editform=editform, **opts)
703 703 if not message:
704 704 # we don't translate commit messages
705 705 message = "Backed out changeset %s" % short(node)
706 706 e = cmdutil.getcommiteditor(edit=True, editform=editform)
707 707 return repo.commit(message, opts.get('user'), opts.get('date'),
708 708 match, editor=e)
709 709 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
710 710 if not newnode:
711 711 ui.status(_("nothing changed\n"))
712 712 return 1
713 713 cmdutil.commitstatus(repo, newnode, branch, bheads)
714 714
715 715 def nice(node):
716 716 return '%d:%s' % (repo.changelog.rev(node), short(node))
717 717 ui.status(_('changeset %s backs out changeset %s\n') %
718 718 (nice(repo.changelog.tip()), nice(node)))
719 719 if opts.get('merge') and op1 != node:
720 720 hg.clean(repo, op1, show_stats=False)
721 721 ui.status(_('merging with changeset %s\n')
722 722 % nice(repo.changelog.tip()))
723 723 try:
724 724 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
725 725 'backout')
726 726 return hg.merge(repo, hex(repo.changelog.tip()))
727 727 finally:
728 728 ui.setconfig('ui', 'forcemerge', '', '')
729 729 return 0
730 730
731 731 @command('bisect',
732 732 [('r', 'reset', False, _('reset bisect state')),
733 733 ('g', 'good', False, _('mark changeset good')),
734 734 ('b', 'bad', False, _('mark changeset bad')),
735 735 ('s', 'skip', False, _('skip testing changeset')),
736 736 ('e', 'extend', False, _('extend the bisect range')),
737 737 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
738 738 ('U', 'noupdate', False, _('do not update to target'))],
739 739 _("[-gbsr] [-U] [-c CMD] [REV]"))
740 740 def bisect(ui, repo, rev=None, extra=None, command=None,
741 741 reset=None, good=None, bad=None, skip=None, extend=None,
742 742 noupdate=None):
743 743 """subdivision search of changesets
744 744
745 745 This command helps to find changesets which introduce problems. To
746 746 use, mark the earliest changeset you know exhibits the problem as
747 747 bad, then mark the latest changeset which is free from the problem
748 748 as good. Bisect will update your working directory to a revision
749 749 for testing (unless the -U/--noupdate option is specified). Once
750 750 you have performed tests, mark the working directory as good or
751 751 bad, and bisect will either update to another candidate changeset
752 752 or announce that it has found the bad revision.
753 753
754 754 As a shortcut, you can also use the revision argument to mark a
755 755 revision as good or bad without checking it out first.
756 756
757 757 If you supply a command, it will be used for automatic bisection.
758 758 The environment variable HG_NODE will contain the ID of the
759 759 changeset being tested. The exit status of the command will be
760 760 used to mark revisions as good or bad: status 0 means good, 125
761 761 means to skip the revision, 127 (command not found) will abort the
762 762 bisection, and any other non-zero exit status means the revision
763 763 is bad.
764 764
765 765 .. container:: verbose
766 766
767 767 Some examples:
768 768
769 769 - start a bisection with known bad revision 34, and good revision 12::
770 770
771 771 hg bisect --bad 34
772 772 hg bisect --good 12
773 773
774 774 - advance the current bisection by marking current revision as good or
775 775 bad::
776 776
777 777 hg bisect --good
778 778 hg bisect --bad
779 779
780 780 - mark the current revision, or a known revision, to be skipped (e.g. if
781 781 that revision is not usable because of another issue)::
782 782
783 783 hg bisect --skip
784 784 hg bisect --skip 23
785 785
786 786 - skip all revisions that do not touch directories ``foo`` or ``bar``::
787 787
788 788 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
789 789
790 790 - forget the current bisection::
791 791
792 792 hg bisect --reset
793 793
794 794 - use 'make && make tests' to automatically find the first broken
795 795 revision::
796 796
797 797 hg bisect --reset
798 798 hg bisect --bad 34
799 799 hg bisect --good 12
800 800 hg bisect --command "make && make tests"
801 801
802 802 - see all changesets whose states are already known in the current
803 803 bisection::
804 804
805 805 hg log -r "bisect(pruned)"
806 806
807 807 - see the changeset currently being bisected (especially useful
808 808 if running with -U/--noupdate)::
809 809
810 810 hg log -r "bisect(current)"
811 811
812 812 - see all changesets that took part in the current bisection::
813 813
814 814 hg log -r "bisect(range)"
815 815
816 816 - you can even get a nice graph::
817 817
818 818 hg log --graph -r "bisect(range)"
819 819
820 820 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
821 821
822 822 Returns 0 on success.
823 823 """
824 824 # backward compatibility
825 825 if rev in "good bad reset init".split():
826 826 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
827 827 cmd, rev, extra = rev, extra, None
828 828 if cmd == "good":
829 829 good = True
830 830 elif cmd == "bad":
831 831 bad = True
832 832 else:
833 833 reset = True
834 834 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
835 835 raise error.Abort(_('incompatible arguments'))
836 836
837 837 cmdutil.checkunfinished(repo)
838 838
839 839 if reset:
840 840 hbisect.resetstate(repo)
841 841 return
842 842
843 843 state = hbisect.load_state(repo)
844 844
845 845 # update state
846 846 if good or bad or skip:
847 847 if rev:
848 848 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
849 849 else:
850 850 nodes = [repo.lookup('.')]
851 851 if good:
852 852 state['good'] += nodes
853 853 elif bad:
854 854 state['bad'] += nodes
855 855 elif skip:
856 856 state['skip'] += nodes
857 857 hbisect.save_state(repo, state)
858 858 if not (state['good'] and state['bad']):
859 859 return
860 860
861 861 def mayupdate(repo, node, show_stats=True):
862 862 """common used update sequence"""
863 863 if noupdate:
864 864 return
865 865 cmdutil.bailifchanged(repo)
866 866 return hg.clean(repo, node, show_stats=show_stats)
867 867
868 868 displayer = cmdutil.show_changeset(ui, repo, {})
869 869
870 870 if command:
871 871 changesets = 1
872 872 if noupdate:
873 873 try:
874 874 node = state['current'][0]
875 875 except LookupError:
876 876 raise error.Abort(_('current bisect revision is unknown - '
877 877 'start a new bisect to fix'))
878 878 else:
879 879 node, p2 = repo.dirstate.parents()
880 880 if p2 != nullid:
881 881 raise error.Abort(_('current bisect revision is a merge'))
882 882 if rev:
883 883 node = repo[scmutil.revsingle(repo, rev, node)].node()
884 884 try:
885 885 while changesets:
886 886 # update state
887 887 state['current'] = [node]
888 888 hbisect.save_state(repo, state)
889 889 status = ui.system(command, environ={'HG_NODE': hex(node)},
890 890 blockedtag='bisect_check')
891 891 if status == 125:
892 892 transition = "skip"
893 893 elif status == 0:
894 894 transition = "good"
895 895 # status < 0 means process was killed
896 896 elif status == 127:
897 897 raise error.Abort(_("failed to execute %s") % command)
898 898 elif status < 0:
899 899 raise error.Abort(_("%s killed") % command)
900 900 else:
901 901 transition = "bad"
902 902 state[transition].append(node)
903 903 ctx = repo[node]
904 904 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
905 905 hbisect.checkstate(state)
906 906 # bisect
907 907 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
908 908 # update to next check
909 909 node = nodes[0]
910 910 mayupdate(repo, node, show_stats=False)
911 911 finally:
912 912 state['current'] = [node]
913 913 hbisect.save_state(repo, state)
914 914 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
915 915 return
916 916
917 917 hbisect.checkstate(state)
918 918
919 919 # actually bisect
920 920 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
921 921 if extend:
922 922 if not changesets:
923 923 extendnode = hbisect.extendrange(repo, state, nodes, good)
924 924 if extendnode is not None:
925 925 ui.write(_("Extending search to changeset %d:%s\n")
926 926 % (extendnode.rev(), extendnode))
927 927 state['current'] = [extendnode.node()]
928 928 hbisect.save_state(repo, state)
929 929 return mayupdate(repo, extendnode.node())
930 930 raise error.Abort(_("nothing to extend"))
931 931
932 932 if changesets == 0:
933 933 hbisect.printresult(ui, repo, state, displayer, nodes, good)
934 934 else:
935 935 assert len(nodes) == 1 # only a single node can be tested next
936 936 node = nodes[0]
937 937 # compute the approximate number of remaining tests
938 938 tests, size = 0, 2
939 939 while size <= changesets:
940 940 tests, size = tests + 1, size * 2
941 941 rev = repo.changelog.rev(node)
942 942 ui.write(_("Testing changeset %d:%s "
943 943 "(%d changesets remaining, ~%d tests)\n")
944 944 % (rev, short(node), changesets, tests))
945 945 state['current'] = [node]
946 946 hbisect.save_state(repo, state)
947 947 return mayupdate(repo, node)
948 948
949 949 @command('bookmarks|bookmark',
950 950 [('f', 'force', False, _('force')),
951 951 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
952 952 ('d', 'delete', False, _('delete a given bookmark')),
953 953 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
954 954 ('i', 'inactive', False, _('mark a bookmark inactive')),
955 955 ] + formatteropts,
956 956 _('hg bookmarks [OPTIONS]... [NAME]...'))
957 957 def bookmark(ui, repo, *names, **opts):
958 958 '''create a new bookmark or list existing bookmarks
959 959
960 960 Bookmarks are labels on changesets to help track lines of development.
961 961 Bookmarks are unversioned and can be moved, renamed and deleted.
962 962 Deleting or moving a bookmark has no effect on the associated changesets.
963 963
964 964 Creating or updating to a bookmark causes it to be marked as 'active'.
965 965 The active bookmark is indicated with a '*'.
966 966 When a commit is made, the active bookmark will advance to the new commit.
967 967 A plain :hg:`update` will also advance an active bookmark, if possible.
968 968 Updating away from a bookmark will cause it to be deactivated.
969 969
970 970 Bookmarks can be pushed and pulled between repositories (see
971 971 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
972 972 diverged, a new 'divergent bookmark' of the form 'name@path' will
973 973 be created. Using :hg:`merge` will resolve the divergence.
974 974
975 975 A bookmark named '@' has the special property that :hg:`clone` will
976 976 check it out by default if it exists.
977 977
978 978 .. container:: verbose
979 979
980 980 Examples:
981 981
982 982 - create an active bookmark for a new line of development::
983 983
984 984 hg book new-feature
985 985
986 986 - create an inactive bookmark as a place marker::
987 987
988 988 hg book -i reviewed
989 989
990 990 - create an inactive bookmark on another changeset::
991 991
992 992 hg book -r .^ tested
993 993
994 994 - rename bookmark turkey to dinner::
995 995
996 996 hg book -m turkey dinner
997 997
998 998 - move the '@' bookmark from another branch::
999 999
1000 1000 hg book -f @
1001 1001 '''
1002 1002 force = opts.get('force')
1003 1003 rev = opts.get('rev')
1004 1004 delete = opts.get('delete')
1005 1005 rename = opts.get('rename')
1006 1006 inactive = opts.get('inactive')
1007 1007
1008 1008 def checkformat(mark):
1009 1009 mark = mark.strip()
1010 1010 if not mark:
1011 1011 raise error.Abort(_("bookmark names cannot consist entirely of "
1012 1012 "whitespace"))
1013 1013 scmutil.checknewlabel(repo, mark, 'bookmark')
1014 1014 return mark
1015 1015
1016 1016 def checkconflict(repo, mark, cur, force=False, target=None):
1017 1017 if mark in marks and not force:
1018 1018 if target:
1019 1019 if marks[mark] == target and target == cur:
1020 1020 # re-activating a bookmark
1021 1021 return
1022 1022 anc = repo.changelog.ancestors([repo[target].rev()])
1023 1023 bmctx = repo[marks[mark]]
1024 1024 divs = [repo[b].node() for b in marks
1025 1025 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1026 1026
1027 1027 # allow resolving a single divergent bookmark even if moving
1028 1028 # the bookmark across branches when a revision is specified
1029 1029 # that contains a divergent bookmark
1030 1030 if bmctx.rev() not in anc and target in divs:
1031 1031 bookmarks.deletedivergent(repo, [target], mark)
1032 1032 return
1033 1033
1034 1034 deletefrom = [b for b in divs
1035 1035 if repo[b].rev() in anc or b == target]
1036 1036 bookmarks.deletedivergent(repo, deletefrom, mark)
1037 1037 if bookmarks.validdest(repo, bmctx, repo[target]):
1038 1038 ui.status(_("moving bookmark '%s' forward from %s\n") %
1039 1039 (mark, short(bmctx.node())))
1040 1040 return
1041 1041 raise error.Abort(_("bookmark '%s' already exists "
1042 1042 "(use -f to force)") % mark)
1043 1043 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1044 1044 and not force):
1045 1045 raise error.Abort(
1046 1046 _("a bookmark cannot have the name of an existing branch"))
1047 1047
1048 1048 if delete and rename:
1049 1049 raise error.Abort(_("--delete and --rename are incompatible"))
1050 1050 if delete and rev:
1051 1051 raise error.Abort(_("--rev is incompatible with --delete"))
1052 1052 if rename and rev:
1053 1053 raise error.Abort(_("--rev is incompatible with --rename"))
1054 1054 if not names and (delete or rev):
1055 1055 raise error.Abort(_("bookmark name required"))
1056 1056
1057 1057 if delete or rename or names or inactive:
1058 1058 wlock = lock = tr = None
1059 1059 try:
1060 1060 wlock = repo.wlock()
1061 1061 lock = repo.lock()
1062 1062 cur = repo.changectx('.').node()
1063 1063 marks = repo._bookmarks
1064 1064 if delete:
1065 1065 tr = repo.transaction('bookmark')
1066 1066 for mark in names:
1067 1067 if mark not in marks:
1068 1068 raise error.Abort(_("bookmark '%s' does not exist") %
1069 1069 mark)
1070 1070 if mark == repo._activebookmark:
1071 1071 bookmarks.deactivate(repo)
1072 1072 del marks[mark]
1073 1073
1074 1074 elif rename:
1075 1075 tr = repo.transaction('bookmark')
1076 1076 if not names:
1077 1077 raise error.Abort(_("new bookmark name required"))
1078 1078 elif len(names) > 1:
1079 1079 raise error.Abort(_("only one new bookmark name allowed"))
1080 1080 mark = checkformat(names[0])
1081 1081 if rename not in marks:
1082 1082 raise error.Abort(_("bookmark '%s' does not exist")
1083 1083 % rename)
1084 1084 checkconflict(repo, mark, cur, force)
1085 1085 marks[mark] = marks[rename]
1086 1086 if repo._activebookmark == rename and not inactive:
1087 1087 bookmarks.activate(repo, mark)
1088 1088 del marks[rename]
1089 1089 elif names:
1090 1090 tr = repo.transaction('bookmark')
1091 1091 newact = None
1092 1092 for mark in names:
1093 1093 mark = checkformat(mark)
1094 1094 if newact is None:
1095 1095 newact = mark
1096 1096 if inactive and mark == repo._activebookmark:
1097 1097 bookmarks.deactivate(repo)
1098 1098 return
1099 1099 tgt = cur
1100 1100 if rev:
1101 1101 tgt = scmutil.revsingle(repo, rev).node()
1102 1102 checkconflict(repo, mark, cur, force, tgt)
1103 1103 marks[mark] = tgt
1104 1104 if not inactive and cur == marks[newact] and not rev:
1105 1105 bookmarks.activate(repo, newact)
1106 1106 elif cur != tgt and newact == repo._activebookmark:
1107 1107 bookmarks.deactivate(repo)
1108 1108 elif inactive:
1109 1109 if len(marks) == 0:
1110 1110 ui.status(_("no bookmarks set\n"))
1111 1111 elif not repo._activebookmark:
1112 1112 ui.status(_("no active bookmark\n"))
1113 1113 else:
1114 1114 bookmarks.deactivate(repo)
1115 1115 if tr is not None:
1116 1116 marks.recordchange(tr)
1117 1117 tr.close()
1118 1118 finally:
1119 1119 lockmod.release(tr, lock, wlock)
1120 1120 else: # show bookmarks
1121 1121 fm = ui.formatter('bookmarks', opts)
1122 1122 hexfn = fm.hexfunc
1123 1123 marks = repo._bookmarks
1124 1124 if len(marks) == 0 and fm.isplain():
1125 1125 ui.status(_("no bookmarks set\n"))
1126 1126 for bmark, n in sorted(marks.iteritems()):
1127 1127 active = repo._activebookmark
1128 1128 if bmark == active:
1129 1129 prefix, label = '*', activebookmarklabel
1130 1130 else:
1131 1131 prefix, label = ' ', ''
1132 1132
1133 1133 fm.startitem()
1134 1134 if not ui.quiet:
1135 1135 fm.plain(' %s ' % prefix, label=label)
1136 1136 fm.write('bookmark', '%s', bmark, label=label)
1137 1137 pad = " " * (25 - encoding.colwidth(bmark))
1138 1138 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1139 1139 repo.changelog.rev(n), hexfn(n), label=label)
1140 1140 fm.data(active=(bmark == active))
1141 1141 fm.plain('\n')
1142 1142 fm.end()
1143 1143
1144 1144 @command('branch',
1145 1145 [('f', 'force', None,
1146 1146 _('set branch name even if it shadows an existing branch')),
1147 1147 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1148 1148 _('[-fC] [NAME]'))
1149 1149 def branch(ui, repo, label=None, **opts):
1150 1150 """set or show the current branch name
1151 1151
1152 1152 .. note::
1153 1153
1154 1154 Branch names are permanent and global. Use :hg:`bookmark` to create a
1155 1155 light-weight bookmark instead. See :hg:`help glossary` for more
1156 1156 information about named branches and bookmarks.
1157 1157
1158 1158 With no argument, show the current branch name. With one argument,
1159 1159 set the working directory branch name (the branch will not exist
1160 1160 in the repository until the next commit). Standard practice
1161 1161 recommends that primary development take place on the 'default'
1162 1162 branch.
1163 1163
1164 1164 Unless -f/--force is specified, branch will not let you set a
1165 1165 branch name that already exists.
1166 1166
1167 1167 Use -C/--clean to reset the working directory branch to that of
1168 1168 the parent of the working directory, negating a previous branch
1169 1169 change.
1170 1170
1171 1171 Use the command :hg:`update` to switch to an existing branch. Use
1172 1172 :hg:`commit --close-branch` to mark this branch head as closed.
1173 1173 When all heads of a branch are closed, the branch will be
1174 1174 considered closed.
1175 1175
1176 1176 Returns 0 on success.
1177 1177 """
1178 1178 if label:
1179 1179 label = label.strip()
1180 1180
1181 1181 if not opts.get('clean') and not label:
1182 1182 ui.write("%s\n" % repo.dirstate.branch())
1183 1183 return
1184 1184
1185 1185 with repo.wlock():
1186 1186 if opts.get('clean'):
1187 1187 label = repo[None].p1().branch()
1188 1188 repo.dirstate.setbranch(label)
1189 1189 ui.status(_('reset working directory to branch %s\n') % label)
1190 1190 elif label:
1191 1191 if not opts.get('force') and label in repo.branchmap():
1192 1192 if label not in [p.branch() for p in repo[None].parents()]:
1193 1193 raise error.Abort(_('a branch of the same name already'
1194 1194 ' exists'),
1195 1195 # i18n: "it" refers to an existing branch
1196 1196 hint=_("use 'hg update' to switch to it"))
1197 1197 scmutil.checknewlabel(repo, label, 'branch')
1198 1198 repo.dirstate.setbranch(label)
1199 1199 ui.status(_('marked working directory as branch %s\n') % label)
1200 1200
1201 1201 # find any open named branches aside from default
1202 1202 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1203 1203 if n != "default" and not c]
1204 1204 if not others:
1205 1205 ui.status(_('(branches are permanent and global, '
1206 1206 'did you want a bookmark?)\n'))
1207 1207
1208 1208 @command('branches',
1209 1209 [('a', 'active', False,
1210 1210 _('show only branches that have unmerged heads (DEPRECATED)')),
1211 1211 ('c', 'closed', False, _('show normal and closed branches')),
1212 1212 ] + formatteropts,
1213 1213 _('[-c]'))
1214 1214 def branches(ui, repo, active=False, closed=False, **opts):
1215 1215 """list repository named branches
1216 1216
1217 1217 List the repository's named branches, indicating which ones are
1218 1218 inactive. If -c/--closed is specified, also list branches which have
1219 1219 been marked closed (see :hg:`commit --close-branch`).
1220 1220
1221 1221 Use the command :hg:`update` to switch to an existing branch.
1222 1222
1223 1223 Returns 0.
1224 1224 """
1225 1225
1226 1226 ui.pager('branches')
1227 1227 fm = ui.formatter('branches', opts)
1228 1228 hexfunc = fm.hexfunc
1229 1229
1230 1230 allheads = set(repo.heads())
1231 1231 branches = []
1232 1232 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1233 1233 isactive = not isclosed and bool(set(heads) & allheads)
1234 1234 branches.append((tag, repo[tip], isactive, not isclosed))
1235 1235 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1236 1236 reverse=True)
1237 1237
1238 1238 for tag, ctx, isactive, isopen in branches:
1239 1239 if active and not isactive:
1240 1240 continue
1241 1241 if isactive:
1242 1242 label = 'branches.active'
1243 1243 notice = ''
1244 1244 elif not isopen:
1245 1245 if not closed:
1246 1246 continue
1247 1247 label = 'branches.closed'
1248 1248 notice = _(' (closed)')
1249 1249 else:
1250 1250 label = 'branches.inactive'
1251 1251 notice = _(' (inactive)')
1252 1252 current = (tag == repo.dirstate.branch())
1253 1253 if current:
1254 1254 label = 'branches.current'
1255 1255
1256 1256 fm.startitem()
1257 1257 fm.write('branch', '%s', tag, label=label)
1258 1258 rev = ctx.rev()
1259 1259 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1260 1260 fmt = ' ' * padsize + ' %d:%s'
1261 1261 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1262 1262 label='log.changeset changeset.%s' % ctx.phasestr())
1263 1263 fm.context(ctx=ctx)
1264 1264 fm.data(active=isactive, closed=not isopen, current=current)
1265 1265 if not ui.quiet:
1266 1266 fm.plain(notice)
1267 1267 fm.plain('\n')
1268 1268 fm.end()
1269 1269
1270 1270 @command('bundle',
1271 1271 [('f', 'force', None, _('run even when the destination is unrelated')),
1272 1272 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1273 1273 _('REV')),
1274 1274 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1275 1275 _('BRANCH')),
1276 1276 ('', 'base', [],
1277 1277 _('a base changeset assumed to be available at the destination'),
1278 1278 _('REV')),
1279 1279 ('a', 'all', None, _('bundle all changesets in the repository')),
1280 1280 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1281 1281 ] + remoteopts,
1282 1282 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1283 1283 def bundle(ui, repo, fname, dest=None, **opts):
1284 1284 """create a changegroup file
1285 1285
1286 1286 Generate a changegroup file collecting changesets to be added
1287 1287 to a repository.
1288 1288
1289 1289 To create a bundle containing all changesets, use -a/--all
1290 1290 (or --base null). Otherwise, hg assumes the destination will have
1291 1291 all the nodes you specify with --base parameters. Otherwise, hg
1292 1292 will assume the repository has all the nodes in destination, or
1293 1293 default-push/default if no destination is specified.
1294 1294
1295 1295 You can change bundle format with the -t/--type option. You can
1296 1296 specify a compression, a bundle version or both using a dash
1297 1297 (comp-version). The available compression methods are: none, bzip2,
1298 1298 and gzip (by default, bundles are compressed using bzip2). The
1299 1299 available formats are: v1, v2 (default to most suitable).
1300 1300
1301 1301 The bundle file can then be transferred using conventional means
1302 1302 and applied to another repository with the unbundle or pull
1303 1303 command. This is useful when direct push and pull are not
1304 1304 available or when exporting an entire repository is undesirable.
1305 1305
1306 1306 Applying bundles preserves all changeset contents including
1307 1307 permissions, copy/rename information, and revision history.
1308 1308
1309 1309 Returns 0 on success, 1 if no changes found.
1310 1310 """
1311 1311 revs = None
1312 1312 if 'rev' in opts:
1313 1313 revstrings = opts['rev']
1314 1314 revs = scmutil.revrange(repo, revstrings)
1315 1315 if revstrings and not revs:
1316 1316 raise error.Abort(_('no commits to bundle'))
1317 1317
1318 1318 bundletype = opts.get('type', 'bzip2').lower()
1319 1319 try:
1320 1320 bcompression, cgversion, params = exchange.parsebundlespec(
1321 1321 repo, bundletype, strict=False)
1322 1322 except error.UnsupportedBundleSpecification as e:
1323 1323 raise error.Abort(str(e),
1324 1324 hint=_("see 'hg help bundle' for supported "
1325 1325 "values for --type"))
1326 1326
1327 1327 # Packed bundles are a pseudo bundle format for now.
1328 1328 if cgversion == 's1':
1329 1329 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1330 1330 hint=_("use 'hg debugcreatestreamclonebundle'"))
1331 1331
1332 1332 if opts.get('all'):
1333 1333 if dest:
1334 1334 raise error.Abort(_("--all is incompatible with specifying "
1335 1335 "a destination"))
1336 1336 if opts.get('base'):
1337 1337 ui.warn(_("ignoring --base because --all was specified\n"))
1338 1338 base = ['null']
1339 1339 else:
1340 1340 base = scmutil.revrange(repo, opts.get('base'))
1341 1341 # TODO: get desired bundlecaps from command line.
1342 1342 bundlecaps = None
1343 1343 if cgversion not in changegroup.supportedoutgoingversions(repo):
1344 1344 raise error.Abort(_("repository does not support bundle version %s") %
1345 1345 cgversion)
1346 1346
1347 1347 if base:
1348 1348 if dest:
1349 1349 raise error.Abort(_("--base is incompatible with specifying "
1350 1350 "a destination"))
1351 1351 common = [repo.lookup(rev) for rev in base]
1352 1352 heads = revs and map(repo.lookup, revs) or None
1353 1353 outgoing = discovery.outgoing(repo, common, heads)
1354 1354 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1355 1355 bundlecaps=bundlecaps,
1356 1356 version=cgversion)
1357 1357 outgoing = None
1358 1358 else:
1359 1359 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1360 1360 dest, branches = hg.parseurl(dest, opts.get('branch'))
1361 1361 other = hg.peer(repo, opts, dest)
1362 1362 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1363 1363 heads = revs and map(repo.lookup, revs) or revs
1364 1364 outgoing = discovery.findcommonoutgoing(repo, other,
1365 1365 onlyheads=heads,
1366 1366 force=opts.get('force'),
1367 1367 portable=True)
1368 1368 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1369 1369 bundlecaps, version=cgversion)
1370 1370 if not cg:
1371 1371 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1372 1372 return 1
1373 1373
1374 1374 if cgversion == '01': #bundle1
1375 1375 if bcompression is None:
1376 1376 bcompression = 'UN'
1377 1377 bversion = 'HG10' + bcompression
1378 1378 bcompression = None
1379 1379 else:
1380 1380 assert cgversion == '02'
1381 1381 bversion = 'HG20'
1382 1382
1383 1383 # TODO compression options should be derived from bundlespec parsing.
1384 1384 # This is a temporary hack to allow adjusting bundle compression
1385 1385 # level without a) formalizing the bundlespec changes to declare it
1386 1386 # b) introducing a command flag.
1387 1387 compopts = {}
1388 1388 complevel = ui.configint('experimental', 'bundlecomplevel')
1389 1389 if complevel is not None:
1390 1390 compopts['level'] = complevel
1391 1391
1392 1392 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1393 1393 compopts=compopts)
1394 1394
1395 1395 @command('cat',
1396 1396 [('o', 'output', '',
1397 1397 _('print output to file with formatted name'), _('FORMAT')),
1398 1398 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 1399 ('', 'decode', None, _('apply any matching decode filter')),
1400 1400 ] + walkopts,
1401 1401 _('[OPTION]... FILE...'),
1402 1402 inferrepo=True)
1403 1403 def cat(ui, repo, file1, *pats, **opts):
1404 1404 """output the current or given revision of files
1405 1405
1406 1406 Print the specified files as they were at the given revision. If
1407 1407 no revision is given, the parent of the working directory is used.
1408 1408
1409 1409 Output may be to a file, in which case the name of the file is
1410 1410 given using a format string. The formatting rules as follows:
1411 1411
1412 1412 :``%%``: literal "%" character
1413 1413 :``%s``: basename of file being printed
1414 1414 :``%d``: dirname of file being printed, or '.' if in repository root
1415 1415 :``%p``: root-relative path name of file being printed
1416 1416 :``%H``: changeset hash (40 hexadecimal digits)
1417 1417 :``%R``: changeset revision number
1418 1418 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 1419 :``%r``: zero-padded changeset revision number
1420 1420 :``%b``: basename of the exporting repository
1421 1421
1422 1422 Returns 0 on success.
1423 1423 """
1424 1424 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 1425 m = scmutil.match(ctx, (file1,) + pats, opts)
1426 1426
1427 1427 ui.pager('cat')
1428 1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1429 1429
1430 1430 @command('^clone',
1431 1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1432 1432 'directory (only a repository)')),
1433 1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1434 1434 _('REV')),
1435 1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1436 1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1437 1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1438 1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1439 1439 ] + remoteopts,
1440 1440 _('[OPTION]... SOURCE [DEST]'),
1441 1441 norepo=True)
1442 1442 def clone(ui, source, dest=None, **opts):
1443 1443 """make a copy of an existing repository
1444 1444
1445 1445 Create a copy of an existing repository in a new directory.
1446 1446
1447 1447 If no destination directory name is specified, it defaults to the
1448 1448 basename of the source.
1449 1449
1450 1450 The location of the source is added to the new repository's
1451 1451 ``.hg/hgrc`` file, as the default to be used for future pulls.
1452 1452
1453 1453 Only local paths and ``ssh://`` URLs are supported as
1454 1454 destinations. For ``ssh://`` destinations, no working directory or
1455 1455 ``.hg/hgrc`` will be created on the remote side.
1456 1456
1457 1457 If the source repository has a bookmark called '@' set, that
1458 1458 revision will be checked out in the new repository by default.
1459 1459
1460 1460 To check out a particular version, use -u/--update, or
1461 1461 -U/--noupdate to create a clone with no working directory.
1462 1462
1463 1463 To pull only a subset of changesets, specify one or more revisions
1464 1464 identifiers with -r/--rev or branches with -b/--branch. The
1465 1465 resulting clone will contain only the specified changesets and
1466 1466 their ancestors. These options (or 'clone src#rev dest') imply
1467 1467 --pull, even for local source repositories.
1468 1468
1469 1469 .. note::
1470 1470
1471 1471 Specifying a tag will include the tagged changeset but not the
1472 1472 changeset containing the tag.
1473 1473
1474 1474 .. container:: verbose
1475 1475
1476 1476 For efficiency, hardlinks are used for cloning whenever the
1477 1477 source and destination are on the same filesystem (note this
1478 1478 applies only to the repository data, not to the working
1479 1479 directory). Some filesystems, such as AFS, implement hardlinking
1480 1480 incorrectly, but do not report errors. In these cases, use the
1481 1481 --pull option to avoid hardlinking.
1482 1482
1483 1483 In some cases, you can clone repositories and the working
1484 1484 directory using full hardlinks with ::
1485 1485
1486 1486 $ cp -al REPO REPOCLONE
1487 1487
1488 1488 This is the fastest way to clone, but it is not always safe. The
1489 1489 operation is not atomic (making sure REPO is not modified during
1490 1490 the operation is up to you) and you have to make sure your
1491 1491 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1492 1492 so). Also, this is not compatible with certain extensions that
1493 1493 place their metadata under the .hg directory, such as mq.
1494 1494
1495 1495 Mercurial will update the working directory to the first applicable
1496 1496 revision from this list:
1497 1497
1498 1498 a) null if -U or the source repository has no changesets
1499 1499 b) if -u . and the source repository is local, the first parent of
1500 1500 the source repository's working directory
1501 1501 c) the changeset specified with -u (if a branch name, this means the
1502 1502 latest head of that branch)
1503 1503 d) the changeset specified with -r
1504 1504 e) the tipmost head specified with -b
1505 1505 f) the tipmost head specified with the url#branch source syntax
1506 1506 g) the revision marked with the '@' bookmark, if present
1507 1507 h) the tipmost head of the default branch
1508 1508 i) tip
1509 1509
1510 1510 When cloning from servers that support it, Mercurial may fetch
1511 1511 pre-generated data from a server-advertised URL. When this is done,
1512 1512 hooks operating on incoming changesets and changegroups may fire twice,
1513 1513 once for the bundle fetched from the URL and another for any additional
1514 1514 data not fetched from this URL. In addition, if an error occurs, the
1515 1515 repository may be rolled back to a partial clone. This behavior may
1516 1516 change in future releases. See :hg:`help -e clonebundles` for more.
1517 1517
1518 1518 Examples:
1519 1519
1520 1520 - clone a remote repository to a new directory named hg/::
1521 1521
1522 1522 hg clone https://www.mercurial-scm.org/repo/hg/
1523 1523
1524 1524 - create a lightweight local clone::
1525 1525
1526 1526 hg clone project/ project-feature/
1527 1527
1528 1528 - clone from an absolute path on an ssh server (note double-slash)::
1529 1529
1530 1530 hg clone ssh://user@server//home/projects/alpha/
1531 1531
1532 1532 - do a high-speed clone over a LAN while checking out a
1533 1533 specified version::
1534 1534
1535 1535 hg clone --uncompressed http://server/repo -u 1.5
1536 1536
1537 1537 - create a repository without changesets after a particular revision::
1538 1538
1539 1539 hg clone -r 04e544 experimental/ good/
1540 1540
1541 1541 - clone (and track) a particular named branch::
1542 1542
1543 1543 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1544 1544
1545 1545 See :hg:`help urls` for details on specifying URLs.
1546 1546
1547 1547 Returns 0 on success.
1548 1548 """
1549 1549 if opts.get('noupdate') and opts.get('updaterev'):
1550 1550 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1551 1551
1552 1552 r = hg.clone(ui, opts, source, dest,
1553 1553 pull=opts.get('pull'),
1554 1554 stream=opts.get('uncompressed'),
1555 1555 rev=opts.get('rev'),
1556 1556 update=opts.get('updaterev') or not opts.get('noupdate'),
1557 1557 branch=opts.get('branch'),
1558 1558 shareopts=opts.get('shareopts'))
1559 1559
1560 1560 return r is None
1561 1561
1562 1562 @command('^commit|ci',
1563 1563 [('A', 'addremove', None,
1564 1564 _('mark new/missing files as added/removed before committing')),
1565 1565 ('', 'close-branch', None,
1566 1566 _('mark a branch head as closed')),
1567 1567 ('', 'amend', None, _('amend the parent of the working directory')),
1568 1568 ('s', 'secret', None, _('use the secret phase for committing')),
1569 1569 ('e', 'edit', None, _('invoke editor on commit messages')),
1570 1570 ('i', 'interactive', None, _('use interactive mode')),
1571 1571 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1572 1572 _('[OPTION]... [FILE]...'),
1573 1573 inferrepo=True)
1574 1574 def commit(ui, repo, *pats, **opts):
1575 1575 """commit the specified files or all outstanding changes
1576 1576
1577 1577 Commit changes to the given files into the repository. Unlike a
1578 1578 centralized SCM, this operation is a local operation. See
1579 1579 :hg:`push` for a way to actively distribute your changes.
1580 1580
1581 1581 If a list of files is omitted, all changes reported by :hg:`status`
1582 1582 will be committed.
1583 1583
1584 1584 If you are committing the result of a merge, do not provide any
1585 1585 filenames or -I/-X filters.
1586 1586
1587 1587 If no commit message is specified, Mercurial starts your
1588 1588 configured editor where you can enter a message. In case your
1589 1589 commit fails, you will find a backup of your message in
1590 1590 ``.hg/last-message.txt``.
1591 1591
1592 1592 The --close-branch flag can be used to mark the current branch
1593 1593 head closed. When all heads of a branch are closed, the branch
1594 1594 will be considered closed and no longer listed.
1595 1595
1596 1596 The --amend flag can be used to amend the parent of the
1597 1597 working directory with a new commit that contains the changes
1598 1598 in the parent in addition to those currently reported by :hg:`status`,
1599 1599 if there are any. The old commit is stored in a backup bundle in
1600 1600 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1601 1601 on how to restore it).
1602 1602
1603 1603 Message, user and date are taken from the amended commit unless
1604 1604 specified. When a message isn't specified on the command line,
1605 1605 the editor will open with the message of the amended commit.
1606 1606
1607 1607 It is not possible to amend public changesets (see :hg:`help phases`)
1608 1608 or changesets that have children.
1609 1609
1610 1610 See :hg:`help dates` for a list of formats valid for -d/--date.
1611 1611
1612 1612 Returns 0 on success, 1 if nothing changed.
1613 1613
1614 1614 .. container:: verbose
1615 1615
1616 1616 Examples:
1617 1617
1618 1618 - commit all files ending in .py::
1619 1619
1620 1620 hg commit --include "set:**.py"
1621 1621
1622 1622 - commit all non-binary files::
1623 1623
1624 1624 hg commit --exclude "set:binary()"
1625 1625
1626 1626 - amend the current commit and set the date to now::
1627 1627
1628 1628 hg commit --amend --date now
1629 1629 """
1630 1630 wlock = lock = None
1631 1631 try:
1632 1632 wlock = repo.wlock()
1633 1633 lock = repo.lock()
1634 1634 return _docommit(ui, repo, *pats, **opts)
1635 1635 finally:
1636 1636 release(lock, wlock)
1637 1637
1638 1638 def _docommit(ui, repo, *pats, **opts):
1639 1639 opts = pycompat.byteskwargs(opts)
1640 1640 if opts.get('interactive'):
1641 1641 opts.pop('interactive')
1642 1642 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1643 1643 cmdutil.recordfilter, *pats,
1644 1644 **pycompat.strkwargs(opts))
1645 1645 # ret can be 0 (no changes to record) or the value returned by
1646 1646 # commit(), 1 if nothing changed or None on success.
1647 1647 return 1 if ret == 0 else ret
1648 1648
1649 1649 if opts.get('subrepos'):
1650 1650 if opts.get('amend'):
1651 1651 raise error.Abort(_('cannot amend with --subrepos'))
1652 1652 # Let --subrepos on the command line override config setting.
1653 1653 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1654 1654
1655 1655 cmdutil.checkunfinished(repo, commit=True)
1656 1656
1657 1657 branch = repo[None].branch()
1658 1658 bheads = repo.branchheads(branch)
1659 1659
1660 1660 extra = {}
1661 1661 if opts.get('close_branch'):
1662 1662 extra['close'] = 1
1663 1663
1664 1664 if not bheads:
1665 1665 raise error.Abort(_('can only close branch heads'))
1666 1666 elif opts.get('amend'):
1667 1667 if repo[None].parents()[0].p1().branch() != branch and \
1668 1668 repo[None].parents()[0].p2().branch() != branch:
1669 1669 raise error.Abort(_('can only close branch heads'))
1670 1670
1671 1671 if opts.get('amend'):
1672 1672 if ui.configbool('ui', 'commitsubrepos'):
1673 1673 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1674 1674
1675 1675 old = repo['.']
1676 1676 if not old.mutable():
1677 1677 raise error.Abort(_('cannot amend public changesets'))
1678 1678 if len(repo[None].parents()) > 1:
1679 1679 raise error.Abort(_('cannot amend while merging'))
1680 1680 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1681 1681 if not allowunstable and old.children():
1682 1682 raise error.Abort(_('cannot amend changeset with children'))
1683 1683
1684 1684 # Currently histedit gets confused if an amend happens while histedit
1685 1685 # is in progress. Since we have a checkunfinished command, we are
1686 1686 # temporarily honoring it.
1687 1687 #
1688 1688 # Note: eventually this guard will be removed. Please do not expect
1689 1689 # this behavior to remain.
1690 1690 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1691 1691 cmdutil.checkunfinished(repo)
1692 1692
1693 1693 # commitfunc is used only for temporary amend commit by cmdutil.amend
1694 1694 def commitfunc(ui, repo, message, match, opts):
1695 1695 return repo.commit(message,
1696 1696 opts.get('user') or old.user(),
1697 1697 opts.get('date') or old.date(),
1698 1698 match,
1699 1699 extra=extra)
1700 1700
1701 1701 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1702 1702 if node == old.node():
1703 1703 ui.status(_("nothing changed\n"))
1704 1704 return 1
1705 1705 else:
1706 1706 def commitfunc(ui, repo, message, match, opts):
1707 1707 overrides = {}
1708 1708 if opts.get('secret'):
1709 1709 overrides[('phases', 'new-commit')] = 'secret'
1710 1710
1711 1711 baseui = repo.baseui
1712 1712 with baseui.configoverride(overrides, 'commit'):
1713 1713 with ui.configoverride(overrides, 'commit'):
1714 1714 editform = cmdutil.mergeeditform(repo[None],
1715 1715 'commit.normal')
1716 1716 editor = cmdutil.getcommiteditor(
1717 1717 editform=editform, **pycompat.strkwargs(opts))
1718 1718 return repo.commit(message,
1719 1719 opts.get('user'),
1720 1720 opts.get('date'),
1721 1721 match,
1722 1722 editor=editor,
1723 1723 extra=extra)
1724 1724
1725 1725 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1726 1726
1727 1727 if not node:
1728 1728 stat = cmdutil.postcommitstatus(repo, pats, opts)
1729 1729 if stat[3]:
1730 1730 ui.status(_("nothing changed (%d missing files, see "
1731 1731 "'hg status')\n") % len(stat[3]))
1732 1732 else:
1733 1733 ui.status(_("nothing changed\n"))
1734 1734 return 1
1735 1735
1736 1736 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1737 1737
1738 1738 @command('config|showconfig|debugconfig',
1739 1739 [('u', 'untrusted', None, _('show untrusted configuration options')),
1740 1740 ('e', 'edit', None, _('edit user config')),
1741 1741 ('l', 'local', None, _('edit repository config')),
1742 1742 ('g', 'global', None, _('edit global config'))] + formatteropts,
1743 1743 _('[-u] [NAME]...'),
1744 1744 optionalrepo=True)
1745 1745 def config(ui, repo, *values, **opts):
1746 1746 """show combined config settings from all hgrc files
1747 1747
1748 1748 With no arguments, print names and values of all config items.
1749 1749
1750 1750 With one argument of the form section.name, print just the value
1751 1751 of that config item.
1752 1752
1753 1753 With multiple arguments, print names and values of all config
1754 1754 items with matching section names.
1755 1755
1756 1756 With --edit, start an editor on the user-level config file. With
1757 1757 --global, edit the system-wide config file. With --local, edit the
1758 1758 repository-level config file.
1759 1759
1760 1760 With --debug, the source (filename and line number) is printed
1761 1761 for each config item.
1762 1762
1763 1763 See :hg:`help config` for more information about config files.
1764 1764
1765 1765 Returns 0 on success, 1 if NAME does not exist.
1766 1766
1767 1767 """
1768 1768
1769 1769 if opts.get('edit') or opts.get('local') or opts.get('global'):
1770 1770 if opts.get('local') and opts.get('global'):
1771 1771 raise error.Abort(_("can't use --local and --global together"))
1772 1772
1773 1773 if opts.get('local'):
1774 1774 if not repo:
1775 1775 raise error.Abort(_("can't use --local outside a repository"))
1776 1776 paths = [repo.vfs.join('hgrc')]
1777 1777 elif opts.get('global'):
1778 1778 paths = scmutil.systemrcpath()
1779 1779 else:
1780 1780 paths = scmutil.userrcpath()
1781 1781
1782 1782 for f in paths:
1783 1783 if os.path.exists(f):
1784 1784 break
1785 1785 else:
1786 1786 if opts.get('global'):
1787 1787 samplehgrc = uimod.samplehgrcs['global']
1788 1788 elif opts.get('local'):
1789 1789 samplehgrc = uimod.samplehgrcs['local']
1790 1790 else:
1791 1791 samplehgrc = uimod.samplehgrcs['user']
1792 1792
1793 1793 f = paths[0]
1794 1794 fp = open(f, "w")
1795 1795 fp.write(samplehgrc)
1796 1796 fp.close()
1797 1797
1798 1798 editor = ui.geteditor()
1799 1799 ui.system("%s \"%s\"" % (editor, f),
1800 1800 onerr=error.Abort, errprefix=_("edit failed"),
1801 1801 blockedtag='config_edit')
1802 1802 return
1803 1803 ui.pager('config')
1804 1804 fm = ui.formatter('config', opts)
1805 1805 for f in scmutil.rcpath():
1806 1806 ui.debug('read config from: %s\n' % f)
1807 1807 untrusted = bool(opts.get('untrusted'))
1808 1808 if values:
1809 1809 sections = [v for v in values if '.' not in v]
1810 1810 items = [v for v in values if '.' in v]
1811 1811 if len(items) > 1 or items and sections:
1812 1812 raise error.Abort(_('only one config item permitted'))
1813 1813 matched = False
1814 1814 for section, name, value in ui.walkconfig(untrusted=untrusted):
1815 1815 source = ui.configsource(section, name, untrusted)
1816 1816 value = pycompat.bytestr(value)
1817 1817 if fm.isplain():
1818 1818 source = source or 'none'
1819 1819 value = value.replace('\n', '\\n')
1820 1820 entryname = section + '.' + name
1821 1821 if values:
1822 1822 for v in values:
1823 1823 if v == section:
1824 1824 fm.startitem()
1825 1825 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1826 1826 fm.write('name value', '%s=%s\n', entryname, value)
1827 1827 matched = True
1828 1828 elif v == entryname:
1829 1829 fm.startitem()
1830 1830 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1831 1831 fm.write('value', '%s\n', value)
1832 1832 fm.data(name=entryname)
1833 1833 matched = True
1834 1834 else:
1835 1835 fm.startitem()
1836 1836 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1837 1837 fm.write('name value', '%s=%s\n', entryname, value)
1838 1838 matched = True
1839 1839 fm.end()
1840 1840 if matched:
1841 1841 return 0
1842 1842 return 1
1843 1843
1844 1844 @command('copy|cp',
1845 1845 [('A', 'after', None, _('record a copy that has already occurred')),
1846 1846 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1847 1847 ] + walkopts + dryrunopts,
1848 1848 _('[OPTION]... [SOURCE]... DEST'))
1849 1849 def copy(ui, repo, *pats, **opts):
1850 1850 """mark files as copied for the next commit
1851 1851
1852 1852 Mark dest as having copies of source files. If dest is a
1853 1853 directory, copies are put in that directory. If dest is a file,
1854 1854 the source must be a single file.
1855 1855
1856 1856 By default, this command copies the contents of files as they
1857 1857 exist in the working directory. If invoked with -A/--after, the
1858 1858 operation is recorded, but no copying is performed.
1859 1859
1860 1860 This command takes effect with the next commit. To undo a copy
1861 1861 before that, see :hg:`revert`.
1862 1862
1863 1863 Returns 0 on success, 1 if errors are encountered.
1864 1864 """
1865 1865 with repo.wlock(False):
1866 1866 return cmdutil.copy(ui, repo, pats, opts)
1867 1867
1868 1868 @command('^diff',
1869 1869 [('r', 'rev', [], _('revision'), _('REV')),
1870 1870 ('c', 'change', '', _('change made by revision'), _('REV'))
1871 1871 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1872 1872 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1873 1873 inferrepo=True)
1874 1874 def diff(ui, repo, *pats, **opts):
1875 1875 """diff repository (or selected files)
1876 1876
1877 1877 Show differences between revisions for the specified files.
1878 1878
1879 1879 Differences between files are shown using the unified diff format.
1880 1880
1881 1881 .. note::
1882 1882
1883 1883 :hg:`diff` may generate unexpected results for merges, as it will
1884 1884 default to comparing against the working directory's first
1885 1885 parent changeset if no revisions are specified.
1886 1886
1887 1887 When two revision arguments are given, then changes are shown
1888 1888 between those revisions. If only one revision is specified then
1889 1889 that revision is compared to the working directory, and, when no
1890 1890 revisions are specified, the working directory files are compared
1891 1891 to its first parent.
1892 1892
1893 1893 Alternatively you can specify -c/--change with a revision to see
1894 1894 the changes in that changeset relative to its first parent.
1895 1895
1896 1896 Without the -a/--text option, diff will avoid generating diffs of
1897 1897 files it detects as binary. With -a, diff will generate a diff
1898 1898 anyway, probably with undesirable results.
1899 1899
1900 1900 Use the -g/--git option to generate diffs in the git extended diff
1901 1901 format. For more information, read :hg:`help diffs`.
1902 1902
1903 1903 .. container:: verbose
1904 1904
1905 1905 Examples:
1906 1906
1907 1907 - compare a file in the current working directory to its parent::
1908 1908
1909 1909 hg diff foo.c
1910 1910
1911 1911 - compare two historical versions of a directory, with rename info::
1912 1912
1913 1913 hg diff --git -r 1.0:1.2 lib/
1914 1914
1915 1915 - get change stats relative to the last change on some date::
1916 1916
1917 1917 hg diff --stat -r "date('may 2')"
1918 1918
1919 1919 - diff all newly-added files that contain a keyword::
1920 1920
1921 1921 hg diff "set:added() and grep(GNU)"
1922 1922
1923 1923 - compare a revision and its parents::
1924 1924
1925 1925 hg diff -c 9353 # compare against first parent
1926 1926 hg diff -r 9353^:9353 # same using revset syntax
1927 1927 hg diff -r 9353^2:9353 # compare against the second parent
1928 1928
1929 1929 Returns 0 on success.
1930 1930 """
1931 1931
1932 1932 revs = opts.get('rev')
1933 1933 change = opts.get('change')
1934 1934 stat = opts.get('stat')
1935 1935 reverse = opts.get('reverse')
1936 1936
1937 1937 if revs and change:
1938 1938 msg = _('cannot specify --rev and --change at the same time')
1939 1939 raise error.Abort(msg)
1940 1940 elif change:
1941 1941 node2 = scmutil.revsingle(repo, change, None).node()
1942 1942 node1 = repo[node2].p1().node()
1943 1943 else:
1944 1944 node1, node2 = scmutil.revpair(repo, revs)
1945 1945
1946 1946 if reverse:
1947 1947 node1, node2 = node2, node1
1948 1948
1949 1949 diffopts = patch.diffallopts(ui, opts)
1950 1950 m = scmutil.match(repo[node2], pats, opts)
1951 1951 ui.pager('diff')
1952 1952 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1953 1953 listsubrepos=opts.get('subrepos'),
1954 1954 root=opts.get('root'))
1955 1955
1956 1956 @command('^export',
1957 1957 [('o', 'output', '',
1958 1958 _('print output to file with formatted name'), _('FORMAT')),
1959 1959 ('', 'switch-parent', None, _('diff against the second parent')),
1960 1960 ('r', 'rev', [], _('revisions to export'), _('REV')),
1961 1961 ] + diffopts,
1962 1962 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1963 1963 def export(ui, repo, *changesets, **opts):
1964 1964 """dump the header and diffs for one or more changesets
1965 1965
1966 1966 Print the changeset header and diffs for one or more revisions.
1967 1967 If no revision is given, the parent of the working directory is used.
1968 1968
1969 1969 The information shown in the changeset header is: author, date,
1970 1970 branch name (if non-default), changeset hash, parent(s) and commit
1971 1971 comment.
1972 1972
1973 1973 .. note::
1974 1974
1975 1975 :hg:`export` may generate unexpected diff output for merge
1976 1976 changesets, as it will compare the merge changeset against its
1977 1977 first parent only.
1978 1978
1979 1979 Output may be to a file, in which case the name of the file is
1980 1980 given using a format string. The formatting rules are as follows:
1981 1981
1982 1982 :``%%``: literal "%" character
1983 1983 :``%H``: changeset hash (40 hexadecimal digits)
1984 1984 :``%N``: number of patches being generated
1985 1985 :``%R``: changeset revision number
1986 1986 :``%b``: basename of the exporting repository
1987 1987 :``%h``: short-form changeset hash (12 hexadecimal digits)
1988 1988 :``%m``: first line of the commit message (only alphanumeric characters)
1989 1989 :``%n``: zero-padded sequence number, starting at 1
1990 1990 :``%r``: zero-padded changeset revision number
1991 1991
1992 1992 Without the -a/--text option, export will avoid generating diffs
1993 1993 of files it detects as binary. With -a, export will generate a
1994 1994 diff anyway, probably with undesirable results.
1995 1995
1996 1996 Use the -g/--git option to generate diffs in the git extended diff
1997 1997 format. See :hg:`help diffs` for more information.
1998 1998
1999 1999 With the --switch-parent option, the diff will be against the
2000 2000 second parent. It can be useful to review a merge.
2001 2001
2002 2002 .. container:: verbose
2003 2003
2004 2004 Examples:
2005 2005
2006 2006 - use export and import to transplant a bugfix to the current
2007 2007 branch::
2008 2008
2009 2009 hg export -r 9353 | hg import -
2010 2010
2011 2011 - export all the changesets between two revisions to a file with
2012 2012 rename information::
2013 2013
2014 2014 hg export --git -r 123:150 > changes.txt
2015 2015
2016 2016 - split outgoing changes into a series of patches with
2017 2017 descriptive names::
2018 2018
2019 2019 hg export -r "outgoing()" -o "%n-%m.patch"
2020 2020
2021 2021 Returns 0 on success.
2022 2022 """
2023 2023 changesets += tuple(opts.get('rev', []))
2024 2024 if not changesets:
2025 2025 changesets = ['.']
2026 2026 revs = scmutil.revrange(repo, changesets)
2027 2027 if not revs:
2028 2028 raise error.Abort(_("export requires at least one changeset"))
2029 2029 if len(revs) > 1:
2030 2030 ui.note(_('exporting patches:\n'))
2031 2031 else:
2032 2032 ui.note(_('exporting patch:\n'))
2033 2033 ui.pager('export')
2034 2034 cmdutil.export(repo, revs, template=opts.get('output'),
2035 2035 switch_parent=opts.get('switch_parent'),
2036 2036 opts=patch.diffallopts(ui, opts))
2037 2037
2038 2038 @command('files',
2039 2039 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2040 2040 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2041 2041 ] + walkopts + formatteropts + subrepoopts,
2042 2042 _('[OPTION]... [FILE]...'))
2043 2043 def files(ui, repo, *pats, **opts):
2044 2044 """list tracked files
2045 2045
2046 2046 Print files under Mercurial control in the working directory or
2047 2047 specified revision for given files (excluding removed files).
2048 2048 Files can be specified as filenames or filesets.
2049 2049
2050 2050 If no files are given to match, this command prints the names
2051 2051 of all files under Mercurial control.
2052 2052
2053 2053 .. container:: verbose
2054 2054
2055 2055 Examples:
2056 2056
2057 2057 - list all files under the current directory::
2058 2058
2059 2059 hg files .
2060 2060
2061 2061 - shows sizes and flags for current revision::
2062 2062
2063 2063 hg files -vr .
2064 2064
2065 2065 - list all files named README::
2066 2066
2067 2067 hg files -I "**/README"
2068 2068
2069 2069 - list all binary files::
2070 2070
2071 2071 hg files "set:binary()"
2072 2072
2073 2073 - find files containing a regular expression::
2074 2074
2075 2075 hg files "set:grep('bob')"
2076 2076
2077 2077 - search tracked file contents with xargs and grep::
2078 2078
2079 2079 hg files -0 | xargs -0 grep foo
2080 2080
2081 2081 See :hg:`help patterns` and :hg:`help filesets` for more information
2082 2082 on specifying file patterns.
2083 2083
2084 2084 Returns 0 if a match is found, 1 otherwise.
2085 2085
2086 2086 """
2087 2087 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2088 2088
2089 2089 end = '\n'
2090 2090 if opts.get('print0'):
2091 2091 end = '\0'
2092 2092 fmt = '%s' + end
2093 2093
2094 2094 m = scmutil.match(ctx, pats, opts)
2095 2095 ui.pager('files')
2096 2096 with ui.formatter('files', opts) as fm:
2097 2097 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2098 2098
2099 2099 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2100 2100 def forget(ui, repo, *pats, **opts):
2101 2101 """forget the specified files on the next commit
2102 2102
2103 2103 Mark the specified files so they will no longer be tracked
2104 2104 after the next commit.
2105 2105
2106 2106 This only removes files from the current branch, not from the
2107 2107 entire project history, and it does not delete them from the
2108 2108 working directory.
2109 2109
2110 2110 To delete the file from the working directory, see :hg:`remove`.
2111 2111
2112 2112 To undo a forget before the next commit, see :hg:`add`.
2113 2113
2114 2114 .. container:: verbose
2115 2115
2116 2116 Examples:
2117 2117
2118 2118 - forget newly-added binary files::
2119 2119
2120 2120 hg forget "set:added() and binary()"
2121 2121
2122 2122 - forget files that would be excluded by .hgignore::
2123 2123
2124 2124 hg forget "set:hgignore()"
2125 2125
2126 2126 Returns 0 on success.
2127 2127 """
2128 2128
2129 2129 if not pats:
2130 2130 raise error.Abort(_('no files specified'))
2131 2131
2132 2132 m = scmutil.match(repo[None], pats, opts)
2133 2133 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2134 2134 return rejected and 1 or 0
2135 2135
2136 2136 @command(
2137 2137 'graft',
2138 2138 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2139 2139 ('c', 'continue', False, _('resume interrupted graft')),
2140 2140 ('e', 'edit', False, _('invoke editor on commit messages')),
2141 2141 ('', 'log', None, _('append graft info to log message')),
2142 2142 ('f', 'force', False, _('force graft')),
2143 2143 ('D', 'currentdate', False,
2144 2144 _('record the current date as commit date')),
2145 2145 ('U', 'currentuser', False,
2146 2146 _('record the current user as committer'), _('DATE'))]
2147 2147 + commitopts2 + mergetoolopts + dryrunopts,
2148 2148 _('[OPTION]... [-r REV]... REV...'))
2149 2149 def graft(ui, repo, *revs, **opts):
2150 2150 '''copy changes from other branches onto the current branch
2151 2151
2152 2152 This command uses Mercurial's merge logic to copy individual
2153 2153 changes from other branches without merging branches in the
2154 2154 history graph. This is sometimes known as 'backporting' or
2155 2155 'cherry-picking'. By default, graft will copy user, date, and
2156 2156 description from the source changesets.
2157 2157
2158 2158 Changesets that are ancestors of the current revision, that have
2159 2159 already been grafted, or that are merges will be skipped.
2160 2160
2161 2161 If --log is specified, log messages will have a comment appended
2162 2162 of the form::
2163 2163
2164 2164 (grafted from CHANGESETHASH)
2165 2165
2166 2166 If --force is specified, revisions will be grafted even if they
2167 2167 are already ancestors of or have been grafted to the destination.
2168 2168 This is useful when the revisions have since been backed out.
2169 2169
2170 2170 If a graft merge results in conflicts, the graft process is
2171 2171 interrupted so that the current merge can be manually resolved.
2172 2172 Once all conflicts are addressed, the graft process can be
2173 2173 continued with the -c/--continue option.
2174 2174
2175 2175 .. note::
2176 2176
2177 2177 The -c/--continue option does not reapply earlier options, except
2178 2178 for --force.
2179 2179
2180 2180 .. container:: verbose
2181 2181
2182 2182 Examples:
2183 2183
2184 2184 - copy a single change to the stable branch and edit its description::
2185 2185
2186 2186 hg update stable
2187 2187 hg graft --edit 9393
2188 2188
2189 2189 - graft a range of changesets with one exception, updating dates::
2190 2190
2191 2191 hg graft -D "2085::2093 and not 2091"
2192 2192
2193 2193 - continue a graft after resolving conflicts::
2194 2194
2195 2195 hg graft -c
2196 2196
2197 2197 - show the source of a grafted changeset::
2198 2198
2199 2199 hg log --debug -r .
2200 2200
2201 2201 - show revisions sorted by date::
2202 2202
2203 2203 hg log -r "sort(all(), date)"
2204 2204
2205 2205 See :hg:`help revisions` for more about specifying revisions.
2206 2206
2207 2207 Returns 0 on successful completion.
2208 2208 '''
2209 2209 with repo.wlock():
2210 2210 return _dograft(ui, repo, *revs, **opts)
2211 2211
2212 2212 def _dograft(ui, repo, *revs, **opts):
2213 2213 if revs and opts.get('rev'):
2214 2214 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2215 2215 'revision ordering!\n'))
2216 2216
2217 2217 revs = list(revs)
2218 2218 revs.extend(opts.get('rev'))
2219 2219
2220 2220 if not opts.get('user') and opts.get('currentuser'):
2221 2221 opts['user'] = ui.username()
2222 2222 if not opts.get('date') and opts.get('currentdate'):
2223 2223 opts['date'] = "%d %d" % util.makedate()
2224 2224
2225 2225 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2226 2226
2227 2227 cont = False
2228 2228 if opts.get('continue'):
2229 2229 cont = True
2230 2230 if revs:
2231 2231 raise error.Abort(_("can't specify --continue and revisions"))
2232 2232 # read in unfinished revisions
2233 2233 try:
2234 2234 nodes = repo.vfs.read('graftstate').splitlines()
2235 2235 revs = [repo[node].rev() for node in nodes]
2236 2236 except IOError as inst:
2237 2237 if inst.errno != errno.ENOENT:
2238 2238 raise
2239 2239 cmdutil.wrongtooltocontinue(repo, _('graft'))
2240 2240 else:
2241 2241 cmdutil.checkunfinished(repo)
2242 2242 cmdutil.bailifchanged(repo)
2243 2243 if not revs:
2244 2244 raise error.Abort(_('no revisions specified'))
2245 2245 revs = scmutil.revrange(repo, revs)
2246 2246
2247 2247 skipped = set()
2248 2248 # check for merges
2249 2249 for rev in repo.revs('%ld and merge()', revs):
2250 2250 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2251 2251 skipped.add(rev)
2252 2252 revs = [r for r in revs if r not in skipped]
2253 2253 if not revs:
2254 2254 return -1
2255 2255
2256 2256 # Don't check in the --continue case, in effect retaining --force across
2257 2257 # --continues. That's because without --force, any revisions we decided to
2258 2258 # skip would have been filtered out here, so they wouldn't have made their
2259 2259 # way to the graftstate. With --force, any revisions we would have otherwise
2260 2260 # skipped would not have been filtered out, and if they hadn't been applied
2261 2261 # already, they'd have been in the graftstate.
2262 2262 if not (cont or opts.get('force')):
2263 2263 # check for ancestors of dest branch
2264 2264 crev = repo['.'].rev()
2265 2265 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2266 2266 # XXX make this lazy in the future
2267 2267 # don't mutate while iterating, create a copy
2268 2268 for rev in list(revs):
2269 2269 if rev in ancestors:
2270 2270 ui.warn(_('skipping ancestor revision %d:%s\n') %
2271 2271 (rev, repo[rev]))
2272 2272 # XXX remove on list is slow
2273 2273 revs.remove(rev)
2274 2274 if not revs:
2275 2275 return -1
2276 2276
2277 2277 # analyze revs for earlier grafts
2278 2278 ids = {}
2279 2279 for ctx in repo.set("%ld", revs):
2280 2280 ids[ctx.hex()] = ctx.rev()
2281 2281 n = ctx.extra().get('source')
2282 2282 if n:
2283 2283 ids[n] = ctx.rev()
2284 2284
2285 2285 # check ancestors for earlier grafts
2286 2286 ui.debug('scanning for duplicate grafts\n')
2287 2287
2288 2288 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2289 2289 ctx = repo[rev]
2290 2290 n = ctx.extra().get('source')
2291 2291 if n in ids:
2292 2292 try:
2293 2293 r = repo[n].rev()
2294 2294 except error.RepoLookupError:
2295 2295 r = None
2296 2296 if r in revs:
2297 2297 ui.warn(_('skipping revision %d:%s '
2298 2298 '(already grafted to %d:%s)\n')
2299 2299 % (r, repo[r], rev, ctx))
2300 2300 revs.remove(r)
2301 2301 elif ids[n] in revs:
2302 2302 if r is None:
2303 2303 ui.warn(_('skipping already grafted revision %d:%s '
2304 2304 '(%d:%s also has unknown origin %s)\n')
2305 2305 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2306 2306 else:
2307 2307 ui.warn(_('skipping already grafted revision %d:%s '
2308 2308 '(%d:%s also has origin %d:%s)\n')
2309 2309 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2310 2310 revs.remove(ids[n])
2311 2311 elif ctx.hex() in ids:
2312 2312 r = ids[ctx.hex()]
2313 2313 ui.warn(_('skipping already grafted revision %d:%s '
2314 2314 '(was grafted from %d:%s)\n') %
2315 2315 (r, repo[r], rev, ctx))
2316 2316 revs.remove(r)
2317 2317 if not revs:
2318 2318 return -1
2319 2319
2320 2320 for pos, ctx in enumerate(repo.set("%ld", revs)):
2321 2321 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2322 2322 ctx.description().split('\n', 1)[0])
2323 2323 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2324 2324 if names:
2325 2325 desc += ' (%s)' % ' '.join(names)
2326 2326 ui.status(_('grafting %s\n') % desc)
2327 2327 if opts.get('dry_run'):
2328 2328 continue
2329 2329
2330 2330 source = ctx.extra().get('source')
2331 2331 extra = {}
2332 2332 if source:
2333 2333 extra['source'] = source
2334 2334 extra['intermediate-source'] = ctx.hex()
2335 2335 else:
2336 2336 extra['source'] = ctx.hex()
2337 2337 user = ctx.user()
2338 2338 if opts.get('user'):
2339 2339 user = opts['user']
2340 2340 date = ctx.date()
2341 2341 if opts.get('date'):
2342 2342 date = opts['date']
2343 2343 message = ctx.description()
2344 2344 if opts.get('log'):
2345 2345 message += '\n(grafted from %s)' % ctx.hex()
2346 2346
2347 2347 # we don't merge the first commit when continuing
2348 2348 if not cont:
2349 2349 # perform the graft merge with p1(rev) as 'ancestor'
2350 2350 try:
2351 2351 # ui.forcemerge is an internal variable, do not document
2352 2352 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2353 2353 'graft')
2354 2354 stats = mergemod.graft(repo, ctx, ctx.p1(),
2355 2355 ['local', 'graft'])
2356 2356 finally:
2357 2357 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2358 2358 # report any conflicts
2359 2359 if stats and stats[3] > 0:
2360 2360 # write out state for --continue
2361 2361 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2362 2362 repo.vfs.write('graftstate', ''.join(nodelines))
2363 2363 extra = ''
2364 2364 if opts.get('user'):
2365 2365 extra += ' --user %s' % util.shellquote(opts['user'])
2366 2366 if opts.get('date'):
2367 2367 extra += ' --date %s' % util.shellquote(opts['date'])
2368 2368 if opts.get('log'):
2369 2369 extra += ' --log'
2370 2370 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2371 2371 raise error.Abort(
2372 2372 _("unresolved conflicts, can't continue"),
2373 2373 hint=hint)
2374 2374 else:
2375 2375 cont = False
2376 2376
2377 2377 # commit
2378 2378 node = repo.commit(text=message, user=user,
2379 2379 date=date, extra=extra, editor=editor)
2380 2380 if node is None:
2381 2381 ui.warn(
2382 2382 _('note: graft of %d:%s created no changes to commit\n') %
2383 2383 (ctx.rev(), ctx))
2384 2384
2385 2385 # remove state when we complete successfully
2386 2386 if not opts.get('dry_run'):
2387 2387 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2388 2388
2389 2389 return 0
2390 2390
2391 2391 @command('grep',
2392 2392 [('0', 'print0', None, _('end fields with NUL')),
2393 2393 ('', 'all', None, _('print all revisions that match')),
2394 2394 ('a', 'text', None, _('treat all files as text')),
2395 2395 ('f', 'follow', None,
2396 2396 _('follow changeset history,'
2397 2397 ' or file history across copies and renames')),
2398 2398 ('i', 'ignore-case', None, _('ignore case when matching')),
2399 2399 ('l', 'files-with-matches', None,
2400 2400 _('print only filenames and revisions that match')),
2401 2401 ('n', 'line-number', None, _('print matching line numbers')),
2402 2402 ('r', 'rev', [],
2403 2403 _('only search files changed within revision range'), _('REV')),
2404 2404 ('u', 'user', None, _('list the author (long with -v)')),
2405 2405 ('d', 'date', None, _('list the date (short with -q)')),
2406 2406 ] + formatteropts + walkopts,
2407 2407 _('[OPTION]... PATTERN [FILE]...'),
2408 2408 inferrepo=True)
2409 2409 def grep(ui, repo, pattern, *pats, **opts):
2410 2410 """search revision history for a pattern in specified files
2411 2411
2412 2412 Search revision history for a regular expression in the specified
2413 2413 files or the entire project.
2414 2414
2415 2415 By default, grep prints the most recent revision number for each
2416 2416 file in which it finds a match. To get it to print every revision
2417 2417 that contains a change in match status ("-" for a match that becomes
2418 2418 a non-match, or "+" for a non-match that becomes a match), use the
2419 2419 --all flag.
2420 2420
2421 2421 PATTERN can be any Python (roughly Perl-compatible) regular
2422 2422 expression.
2423 2423
2424 2424 If no FILEs are specified (and -f/--follow isn't set), all files in
2425 2425 the repository are searched, including those that don't exist in the
2426 2426 current branch or have been deleted in a prior changeset.
2427 2427
2428 2428 Returns 0 if a match is found, 1 otherwise.
2429 2429 """
2430 2430 reflags = re.M
2431 2431 if opts.get('ignore_case'):
2432 2432 reflags |= re.I
2433 2433 try:
2434 2434 regexp = util.re.compile(pattern, reflags)
2435 2435 except re.error as inst:
2436 2436 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2437 2437 return 1
2438 2438 sep, eol = ':', '\n'
2439 2439 if opts.get('print0'):
2440 2440 sep = eol = '\0'
2441 2441
2442 2442 getfile = util.lrucachefunc(repo.file)
2443 2443
2444 2444 def matchlines(body):
2445 2445 begin = 0
2446 2446 linenum = 0
2447 2447 while begin < len(body):
2448 2448 match = regexp.search(body, begin)
2449 2449 if not match:
2450 2450 break
2451 2451 mstart, mend = match.span()
2452 2452 linenum += body.count('\n', begin, mstart) + 1
2453 2453 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2454 2454 begin = body.find('\n', mend) + 1 or len(body) + 1
2455 2455 lend = begin - 1
2456 2456 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2457 2457
2458 2458 class linestate(object):
2459 2459 def __init__(self, line, linenum, colstart, colend):
2460 2460 self.line = line
2461 2461 self.linenum = linenum
2462 2462 self.colstart = colstart
2463 2463 self.colend = colend
2464 2464
2465 2465 def __hash__(self):
2466 2466 return hash((self.linenum, self.line))
2467 2467
2468 2468 def __eq__(self, other):
2469 2469 return self.line == other.line
2470 2470
2471 2471 def findpos(self):
2472 2472 """Iterate all (start, end) indices of matches"""
2473 2473 yield self.colstart, self.colend
2474 2474 p = self.colend
2475 2475 while p < len(self.line):
2476 2476 m = regexp.search(self.line, p)
2477 2477 if not m:
2478 2478 break
2479 2479 yield m.span()
2480 2480 p = m.end()
2481 2481
2482 2482 matches = {}
2483 2483 copies = {}
2484 2484 def grepbody(fn, rev, body):
2485 2485 matches[rev].setdefault(fn, [])
2486 2486 m = matches[rev][fn]
2487 2487 for lnum, cstart, cend, line in matchlines(body):
2488 2488 s = linestate(line, lnum, cstart, cend)
2489 2489 m.append(s)
2490 2490
2491 2491 def difflinestates(a, b):
2492 2492 sm = difflib.SequenceMatcher(None, a, b)
2493 2493 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2494 2494 if tag == 'insert':
2495 2495 for i in xrange(blo, bhi):
2496 2496 yield ('+', b[i])
2497 2497 elif tag == 'delete':
2498 2498 for i in xrange(alo, ahi):
2499 2499 yield ('-', a[i])
2500 2500 elif tag == 'replace':
2501 2501 for i in xrange(alo, ahi):
2502 2502 yield ('-', a[i])
2503 2503 for i in xrange(blo, bhi):
2504 2504 yield ('+', b[i])
2505 2505
2506 2506 def display(fm, fn, ctx, pstates, states):
2507 2507 rev = ctx.rev()
2508 2508 if fm.isplain():
2509 2509 formatuser = ui.shortuser
2510 2510 else:
2511 2511 formatuser = str
2512 2512 if ui.quiet:
2513 2513 datefmt = '%Y-%m-%d'
2514 2514 else:
2515 2515 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2516 2516 found = False
2517 2517 @util.cachefunc
2518 2518 def binary():
2519 2519 flog = getfile(fn)
2520 2520 return util.binary(flog.read(ctx.filenode(fn)))
2521 2521
2522 2522 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2523 2523 if opts.get('all'):
2524 2524 iter = difflinestates(pstates, states)
2525 2525 else:
2526 2526 iter = [('', l) for l in states]
2527 2527 for change, l in iter:
2528 2528 fm.startitem()
2529 2529 fm.data(node=fm.hexfunc(ctx.node()))
2530 2530 cols = [
2531 2531 ('filename', fn, True),
2532 2532 ('rev', rev, True),
2533 2533 ('linenumber', l.linenum, opts.get('line_number')),
2534 2534 ]
2535 2535 if opts.get('all'):
2536 2536 cols.append(('change', change, True))
2537 2537 cols.extend([
2538 2538 ('user', formatuser(ctx.user()), opts.get('user')),
2539 2539 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2540 2540 ])
2541 2541 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2542 2542 for name, data, cond in cols:
2543 2543 field = fieldnamemap.get(name, name)
2544 2544 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2545 2545 if cond and name != lastcol:
2546 2546 fm.plain(sep, label='grep.sep')
2547 2547 if not opts.get('files_with_matches'):
2548 2548 fm.plain(sep, label='grep.sep')
2549 2549 if not opts.get('text') and binary():
2550 2550 fm.plain(_(" Binary file matches"))
2551 2551 else:
2552 2552 displaymatches(fm.nested('texts'), l)
2553 2553 fm.plain(eol)
2554 2554 found = True
2555 2555 if opts.get('files_with_matches'):
2556 2556 break
2557 2557 return found
2558 2558
2559 2559 def displaymatches(fm, l):
2560 2560 p = 0
2561 2561 for s, e in l.findpos():
2562 2562 if p < s:
2563 2563 fm.startitem()
2564 2564 fm.write('text', '%s', l.line[p:s])
2565 2565 fm.data(matched=False)
2566 2566 fm.startitem()
2567 2567 fm.write('text', '%s', l.line[s:e], label='grep.match')
2568 2568 fm.data(matched=True)
2569 2569 p = e
2570 2570 if p < len(l.line):
2571 2571 fm.startitem()
2572 2572 fm.write('text', '%s', l.line[p:])
2573 2573 fm.data(matched=False)
2574 2574 fm.end()
2575 2575
2576 2576 skip = {}
2577 2577 revfiles = {}
2578 2578 matchfn = scmutil.match(repo[None], pats, opts)
2579 2579 found = False
2580 2580 follow = opts.get('follow')
2581 2581
2582 2582 def prep(ctx, fns):
2583 2583 rev = ctx.rev()
2584 2584 pctx = ctx.p1()
2585 2585 parent = pctx.rev()
2586 2586 matches.setdefault(rev, {})
2587 2587 matches.setdefault(parent, {})
2588 2588 files = revfiles.setdefault(rev, [])
2589 2589 for fn in fns:
2590 2590 flog = getfile(fn)
2591 2591 try:
2592 2592 fnode = ctx.filenode(fn)
2593 2593 except error.LookupError:
2594 2594 continue
2595 2595
2596 2596 copied = flog.renamed(fnode)
2597 2597 copy = follow and copied and copied[0]
2598 2598 if copy:
2599 2599 copies.setdefault(rev, {})[fn] = copy
2600 2600 if fn in skip:
2601 2601 if copy:
2602 2602 skip[copy] = True
2603 2603 continue
2604 2604 files.append(fn)
2605 2605
2606 2606 if fn not in matches[rev]:
2607 2607 grepbody(fn, rev, flog.read(fnode))
2608 2608
2609 2609 pfn = copy or fn
2610 2610 if pfn not in matches[parent]:
2611 2611 try:
2612 2612 fnode = pctx.filenode(pfn)
2613 2613 grepbody(pfn, parent, flog.read(fnode))
2614 2614 except error.LookupError:
2615 2615 pass
2616 2616
2617 2617 ui.pager('grep')
2618 2618 fm = ui.formatter('grep', opts)
2619 2619 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2620 2620 rev = ctx.rev()
2621 2621 parent = ctx.p1().rev()
2622 2622 for fn in sorted(revfiles.get(rev, [])):
2623 2623 states = matches[rev][fn]
2624 2624 copy = copies.get(rev, {}).get(fn)
2625 2625 if fn in skip:
2626 2626 if copy:
2627 2627 skip[copy] = True
2628 2628 continue
2629 2629 pstates = matches.get(parent, {}).get(copy or fn, [])
2630 2630 if pstates or states:
2631 2631 r = display(fm, fn, ctx, pstates, states)
2632 2632 found = found or r
2633 2633 if r and not opts.get('all'):
2634 2634 skip[fn] = True
2635 2635 if copy:
2636 2636 skip[copy] = True
2637 2637 del matches[rev]
2638 2638 del revfiles[rev]
2639 2639 fm.end()
2640 2640
2641 2641 return not found
2642 2642
2643 2643 @command('heads',
2644 2644 [('r', 'rev', '',
2645 2645 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2646 2646 ('t', 'topo', False, _('show topological heads only')),
2647 2647 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2648 2648 ('c', 'closed', False, _('show normal and closed branch heads')),
2649 2649 ] + templateopts,
2650 2650 _('[-ct] [-r STARTREV] [REV]...'))
2651 2651 def heads(ui, repo, *branchrevs, **opts):
2652 2652 """show branch heads
2653 2653
2654 2654 With no arguments, show all open branch heads in the repository.
2655 2655 Branch heads are changesets that have no descendants on the
2656 2656 same branch. They are where development generally takes place and
2657 2657 are the usual targets for update and merge operations.
2658 2658
2659 2659 If one or more REVs are given, only open branch heads on the
2660 2660 branches associated with the specified changesets are shown. This
2661 2661 means that you can use :hg:`heads .` to see the heads on the
2662 2662 currently checked-out branch.
2663 2663
2664 2664 If -c/--closed is specified, also show branch heads marked closed
2665 2665 (see :hg:`commit --close-branch`).
2666 2666
2667 2667 If STARTREV is specified, only those heads that are descendants of
2668 2668 STARTREV will be displayed.
2669 2669
2670 2670 If -t/--topo is specified, named branch mechanics will be ignored and only
2671 2671 topological heads (changesets with no children) will be shown.
2672 2672
2673 2673 Returns 0 if matching heads are found, 1 if not.
2674 2674 """
2675 2675
2676 2676 start = None
2677 2677 if 'rev' in opts:
2678 2678 start = scmutil.revsingle(repo, opts['rev'], None).node()
2679 2679
2680 2680 if opts.get('topo'):
2681 2681 heads = [repo[h] for h in repo.heads(start)]
2682 2682 else:
2683 2683 heads = []
2684 2684 for branch in repo.branchmap():
2685 2685 heads += repo.branchheads(branch, start, opts.get('closed'))
2686 2686 heads = [repo[h] for h in heads]
2687 2687
2688 2688 if branchrevs:
2689 2689 branches = set(repo[br].branch() for br in branchrevs)
2690 2690 heads = [h for h in heads if h.branch() in branches]
2691 2691
2692 2692 if opts.get('active') and branchrevs:
2693 2693 dagheads = repo.heads(start)
2694 2694 heads = [h for h in heads if h.node() in dagheads]
2695 2695
2696 2696 if branchrevs:
2697 2697 haveheads = set(h.branch() for h in heads)
2698 2698 if branches - haveheads:
2699 2699 headless = ', '.join(b for b in branches - haveheads)
2700 2700 msg = _('no open branch heads found on branches %s')
2701 2701 if opts.get('rev'):
2702 2702 msg += _(' (started at %s)') % opts['rev']
2703 2703 ui.warn((msg + '\n') % headless)
2704 2704
2705 2705 if not heads:
2706 2706 return 1
2707 2707
2708 2708 ui.pager('heads')
2709 2709 heads = sorted(heads, key=lambda x: -x.rev())
2710 2710 displayer = cmdutil.show_changeset(ui, repo, opts)
2711 2711 for ctx in heads:
2712 2712 displayer.show(ctx)
2713 2713 displayer.close()
2714 2714
2715 2715 @command('help',
2716 2716 [('e', 'extension', None, _('show only help for extensions')),
2717 2717 ('c', 'command', None, _('show only help for commands')),
2718 2718 ('k', 'keyword', None, _('show topics matching keyword')),
2719 2719 ('s', 'system', [], _('show help for specific platform(s)')),
2720 2720 ],
2721 2721 _('[-ecks] [TOPIC]'),
2722 2722 norepo=True)
2723 2723 def help_(ui, name=None, **opts):
2724 2724 """show help for a given topic or a help overview
2725 2725
2726 2726 With no arguments, print a list of commands with short help messages.
2727 2727
2728 2728 Given a topic, extension, or command name, print help for that
2729 2729 topic.
2730 2730
2731 2731 Returns 0 if successful.
2732 2732 """
2733 2733
2734 2734 keep = opts.get('system') or []
2735 2735 if len(keep) == 0:
2736 2736 if pycompat.sysplatform.startswith('win'):
2737 2737 keep.append('windows')
2738 2738 elif pycompat.sysplatform == 'OpenVMS':
2739 2739 keep.append('vms')
2740 2740 elif pycompat.sysplatform == 'plan9':
2741 2741 keep.append('plan9')
2742 2742 else:
2743 2743 keep.append('unix')
2744 2744 keep.append(pycompat.sysplatform.lower())
2745 2745 if ui.verbose:
2746 2746 keep.append('verbose')
2747 2747
2748 2748 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2749 2749 ui.pager('help')
2750 2750 ui.write(formatted)
2751 2751
2752 2752
2753 2753 @command('identify|id',
2754 2754 [('r', 'rev', '',
2755 2755 _('identify the specified revision'), _('REV')),
2756 2756 ('n', 'num', None, _('show local revision number')),
2757 2757 ('i', 'id', None, _('show global revision id')),
2758 2758 ('b', 'branch', None, _('show branch')),
2759 2759 ('t', 'tags', None, _('show tags')),
2760 2760 ('B', 'bookmarks', None, _('show bookmarks')),
2761 2761 ] + remoteopts,
2762 2762 _('[-nibtB] [-r REV] [SOURCE]'),
2763 2763 optionalrepo=True)
2764 2764 def identify(ui, repo, source=None, rev=None,
2765 2765 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2766 2766 """identify the working directory or specified revision
2767 2767
2768 2768 Print a summary identifying the repository state at REV using one or
2769 2769 two parent hash identifiers, followed by a "+" if the working
2770 2770 directory has uncommitted changes, the branch name (if not default),
2771 2771 a list of tags, and a list of bookmarks.
2772 2772
2773 2773 When REV is not given, print a summary of the current state of the
2774 2774 repository.
2775 2775
2776 2776 Specifying a path to a repository root or Mercurial bundle will
2777 2777 cause lookup to operate on that repository/bundle.
2778 2778
2779 2779 .. container:: verbose
2780 2780
2781 2781 Examples:
2782 2782
2783 2783 - generate a build identifier for the working directory::
2784 2784
2785 2785 hg id --id > build-id.dat
2786 2786
2787 2787 - find the revision corresponding to a tag::
2788 2788
2789 2789 hg id -n -r 1.3
2790 2790
2791 2791 - check the most recent revision of a remote repository::
2792 2792
2793 2793 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2794 2794
2795 2795 See :hg:`log` for generating more information about specific revisions,
2796 2796 including full hash identifiers.
2797 2797
2798 2798 Returns 0 if successful.
2799 2799 """
2800 2800
2801 2801 if not repo and not source:
2802 2802 raise error.Abort(_("there is no Mercurial repository here "
2803 2803 "(.hg not found)"))
2804 2804
2805 2805 if ui.debugflag:
2806 2806 hexfunc = hex
2807 2807 else:
2808 2808 hexfunc = short
2809 2809 default = not (num or id or branch or tags or bookmarks)
2810 2810 output = []
2811 2811 revs = []
2812 2812
2813 2813 if source:
2814 2814 source, branches = hg.parseurl(ui.expandpath(source))
2815 2815 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2816 2816 repo = peer.local()
2817 2817 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2818 2818
2819 2819 if not repo:
2820 2820 if num or branch or tags:
2821 2821 raise error.Abort(
2822 2822 _("can't query remote revision number, branch, or tags"))
2823 2823 if not rev and revs:
2824 2824 rev = revs[0]
2825 2825 if not rev:
2826 2826 rev = "tip"
2827 2827
2828 2828 remoterev = peer.lookup(rev)
2829 2829 if default or id:
2830 2830 output = [hexfunc(remoterev)]
2831 2831
2832 2832 def getbms():
2833 2833 bms = []
2834 2834
2835 2835 if 'bookmarks' in peer.listkeys('namespaces'):
2836 2836 hexremoterev = hex(remoterev)
2837 2837 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2838 2838 if bmr == hexremoterev]
2839 2839
2840 2840 return sorted(bms)
2841 2841
2842 2842 if bookmarks:
2843 2843 output.extend(getbms())
2844 2844 elif default and not ui.quiet:
2845 2845 # multiple bookmarks for a single parent separated by '/'
2846 2846 bm = '/'.join(getbms())
2847 2847 if bm:
2848 2848 output.append(bm)
2849 2849 else:
2850 2850 ctx = scmutil.revsingle(repo, rev, None)
2851 2851
2852 2852 if ctx.rev() is None:
2853 2853 ctx = repo[None]
2854 2854 parents = ctx.parents()
2855 2855 taglist = []
2856 2856 for p in parents:
2857 2857 taglist.extend(p.tags())
2858 2858
2859 2859 changed = ""
2860 2860 if default or id or num:
2861 2861 if (any(repo.status())
2862 2862 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2863 2863 changed = '+'
2864 2864 if default or id:
2865 2865 output = ["%s%s" %
2866 2866 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2867 2867 if num:
2868 2868 output.append("%s%s" %
2869 2869 ('+'.join([str(p.rev()) for p in parents]), changed))
2870 2870 else:
2871 2871 if default or id:
2872 2872 output = [hexfunc(ctx.node())]
2873 2873 if num:
2874 2874 output.append(str(ctx.rev()))
2875 2875 taglist = ctx.tags()
2876 2876
2877 2877 if default and not ui.quiet:
2878 2878 b = ctx.branch()
2879 2879 if b != 'default':
2880 2880 output.append("(%s)" % b)
2881 2881
2882 2882 # multiple tags for a single parent separated by '/'
2883 2883 t = '/'.join(taglist)
2884 2884 if t:
2885 2885 output.append(t)
2886 2886
2887 2887 # multiple bookmarks for a single parent separated by '/'
2888 2888 bm = '/'.join(ctx.bookmarks())
2889 2889 if bm:
2890 2890 output.append(bm)
2891 2891 else:
2892 2892 if branch:
2893 2893 output.append(ctx.branch())
2894 2894
2895 2895 if tags:
2896 2896 output.extend(taglist)
2897 2897
2898 2898 if bookmarks:
2899 2899 output.extend(ctx.bookmarks())
2900 2900
2901 2901 ui.write("%s\n" % ' '.join(output))
2902 2902
2903 2903 @command('import|patch',
2904 2904 [('p', 'strip', 1,
2905 2905 _('directory strip option for patch. This has the same '
2906 2906 'meaning as the corresponding patch option'), _('NUM')),
2907 2907 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2908 2908 ('e', 'edit', False, _('invoke editor on commit messages')),
2909 2909 ('f', 'force', None,
2910 2910 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2911 2911 ('', 'no-commit', None,
2912 2912 _("don't commit, just update the working directory")),
2913 2913 ('', 'bypass', None,
2914 2914 _("apply patch without touching the working directory")),
2915 2915 ('', 'partial', None,
2916 2916 _('commit even if some hunks fail')),
2917 2917 ('', 'exact', None,
2918 2918 _('abort if patch would apply lossily')),
2919 2919 ('', 'prefix', '',
2920 2920 _('apply patch to subdirectory'), _('DIR')),
2921 2921 ('', 'import-branch', None,
2922 2922 _('use any branch information in patch (implied by --exact)'))] +
2923 2923 commitopts + commitopts2 + similarityopts,
2924 2924 _('[OPTION]... PATCH...'))
2925 2925 def import_(ui, repo, patch1=None, *patches, **opts):
2926 2926 """import an ordered set of patches
2927 2927
2928 2928 Import a list of patches and commit them individually (unless
2929 2929 --no-commit is specified).
2930 2930
2931 2931 To read a patch from standard input (stdin), use "-" as the patch
2932 2932 name. If a URL is specified, the patch will be downloaded from
2933 2933 there.
2934 2934
2935 2935 Import first applies changes to the working directory (unless
2936 2936 --bypass is specified), import will abort if there are outstanding
2937 2937 changes.
2938 2938
2939 2939 Use --bypass to apply and commit patches directly to the
2940 2940 repository, without affecting the working directory. Without
2941 2941 --exact, patches will be applied on top of the working directory
2942 2942 parent revision.
2943 2943
2944 2944 You can import a patch straight from a mail message. Even patches
2945 2945 as attachments work (to use the body part, it must have type
2946 2946 text/plain or text/x-patch). From and Subject headers of email
2947 2947 message are used as default committer and commit message. All
2948 2948 text/plain body parts before first diff are added to the commit
2949 2949 message.
2950 2950
2951 2951 If the imported patch was generated by :hg:`export`, user and
2952 2952 description from patch override values from message headers and
2953 2953 body. Values given on command line with -m/--message and -u/--user
2954 2954 override these.
2955 2955
2956 2956 If --exact is specified, import will set the working directory to
2957 2957 the parent of each patch before applying it, and will abort if the
2958 2958 resulting changeset has a different ID than the one recorded in
2959 2959 the patch. This will guard against various ways that portable
2960 2960 patch formats and mail systems might fail to transfer Mercurial
2961 2961 data or metadata. See :hg:`bundle` for lossless transmission.
2962 2962
2963 2963 Use --partial to ensure a changeset will be created from the patch
2964 2964 even if some hunks fail to apply. Hunks that fail to apply will be
2965 2965 written to a <target-file>.rej file. Conflicts can then be resolved
2966 2966 by hand before :hg:`commit --amend` is run to update the created
2967 2967 changeset. This flag exists to let people import patches that
2968 2968 partially apply without losing the associated metadata (author,
2969 2969 date, description, ...).
2970 2970
2971 2971 .. note::
2972 2972
2973 2973 When no hunks apply cleanly, :hg:`import --partial` will create
2974 2974 an empty changeset, importing only the patch metadata.
2975 2975
2976 2976 With -s/--similarity, hg will attempt to discover renames and
2977 2977 copies in the patch in the same way as :hg:`addremove`.
2978 2978
2979 2979 It is possible to use external patch programs to perform the patch
2980 2980 by setting the ``ui.patch`` configuration option. For the default
2981 2981 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2982 2982 See :hg:`help config` for more information about configuration
2983 2983 files and how to use these options.
2984 2984
2985 2985 See :hg:`help dates` for a list of formats valid for -d/--date.
2986 2986
2987 2987 .. container:: verbose
2988 2988
2989 2989 Examples:
2990 2990
2991 2991 - import a traditional patch from a website and detect renames::
2992 2992
2993 2993 hg import -s 80 http://example.com/bugfix.patch
2994 2994
2995 2995 - import a changeset from an hgweb server::
2996 2996
2997 2997 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2998 2998
2999 2999 - import all the patches in an Unix-style mbox::
3000 3000
3001 3001 hg import incoming-patches.mbox
3002 3002
3003 3003 - import patches from stdin::
3004 3004
3005 3005 hg import -
3006 3006
3007 3007 - attempt to exactly restore an exported changeset (not always
3008 3008 possible)::
3009 3009
3010 3010 hg import --exact proposed-fix.patch
3011 3011
3012 3012 - use an external tool to apply a patch which is too fuzzy for
3013 3013 the default internal tool.
3014 3014
3015 3015 hg import --config ui.patch="patch --merge" fuzzy.patch
3016 3016
3017 3017 - change the default fuzzing from 2 to a less strict 7
3018 3018
3019 3019 hg import --config ui.fuzz=7 fuzz.patch
3020 3020
3021 3021 Returns 0 on success, 1 on partial success (see --partial).
3022 3022 """
3023 3023
3024 3024 if not patch1:
3025 3025 raise error.Abort(_('need at least one patch to import'))
3026 3026
3027 3027 patches = (patch1,) + patches
3028 3028
3029 3029 date = opts.get('date')
3030 3030 if date:
3031 3031 opts['date'] = util.parsedate(date)
3032 3032
3033 3033 exact = opts.get('exact')
3034 3034 update = not opts.get('bypass')
3035 3035 if not update and opts.get('no_commit'):
3036 3036 raise error.Abort(_('cannot use --no-commit with --bypass'))
3037 3037 try:
3038 3038 sim = float(opts.get('similarity') or 0)
3039 3039 except ValueError:
3040 3040 raise error.Abort(_('similarity must be a number'))
3041 3041 if sim < 0 or sim > 100:
3042 3042 raise error.Abort(_('similarity must be between 0 and 100'))
3043 3043 if sim and not update:
3044 3044 raise error.Abort(_('cannot use --similarity with --bypass'))
3045 3045 if exact:
3046 3046 if opts.get('edit'):
3047 3047 raise error.Abort(_('cannot use --exact with --edit'))
3048 3048 if opts.get('prefix'):
3049 3049 raise error.Abort(_('cannot use --exact with --prefix'))
3050 3050
3051 3051 base = opts["base"]
3052 3052 wlock = dsguard = lock = tr = None
3053 3053 msgs = []
3054 3054 ret = 0
3055 3055
3056 3056
3057 3057 try:
3058 3058 wlock = repo.wlock()
3059 3059
3060 3060 if update:
3061 3061 cmdutil.checkunfinished(repo)
3062 3062 if (exact or not opts.get('force')):
3063 3063 cmdutil.bailifchanged(repo)
3064 3064
3065 3065 if not opts.get('no_commit'):
3066 3066 lock = repo.lock()
3067 3067 tr = repo.transaction('import')
3068 3068 else:
3069 3069 dsguard = dirstateguard.dirstateguard(repo, 'import')
3070 3070 parents = repo[None].parents()
3071 3071 for patchurl in patches:
3072 3072 if patchurl == '-':
3073 3073 ui.status(_('applying patch from stdin\n'))
3074 3074 patchfile = ui.fin
3075 3075 patchurl = 'stdin' # for error message
3076 3076 else:
3077 3077 patchurl = os.path.join(base, patchurl)
3078 3078 ui.status(_('applying %s\n') % patchurl)
3079 3079 patchfile = hg.openpath(ui, patchurl)
3080 3080
3081 3081 haspatch = False
3082 3082 for hunk in patch.split(patchfile):
3083 3083 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3084 3084 parents, opts,
3085 3085 msgs, hg.clean)
3086 3086 if msg:
3087 3087 haspatch = True
3088 3088 ui.note(msg + '\n')
3089 3089 if update or exact:
3090 3090 parents = repo[None].parents()
3091 3091 else:
3092 3092 parents = [repo[node]]
3093 3093 if rej:
3094 3094 ui.write_err(_("patch applied partially\n"))
3095 3095 ui.write_err(_("(fix the .rej files and run "
3096 3096 "`hg commit --amend`)\n"))
3097 3097 ret = 1
3098 3098 break
3099 3099
3100 3100 if not haspatch:
3101 3101 raise error.Abort(_('%s: no diffs found') % patchurl)
3102 3102
3103 3103 if tr:
3104 3104 tr.close()
3105 3105 if msgs:
3106 3106 repo.savecommitmessage('\n* * *\n'.join(msgs))
3107 3107 if dsguard:
3108 3108 dsguard.close()
3109 3109 return ret
3110 3110 finally:
3111 3111 if tr:
3112 3112 tr.release()
3113 3113 release(lock, dsguard, wlock)
3114 3114
3115 3115 @command('incoming|in',
3116 3116 [('f', 'force', None,
3117 3117 _('run even if remote repository is unrelated')),
3118 3118 ('n', 'newest-first', None, _('show newest record first')),
3119 3119 ('', 'bundle', '',
3120 3120 _('file to store the bundles into'), _('FILE')),
3121 3121 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3122 3122 ('B', 'bookmarks', False, _("compare bookmarks")),
3123 3123 ('b', 'branch', [],
3124 3124 _('a specific branch you would like to pull'), _('BRANCH')),
3125 3125 ] + logopts + remoteopts + subrepoopts,
3126 3126 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3127 3127 def incoming(ui, repo, source="default", **opts):
3128 3128 """show new changesets found in source
3129 3129
3130 3130 Show new changesets found in the specified path/URL or the default
3131 3131 pull location. These are the changesets that would have been pulled
3132 3132 if a pull at the time you issued this command.
3133 3133
3134 3134 See pull for valid source format details.
3135 3135
3136 3136 .. container:: verbose
3137 3137
3138 3138 With -B/--bookmarks, the result of bookmark comparison between
3139 3139 local and remote repositories is displayed. With -v/--verbose,
3140 3140 status is also displayed for each bookmark like below::
3141 3141
3142 3142 BM1 01234567890a added
3143 3143 BM2 1234567890ab advanced
3144 3144 BM3 234567890abc diverged
3145 3145 BM4 34567890abcd changed
3146 3146
3147 3147 The action taken locally when pulling depends on the
3148 3148 status of each bookmark:
3149 3149
3150 3150 :``added``: pull will create it
3151 3151 :``advanced``: pull will update it
3152 3152 :``diverged``: pull will create a divergent bookmark
3153 3153 :``changed``: result depends on remote changesets
3154 3154
3155 3155 From the point of view of pulling behavior, bookmark
3156 3156 existing only in the remote repository are treated as ``added``,
3157 3157 even if it is in fact locally deleted.
3158 3158
3159 3159 .. container:: verbose
3160 3160
3161 3161 For remote repository, using --bundle avoids downloading the
3162 3162 changesets twice if the incoming is followed by a pull.
3163 3163
3164 3164 Examples:
3165 3165
3166 3166 - show incoming changes with patches and full description::
3167 3167
3168 3168 hg incoming -vp
3169 3169
3170 3170 - show incoming changes excluding merges, store a bundle::
3171 3171
3172 3172 hg in -vpM --bundle incoming.hg
3173 3173 hg pull incoming.hg
3174 3174
3175 3175 - briefly list changes inside a bundle::
3176 3176
3177 3177 hg in changes.hg -T "{desc|firstline}\\n"
3178 3178
3179 3179 Returns 0 if there are incoming changes, 1 otherwise.
3180 3180 """
3181 3181 if opts.get('graph'):
3182 3182 cmdutil.checkunsupportedgraphflags([], opts)
3183 3183 def display(other, chlist, displayer):
3184 3184 revdag = cmdutil.graphrevs(other, chlist, opts)
3185 3185 cmdutil.displaygraph(ui, repo, revdag, displayer,
3186 3186 graphmod.asciiedges)
3187 3187
3188 3188 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3189 3189 return 0
3190 3190
3191 3191 if opts.get('bundle') and opts.get('subrepos'):
3192 3192 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3193 3193
3194 3194 if opts.get('bookmarks'):
3195 3195 source, branches = hg.parseurl(ui.expandpath(source),
3196 3196 opts.get('branch'))
3197 3197 other = hg.peer(repo, opts, source)
3198 3198 if 'bookmarks' not in other.listkeys('namespaces'):
3199 3199 ui.warn(_("remote doesn't support bookmarks\n"))
3200 3200 return 0
3201 3201 ui.pager('incoming')
3202 3202 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3203 3203 return bookmarks.incoming(ui, repo, other)
3204 3204
3205 3205 repo._subtoppath = ui.expandpath(source)
3206 3206 try:
3207 3207 return hg.incoming(ui, repo, source, opts)
3208 3208 finally:
3209 3209 del repo._subtoppath
3210 3210
3211 3211
3212 3212 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3213 3213 norepo=True)
3214 3214 def init(ui, dest=".", **opts):
3215 3215 """create a new repository in the given directory
3216 3216
3217 3217 Initialize a new repository in the given directory. If the given
3218 3218 directory does not exist, it will be created.
3219 3219
3220 3220 If no directory is given, the current directory is used.
3221 3221
3222 3222 It is possible to specify an ``ssh://`` URL as the destination.
3223 3223 See :hg:`help urls` for more information.
3224 3224
3225 3225 Returns 0 on success.
3226 3226 """
3227 3227 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3228 3228
3229 3229 @command('locate',
3230 3230 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3231 3231 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3232 3232 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3233 3233 ] + walkopts,
3234 3234 _('[OPTION]... [PATTERN]...'))
3235 3235 def locate(ui, repo, *pats, **opts):
3236 3236 """locate files matching specific patterns (DEPRECATED)
3237 3237
3238 3238 Print files under Mercurial control in the working directory whose
3239 3239 names match the given patterns.
3240 3240
3241 3241 By default, this command searches all directories in the working
3242 3242 directory. To search just the current directory and its
3243 3243 subdirectories, use "--include .".
3244 3244
3245 3245 If no patterns are given to match, this command prints the names
3246 3246 of all files under Mercurial control in the working directory.
3247 3247
3248 3248 If you want to feed the output of this command into the "xargs"
3249 3249 command, use the -0 option to both this command and "xargs". This
3250 3250 will avoid the problem of "xargs" treating single filenames that
3251 3251 contain whitespace as multiple filenames.
3252 3252
3253 3253 See :hg:`help files` for a more versatile command.
3254 3254
3255 3255 Returns 0 if a match is found, 1 otherwise.
3256 3256 """
3257 3257 if opts.get('print0'):
3258 3258 end = '\0'
3259 3259 else:
3260 3260 end = '\n'
3261 3261 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3262 3262
3263 3263 ret = 1
3264 3264 ctx = repo[rev]
3265 3265 m = scmutil.match(ctx, pats, opts, default='relglob',
3266 3266 badfn=lambda x, y: False)
3267 3267
3268 3268 ui.pager('locate')
3269 3269 for abs in ctx.matches(m):
3270 3270 if opts.get('fullpath'):
3271 3271 ui.write(repo.wjoin(abs), end)
3272 3272 else:
3273 3273 ui.write(((pats and m.rel(abs)) or abs), end)
3274 3274 ret = 0
3275 3275
3276 3276 return ret
3277 3277
3278 3278 @command('^log|history',
3279 3279 [('f', 'follow', None,
3280 3280 _('follow changeset history, or file history across copies and renames')),
3281 3281 ('', 'follow-first', None,
3282 3282 _('only follow the first parent of merge changesets (DEPRECATED)')),
3283 3283 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3284 3284 ('C', 'copies', None, _('show copied files')),
3285 3285 ('k', 'keyword', [],
3286 3286 _('do case-insensitive search for a given text'), _('TEXT')),
3287 3287 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3288 3288 ('', 'removed', None, _('include revisions where files were removed')),
3289 3289 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3290 3290 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3291 3291 ('', 'only-branch', [],
3292 3292 _('show only changesets within the given named branch (DEPRECATED)'),
3293 3293 _('BRANCH')),
3294 3294 ('b', 'branch', [],
3295 3295 _('show changesets within the given named branch'), _('BRANCH')),
3296 3296 ('P', 'prune', [],
3297 3297 _('do not display revision or any of its ancestors'), _('REV')),
3298 3298 ] + logopts + walkopts,
3299 3299 _('[OPTION]... [FILE]'),
3300 3300 inferrepo=True)
3301 3301 def log(ui, repo, *pats, **opts):
3302 3302 """show revision history of entire repository or files
3303 3303
3304 3304 Print the revision history of the specified files or the entire
3305 3305 project.
3306 3306
3307 3307 If no revision range is specified, the default is ``tip:0`` unless
3308 3308 --follow is set, in which case the working directory parent is
3309 3309 used as the starting revision.
3310 3310
3311 3311 File history is shown without following rename or copy history of
3312 3312 files. Use -f/--follow with a filename to follow history across
3313 3313 renames and copies. --follow without a filename will only show
3314 3314 ancestors or descendants of the starting revision.
3315 3315
3316 3316 By default this command prints revision number and changeset id,
3317 3317 tags, non-trivial parents, user, date and time, and a summary for
3318 3318 each commit. When the -v/--verbose switch is used, the list of
3319 3319 changed files and full commit message are shown.
3320 3320
3321 3321 With --graph the revisions are shown as an ASCII art DAG with the most
3322 3322 recent changeset at the top.
3323 3323 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3324 3324 and '+' represents a fork where the changeset from the lines below is a
3325 3325 parent of the 'o' merge on the same line.
3326 3326
3327 3327 .. note::
3328 3328
3329 3329 :hg:`log --patch` may generate unexpected diff output for merge
3330 3330 changesets, as it will only compare the merge changeset against
3331 3331 its first parent. Also, only files different from BOTH parents
3332 3332 will appear in files:.
3333 3333
3334 3334 .. note::
3335 3335
3336 3336 For performance reasons, :hg:`log FILE` may omit duplicate changes
3337 3337 made on branches and will not show removals or mode changes. To
3338 3338 see all such changes, use the --removed switch.
3339 3339
3340 3340 .. container:: verbose
3341 3341
3342 3342 Some examples:
3343 3343
3344 3344 - changesets with full descriptions and file lists::
3345 3345
3346 3346 hg log -v
3347 3347
3348 3348 - changesets ancestral to the working directory::
3349 3349
3350 3350 hg log -f
3351 3351
3352 3352 - last 10 commits on the current branch::
3353 3353
3354 3354 hg log -l 10 -b .
3355 3355
3356 3356 - changesets showing all modifications of a file, including removals::
3357 3357
3358 3358 hg log --removed file.c
3359 3359
3360 3360 - all changesets that touch a directory, with diffs, excluding merges::
3361 3361
3362 3362 hg log -Mp lib/
3363 3363
3364 3364 - all revision numbers that match a keyword::
3365 3365
3366 3366 hg log -k bug --template "{rev}\\n"
3367 3367
3368 3368 - the full hash identifier of the working directory parent::
3369 3369
3370 3370 hg log -r . --template "{node}\\n"
3371 3371
3372 3372 - list available log templates::
3373 3373
3374 3374 hg log -T list
3375 3375
3376 3376 - check if a given changeset is included in a tagged release::
3377 3377
3378 3378 hg log -r "a21ccf and ancestor(1.9)"
3379 3379
3380 3380 - find all changesets by some user in a date range::
3381 3381
3382 3382 hg log -k alice -d "may 2008 to jul 2008"
3383 3383
3384 3384 - summary of all changesets after the last tag::
3385 3385
3386 3386 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3387 3387
3388 3388 See :hg:`help dates` for a list of formats valid for -d/--date.
3389 3389
3390 3390 See :hg:`help revisions` for more about specifying and ordering
3391 3391 revisions.
3392 3392
3393 3393 See :hg:`help templates` for more about pre-packaged styles and
3394 3394 specifying custom templates.
3395 3395
3396 3396 Returns 0 on success.
3397 3397
3398 3398 """
3399 3399 opts = pycompat.byteskwargs(opts)
3400 3400 if opts.get('follow') and opts.get('rev'):
3401 3401 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3402 3402 del opts['follow']
3403 3403
3404 3404 if opts.get('graph'):
3405 3405 return cmdutil.graphlog(ui, repo, pats, opts)
3406 3406
3407 3407 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3408 3408 limit = cmdutil.loglimit(opts)
3409 3409 count = 0
3410 3410
3411 3411 getrenamed = None
3412 3412 if opts.get('copies'):
3413 3413 endrev = None
3414 3414 if opts.get('rev'):
3415 3415 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3416 3416 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3417 3417
3418 3418 ui.pager('log')
3419 3419 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3420 3420 for rev in revs:
3421 3421 if count == limit:
3422 3422 break
3423 3423 ctx = repo[rev]
3424 3424 copies = None
3425 3425 if getrenamed is not None and rev:
3426 3426 copies = []
3427 3427 for fn in ctx.files():
3428 3428 rename = getrenamed(fn, rev)
3429 3429 if rename:
3430 3430 copies.append((fn, rename[0]))
3431 3431 if filematcher:
3432 3432 revmatchfn = filematcher(ctx.rev())
3433 3433 else:
3434 3434 revmatchfn = None
3435 3435 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3436 3436 if displayer.flush(ctx):
3437 3437 count += 1
3438 3438
3439 3439 displayer.close()
3440 3440
3441 3441 @command('manifest',
3442 3442 [('r', 'rev', '', _('revision to display'), _('REV')),
3443 3443 ('', 'all', False, _("list files from all revisions"))]
3444 3444 + formatteropts,
3445 3445 _('[-r REV]'))
3446 3446 def manifest(ui, repo, node=None, rev=None, **opts):
3447 3447 """output the current or given revision of the project manifest
3448 3448
3449 3449 Print a list of version controlled files for the given revision.
3450 3450 If no revision is given, the first parent of the working directory
3451 3451 is used, or the null revision if no revision is checked out.
3452 3452
3453 3453 With -v, print file permissions, symlink and executable bits.
3454 3454 With --debug, print file revision hashes.
3455 3455
3456 3456 If option --all is specified, the list of all files from all revisions
3457 3457 is printed. This includes deleted and renamed files.
3458 3458
3459 3459 Returns 0 on success.
3460 3460 """
3461 3461 fm = ui.formatter('manifest', opts)
3462 3462
3463 3463 if opts.get('all'):
3464 3464 if rev or node:
3465 3465 raise error.Abort(_("can't specify a revision with --all"))
3466 3466
3467 3467 res = []
3468 3468 prefix = "data/"
3469 3469 suffix = ".i"
3470 3470 plen = len(prefix)
3471 3471 slen = len(suffix)
3472 3472 with repo.lock():
3473 3473 for fn, b, size in repo.store.datafiles():
3474 3474 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3475 3475 res.append(fn[plen:-slen])
3476 3476 ui.pager('manifest')
3477 3477 for f in res:
3478 3478 fm.startitem()
3479 3479 fm.write("path", '%s\n', f)
3480 3480 fm.end()
3481 3481 return
3482 3482
3483 3483 if rev and node:
3484 3484 raise error.Abort(_("please specify just one revision"))
3485 3485
3486 3486 if not node:
3487 3487 node = rev
3488 3488
3489 3489 char = {'l': '@', 'x': '*', '': ''}
3490 3490 mode = {'l': '644', 'x': '755', '': '644'}
3491 3491 ctx = scmutil.revsingle(repo, node)
3492 3492 mf = ctx.manifest()
3493 3493 ui.pager('manifest')
3494 3494 for f in ctx:
3495 3495 fm.startitem()
3496 3496 fl = ctx[f].flags()
3497 3497 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3498 3498 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3499 3499 fm.write('path', '%s\n', f)
3500 3500 fm.end()
3501 3501
3502 3502 @command('^merge',
3503 3503 [('f', 'force', None,
3504 3504 _('force a merge including outstanding changes (DEPRECATED)')),
3505 3505 ('r', 'rev', '', _('revision to merge'), _('REV')),
3506 3506 ('P', 'preview', None,
3507 3507 _('review revisions to merge (no merge is performed)'))
3508 3508 ] + mergetoolopts,
3509 3509 _('[-P] [[-r] REV]'))
3510 3510 def merge(ui, repo, node=None, **opts):
3511 3511 """merge another revision into working directory
3512 3512
3513 3513 The current working directory is updated with all changes made in
3514 3514 the requested revision since the last common predecessor revision.
3515 3515
3516 3516 Files that changed between either parent are marked as changed for
3517 3517 the next commit and a commit must be performed before any further
3518 3518 updates to the repository are allowed. The next commit will have
3519 3519 two parents.
3520 3520
3521 3521 ``--tool`` can be used to specify the merge tool used for file
3522 3522 merges. It overrides the HGMERGE environment variable and your
3523 3523 configuration files. See :hg:`help merge-tools` for options.
3524 3524
3525 3525 If no revision is specified, the working directory's parent is a
3526 3526 head revision, and the current branch contains exactly one other
3527 3527 head, the other head is merged with by default. Otherwise, an
3528 3528 explicit revision with which to merge with must be provided.
3529 3529
3530 3530 See :hg:`help resolve` for information on handling file conflicts.
3531 3531
3532 3532 To undo an uncommitted merge, use :hg:`update --clean .` which
3533 3533 will check out a clean copy of the original merge parent, losing
3534 3534 all changes.
3535 3535
3536 3536 Returns 0 on success, 1 if there are unresolved files.
3537 3537 """
3538 3538
3539 3539 if opts.get('rev') and node:
3540 3540 raise error.Abort(_("please specify just one revision"))
3541 3541 if not node:
3542 3542 node = opts.get('rev')
3543 3543
3544 3544 if node:
3545 3545 node = scmutil.revsingle(repo, node).node()
3546 3546
3547 3547 if not node:
3548 3548 node = repo[destutil.destmerge(repo)].node()
3549 3549
3550 3550 if opts.get('preview'):
3551 3551 # find nodes that are ancestors of p2 but not of p1
3552 3552 p1 = repo.lookup('.')
3553 3553 p2 = repo.lookup(node)
3554 3554 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3555 3555
3556 3556 displayer = cmdutil.show_changeset(ui, repo, opts)
3557 3557 for node in nodes:
3558 3558 displayer.show(repo[node])
3559 3559 displayer.close()
3560 3560 return 0
3561 3561
3562 3562 try:
3563 3563 # ui.forcemerge is an internal variable, do not document
3564 3564 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3565 3565 force = opts.get('force')
3566 3566 labels = ['working copy', 'merge rev']
3567 3567 return hg.merge(repo, node, force=force, mergeforce=force,
3568 3568 labels=labels)
3569 3569 finally:
3570 3570 ui.setconfig('ui', 'forcemerge', '', 'merge')
3571 3571
3572 3572 @command('outgoing|out',
3573 3573 [('f', 'force', None, _('run even when the destination is unrelated')),
3574 3574 ('r', 'rev', [],
3575 3575 _('a changeset intended to be included in the destination'), _('REV')),
3576 3576 ('n', 'newest-first', None, _('show newest record first')),
3577 3577 ('B', 'bookmarks', False, _('compare bookmarks')),
3578 3578 ('b', 'branch', [], _('a specific branch you would like to push'),
3579 3579 _('BRANCH')),
3580 3580 ] + logopts + remoteopts + subrepoopts,
3581 3581 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3582 3582 def outgoing(ui, repo, dest=None, **opts):
3583 3583 """show changesets not found in the destination
3584 3584
3585 3585 Show changesets not found in the specified destination repository
3586 3586 or the default push location. These are the changesets that would
3587 3587 be pushed if a push was requested.
3588 3588
3589 3589 See pull for details of valid destination formats.
3590 3590
3591 3591 .. container:: verbose
3592 3592
3593 3593 With -B/--bookmarks, the result of bookmark comparison between
3594 3594 local and remote repositories is displayed. With -v/--verbose,
3595 3595 status is also displayed for each bookmark like below::
3596 3596
3597 3597 BM1 01234567890a added
3598 3598 BM2 deleted
3599 3599 BM3 234567890abc advanced
3600 3600 BM4 34567890abcd diverged
3601 3601 BM5 4567890abcde changed
3602 3602
3603 3603 The action taken when pushing depends on the
3604 3604 status of each bookmark:
3605 3605
3606 3606 :``added``: push with ``-B`` will create it
3607 3607 :``deleted``: push with ``-B`` will delete it
3608 3608 :``advanced``: push will update it
3609 3609 :``diverged``: push with ``-B`` will update it
3610 3610 :``changed``: push with ``-B`` will update it
3611 3611
3612 3612 From the point of view of pushing behavior, bookmarks
3613 3613 existing only in the remote repository are treated as
3614 3614 ``deleted``, even if it is in fact added remotely.
3615 3615
3616 3616 Returns 0 if there are outgoing changes, 1 otherwise.
3617 3617 """
3618 3618 if opts.get('graph'):
3619 3619 cmdutil.checkunsupportedgraphflags([], opts)
3620 3620 o, other = hg._outgoing(ui, repo, dest, opts)
3621 3621 if not o:
3622 3622 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3623 3623 return
3624 3624
3625 3625 revdag = cmdutil.graphrevs(repo, o, opts)
3626 3626 ui.pager('outgoing')
3627 3627 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3628 3628 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3629 3629 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3630 3630 return 0
3631 3631
3632 3632 if opts.get('bookmarks'):
3633 3633 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3634 3634 dest, branches = hg.parseurl(dest, opts.get('branch'))
3635 3635 other = hg.peer(repo, opts, dest)
3636 3636 if 'bookmarks' not in other.listkeys('namespaces'):
3637 3637 ui.warn(_("remote doesn't support bookmarks\n"))
3638 3638 return 0
3639 3639 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3640 3640 ui.pager('outgoing')
3641 3641 return bookmarks.outgoing(ui, repo, other)
3642 3642
3643 3643 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3644 3644 try:
3645 3645 return hg.outgoing(ui, repo, dest, opts)
3646 3646 finally:
3647 3647 del repo._subtoppath
3648 3648
3649 3649 @command('parents',
3650 3650 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3651 3651 ] + templateopts,
3652 3652 _('[-r REV] [FILE]'),
3653 3653 inferrepo=True)
3654 3654 def parents(ui, repo, file_=None, **opts):
3655 3655 """show the parents of the working directory or revision (DEPRECATED)
3656 3656
3657 3657 Print the working directory's parent revisions. If a revision is
3658 3658 given via -r/--rev, the parent of that revision will be printed.
3659 3659 If a file argument is given, the revision in which the file was
3660 3660 last changed (before the working directory revision or the
3661 3661 argument to --rev if given) is printed.
3662 3662
3663 3663 This command is equivalent to::
3664 3664
3665 3665 hg log -r "p1()+p2()" or
3666 3666 hg log -r "p1(REV)+p2(REV)" or
3667 3667 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3668 3668 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3669 3669
3670 3670 See :hg:`summary` and :hg:`help revsets` for related information.
3671 3671
3672 3672 Returns 0 on success.
3673 3673 """
3674 3674
3675 3675 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3676 3676
3677 3677 if file_:
3678 3678 m = scmutil.match(ctx, (file_,), opts)
3679 3679 if m.anypats() or len(m.files()) != 1:
3680 3680 raise error.Abort(_('can only specify an explicit filename'))
3681 3681 file_ = m.files()[0]
3682 3682 filenodes = []
3683 3683 for cp in ctx.parents():
3684 3684 if not cp:
3685 3685 continue
3686 3686 try:
3687 3687 filenodes.append(cp.filenode(file_))
3688 3688 except error.LookupError:
3689 3689 pass
3690 3690 if not filenodes:
3691 3691 raise error.Abort(_("'%s' not found in manifest!") % file_)
3692 3692 p = []
3693 3693 for fn in filenodes:
3694 3694 fctx = repo.filectx(file_, fileid=fn)
3695 3695 p.append(fctx.node())
3696 3696 else:
3697 3697 p = [cp.node() for cp in ctx.parents()]
3698 3698
3699 3699 displayer = cmdutil.show_changeset(ui, repo, opts)
3700 3700 for n in p:
3701 3701 if n != nullid:
3702 3702 displayer.show(repo[n])
3703 3703 displayer.close()
3704 3704
3705 3705 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3706 3706 def paths(ui, repo, search=None, **opts):
3707 3707 """show aliases for remote repositories
3708 3708
3709 3709 Show definition of symbolic path name NAME. If no name is given,
3710 3710 show definition of all available names.
3711 3711
3712 3712 Option -q/--quiet suppresses all output when searching for NAME
3713 3713 and shows only the path names when listing all definitions.
3714 3714
3715 3715 Path names are defined in the [paths] section of your
3716 3716 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3717 3717 repository, ``.hg/hgrc`` is used, too.
3718 3718
3719 3719 The path names ``default`` and ``default-push`` have a special
3720 3720 meaning. When performing a push or pull operation, they are used
3721 3721 as fallbacks if no location is specified on the command-line.
3722 3722 When ``default-push`` is set, it will be used for push and
3723 3723 ``default`` will be used for pull; otherwise ``default`` is used
3724 3724 as the fallback for both. When cloning a repository, the clone
3725 3725 source is written as ``default`` in ``.hg/hgrc``.
3726 3726
3727 3727 .. note::
3728 3728
3729 3729 ``default`` and ``default-push`` apply to all inbound (e.g.
3730 3730 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3731 3731 and :hg:`bundle`) operations.
3732 3732
3733 3733 See :hg:`help urls` for more information.
3734 3734
3735 3735 Returns 0 on success.
3736 3736 """
3737 3737 ui.pager('paths')
3738 3738 if search:
3739 3739 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3740 3740 if name == search]
3741 3741 else:
3742 3742 pathitems = sorted(ui.paths.iteritems())
3743 3743
3744 3744 fm = ui.formatter('paths', opts)
3745 3745 if fm.isplain():
3746 3746 hidepassword = util.hidepassword
3747 3747 else:
3748 3748 hidepassword = str
3749 3749 if ui.quiet:
3750 3750 namefmt = '%s\n'
3751 3751 else:
3752 3752 namefmt = '%s = '
3753 3753 showsubopts = not search and not ui.quiet
3754 3754
3755 3755 for name, path in pathitems:
3756 3756 fm.startitem()
3757 3757 fm.condwrite(not search, 'name', namefmt, name)
3758 3758 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3759 3759 for subopt, value in sorted(path.suboptions.items()):
3760 3760 assert subopt not in ('name', 'url')
3761 3761 if showsubopts:
3762 3762 fm.plain('%s:%s = ' % (name, subopt))
3763 3763 fm.condwrite(showsubopts, subopt, '%s\n', value)
3764 3764
3765 3765 fm.end()
3766 3766
3767 3767 if search and not pathitems:
3768 3768 if not ui.quiet:
3769 3769 ui.warn(_("not found!\n"))
3770 3770 return 1
3771 3771 else:
3772 3772 return 0
3773 3773
3774 3774 @command('phase',
3775 3775 [('p', 'public', False, _('set changeset phase to public')),
3776 3776 ('d', 'draft', False, _('set changeset phase to draft')),
3777 3777 ('s', 'secret', False, _('set changeset phase to secret')),
3778 3778 ('f', 'force', False, _('allow to move boundary backward')),
3779 3779 ('r', 'rev', [], _('target revision'), _('REV')),
3780 3780 ],
3781 3781 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3782 3782 def phase(ui, repo, *revs, **opts):
3783 3783 """set or show the current phase name
3784 3784
3785 3785 With no argument, show the phase name of the current revision(s).
3786 3786
3787 3787 With one of -p/--public, -d/--draft or -s/--secret, change the
3788 3788 phase value of the specified revisions.
3789 3789
3790 3790 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3791 3791 lower phase to an higher phase. Phases are ordered as follows::
3792 3792
3793 3793 public < draft < secret
3794 3794
3795 3795 Returns 0 on success, 1 if some phases could not be changed.
3796 3796
3797 3797 (For more information about the phases concept, see :hg:`help phases`.)
3798 3798 """
3799 3799 # search for a unique phase argument
3800 3800 targetphase = None
3801 3801 for idx, name in enumerate(phases.phasenames):
3802 3802 if opts[name]:
3803 3803 if targetphase is not None:
3804 3804 raise error.Abort(_('only one phase can be specified'))
3805 3805 targetphase = idx
3806 3806
3807 3807 # look for specified revision
3808 3808 revs = list(revs)
3809 3809 revs.extend(opts['rev'])
3810 3810 if not revs:
3811 3811 # display both parents as the second parent phase can influence
3812 3812 # the phase of a merge commit
3813 3813 revs = [c.rev() for c in repo[None].parents()]
3814 3814
3815 3815 revs = scmutil.revrange(repo, revs)
3816 3816
3817 3817 lock = None
3818 3818 ret = 0
3819 3819 if targetphase is None:
3820 3820 # display
3821 3821 for r in revs:
3822 3822 ctx = repo[r]
3823 3823 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3824 3824 else:
3825 3825 tr = None
3826 3826 lock = repo.lock()
3827 3827 try:
3828 3828 tr = repo.transaction("phase")
3829 3829 # set phase
3830 3830 if not revs:
3831 3831 raise error.Abort(_('empty revision set'))
3832 3832 nodes = [repo[r].node() for r in revs]
3833 3833 # moving revision from public to draft may hide them
3834 3834 # We have to check result on an unfiltered repository
3835 3835 unfi = repo.unfiltered()
3836 3836 getphase = unfi._phasecache.phase
3837 3837 olddata = [getphase(unfi, r) for r in unfi]
3838 3838 phases.advanceboundary(repo, tr, targetphase, nodes)
3839 3839 if opts['force']:
3840 3840 phases.retractboundary(repo, tr, targetphase, nodes)
3841 3841 tr.close()
3842 3842 finally:
3843 3843 if tr is not None:
3844 3844 tr.release()
3845 3845 lock.release()
3846 3846 getphase = unfi._phasecache.phase
3847 3847 newdata = [getphase(unfi, r) for r in unfi]
3848 3848 changes = sum(newdata[r] != olddata[r] for r in unfi)
3849 3849 cl = unfi.changelog
3850 3850 rejected = [n for n in nodes
3851 3851 if newdata[cl.rev(n)] < targetphase]
3852 3852 if rejected:
3853 3853 ui.warn(_('cannot move %i changesets to a higher '
3854 3854 'phase, use --force\n') % len(rejected))
3855 3855 ret = 1
3856 3856 if changes:
3857 3857 msg = _('phase changed for %i changesets\n') % changes
3858 3858 if ret:
3859 3859 ui.status(msg)
3860 3860 else:
3861 3861 ui.note(msg)
3862 3862 else:
3863 3863 ui.warn(_('no phases changed\n'))
3864 3864 return ret
3865 3865
3866 3866 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3867 3867 """Run after a changegroup has been added via pull/unbundle
3868 3868
3869 3869 This takes arguments below:
3870 3870
3871 3871 :modheads: change of heads by pull/unbundle
3872 3872 :optupdate: updating working directory is needed or not
3873 3873 :checkout: update destination revision (or None to default destination)
3874 3874 :brev: a name, which might be a bookmark to be activated after updating
3875 3875 """
3876 3876 if modheads == 0:
3877 3877 return
3878 3878 if optupdate:
3879 3879 try:
3880 3880 return hg.updatetotally(ui, repo, checkout, brev)
3881 3881 except error.UpdateAbort as inst:
3882 3882 msg = _("not updating: %s") % str(inst)
3883 3883 hint = inst.hint
3884 3884 raise error.UpdateAbort(msg, hint=hint)
3885 3885 if modheads > 1:
3886 3886 currentbranchheads = len(repo.branchheads())
3887 3887 if currentbranchheads == modheads:
3888 3888 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3889 3889 elif currentbranchheads > 1:
3890 3890 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3891 3891 "merge)\n"))
3892 3892 else:
3893 3893 ui.status(_("(run 'hg heads' to see heads)\n"))
3894 3894 else:
3895 3895 ui.status(_("(run 'hg update' to get a working copy)\n"))
3896 3896
3897 3897 @command('^pull',
3898 3898 [('u', 'update', None,
3899 3899 _('update to new branch head if changesets were pulled')),
3900 3900 ('f', 'force', None, _('run even when remote repository is unrelated')),
3901 3901 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3902 3902 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3903 3903 ('b', 'branch', [], _('a specific branch you would like to pull'),
3904 3904 _('BRANCH')),
3905 3905 ] + remoteopts,
3906 3906 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3907 3907 def pull(ui, repo, source="default", **opts):
3908 3908 """pull changes from the specified source
3909 3909
3910 3910 Pull changes from a remote repository to a local one.
3911 3911
3912 3912 This finds all changes from the repository at the specified path
3913 3913 or URL and adds them to a local repository (the current one unless
3914 3914 -R is specified). By default, this does not update the copy of the
3915 3915 project in the working directory.
3916 3916
3917 3917 Use :hg:`incoming` if you want to see what would have been added
3918 3918 by a pull at the time you issued this command. If you then decide
3919 3919 to add those changes to the repository, you should use :hg:`pull
3920 3920 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3921 3921
3922 3922 If SOURCE is omitted, the 'default' path will be used.
3923 3923 See :hg:`help urls` for more information.
3924 3924
3925 3925 Specifying bookmark as ``.`` is equivalent to specifying the active
3926 3926 bookmark's name.
3927 3927
3928 3928 Returns 0 on success, 1 if an update had unresolved files.
3929 3929 """
3930 3930 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3931 3931 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3932 3932 other = hg.peer(repo, opts, source)
3933 3933 try:
3934 3934 revs, checkout = hg.addbranchrevs(repo, other, branches,
3935 3935 opts.get('rev'))
3936 3936
3937 3937
3938 3938 pullopargs = {}
3939 3939 if opts.get('bookmark'):
3940 3940 if not revs:
3941 3941 revs = []
3942 3942 # The list of bookmark used here is not the one used to actually
3943 3943 # update the bookmark name. This can result in the revision pulled
3944 3944 # not ending up with the name of the bookmark because of a race
3945 3945 # condition on the server. (See issue 4689 for details)
3946 3946 remotebookmarks = other.listkeys('bookmarks')
3947 3947 pullopargs['remotebookmarks'] = remotebookmarks
3948 3948 for b in opts['bookmark']:
3949 3949 b = repo._bookmarks.expandname(b)
3950 3950 if b not in remotebookmarks:
3951 3951 raise error.Abort(_('remote bookmark %s not found!') % b)
3952 3952 revs.append(remotebookmarks[b])
3953 3953
3954 3954 if revs:
3955 3955 try:
3956 3956 # When 'rev' is a bookmark name, we cannot guarantee that it
3957 3957 # will be updated with that name because of a race condition
3958 3958 # server side. (See issue 4689 for details)
3959 3959 oldrevs = revs
3960 3960 revs = [] # actually, nodes
3961 3961 for r in oldrevs:
3962 3962 node = other.lookup(r)
3963 3963 revs.append(node)
3964 3964 if r == checkout:
3965 3965 checkout = node
3966 3966 except error.CapabilityError:
3967 3967 err = _("other repository doesn't support revision lookup, "
3968 3968 "so a rev cannot be specified.")
3969 3969 raise error.Abort(err)
3970 3970
3971 3971 pullopargs.update(opts.get('opargs', {}))
3972 3972 modheads = exchange.pull(repo, other, heads=revs,
3973 3973 force=opts.get('force'),
3974 3974 bookmarks=opts.get('bookmark', ()),
3975 3975 opargs=pullopargs).cgresult
3976 3976
3977 3977 # brev is a name, which might be a bookmark to be activated at
3978 3978 # the end of the update. In other words, it is an explicit
3979 3979 # destination of the update
3980 3980 brev = None
3981 3981
3982 3982 if checkout:
3983 3983 checkout = str(repo.changelog.rev(checkout))
3984 3984
3985 3985 # order below depends on implementation of
3986 3986 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3987 3987 # because 'checkout' is determined without it.
3988 3988 if opts.get('rev'):
3989 3989 brev = opts['rev'][0]
3990 3990 elif opts.get('branch'):
3991 3991 brev = opts['branch'][0]
3992 3992 else:
3993 3993 brev = branches[0]
3994 3994 repo._subtoppath = source
3995 3995 try:
3996 3996 ret = postincoming(ui, repo, modheads, opts.get('update'),
3997 3997 checkout, brev)
3998 3998
3999 3999 finally:
4000 4000 del repo._subtoppath
4001 4001
4002 4002 finally:
4003 4003 other.close()
4004 4004 return ret
4005 4005
4006 4006 @command('^push',
4007 4007 [('f', 'force', None, _('force push')),
4008 4008 ('r', 'rev', [],
4009 4009 _('a changeset intended to be included in the destination'),
4010 4010 _('REV')),
4011 4011 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4012 4012 ('b', 'branch', [],
4013 4013 _('a specific branch you would like to push'), _('BRANCH')),
4014 4014 ('', 'new-branch', False, _('allow pushing a new branch')),
4015 4015 ] + remoteopts,
4016 4016 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4017 4017 def push(ui, repo, dest=None, **opts):
4018 4018 """push changes to the specified destination
4019 4019
4020 4020 Push changesets from the local repository to the specified
4021 4021 destination.
4022 4022
4023 4023 This operation is symmetrical to pull: it is identical to a pull
4024 4024 in the destination repository from the current one.
4025 4025
4026 4026 By default, push will not allow creation of new heads at the
4027 4027 destination, since multiple heads would make it unclear which head
4028 4028 to use. In this situation, it is recommended to pull and merge
4029 4029 before pushing.
4030 4030
4031 4031 Use --new-branch if you want to allow push to create a new named
4032 4032 branch that is not present at the destination. This allows you to
4033 4033 only create a new branch without forcing other changes.
4034 4034
4035 4035 .. note::
4036 4036
4037 4037 Extra care should be taken with the -f/--force option,
4038 4038 which will push all new heads on all branches, an action which will
4039 4039 almost always cause confusion for collaborators.
4040 4040
4041 4041 If -r/--rev is used, the specified revision and all its ancestors
4042 4042 will be pushed to the remote repository.
4043 4043
4044 4044 If -B/--bookmark is used, the specified bookmarked revision, its
4045 4045 ancestors, and the bookmark will be pushed to the remote
4046 4046 repository. Specifying ``.`` is equivalent to specifying the active
4047 4047 bookmark's name.
4048 4048
4049 4049 Please see :hg:`help urls` for important details about ``ssh://``
4050 4050 URLs. If DESTINATION is omitted, a default path will be used.
4051 4051
4052 4052 Returns 0 if push was successful, 1 if nothing to push.
4053 4053 """
4054 4054
4055 4055 if opts.get('bookmark'):
4056 4056 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4057 4057 for b in opts['bookmark']:
4058 4058 # translate -B options to -r so changesets get pushed
4059 4059 b = repo._bookmarks.expandname(b)
4060 4060 if b in repo._bookmarks:
4061 4061 opts.setdefault('rev', []).append(b)
4062 4062 else:
4063 4063 # if we try to push a deleted bookmark, translate it to null
4064 4064 # this lets simultaneous -r, -b options continue working
4065 4065 opts.setdefault('rev', []).append("null")
4066 4066
4067 4067 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4068 4068 if not path:
4069 4069 raise error.Abort(_('default repository not configured!'),
4070 4070 hint=_("see 'hg help config.paths'"))
4071 4071 dest = path.pushloc or path.loc
4072 4072 branches = (path.branch, opts.get('branch') or [])
4073 4073 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4074 4074 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4075 4075 other = hg.peer(repo, opts, dest)
4076 4076
4077 4077 if revs:
4078 4078 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4079 4079 if not revs:
4080 4080 raise error.Abort(_("specified revisions evaluate to an empty set"),
4081 4081 hint=_("use different revision arguments"))
4082 4082 elif path.pushrev:
4083 4083 # It doesn't make any sense to specify ancestor revisions. So limit
4084 4084 # to DAG heads to make discovery simpler.
4085 4085 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4086 4086 revs = scmutil.revrange(repo, [expr])
4087 4087 revs = [repo[rev].node() for rev in revs]
4088 4088 if not revs:
4089 4089 raise error.Abort(_('default push revset for path evaluates to an '
4090 4090 'empty set'))
4091 4091
4092 4092 repo._subtoppath = dest
4093 4093 try:
4094 4094 # push subrepos depth-first for coherent ordering
4095 4095 c = repo['']
4096 4096 subs = c.substate # only repos that are committed
4097 4097 for s in sorted(subs):
4098 4098 result = c.sub(s).push(opts)
4099 4099 if result == 0:
4100 4100 return not result
4101 4101 finally:
4102 4102 del repo._subtoppath
4103 4103 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4104 4104 newbranch=opts.get('new_branch'),
4105 4105 bookmarks=opts.get('bookmark', ()),
4106 4106 opargs=opts.get('opargs'))
4107 4107
4108 4108 result = not pushop.cgresult
4109 4109
4110 4110 if pushop.bkresult is not None:
4111 4111 if pushop.bkresult == 2:
4112 4112 result = 2
4113 4113 elif not result and pushop.bkresult:
4114 4114 result = 2
4115 4115
4116 4116 return result
4117 4117
4118 4118 @command('recover', [])
4119 4119 def recover(ui, repo):
4120 4120 """roll back an interrupted transaction
4121 4121
4122 4122 Recover from an interrupted commit or pull.
4123 4123
4124 4124 This command tries to fix the repository status after an
4125 4125 interrupted operation. It should only be necessary when Mercurial
4126 4126 suggests it.
4127 4127
4128 4128 Returns 0 if successful, 1 if nothing to recover or verify fails.
4129 4129 """
4130 4130 if repo.recover():
4131 4131 return hg.verify(repo)
4132 4132 return 1
4133 4133
4134 4134 @command('^remove|rm',
4135 4135 [('A', 'after', None, _('record delete for missing files')),
4136 4136 ('f', 'force', None,
4137 4137 _('forget added files, delete modified files')),
4138 4138 ] + subrepoopts + walkopts,
4139 4139 _('[OPTION]... FILE...'),
4140 4140 inferrepo=True)
4141 4141 def remove(ui, repo, *pats, **opts):
4142 4142 """remove the specified files on the next commit
4143 4143
4144 4144 Schedule the indicated files for removal from the current branch.
4145 4145
4146 4146 This command schedules the files to be removed at the next commit.
4147 4147 To undo a remove before that, see :hg:`revert`. To undo added
4148 4148 files, see :hg:`forget`.
4149 4149
4150 4150 .. container:: verbose
4151 4151
4152 4152 -A/--after can be used to remove only files that have already
4153 4153 been deleted, -f/--force can be used to force deletion, and -Af
4154 4154 can be used to remove files from the next revision without
4155 4155 deleting them from the working directory.
4156 4156
4157 4157 The following table details the behavior of remove for different
4158 4158 file states (columns) and option combinations (rows). The file
4159 4159 states are Added [A], Clean [C], Modified [M] and Missing [!]
4160 4160 (as reported by :hg:`status`). The actions are Warn, Remove
4161 4161 (from branch) and Delete (from disk):
4162 4162
4163 4163 ========= == == == ==
4164 4164 opt/state A C M !
4165 4165 ========= == == == ==
4166 4166 none W RD W R
4167 4167 -f R RD RD R
4168 4168 -A W W W R
4169 4169 -Af R R R R
4170 4170 ========= == == == ==
4171 4171
4172 4172 .. note::
4173 4173
4174 4174 :hg:`remove` never deletes files in Added [A] state from the
4175 4175 working directory, not even if ``--force`` is specified.
4176 4176
4177 4177 Returns 0 on success, 1 if any warnings encountered.
4178 4178 """
4179 4179
4180 4180 after, force = opts.get('after'), opts.get('force')
4181 4181 if not pats and not after:
4182 4182 raise error.Abort(_('no files specified'))
4183 4183
4184 4184 m = scmutil.match(repo[None], pats, opts)
4185 4185 subrepos = opts.get('subrepos')
4186 4186 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4187 4187
4188 4188 @command('rename|move|mv',
4189 4189 [('A', 'after', None, _('record a rename that has already occurred')),
4190 4190 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4191 4191 ] + walkopts + dryrunopts,
4192 4192 _('[OPTION]... SOURCE... DEST'))
4193 4193 def rename(ui, repo, *pats, **opts):
4194 4194 """rename files; equivalent of copy + remove
4195 4195
4196 4196 Mark dest as copies of sources; mark sources for deletion. If dest
4197 4197 is a directory, copies are put in that directory. If dest is a
4198 4198 file, there can only be one source.
4199 4199
4200 4200 By default, this command copies the contents of files as they
4201 4201 exist in the working directory. If invoked with -A/--after, the
4202 4202 operation is recorded, but no copying is performed.
4203 4203
4204 4204 This command takes effect at the next commit. To undo a rename
4205 4205 before that, see :hg:`revert`.
4206 4206
4207 4207 Returns 0 on success, 1 if errors are encountered.
4208 4208 """
4209 4209 with repo.wlock(False):
4210 4210 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4211 4211
4212 4212 @command('resolve',
4213 4213 [('a', 'all', None, _('select all unresolved files')),
4214 4214 ('l', 'list', None, _('list state of files needing merge')),
4215 4215 ('m', 'mark', None, _('mark files as resolved')),
4216 4216 ('u', 'unmark', None, _('mark files as unresolved')),
4217 4217 ('n', 'no-status', None, _('hide status prefix'))]
4218 4218 + mergetoolopts + walkopts + formatteropts,
4219 4219 _('[OPTION]... [FILE]...'),
4220 4220 inferrepo=True)
4221 4221 def resolve(ui, repo, *pats, **opts):
4222 4222 """redo merges or set/view the merge status of files
4223 4223
4224 4224 Merges with unresolved conflicts are often the result of
4225 4225 non-interactive merging using the ``internal:merge`` configuration
4226 4226 setting, or a command-line merge tool like ``diff3``. The resolve
4227 4227 command is used to manage the files involved in a merge, after
4228 4228 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4229 4229 working directory must have two parents). See :hg:`help
4230 4230 merge-tools` for information on configuring merge tools.
4231 4231
4232 4232 The resolve command can be used in the following ways:
4233 4233
4234 4234 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4235 4235 files, discarding any previous merge attempts. Re-merging is not
4236 4236 performed for files already marked as resolved. Use ``--all/-a``
4237 4237 to select all unresolved files. ``--tool`` can be used to specify
4238 4238 the merge tool used for the given files. It overrides the HGMERGE
4239 4239 environment variable and your configuration files. Previous file
4240 4240 contents are saved with a ``.orig`` suffix.
4241 4241
4242 4242 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4243 4243 (e.g. after having manually fixed-up the files). The default is
4244 4244 to mark all unresolved files.
4245 4245
4246 4246 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4247 4247 default is to mark all resolved files.
4248 4248
4249 4249 - :hg:`resolve -l`: list files which had or still have conflicts.
4250 4250 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4251 4251 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4252 4252 the list. See :hg:`help filesets` for details.
4253 4253
4254 4254 .. note::
4255 4255
4256 4256 Mercurial will not let you commit files with unresolved merge
4257 4257 conflicts. You must use :hg:`resolve -m ...` before you can
4258 4258 commit after a conflicting merge.
4259 4259
4260 4260 Returns 0 on success, 1 if any files fail a resolve attempt.
4261 4261 """
4262 4262
4263 4263 flaglist = 'all mark unmark list no_status'.split()
4264 4264 all, mark, unmark, show, nostatus = \
4265 4265 [opts.get(o) for o in flaglist]
4266 4266
4267 4267 if (show and (mark or unmark)) or (mark and unmark):
4268 4268 raise error.Abort(_("too many options specified"))
4269 4269 if pats and all:
4270 4270 raise error.Abort(_("can't specify --all and patterns"))
4271 4271 if not (all or pats or show or mark or unmark):
4272 4272 raise error.Abort(_('no files or directories specified'),
4273 4273 hint=('use --all to re-merge all unresolved files'))
4274 4274
4275 4275 if show:
4276 4276 ui.pager('resolve')
4277 4277 fm = ui.formatter('resolve', opts)
4278 4278 ms = mergemod.mergestate.read(repo)
4279 4279 m = scmutil.match(repo[None], pats, opts)
4280 4280 for f in ms:
4281 4281 if not m(f):
4282 4282 continue
4283 4283 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4284 4284 'd': 'driverresolved'}[ms[f]]
4285 4285 fm.startitem()
4286 4286 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4287 4287 fm.write('path', '%s\n', f, label=l)
4288 4288 fm.end()
4289 4289 return 0
4290 4290
4291 4291 with repo.wlock():
4292 4292 ms = mergemod.mergestate.read(repo)
4293 4293
4294 4294 if not (ms.active() or repo.dirstate.p2() != nullid):
4295 4295 raise error.Abort(
4296 4296 _('resolve command not applicable when not merging'))
4297 4297
4298 4298 wctx = repo[None]
4299 4299
4300 4300 if ms.mergedriver and ms.mdstate() == 'u':
4301 4301 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4302 4302 ms.commit()
4303 4303 # allow mark and unmark to go through
4304 4304 if not mark and not unmark and not proceed:
4305 4305 return 1
4306 4306
4307 4307 m = scmutil.match(wctx, pats, opts)
4308 4308 ret = 0
4309 4309 didwork = False
4310 4310 runconclude = False
4311 4311
4312 4312 tocomplete = []
4313 4313 for f in ms:
4314 4314 if not m(f):
4315 4315 continue
4316 4316
4317 4317 didwork = True
4318 4318
4319 4319 # don't let driver-resolved files be marked, and run the conclude
4320 4320 # step if asked to resolve
4321 4321 if ms[f] == "d":
4322 4322 exact = m.exact(f)
4323 4323 if mark:
4324 4324 if exact:
4325 4325 ui.warn(_('not marking %s as it is driver-resolved\n')
4326 4326 % f)
4327 4327 elif unmark:
4328 4328 if exact:
4329 4329 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4330 4330 % f)
4331 4331 else:
4332 4332 runconclude = True
4333 4333 continue
4334 4334
4335 4335 if mark:
4336 4336 ms.mark(f, "r")
4337 4337 elif unmark:
4338 4338 ms.mark(f, "u")
4339 4339 else:
4340 4340 # backup pre-resolve (merge uses .orig for its own purposes)
4341 4341 a = repo.wjoin(f)
4342 4342 try:
4343 4343 util.copyfile(a, a + ".resolve")
4344 4344 except (IOError, OSError) as inst:
4345 4345 if inst.errno != errno.ENOENT:
4346 4346 raise
4347 4347
4348 4348 try:
4349 4349 # preresolve file
4350 4350 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4351 4351 'resolve')
4352 4352 complete, r = ms.preresolve(f, wctx)
4353 4353 if not complete:
4354 4354 tocomplete.append(f)
4355 4355 elif r:
4356 4356 ret = 1
4357 4357 finally:
4358 4358 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4359 4359 ms.commit()
4360 4360
4361 4361 # replace filemerge's .orig file with our resolve file, but only
4362 4362 # for merges that are complete
4363 4363 if complete:
4364 4364 try:
4365 4365 util.rename(a + ".resolve",
4366 4366 scmutil.origpath(ui, repo, a))
4367 4367 except OSError as inst:
4368 4368 if inst.errno != errno.ENOENT:
4369 4369 raise
4370 4370
4371 4371 for f in tocomplete:
4372 4372 try:
4373 4373 # resolve file
4374 4374 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4375 4375 'resolve')
4376 4376 r = ms.resolve(f, wctx)
4377 4377 if r:
4378 4378 ret = 1
4379 4379 finally:
4380 4380 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4381 4381 ms.commit()
4382 4382
4383 4383 # replace filemerge's .orig file with our resolve file
4384 4384 a = repo.wjoin(f)
4385 4385 try:
4386 4386 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4387 4387 except OSError as inst:
4388 4388 if inst.errno != errno.ENOENT:
4389 4389 raise
4390 4390
4391 4391 ms.commit()
4392 4392 ms.recordactions()
4393 4393
4394 4394 if not didwork and pats:
4395 4395 hint = None
4396 4396 if not any([p for p in pats if p.find(':') >= 0]):
4397 4397 pats = ['path:%s' % p for p in pats]
4398 4398 m = scmutil.match(wctx, pats, opts)
4399 4399 for f in ms:
4400 4400 if not m(f):
4401 4401 continue
4402 4402 flags = ''.join(['-%s ' % o[0] for o in flaglist
4403 4403 if opts.get(o)])
4404 4404 hint = _("(try: hg resolve %s%s)\n") % (
4405 4405 flags,
4406 4406 ' '.join(pats))
4407 4407 break
4408 4408 ui.warn(_("arguments do not match paths that need resolving\n"))
4409 4409 if hint:
4410 4410 ui.warn(hint)
4411 4411 elif ms.mergedriver and ms.mdstate() != 's':
4412 4412 # run conclude step when either a driver-resolved file is requested
4413 4413 # or there are no driver-resolved files
4414 4414 # we can't use 'ret' to determine whether any files are unresolved
4415 4415 # because we might not have tried to resolve some
4416 4416 if ((runconclude or not list(ms.driverresolved()))
4417 4417 and not list(ms.unresolved())):
4418 4418 proceed = mergemod.driverconclude(repo, ms, wctx)
4419 4419 ms.commit()
4420 4420 if not proceed:
4421 4421 return 1
4422 4422
4423 4423 # Nudge users into finishing an unfinished operation
4424 4424 unresolvedf = list(ms.unresolved())
4425 4425 driverresolvedf = list(ms.driverresolved())
4426 4426 if not unresolvedf and not driverresolvedf:
4427 4427 ui.status(_('(no more unresolved files)\n'))
4428 4428 cmdutil.checkafterresolved(repo)
4429 4429 elif not unresolvedf:
4430 4430 ui.status(_('(no more unresolved files -- '
4431 4431 'run "hg resolve --all" to conclude)\n'))
4432 4432
4433 4433 return ret
4434 4434
4435 4435 @command('revert',
4436 4436 [('a', 'all', None, _('revert all changes when no arguments given')),
4437 4437 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4438 4438 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4439 4439 ('C', 'no-backup', None, _('do not save backup copies of files')),
4440 4440 ('i', 'interactive', None,
4441 4441 _('interactively select the changes (EXPERIMENTAL)')),
4442 4442 ] + walkopts + dryrunopts,
4443 4443 _('[OPTION]... [-r REV] [NAME]...'))
4444 4444 def revert(ui, repo, *pats, **opts):
4445 4445 """restore files to their checkout state
4446 4446
4447 4447 .. note::
4448 4448
4449 4449 To check out earlier revisions, you should use :hg:`update REV`.
4450 4450 To cancel an uncommitted merge (and lose your changes),
4451 4451 use :hg:`update --clean .`.
4452 4452
4453 4453 With no revision specified, revert the specified files or directories
4454 4454 to the contents they had in the parent of the working directory.
4455 4455 This restores the contents of files to an unmodified
4456 4456 state and unschedules adds, removes, copies, and renames. If the
4457 4457 working directory has two parents, you must explicitly specify a
4458 4458 revision.
4459 4459
4460 4460 Using the -r/--rev or -d/--date options, revert the given files or
4461 4461 directories to their states as of a specific revision. Because
4462 4462 revert does not change the working directory parents, this will
4463 4463 cause these files to appear modified. This can be helpful to "back
4464 4464 out" some or all of an earlier change. See :hg:`backout` for a
4465 4465 related method.
4466 4466
4467 4467 Modified files are saved with a .orig suffix before reverting.
4468 4468 To disable these backups, use --no-backup. It is possible to store
4469 4469 the backup files in a custom directory relative to the root of the
4470 4470 repository by setting the ``ui.origbackuppath`` configuration
4471 4471 option.
4472 4472
4473 4473 See :hg:`help dates` for a list of formats valid for -d/--date.
4474 4474
4475 4475 See :hg:`help backout` for a way to reverse the effect of an
4476 4476 earlier changeset.
4477 4477
4478 4478 Returns 0 on success.
4479 4479 """
4480 4480
4481 4481 if opts.get("date"):
4482 4482 if opts.get("rev"):
4483 4483 raise error.Abort(_("you can't specify a revision and a date"))
4484 4484 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4485 4485
4486 4486 parent, p2 = repo.dirstate.parents()
4487 4487 if not opts.get('rev') and p2 != nullid:
4488 4488 # revert after merge is a trap for new users (issue2915)
4489 4489 raise error.Abort(_('uncommitted merge with no revision specified'),
4490 4490 hint=_("use 'hg update' or see 'hg help revert'"))
4491 4491
4492 4492 ctx = scmutil.revsingle(repo, opts.get('rev'))
4493 4493
4494 4494 if (not (pats or opts.get('include') or opts.get('exclude') or
4495 4495 opts.get('all') or opts.get('interactive'))):
4496 4496 msg = _("no files or directories specified")
4497 4497 if p2 != nullid:
4498 4498 hint = _("uncommitted merge, use --all to discard all changes,"
4499 4499 " or 'hg update -C .' to abort the merge")
4500 4500 raise error.Abort(msg, hint=hint)
4501 4501 dirty = any(repo.status())
4502 4502 node = ctx.node()
4503 4503 if node != parent:
4504 4504 if dirty:
4505 4505 hint = _("uncommitted changes, use --all to discard all"
4506 4506 " changes, or 'hg update %s' to update") % ctx.rev()
4507 4507 else:
4508 4508 hint = _("use --all to revert all files,"
4509 4509 " or 'hg update %s' to update") % ctx.rev()
4510 4510 elif dirty:
4511 4511 hint = _("uncommitted changes, use --all to discard all changes")
4512 4512 else:
4513 4513 hint = _("use --all to revert all files")
4514 4514 raise error.Abort(msg, hint=hint)
4515 4515
4516 4516 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4517 4517
4518 4518 @command('rollback', dryrunopts +
4519 4519 [('f', 'force', False, _('ignore safety measures'))])
4520 4520 def rollback(ui, repo, **opts):
4521 4521 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4522 4522
4523 4523 Please use :hg:`commit --amend` instead of rollback to correct
4524 4524 mistakes in the last commit.
4525 4525
4526 4526 This command should be used with care. There is only one level of
4527 4527 rollback, and there is no way to undo a rollback. It will also
4528 4528 restore the dirstate at the time of the last transaction, losing
4529 4529 any dirstate changes since that time. This command does not alter
4530 4530 the working directory.
4531 4531
4532 4532 Transactions are used to encapsulate the effects of all commands
4533 4533 that create new changesets or propagate existing changesets into a
4534 4534 repository.
4535 4535
4536 4536 .. container:: verbose
4537 4537
4538 4538 For example, the following commands are transactional, and their
4539 4539 effects can be rolled back:
4540 4540
4541 4541 - commit
4542 4542 - import
4543 4543 - pull
4544 4544 - push (with this repository as the destination)
4545 4545 - unbundle
4546 4546
4547 4547 To avoid permanent data loss, rollback will refuse to rollback a
4548 4548 commit transaction if it isn't checked out. Use --force to
4549 4549 override this protection.
4550 4550
4551 4551 The rollback command can be entirely disabled by setting the
4552 4552 ``ui.rollback`` configuration setting to false. If you're here
4553 4553 because you want to use rollback and it's disabled, you can
4554 4554 re-enable the command by setting ``ui.rollback`` to true.
4555 4555
4556 4556 This command is not intended for use on public repositories. Once
4557 4557 changes are visible for pull by other users, rolling a transaction
4558 4558 back locally is ineffective (someone else may already have pulled
4559 4559 the changes). Furthermore, a race is possible with readers of the
4560 4560 repository; for example an in-progress pull from the repository
4561 4561 may fail if a rollback is performed.
4562 4562
4563 4563 Returns 0 on success, 1 if no rollback data is available.
4564 4564 """
4565 4565 if not ui.configbool('ui', 'rollback', True):
4566 4566 raise error.Abort(_('rollback is disabled because it is unsafe'),
4567 4567 hint=('see `hg help -v rollback` for information'))
4568 4568 return repo.rollback(dryrun=opts.get('dry_run'),
4569 4569 force=opts.get('force'))
4570 4570
4571 4571 @command('root', [])
4572 4572 def root(ui, repo):
4573 4573 """print the root (top) of the current working directory
4574 4574
4575 4575 Print the root directory of the current repository.
4576 4576
4577 4577 Returns 0 on success.
4578 4578 """
4579 4579 ui.write(repo.root + "\n")
4580 4580
4581 4581 @command('^serve',
4582 4582 [('A', 'accesslog', '', _('name of access log file to write to'),
4583 4583 _('FILE')),
4584 4584 ('d', 'daemon', None, _('run server in background')),
4585 4585 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4586 4586 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4587 4587 # use string type, then we can check if something was passed
4588 4588 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4589 4589 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4590 4590 _('ADDR')),
4591 4591 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4592 4592 _('PREFIX')),
4593 4593 ('n', 'name', '',
4594 4594 _('name to show in web pages (default: working directory)'), _('NAME')),
4595 4595 ('', 'web-conf', '',
4596 4596 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4597 4597 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4598 4598 _('FILE')),
4599 4599 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4600 4600 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4601 4601 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4602 4602 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4603 4603 ('', 'style', '', _('template style to use'), _('STYLE')),
4604 4604 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4605 4605 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4606 4606 _('[OPTION]...'),
4607 4607 optionalrepo=True)
4608 4608 def serve(ui, repo, **opts):
4609 4609 """start stand-alone webserver
4610 4610
4611 4611 Start a local HTTP repository browser and pull server. You can use
4612 4612 this for ad-hoc sharing and browsing of repositories. It is
4613 4613 recommended to use a real web server to serve a repository for
4614 4614 longer periods of time.
4615 4615
4616 4616 Please note that the server does not implement access control.
4617 4617 This means that, by default, anybody can read from the server and
4618 4618 nobody can write to it by default. Set the ``web.allow_push``
4619 4619 option to ``*`` to allow everybody to push to the server. You
4620 4620 should use a real web server if you need to authenticate users.
4621 4621
4622 4622 By default, the server logs accesses to stdout and errors to
4623 4623 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4624 4624 files.
4625 4625
4626 4626 To have the server choose a free port number to listen on, specify
4627 4627 a port number of 0; in this case, the server will print the port
4628 4628 number it uses.
4629 4629
4630 4630 Returns 0 on success.
4631 4631 """
4632 4632
4633 4633 if opts["stdio"] and opts["cmdserver"]:
4634 4634 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4635 4635
4636 4636 if opts["stdio"]:
4637 4637 if repo is None:
4638 4638 raise error.RepoError(_("there is no Mercurial repository here"
4639 4639 " (.hg not found)"))
4640 4640 s = sshserver.sshserver(ui, repo)
4641 4641 s.serve_forever()
4642 4642
4643 4643 service = server.createservice(ui, repo, opts)
4644 4644 return server.runservice(opts, initfn=service.init, runfn=service.run)
4645 4645
4646 4646 @command('^status|st',
4647 4647 [('A', 'all', None, _('show status of all files')),
4648 4648 ('m', 'modified', None, _('show only modified files')),
4649 4649 ('a', 'added', None, _('show only added files')),
4650 4650 ('r', 'removed', None, _('show only removed files')),
4651 4651 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4652 4652 ('c', 'clean', None, _('show only files without changes')),
4653 4653 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4654 4654 ('i', 'ignored', None, _('show only ignored files')),
4655 4655 ('n', 'no-status', None, _('hide status prefix')),
4656 4656 ('C', 'copies', None, _('show source of copied files')),
4657 4657 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4658 4658 ('', 'rev', [], _('show difference from revision'), _('REV')),
4659 4659 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4660 4660 ] + walkopts + subrepoopts + formatteropts,
4661 4661 _('[OPTION]... [FILE]...'),
4662 4662 inferrepo=True)
4663 4663 def status(ui, repo, *pats, **opts):
4664 4664 """show changed files in the working directory
4665 4665
4666 4666 Show status of files in the repository. If names are given, only
4667 4667 files that match are shown. Files that are clean or ignored or
4668 4668 the source of a copy/move operation, are not listed unless
4669 4669 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4670 4670 Unless options described with "show only ..." are given, the
4671 4671 options -mardu are used.
4672 4672
4673 4673 Option -q/--quiet hides untracked (unknown and ignored) files
4674 4674 unless explicitly requested with -u/--unknown or -i/--ignored.
4675 4675
4676 4676 .. note::
4677 4677
4678 4678 :hg:`status` may appear to disagree with diff if permissions have
4679 4679 changed or a merge has occurred. The standard diff format does
4680 4680 not report permission changes and diff only reports changes
4681 4681 relative to one merge parent.
4682 4682
4683 4683 If one revision is given, it is used as the base revision.
4684 4684 If two revisions are given, the differences between them are
4685 4685 shown. The --change option can also be used as a shortcut to list
4686 4686 the changed files of a revision from its first parent.
4687 4687
4688 4688 The codes used to show the status of files are::
4689 4689
4690 4690 M = modified
4691 4691 A = added
4692 4692 R = removed
4693 4693 C = clean
4694 4694 ! = missing (deleted by non-hg command, but still tracked)
4695 4695 ? = not tracked
4696 4696 I = ignored
4697 4697 = origin of the previous file (with --copies)
4698 4698
4699 4699 .. container:: verbose
4700 4700
4701 4701 Examples:
4702 4702
4703 4703 - show changes in the working directory relative to a
4704 4704 changeset::
4705 4705
4706 4706 hg status --rev 9353
4707 4707
4708 4708 - show changes in the working directory relative to the
4709 4709 current directory (see :hg:`help patterns` for more information)::
4710 4710
4711 4711 hg status re:
4712 4712
4713 4713 - show all changes including copies in an existing changeset::
4714 4714
4715 4715 hg status --copies --change 9353
4716 4716
4717 4717 - get a NUL separated list of added files, suitable for xargs::
4718 4718
4719 4719 hg status -an0
4720 4720
4721 4721 Returns 0 on success.
4722 4722 """
4723 4723
4724 4724 opts = pycompat.byteskwargs(opts)
4725 4725 revs = opts.get('rev')
4726 4726 change = opts.get('change')
4727 4727
4728 4728 if revs and change:
4729 4729 msg = _('cannot specify --rev and --change at the same time')
4730 4730 raise error.Abort(msg)
4731 4731 elif change:
4732 4732 node2 = scmutil.revsingle(repo, change, None).node()
4733 4733 node1 = repo[node2].p1().node()
4734 4734 else:
4735 4735 node1, node2 = scmutil.revpair(repo, revs)
4736 4736
4737 4737 if pats:
4738 4738 cwd = repo.getcwd()
4739 4739 else:
4740 4740 cwd = ''
4741 4741
4742 4742 if opts.get('print0'):
4743 4743 end = '\0'
4744 4744 else:
4745 4745 end = '\n'
4746 4746 copy = {}
4747 4747 states = 'modified added removed deleted unknown ignored clean'.split()
4748 4748 show = [k for k in states if opts.get(k)]
4749 4749 if opts.get('all'):
4750 4750 show += ui.quiet and (states[:4] + ['clean']) or states
4751 4751 if not show:
4752 4752 if ui.quiet:
4753 4753 show = states[:4]
4754 4754 else:
4755 4755 show = states[:5]
4756 4756
4757 4757 m = scmutil.match(repo[node2], pats, opts)
4758 4758 stat = repo.status(node1, node2, m,
4759 4759 'ignored' in show, 'clean' in show, 'unknown' in show,
4760 4760 opts.get('subrepos'))
4761 4761 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4762 4762
4763 4763 if (opts.get('all') or opts.get('copies')
4764 4764 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4765 4765 copy = copies.pathcopies(repo[node1], repo[node2], m)
4766 4766
4767 4767 ui.pager('status')
4768 4768 fm = ui.formatter('status', opts)
4769 4769 fmt = '%s' + end
4770 4770 showchar = not opts.get('no_status')
4771 4771
4772 4772 for state, char, files in changestates:
4773 4773 if state in show:
4774 4774 label = 'status.' + state
4775 4775 for f in files:
4776 4776 fm.startitem()
4777 4777 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4778 4778 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4779 4779 if f in copy:
4780 4780 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4781 4781 label='status.copied')
4782 4782 fm.end()
4783 4783
4784 4784 @command('^summary|sum',
4785 4785 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4786 4786 def summary(ui, repo, **opts):
4787 4787 """summarize working directory state
4788 4788
4789 4789 This generates a brief summary of the working directory state,
4790 4790 including parents, branch, commit status, phase and available updates.
4791 4791
4792 4792 With the --remote option, this will check the default paths for
4793 4793 incoming and outgoing changes. This can be time-consuming.
4794 4794
4795 4795 Returns 0 on success.
4796 4796 """
4797 4797
4798 4798 ui.pager('summary')
4799 4799 ctx = repo[None]
4800 4800 parents = ctx.parents()
4801 4801 pnode = parents[0].node()
4802 4802 marks = []
4803 4803
4804 4804 ms = None
4805 4805 try:
4806 4806 ms = mergemod.mergestate.read(repo)
4807 4807 except error.UnsupportedMergeRecords as e:
4808 4808 s = ' '.join(e.recordtypes)
4809 4809 ui.warn(
4810 4810 _('warning: merge state has unsupported record types: %s\n') % s)
4811 4811 unresolved = 0
4812 4812 else:
4813 4813 unresolved = [f for f in ms if ms[f] == 'u']
4814 4814
4815 4815 for p in parents:
4816 4816 # label with log.changeset (instead of log.parent) since this
4817 4817 # shows a working directory parent *changeset*:
4818 4818 # i18n: column positioning for "hg summary"
4819 4819 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4820 4820 label=cmdutil._changesetlabels(p))
4821 4821 ui.write(' '.join(p.tags()), label='log.tag')
4822 4822 if p.bookmarks():
4823 4823 marks.extend(p.bookmarks())
4824 4824 if p.rev() == -1:
4825 4825 if not len(repo):
4826 4826 ui.write(_(' (empty repository)'))
4827 4827 else:
4828 4828 ui.write(_(' (no revision checked out)'))
4829 4829 if p.troubled():
4830 4830 ui.write(' ('
4831 4831 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4832 4832 for trouble in p.troubles())
4833 4833 + ')')
4834 4834 ui.write('\n')
4835 4835 if p.description():
4836 4836 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4837 4837 label='log.summary')
4838 4838
4839 4839 branch = ctx.branch()
4840 4840 bheads = repo.branchheads(branch)
4841 4841 # i18n: column positioning for "hg summary"
4842 4842 m = _('branch: %s\n') % branch
4843 4843 if branch != 'default':
4844 4844 ui.write(m, label='log.branch')
4845 4845 else:
4846 4846 ui.status(m, label='log.branch')
4847 4847
4848 4848 if marks:
4849 4849 active = repo._activebookmark
4850 4850 # i18n: column positioning for "hg summary"
4851 4851 ui.write(_('bookmarks:'), label='log.bookmark')
4852 4852 if active is not None:
4853 4853 if active in marks:
4854 4854 ui.write(' *' + active, label=activebookmarklabel)
4855 4855 marks.remove(active)
4856 4856 else:
4857 4857 ui.write(' [%s]' % active, label=activebookmarklabel)
4858 4858 for m in marks:
4859 4859 ui.write(' ' + m, label='log.bookmark')
4860 4860 ui.write('\n', label='log.bookmark')
4861 4861
4862 4862 status = repo.status(unknown=True)
4863 4863
4864 4864 c = repo.dirstate.copies()
4865 4865 copied, renamed = [], []
4866 4866 for d, s in c.iteritems():
4867 4867 if s in status.removed:
4868 4868 status.removed.remove(s)
4869 4869 renamed.append(d)
4870 4870 else:
4871 4871 copied.append(d)
4872 4872 if d in status.added:
4873 4873 status.added.remove(d)
4874 4874
4875 4875 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4876 4876
4877 4877 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4878 4878 (ui.label(_('%d added'), 'status.added'), status.added),
4879 4879 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4880 4880 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4881 4881 (ui.label(_('%d copied'), 'status.copied'), copied),
4882 4882 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4883 4883 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4884 4884 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4885 4885 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4886 4886 t = []
4887 4887 for l, s in labels:
4888 4888 if s:
4889 4889 t.append(l % len(s))
4890 4890
4891 4891 t = ', '.join(t)
4892 4892 cleanworkdir = False
4893 4893
4894 4894 if repo.vfs.exists('graftstate'):
4895 4895 t += _(' (graft in progress)')
4896 4896 if repo.vfs.exists('updatestate'):
4897 4897 t += _(' (interrupted update)')
4898 4898 elif len(parents) > 1:
4899 4899 t += _(' (merge)')
4900 4900 elif branch != parents[0].branch():
4901 4901 t += _(' (new branch)')
4902 4902 elif (parents[0].closesbranch() and
4903 4903 pnode in repo.branchheads(branch, closed=True)):
4904 4904 t += _(' (head closed)')
4905 4905 elif not (status.modified or status.added or status.removed or renamed or
4906 4906 copied or subs):
4907 4907 t += _(' (clean)')
4908 4908 cleanworkdir = True
4909 4909 elif pnode not in bheads:
4910 4910 t += _(' (new branch head)')
4911 4911
4912 4912 if parents:
4913 4913 pendingphase = max(p.phase() for p in parents)
4914 4914 else:
4915 4915 pendingphase = phases.public
4916 4916
4917 4917 if pendingphase > phases.newcommitphase(ui):
4918 4918 t += ' (%s)' % phases.phasenames[pendingphase]
4919 4919
4920 4920 if cleanworkdir:
4921 4921 # i18n: column positioning for "hg summary"
4922 4922 ui.status(_('commit: %s\n') % t.strip())
4923 4923 else:
4924 4924 # i18n: column positioning for "hg summary"
4925 4925 ui.write(_('commit: %s\n') % t.strip())
4926 4926
4927 4927 # all ancestors of branch heads - all ancestors of parent = new csets
4928 4928 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4929 4929 bheads))
4930 4930
4931 4931 if new == 0:
4932 4932 # i18n: column positioning for "hg summary"
4933 4933 ui.status(_('update: (current)\n'))
4934 4934 elif pnode not in bheads:
4935 4935 # i18n: column positioning for "hg summary"
4936 4936 ui.write(_('update: %d new changesets (update)\n') % new)
4937 4937 else:
4938 4938 # i18n: column positioning for "hg summary"
4939 4939 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4940 4940 (new, len(bheads)))
4941 4941
4942 4942 t = []
4943 4943 draft = len(repo.revs('draft()'))
4944 4944 if draft:
4945 4945 t.append(_('%d draft') % draft)
4946 4946 secret = len(repo.revs('secret()'))
4947 4947 if secret:
4948 4948 t.append(_('%d secret') % secret)
4949 4949
4950 4950 if draft or secret:
4951 4951 ui.status(_('phases: %s\n') % ', '.join(t))
4952 4952
4953 4953 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4954 4954 for trouble in ("unstable", "divergent", "bumped"):
4955 4955 numtrouble = len(repo.revs(trouble + "()"))
4956 4956 # We write all the possibilities to ease translation
4957 4957 troublemsg = {
4958 4958 "unstable": _("unstable: %d changesets"),
4959 4959 "divergent": _("divergent: %d changesets"),
4960 4960 "bumped": _("bumped: %d changesets"),
4961 4961 }
4962 4962 if numtrouble > 0:
4963 4963 ui.status(troublemsg[trouble] % numtrouble + "\n")
4964 4964
4965 4965 cmdutil.summaryhooks(ui, repo)
4966 4966
4967 4967 if opts.get('remote'):
4968 4968 needsincoming, needsoutgoing = True, True
4969 4969 else:
4970 4970 needsincoming, needsoutgoing = False, False
4971 4971 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4972 4972 if i:
4973 4973 needsincoming = True
4974 4974 if o:
4975 4975 needsoutgoing = True
4976 4976 if not needsincoming and not needsoutgoing:
4977 4977 return
4978 4978
4979 4979 def getincoming():
4980 4980 source, branches = hg.parseurl(ui.expandpath('default'))
4981 4981 sbranch = branches[0]
4982 4982 try:
4983 4983 other = hg.peer(repo, {}, source)
4984 4984 except error.RepoError:
4985 4985 if opts.get('remote'):
4986 4986 raise
4987 4987 return source, sbranch, None, None, None
4988 4988 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4989 4989 if revs:
4990 4990 revs = [other.lookup(rev) for rev in revs]
4991 4991 ui.debug('comparing with %s\n' % util.hidepassword(source))
4992 4992 repo.ui.pushbuffer()
4993 4993 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4994 4994 repo.ui.popbuffer()
4995 4995 return source, sbranch, other, commoninc, commoninc[1]
4996 4996
4997 4997 if needsincoming:
4998 4998 source, sbranch, sother, commoninc, incoming = getincoming()
4999 4999 else:
5000 5000 source = sbranch = sother = commoninc = incoming = None
5001 5001
5002 5002 def getoutgoing():
5003 5003 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5004 5004 dbranch = branches[0]
5005 5005 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5006 5006 if source != dest:
5007 5007 try:
5008 5008 dother = hg.peer(repo, {}, dest)
5009 5009 except error.RepoError:
5010 5010 if opts.get('remote'):
5011 5011 raise
5012 5012 return dest, dbranch, None, None
5013 5013 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5014 5014 elif sother is None:
5015 5015 # there is no explicit destination peer, but source one is invalid
5016 5016 return dest, dbranch, None, None
5017 5017 else:
5018 5018 dother = sother
5019 5019 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5020 5020 common = None
5021 5021 else:
5022 5022 common = commoninc
5023 5023 if revs:
5024 5024 revs = [repo.lookup(rev) for rev in revs]
5025 5025 repo.ui.pushbuffer()
5026 5026 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5027 5027 commoninc=common)
5028 5028 repo.ui.popbuffer()
5029 5029 return dest, dbranch, dother, outgoing
5030 5030
5031 5031 if needsoutgoing:
5032 5032 dest, dbranch, dother, outgoing = getoutgoing()
5033 5033 else:
5034 5034 dest = dbranch = dother = outgoing = None
5035 5035
5036 5036 if opts.get('remote'):
5037 5037 t = []
5038 5038 if incoming:
5039 5039 t.append(_('1 or more incoming'))
5040 5040 o = outgoing.missing
5041 5041 if o:
5042 5042 t.append(_('%d outgoing') % len(o))
5043 5043 other = dother or sother
5044 5044 if 'bookmarks' in other.listkeys('namespaces'):
5045 5045 counts = bookmarks.summary(repo, other)
5046 5046 if counts[0] > 0:
5047 5047 t.append(_('%d incoming bookmarks') % counts[0])
5048 5048 if counts[1] > 0:
5049 5049 t.append(_('%d outgoing bookmarks') % counts[1])
5050 5050
5051 5051 if t:
5052 5052 # i18n: column positioning for "hg summary"
5053 5053 ui.write(_('remote: %s\n') % (', '.join(t)))
5054 5054 else:
5055 5055 # i18n: column positioning for "hg summary"
5056 5056 ui.status(_('remote: (synced)\n'))
5057 5057
5058 5058 cmdutil.summaryremotehooks(ui, repo, opts,
5059 5059 ((source, sbranch, sother, commoninc),
5060 5060 (dest, dbranch, dother, outgoing)))
5061 5061
5062 5062 @command('tag',
5063 5063 [('f', 'force', None, _('force tag')),
5064 5064 ('l', 'local', None, _('make the tag local')),
5065 5065 ('r', 'rev', '', _('revision to tag'), _('REV')),
5066 5066 ('', 'remove', None, _('remove a tag')),
5067 5067 # -l/--local is already there, commitopts cannot be used
5068 5068 ('e', 'edit', None, _('invoke editor on commit messages')),
5069 5069 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5070 5070 ] + commitopts2,
5071 5071 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5072 5072 def tag(ui, repo, name1, *names, **opts):
5073 5073 """add one or more tags for the current or given revision
5074 5074
5075 5075 Name a particular revision using <name>.
5076 5076
5077 5077 Tags are used to name particular revisions of the repository and are
5078 5078 very useful to compare different revisions, to go back to significant
5079 5079 earlier versions or to mark branch points as releases, etc. Changing
5080 5080 an existing tag is normally disallowed; use -f/--force to override.
5081 5081
5082 5082 If no revision is given, the parent of the working directory is
5083 5083 used.
5084 5084
5085 5085 To facilitate version control, distribution, and merging of tags,
5086 5086 they are stored as a file named ".hgtags" which is managed similarly
5087 5087 to other project files and can be hand-edited if necessary. This
5088 5088 also means that tagging creates a new commit. The file
5089 5089 ".hg/localtags" is used for local tags (not shared among
5090 5090 repositories).
5091 5091
5092 5092 Tag commits are usually made at the head of a branch. If the parent
5093 5093 of the working directory is not a branch head, :hg:`tag` aborts; use
5094 5094 -f/--force to force the tag commit to be based on a non-head
5095 5095 changeset.
5096 5096
5097 5097 See :hg:`help dates` for a list of formats valid for -d/--date.
5098 5098
5099 5099 Since tag names have priority over branch names during revision
5100 5100 lookup, using an existing branch name as a tag name is discouraged.
5101 5101
5102 5102 Returns 0 on success.
5103 5103 """
5104 5104 wlock = lock = None
5105 5105 try:
5106 5106 wlock = repo.wlock()
5107 5107 lock = repo.lock()
5108 5108 rev_ = "."
5109 5109 names = [t.strip() for t in (name1,) + names]
5110 5110 if len(names) != len(set(names)):
5111 5111 raise error.Abort(_('tag names must be unique'))
5112 5112 for n in names:
5113 5113 scmutil.checknewlabel(repo, n, 'tag')
5114 5114 if not n:
5115 5115 raise error.Abort(_('tag names cannot consist entirely of '
5116 5116 'whitespace'))
5117 5117 if opts.get('rev') and opts.get('remove'):
5118 5118 raise error.Abort(_("--rev and --remove are incompatible"))
5119 5119 if opts.get('rev'):
5120 5120 rev_ = opts['rev']
5121 5121 message = opts.get('message')
5122 5122 if opts.get('remove'):
5123 5123 if opts.get('local'):
5124 5124 expectedtype = 'local'
5125 5125 else:
5126 5126 expectedtype = 'global'
5127 5127
5128 5128 for n in names:
5129 5129 if not repo.tagtype(n):
5130 5130 raise error.Abort(_("tag '%s' does not exist") % n)
5131 5131 if repo.tagtype(n) != expectedtype:
5132 5132 if expectedtype == 'global':
5133 5133 raise error.Abort(_("tag '%s' is not a global tag") % n)
5134 5134 else:
5135 5135 raise error.Abort(_("tag '%s' is not a local tag") % n)
5136 5136 rev_ = 'null'
5137 5137 if not message:
5138 5138 # we don't translate commit messages
5139 5139 message = 'Removed tag %s' % ', '.join(names)
5140 5140 elif not opts.get('force'):
5141 5141 for n in names:
5142 5142 if n in repo.tags():
5143 5143 raise error.Abort(_("tag '%s' already exists "
5144 5144 "(use -f to force)") % n)
5145 5145 if not opts.get('local'):
5146 5146 p1, p2 = repo.dirstate.parents()
5147 5147 if p2 != nullid:
5148 5148 raise error.Abort(_('uncommitted merge'))
5149 5149 bheads = repo.branchheads()
5150 5150 if not opts.get('force') and bheads and p1 not in bheads:
5151 5151 raise error.Abort(_('working directory is not at a branch head '
5152 5152 '(use -f to force)'))
5153 5153 r = scmutil.revsingle(repo, rev_).node()
5154 5154
5155 5155 if not message:
5156 5156 # we don't translate commit messages
5157 5157 message = ('Added tag %s for changeset %s' %
5158 5158 (', '.join(names), short(r)))
5159 5159
5160 5160 date = opts.get('date')
5161 5161 if date:
5162 5162 date = util.parsedate(date)
5163 5163
5164 5164 if opts.get('remove'):
5165 5165 editform = 'tag.remove'
5166 5166 else:
5167 5167 editform = 'tag.add'
5168 5168 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5169 5169
5170 5170 # don't allow tagging the null rev
5171 5171 if (not opts.get('remove') and
5172 5172 scmutil.revsingle(repo, rev_).rev() == nullrev):
5173 5173 raise error.Abort(_("cannot tag null revision"))
5174 5174
5175 5175 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5176 5176 editor=editor)
5177 5177 finally:
5178 5178 release(lock, wlock)
5179 5179
5180 5180 @command('tags', formatteropts, '')
5181 5181 def tags(ui, repo, **opts):
5182 5182 """list repository tags
5183 5183
5184 5184 This lists both regular and local tags. When the -v/--verbose
5185 5185 switch is used, a third column "local" is printed for local tags.
5186 5186 When the -q/--quiet switch is used, only the tag name is printed.
5187 5187
5188 5188 Returns 0 on success.
5189 5189 """
5190 5190
5191 5191 ui.pager('tags')
5192 5192 fm = ui.formatter('tags', opts)
5193 5193 hexfunc = fm.hexfunc
5194 5194 tagtype = ""
5195 5195
5196 5196 for t, n in reversed(repo.tagslist()):
5197 5197 hn = hexfunc(n)
5198 5198 label = 'tags.normal'
5199 5199 tagtype = ''
5200 5200 if repo.tagtype(t) == 'local':
5201 5201 label = 'tags.local'
5202 5202 tagtype = 'local'
5203 5203
5204 5204 fm.startitem()
5205 5205 fm.write('tag', '%s', t, label=label)
5206 5206 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5207 5207 fm.condwrite(not ui.quiet, 'rev node', fmt,
5208 5208 repo.changelog.rev(n), hn, label=label)
5209 5209 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5210 5210 tagtype, label=label)
5211 5211 fm.plain('\n')
5212 5212 fm.end()
5213 5213
5214 5214 @command('tip',
5215 5215 [('p', 'patch', None, _('show patch')),
5216 5216 ('g', 'git', None, _('use git extended diff format')),
5217 5217 ] + templateopts,
5218 5218 _('[-p] [-g]'))
5219 5219 def tip(ui, repo, **opts):
5220 5220 """show the tip revision (DEPRECATED)
5221 5221
5222 5222 The tip revision (usually just called the tip) is the changeset
5223 5223 most recently added to the repository (and therefore the most
5224 5224 recently changed head).
5225 5225
5226 5226 If you have just made a commit, that commit will be the tip. If
5227 5227 you have just pulled changes from another repository, the tip of
5228 5228 that repository becomes the current tip. The "tip" tag is special
5229 5229 and cannot be renamed or assigned to a different changeset.
5230 5230
5231 5231 This command is deprecated, please use :hg:`heads` instead.
5232 5232
5233 5233 Returns 0 on success.
5234 5234 """
5235 5235 displayer = cmdutil.show_changeset(ui, repo, opts)
5236 5236 displayer.show(repo['tip'])
5237 5237 displayer.close()
5238 5238
5239 5239 @command('unbundle',
5240 5240 [('u', 'update', None,
5241 5241 _('update to new branch head if changesets were unbundled'))],
5242 5242 _('[-u] FILE...'))
5243 5243 def unbundle(ui, repo, fname1, *fnames, **opts):
5244 5244 """apply one or more changegroup files
5245 5245
5246 5246 Apply one or more compressed changegroup files generated by the
5247 5247 bundle command.
5248 5248
5249 5249 Returns 0 on success, 1 if an update has unresolved files.
5250 5250 """
5251 5251 fnames = (fname1,) + fnames
5252 5252
5253 5253 with repo.lock():
5254 5254 for fname in fnames:
5255 5255 f = hg.openpath(ui, fname)
5256 5256 gen = exchange.readbundle(ui, f, fname)
5257 5257 if isinstance(gen, bundle2.unbundle20):
5258 5258 tr = repo.transaction('unbundle')
5259 5259 try:
5260 5260 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5261 5261 url='bundle:' + fname)
5262 5262 tr.close()
5263 5263 except error.BundleUnknownFeatureError as exc:
5264 5264 raise error.Abort(_('%s: unknown bundle feature, %s')
5265 5265 % (fname, exc),
5266 5266 hint=_("see https://mercurial-scm.org/"
5267 5267 "wiki/BundleFeature for more "
5268 5268 "information"))
5269 5269 finally:
5270 5270 if tr:
5271 5271 tr.release()
5272 5272 changes = [r.get('return', 0)
5273 5273 for r in op.records['changegroup']]
5274 5274 modheads = changegroup.combineresults(changes)
5275 5275 elif isinstance(gen, streamclone.streamcloneapplier):
5276 5276 raise error.Abort(
5277 5277 _('packed bundles cannot be applied with '
5278 5278 '"hg unbundle"'),
5279 5279 hint=_('use "hg debugapplystreamclonebundle"'))
5280 5280 else:
5281 5281 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5282 5282
5283 5283 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5284 5284
5285 5285 @command('^update|up|checkout|co',
5286 5286 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5287 5287 ('c', 'check', None, _('require clean working directory')),
5288 5288 ('m', 'merge', None, _('merge uncommitted changes')),
5289 5289 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5290 5290 ('r', 'rev', '', _('revision'), _('REV'))
5291 5291 ] + mergetoolopts,
5292 5292 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5293 5293 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5294 5294 merge=None, tool=None):
5295 5295 """update working directory (or switch revisions)
5296 5296
5297 5297 Update the repository's working directory to the specified
5298 5298 changeset. If no changeset is specified, update to the tip of the
5299 5299 current named branch and move the active bookmark (see :hg:`help
5300 5300 bookmarks`).
5301 5301
5302 5302 Update sets the working directory's parent revision to the specified
5303 5303 changeset (see :hg:`help parents`).
5304 5304
5305 5305 If the changeset is not a descendant or ancestor of the working
5306 5306 directory's parent and there are uncommitted changes, the update is
5307 5307 aborted. With the -c/--check option, the working directory is checked
5308 5308 for uncommitted changes; if none are found, the working directory is
5309 5309 updated to the specified changeset.
5310 5310
5311 5311 .. container:: verbose
5312 5312
5313 5313 The -C/--clean, -c/--check, and -m/--merge options control what
5314 5314 happens if the working directory contains uncommitted changes.
5315 5315 At most of one of them can be specified.
5316 5316
5317 5317 1. If no option is specified, and if
5318 5318 the requested changeset is an ancestor or descendant of
5319 5319 the working directory's parent, the uncommitted changes
5320 5320 are merged into the requested changeset and the merged
5321 5321 result is left uncommitted. If the requested changeset is
5322 5322 not an ancestor or descendant (that is, it is on another
5323 5323 branch), the update is aborted and the uncommitted changes
5324 5324 are preserved.
5325 5325
5326 5326 2. With the -m/--merge option, the update is allowed even if the
5327 5327 requested changeset is not an ancestor or descendant of
5328 5328 the working directory's parent.
5329 5329
5330 5330 3. With the -c/--check option, the update is aborted and the
5331 5331 uncommitted changes are preserved.
5332 5332
5333 5333 4. With the -C/--clean option, uncommitted changes are discarded and
5334 5334 the working directory is updated to the requested changeset.
5335 5335
5336 5336 To cancel an uncommitted merge (and lose your changes), use
5337 5337 :hg:`update --clean .`.
5338 5338
5339 5339 Use null as the changeset to remove the working directory (like
5340 5340 :hg:`clone -U`).
5341 5341
5342 5342 If you want to revert just one file to an older revision, use
5343 5343 :hg:`revert [-r REV] NAME`.
5344 5344
5345 5345 See :hg:`help dates` for a list of formats valid for -d/--date.
5346 5346
5347 5347 Returns 0 on success, 1 if there are unresolved files.
5348 5348 """
5349 5349 if rev and node:
5350 5350 raise error.Abort(_("please specify just one revision"))
5351 5351
5352 if ui.configbool('commands', 'update.requiredest', False):
5353 if not node and not rev and not date:
5354 raise error.Abort(_('you must specify a destination'),
5355 hint=_('for example: hg update ".::"'))
5356
5352 5357 if rev is None or rev == '':
5353 5358 rev = node
5354 5359
5355 5360 if date and rev is not None:
5356 5361 raise error.Abort(_("you can't specify a revision and a date"))
5357 5362
5358 5363 if len([x for x in (clean, check, merge) if x]) > 1:
5359 5364 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5360 5365 "or -m/merge"))
5361 5366
5362 5367 updatecheck = None
5363 5368 if check:
5364 5369 updatecheck = 'abort'
5365 5370 elif merge:
5366 5371 updatecheck = 'none'
5367 5372
5368 5373 with repo.wlock():
5369 5374 cmdutil.clearunfinished(repo)
5370 5375
5371 5376 if date:
5372 5377 rev = cmdutil.finddate(ui, repo, date)
5373 5378
5374 5379 # if we defined a bookmark, we have to remember the original name
5375 5380 brev = rev
5376 5381 rev = scmutil.revsingle(repo, rev, rev).rev()
5377 5382
5378 5383 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5379 5384
5380 5385 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5381 5386 updatecheck=updatecheck)
5382 5387
5383 5388 @command('verify', [])
5384 5389 def verify(ui, repo):
5385 5390 """verify the integrity of the repository
5386 5391
5387 5392 Verify the integrity of the current repository.
5388 5393
5389 5394 This will perform an extensive check of the repository's
5390 5395 integrity, validating the hashes and checksums of each entry in
5391 5396 the changelog, manifest, and tracked files, as well as the
5392 5397 integrity of their crosslinks and indices.
5393 5398
5394 5399 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5395 5400 for more information about recovery from corruption of the
5396 5401 repository.
5397 5402
5398 5403 Returns 0 on success, 1 if errors are encountered.
5399 5404 """
5400 5405 return hg.verify(repo)
5401 5406
5402 5407 @command('version', [] + formatteropts, norepo=True)
5403 5408 def version_(ui, **opts):
5404 5409 """output version and copyright information"""
5405 5410 if ui.verbose:
5406 5411 ui.pager('version')
5407 5412 fm = ui.formatter("version", opts)
5408 5413 fm.startitem()
5409 5414 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5410 5415 util.version())
5411 5416 license = _(
5412 5417 "(see https://mercurial-scm.org for more information)\n"
5413 5418 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5414 5419 "This is free software; see the source for copying conditions. "
5415 5420 "There is NO\nwarranty; "
5416 5421 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5417 5422 )
5418 5423 if not ui.quiet:
5419 5424 fm.plain(license)
5420 5425
5421 5426 if ui.verbose:
5422 5427 fm.plain(_("\nEnabled extensions:\n\n"))
5423 5428 # format names and versions into columns
5424 5429 names = []
5425 5430 vers = []
5426 5431 isinternals = []
5427 5432 for name, module in extensions.extensions():
5428 5433 names.append(name)
5429 5434 vers.append(extensions.moduleversion(module) or None)
5430 5435 isinternals.append(extensions.ismoduleinternal(module))
5431 5436 fn = fm.nested("extensions")
5432 5437 if names:
5433 5438 namefmt = " %%-%ds " % max(len(n) for n in names)
5434 5439 places = [_("external"), _("internal")]
5435 5440 for n, v, p in zip(names, vers, isinternals):
5436 5441 fn.startitem()
5437 5442 fn.condwrite(ui.verbose, "name", namefmt, n)
5438 5443 if ui.verbose:
5439 5444 fn.plain("%s " % places[p])
5440 5445 fn.data(bundled=p)
5441 5446 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5442 5447 if ui.verbose:
5443 5448 fn.plain("\n")
5444 5449 fn.end()
5445 5450 fm.end()
5446 5451
5447 5452 def loadcmdtable(ui, name, cmdtable):
5448 5453 """Load command functions from specified cmdtable
5449 5454 """
5450 5455 overrides = [cmd for cmd in cmdtable if cmd in table]
5451 5456 if overrides:
5452 5457 ui.warn(_("extension '%s' overrides commands: %s\n")
5453 5458 % (name, " ".join(overrides)))
5454 5459 table.update(cmdtable)
@@ -1,2352 +1,2361 b''
1 1 The Mercurial system uses a set of configuration files to control
2 2 aspects of its behavior.
3 3
4 4 Troubleshooting
5 5 ===============
6 6
7 7 If you're having problems with your configuration,
8 8 :hg:`config --debug` can help you understand what is introducing
9 9 a setting into your environment.
10 10
11 11 See :hg:`help config.syntax` and :hg:`help config.files`
12 12 for information about how and where to override things.
13 13
14 14 Structure
15 15 =========
16 16
17 17 The configuration files use a simple ini-file format. A configuration
18 18 file consists of sections, led by a ``[section]`` header and followed
19 19 by ``name = value`` entries::
20 20
21 21 [ui]
22 22 username = Firstname Lastname <firstname.lastname@example.net>
23 23 verbose = True
24 24
25 25 The above entries will be referred to as ``ui.username`` and
26 26 ``ui.verbose``, respectively. See :hg:`help config.syntax`.
27 27
28 28 Files
29 29 =====
30 30
31 31 Mercurial reads configuration data from several files, if they exist.
32 32 These files do not exist by default and you will have to create the
33 33 appropriate configuration files yourself:
34 34
35 35 Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
36 36
37 37 Global configuration like the username setting is typically put into:
38 38
39 39 .. container:: windows
40 40
41 41 - ``%USERPROFILE%\mercurial.ini`` (on Windows)
42 42
43 43 .. container:: unix.plan9
44 44
45 45 - ``$HOME/.hgrc`` (on Unix, Plan9)
46 46
47 47 The names of these files depend on the system on which Mercurial is
48 48 installed. ``*.rc`` files from a single directory are read in
49 49 alphabetical order, later ones overriding earlier ones. Where multiple
50 50 paths are given below, settings from earlier paths override later
51 51 ones.
52 52
53 53 .. container:: verbose.unix
54 54
55 55 On Unix, the following files are consulted:
56 56
57 57 - ``<repo>/.hg/hgrc`` (per-repository)
58 58 - ``$HOME/.hgrc`` (per-user)
59 59 - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user)
60 60 - ``<install-root>/etc/mercurial/hgrc`` (per-installation)
61 61 - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation)
62 62 - ``/etc/mercurial/hgrc`` (per-system)
63 63 - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
64 64 - ``<internal>/default.d/*.rc`` (defaults)
65 65
66 66 .. container:: verbose.windows
67 67
68 68 On Windows, the following files are consulted:
69 69
70 70 - ``<repo>/.hg/hgrc`` (per-repository)
71 71 - ``%USERPROFILE%\.hgrc`` (per-user)
72 72 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
73 73 - ``%HOME%\.hgrc`` (per-user)
74 74 - ``%HOME%\Mercurial.ini`` (per-user)
75 75 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
76 76 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
77 77 - ``<install-dir>\Mercurial.ini`` (per-installation)
78 78 - ``<internal>/default.d/*.rc`` (defaults)
79 79
80 80 .. note::
81 81
82 82 The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
83 83 is used when running 32-bit Python on 64-bit Windows.
84 84
85 85 .. container:: windows
86 86
87 87 On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
88 88
89 89 .. container:: verbose.plan9
90 90
91 91 On Plan9, the following files are consulted:
92 92
93 93 - ``<repo>/.hg/hgrc`` (per-repository)
94 94 - ``$home/lib/hgrc`` (per-user)
95 95 - ``<install-root>/lib/mercurial/hgrc`` (per-installation)
96 96 - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation)
97 97 - ``/lib/mercurial/hgrc`` (per-system)
98 98 - ``/lib/mercurial/hgrc.d/*.rc`` (per-system)
99 99 - ``<internal>/default.d/*.rc`` (defaults)
100 100
101 101 Per-repository configuration options only apply in a
102 102 particular repository. This file is not version-controlled, and
103 103 will not get transferred during a "clone" operation. Options in
104 104 this file override options in all other configuration files.
105 105
106 106 .. container:: unix.plan9
107 107
108 108 On Plan 9 and Unix, most of this file will be ignored if it doesn't
109 109 belong to a trusted user or to a trusted group. See
110 110 :hg:`help config.trusted` for more details.
111 111
112 112 Per-user configuration file(s) are for the user running Mercurial. Options
113 113 in these files apply to all Mercurial commands executed by this user in any
114 114 directory. Options in these files override per-system and per-installation
115 115 options.
116 116
117 117 Per-installation configuration files are searched for in the
118 118 directory where Mercurial is installed. ``<install-root>`` is the
119 119 parent directory of the **hg** executable (or symlink) being run.
120 120
121 121 .. container:: unix.plan9
122 122
123 123 For example, if installed in ``/shared/tools/bin/hg``, Mercurial
124 124 will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these
125 125 files apply to all Mercurial commands executed by any user in any
126 126 directory.
127 127
128 128 Per-installation configuration files are for the system on
129 129 which Mercurial is running. Options in these files apply to all
130 130 Mercurial commands executed by any user in any directory. Registry
131 131 keys contain PATH-like strings, every part of which must reference
132 132 a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
133 133 be read. Mercurial checks each of these locations in the specified
134 134 order until one or more configuration files are detected.
135 135
136 136 Per-system configuration files are for the system on which Mercurial
137 137 is running. Options in these files apply to all Mercurial commands
138 138 executed by any user in any directory. Options in these files
139 139 override per-installation options.
140 140
141 141 Mercurial comes with some default configuration. The default configuration
142 142 files are installed with Mercurial and will be overwritten on upgrades. Default
143 143 configuration files should never be edited by users or administrators but can
144 144 be overridden in other configuration files. So far the directory only contains
145 145 merge tool configuration but packagers can also put other default configuration
146 146 there.
147 147
148 148 Syntax
149 149 ======
150 150
151 151 A configuration file consists of sections, led by a ``[section]`` header
152 152 and followed by ``name = value`` entries (sometimes called
153 153 ``configuration keys``)::
154 154
155 155 [spam]
156 156 eggs=ham
157 157 green=
158 158 eggs
159 159
160 160 Each line contains one entry. If the lines that follow are indented,
161 161 they are treated as continuations of that entry. Leading whitespace is
162 162 removed from values. Empty lines are skipped. Lines beginning with
163 163 ``#`` or ``;`` are ignored and may be used to provide comments.
164 164
165 165 Configuration keys can be set multiple times, in which case Mercurial
166 166 will use the value that was configured last. As an example::
167 167
168 168 [spam]
169 169 eggs=large
170 170 ham=serrano
171 171 eggs=small
172 172
173 173 This would set the configuration key named ``eggs`` to ``small``.
174 174
175 175 It is also possible to define a section multiple times. A section can
176 176 be redefined on the same and/or on different configuration files. For
177 177 example::
178 178
179 179 [foo]
180 180 eggs=large
181 181 ham=serrano
182 182 eggs=small
183 183
184 184 [bar]
185 185 eggs=ham
186 186 green=
187 187 eggs
188 188
189 189 [foo]
190 190 ham=prosciutto
191 191 eggs=medium
192 192 bread=toasted
193 193
194 194 This would set the ``eggs``, ``ham``, and ``bread`` configuration keys
195 195 of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,
196 196 respectively. As you can see there only thing that matters is the last
197 197 value that was set for each of the configuration keys.
198 198
199 199 If a configuration key is set multiple times in different
200 200 configuration files the final value will depend on the order in which
201 201 the different configuration files are read, with settings from earlier
202 202 paths overriding later ones as described on the ``Files`` section
203 203 above.
204 204
205 205 A line of the form ``%include file`` will include ``file`` into the
206 206 current configuration file. The inclusion is recursive, which means
207 207 that included files can include other files. Filenames are relative to
208 208 the configuration file in which the ``%include`` directive is found.
209 209 Environment variables and ``~user`` constructs are expanded in
210 210 ``file``. This lets you do something like::
211 211
212 212 %include ~/.hgrc.d/$HOST.rc
213 213
214 214 to include a different configuration file on each computer you use.
215 215
216 216 A line with ``%unset name`` will remove ``name`` from the current
217 217 section, if it has been set previously.
218 218
219 219 The values are either free-form text strings, lists of text strings,
220 220 or Boolean values. Boolean values can be set to true using any of "1",
221 221 "yes", "true", or "on" and to false using "0", "no", "false", or "off"
222 222 (all case insensitive).
223 223
224 224 List values are separated by whitespace or comma, except when values are
225 225 placed in double quotation marks::
226 226
227 227 allow_read = "John Doe, PhD", brian, betty
228 228
229 229 Quotation marks can be escaped by prefixing them with a backslash. Only
230 230 quotation marks at the beginning of a word is counted as a quotation
231 231 (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``).
232 232
233 233 Sections
234 234 ========
235 235
236 236 This section describes the different sections that may appear in a
237 237 Mercurial configuration file, the purpose of each section, its possible
238 238 keys, and their possible values.
239 239
240 240 ``alias``
241 241 ---------
242 242
243 243 Defines command aliases.
244 244
245 245 Aliases allow you to define your own commands in terms of other
246 246 commands (or aliases), optionally including arguments. Positional
247 247 arguments in the form of ``$1``, ``$2``, etc. in the alias definition
248 248 are expanded by Mercurial before execution. Positional arguments not
249 249 already used by ``$N`` in the definition are put at the end of the
250 250 command to be executed.
251 251
252 252 Alias definitions consist of lines of the form::
253 253
254 254 <alias> = <command> [<argument>]...
255 255
256 256 For example, this definition::
257 257
258 258 latest = log --limit 5
259 259
260 260 creates a new command ``latest`` that shows only the five most recent
261 261 changesets. You can define subsequent aliases using earlier ones::
262 262
263 263 stable5 = latest -b stable
264 264
265 265 .. note::
266 266
267 267 It is possible to create aliases with the same names as
268 268 existing commands, which will then override the original
269 269 definitions. This is almost always a bad idea!
270 270
271 271 An alias can start with an exclamation point (``!``) to make it a
272 272 shell alias. A shell alias is executed with the shell and will let you
273 273 run arbitrary commands. As an example, ::
274 274
275 275 echo = !echo $@
276 276
277 277 will let you do ``hg echo foo`` to have ``foo`` printed in your
278 278 terminal. A better example might be::
279 279
280 280 purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f
281 281
282 282 which will make ``hg purge`` delete all unknown files in the
283 283 repository in the same manner as the purge extension.
284 284
285 285 Positional arguments like ``$1``, ``$2``, etc. in the alias definition
286 286 expand to the command arguments. Unmatched arguments are
287 287 removed. ``$0`` expands to the alias name and ``$@`` expands to all
288 288 arguments separated by a space. ``"$@"`` (with quotes) expands to all
289 289 arguments quoted individually and separated by a space. These expansions
290 290 happen before the command is passed to the shell.
291 291
292 292 Shell aliases are executed in an environment where ``$HG`` expands to
293 293 the path of the Mercurial that was used to execute the alias. This is
294 294 useful when you want to call further Mercurial commands in a shell
295 295 alias, as was done above for the purge alias. In addition,
296 296 ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
297 297 echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
298 298
299 299 .. note::
300 300
301 301 Some global configuration options such as ``-R`` are
302 302 processed before shell aliases and will thus not be passed to
303 303 aliases.
304 304
305 305
306 306 ``annotate``
307 307 ------------
308 308
309 309 Settings used when displaying file annotations. All values are
310 310 Booleans and default to False. See :hg:`help config.diff` for
311 311 related options for the diff command.
312 312
313 313 ``ignorews``
314 314 Ignore white space when comparing lines.
315 315
316 316 ``ignorewsamount``
317 317 Ignore changes in the amount of white space.
318 318
319 319 ``ignoreblanklines``
320 320 Ignore changes whose lines are all blank.
321 321
322 322
323 323 ``auth``
324 324 --------
325 325
326 326 Authentication credentials for HTTP authentication. This section
327 327 allows you to store usernames and passwords for use when logging
328 328 *into* HTTP servers. See :hg:`help config.web` if
329 329 you want to configure *who* can login to your HTTP server.
330 330
331 331 Each line has the following format::
332 332
333 333 <name>.<argument> = <value>
334 334
335 335 where ``<name>`` is used to group arguments into authentication
336 336 entries. Example::
337 337
338 338 foo.prefix = hg.intevation.de/mercurial
339 339 foo.username = foo
340 340 foo.password = bar
341 341 foo.schemes = http https
342 342
343 343 bar.prefix = secure.example.org
344 344 bar.key = path/to/file.key
345 345 bar.cert = path/to/file.cert
346 346 bar.schemes = https
347 347
348 348 Supported arguments:
349 349
350 350 ``prefix``
351 351 Either ``*`` or a URI prefix with or without the scheme part.
352 352 The authentication entry with the longest matching prefix is used
353 353 (where ``*`` matches everything and counts as a match of length
354 354 1). If the prefix doesn't include a scheme, the match is performed
355 355 against the URI with its scheme stripped as well, and the schemes
356 356 argument, q.v., is then subsequently consulted.
357 357
358 358 ``username``
359 359 Optional. Username to authenticate with. If not given, and the
360 360 remote site requires basic or digest authentication, the user will
361 361 be prompted for it. Environment variables are expanded in the
362 362 username letting you do ``foo.username = $USER``. If the URI
363 363 includes a username, only ``[auth]`` entries with a matching
364 364 username or without a username will be considered.
365 365
366 366 ``password``
367 367 Optional. Password to authenticate with. If not given, and the
368 368 remote site requires basic or digest authentication, the user
369 369 will be prompted for it.
370 370
371 371 ``key``
372 372 Optional. PEM encoded client certificate key file. Environment
373 373 variables are expanded in the filename.
374 374
375 375 ``cert``
376 376 Optional. PEM encoded client certificate chain file. Environment
377 377 variables are expanded in the filename.
378 378
379 379 ``schemes``
380 380 Optional. Space separated list of URI schemes to use this
381 381 authentication entry with. Only used if the prefix doesn't include
382 382 a scheme. Supported schemes are http and https. They will match
383 383 static-http and static-https respectively, as well.
384 384 (default: https)
385 385
386 386 If no suitable authentication entry is found, the user is prompted
387 387 for credentials as usual if required by the remote.
388 388
389 389 ``color``
390 390 ---------
391 391
392 392 Configure the Mercurial color mode. For details about how to define your custom
393 393 effect and style see :hg:`help color`.
394 394
395 395 ``mode``
396 396 String: control the method used to output color. One of ``auto``, ``ansi``,
397 397 ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension will
398 398 use ANSI mode by default (or win32 mode on Windows) if it detects a
399 399 terminal. Any invalid value will disable color.
400 400
401 401 ``pagermode``
402 402 String: optinal override of ``color.mode`` used with pager (from the pager
403 403 extensions).
404 404
405 405 On some systems, terminfo mode may cause problems when using
406 406 color with the pager extension and less -R. less with the -R option
407 407 will only display ECMA-48 color codes, and terminfo mode may sometimes
408 408 emit codes that less doesn't understand. You can work around this by
409 409 either using ansi mode (or auto mode), or by using less -r (which will
410 410 pass through all terminal control codes, not just color control
411 411 codes).
412 412
413 413 On some systems (such as MSYS in Windows), the terminal may support
414 414 a different color mode than the pager (activated via the "pager"
415 415 extension).
416 416
417 ``commands``
418 ----------
419
420 ``update.requiredest``
421 Require that the user pass a destination when running ``hg update``.
422 For example, ``hg update .::`` will be allowed, but a plain ``hg update``
423 will be disallowed.
424 (default: False)
425
417 426 ``committemplate``
418 427 ------------------
419 428
420 429 ``changeset``
421 430 String: configuration in this section is used as the template to
422 431 customize the text shown in the editor when committing.
423 432
424 433 In addition to pre-defined template keywords, commit log specific one
425 434 below can be used for customization:
426 435
427 436 ``extramsg``
428 437 String: Extra message (typically 'Leave message empty to abort
429 438 commit.'). This may be changed by some commands or extensions.
430 439
431 440 For example, the template configuration below shows as same text as
432 441 one shown by default::
433 442
434 443 [committemplate]
435 444 changeset = {desc}\n\n
436 445 HG: Enter commit message. Lines beginning with 'HG:' are removed.
437 446 HG: {extramsg}
438 447 HG: --
439 448 HG: user: {author}\n{ifeq(p2rev, "-1", "",
440 449 "HG: branch merge\n")
441 450 }HG: branch '{branch}'\n{if(activebookmark,
442 451 "HG: bookmark '{activebookmark}'\n") }{subrepos %
443 452 "HG: subrepo {subrepo}\n" }{file_adds %
444 453 "HG: added {file}\n" }{file_mods %
445 454 "HG: changed {file}\n" }{file_dels %
446 455 "HG: removed {file}\n" }{if(files, "",
447 456 "HG: no files changed\n")}
448 457
449 458 ``diff()``
450 459 String: show the diff (see :hg:`help templates` for detail)
451 460
452 461 Sometimes it is helpful to show the diff of the changeset in the editor without
453 462 having to prefix 'HG: ' to each line so that highlighting works correctly. For
454 463 this, Mercurial provides a special string which will ignore everything below
455 464 it::
456 465
457 466 HG: ------------------------ >8 ------------------------
458 467
459 468 For example, the template configuration below will show the diff below the
460 469 extra message::
461 470
462 471 [committemplate]
463 472 changeset = {desc}\n\n
464 473 HG: Enter commit message. Lines beginning with 'HG:' are removed.
465 474 HG: {extramsg}
466 475 HG: ------------------------ >8 ------------------------
467 476 HG: Do not touch the line above.
468 477 HG: Everything below will be removed.
469 478 {diff()}
470 479
471 480 .. note::
472 481
473 482 For some problematic encodings (see :hg:`help win32mbcs` for
474 483 detail), this customization should be configured carefully, to
475 484 avoid showing broken characters.
476 485
477 486 For example, if a multibyte character ending with backslash (0x5c) is
478 487 followed by the ASCII character 'n' in the customized template,
479 488 the sequence of backslash and 'n' is treated as line-feed unexpectedly
480 489 (and the multibyte character is broken, too).
481 490
482 491 Customized template is used for commands below (``--edit`` may be
483 492 required):
484 493
485 494 - :hg:`backout`
486 495 - :hg:`commit`
487 496 - :hg:`fetch` (for merge commit only)
488 497 - :hg:`graft`
489 498 - :hg:`histedit`
490 499 - :hg:`import`
491 500 - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`
492 501 - :hg:`rebase`
493 502 - :hg:`shelve`
494 503 - :hg:`sign`
495 504 - :hg:`tag`
496 505 - :hg:`transplant`
497 506
498 507 Configuring items below instead of ``changeset`` allows showing
499 508 customized message only for specific actions, or showing different
500 509 messages for each action.
501 510
502 511 - ``changeset.backout`` for :hg:`backout`
503 512 - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges
504 513 - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other
505 514 - ``changeset.commit.normal.merge`` for :hg:`commit` on merges
506 515 - ``changeset.commit.normal.normal`` for :hg:`commit` on other
507 516 - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
508 517 - ``changeset.gpg.sign`` for :hg:`sign`
509 518 - ``changeset.graft`` for :hg:`graft`
510 519 - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit`
511 520 - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit`
512 521 - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit`
513 522 - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit`
514 523 - ``changeset.import.bypass`` for :hg:`import --bypass`
515 524 - ``changeset.import.normal.merge`` for :hg:`import` on merges
516 525 - ``changeset.import.normal.normal`` for :hg:`import` on other
517 526 - ``changeset.mq.qnew`` for :hg:`qnew`
518 527 - ``changeset.mq.qfold`` for :hg:`qfold`
519 528 - ``changeset.mq.qrefresh`` for :hg:`qrefresh`
520 529 - ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
521 530 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
522 531 - ``changeset.rebase.normal`` for :hg:`rebase` on other
523 532 - ``changeset.shelve.shelve`` for :hg:`shelve`
524 533 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
525 534 - ``changeset.tag.remove`` for :hg:`tag --remove`
526 535 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
527 536 - ``changeset.transplant.normal`` for :hg:`transplant` on other
528 537
529 538 These dot-separated lists of names are treated as hierarchical ones.
530 539 For example, ``changeset.tag.remove`` customizes the commit message
531 540 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
532 541 commit message for :hg:`tag` regardless of ``--remove`` option.
533 542
534 543 When the external editor is invoked for a commit, the corresponding
535 544 dot-separated list of names without the ``changeset.`` prefix
536 545 (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment
537 546 variable.
538 547
539 548 In this section, items other than ``changeset`` can be referred from
540 549 others. For example, the configuration to list committed files up
541 550 below can be referred as ``{listupfiles}``::
542 551
543 552 [committemplate]
544 553 listupfiles = {file_adds %
545 554 "HG: added {file}\n" }{file_mods %
546 555 "HG: changed {file}\n" }{file_dels %
547 556 "HG: removed {file}\n" }{if(files, "",
548 557 "HG: no files changed\n")}
549 558
550 559 ``decode/encode``
551 560 -----------------
552 561
553 562 Filters for transforming files on checkout/checkin. This would
554 563 typically be used for newline processing or other
555 564 localization/canonicalization of files.
556 565
557 566 Filters consist of a filter pattern followed by a filter command.
558 567 Filter patterns are globs by default, rooted at the repository root.
559 568 For example, to match any file ending in ``.txt`` in the root
560 569 directory only, use the pattern ``*.txt``. To match any file ending
561 570 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
562 571 For each file only the first matching filter applies.
563 572
564 573 The filter command can start with a specifier, either ``pipe:`` or
565 574 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
566 575
567 576 A ``pipe:`` command must accept data on stdin and return the transformed
568 577 data on stdout.
569 578
570 579 Pipe example::
571 580
572 581 [encode]
573 582 # uncompress gzip files on checkin to improve delta compression
574 583 # note: not necessarily a good idea, just an example
575 584 *.gz = pipe: gunzip
576 585
577 586 [decode]
578 587 # recompress gzip files when writing them to the working dir (we
579 588 # can safely omit "pipe:", because it's the default)
580 589 *.gz = gzip
581 590
582 591 A ``tempfile:`` command is a template. The string ``INFILE`` is replaced
583 592 with the name of a temporary file that contains the data to be
584 593 filtered by the command. The string ``OUTFILE`` is replaced with the name
585 594 of an empty temporary file, where the filtered data must be written by
586 595 the command.
587 596
588 597 .. container:: windows
589 598
590 599 .. note::
591 600
592 601 The tempfile mechanism is recommended for Windows systems,
593 602 where the standard shell I/O redirection operators often have
594 603 strange effects and may corrupt the contents of your files.
595 604
596 605 This filter mechanism is used internally by the ``eol`` extension to
597 606 translate line ending characters between Windows (CRLF) and Unix (LF)
598 607 format. We suggest you use the ``eol`` extension for convenience.
599 608
600 609
601 610 ``defaults``
602 611 ------------
603 612
604 613 (defaults are deprecated. Don't use them. Use aliases instead.)
605 614
606 615 Use the ``[defaults]`` section to define command defaults, i.e. the
607 616 default options/arguments to pass to the specified commands.
608 617
609 618 The following example makes :hg:`log` run in verbose mode, and
610 619 :hg:`status` show only the modified files, by default::
611 620
612 621 [defaults]
613 622 log = -v
614 623 status = -m
615 624
616 625 The actual commands, instead of their aliases, must be used when
617 626 defining command defaults. The command defaults will also be applied
618 627 to the aliases of the commands defined.
619 628
620 629
621 630 ``diff``
622 631 --------
623 632
624 633 Settings used when displaying diffs. Everything except for ``unified``
625 634 is a Boolean and defaults to False. See :hg:`help config.annotate`
626 635 for related options for the annotate command.
627 636
628 637 ``git``
629 638 Use git extended diff format.
630 639
631 640 ``nobinary``
632 641 Omit git binary patches.
633 642
634 643 ``nodates``
635 644 Don't include dates in diff headers.
636 645
637 646 ``noprefix``
638 647 Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
639 648
640 649 ``showfunc``
641 650 Show which function each change is in.
642 651
643 652 ``ignorews``
644 653 Ignore white space when comparing lines.
645 654
646 655 ``ignorewsamount``
647 656 Ignore changes in the amount of white space.
648 657
649 658 ``ignoreblanklines``
650 659 Ignore changes whose lines are all blank.
651 660
652 661 ``unified``
653 662 Number of lines of context to show.
654 663
655 664 ``email``
656 665 ---------
657 666
658 667 Settings for extensions that send email messages.
659 668
660 669 ``from``
661 670 Optional. Email address to use in "From" header and SMTP envelope
662 671 of outgoing messages.
663 672
664 673 ``to``
665 674 Optional. Comma-separated list of recipients' email addresses.
666 675
667 676 ``cc``
668 677 Optional. Comma-separated list of carbon copy recipients'
669 678 email addresses.
670 679
671 680 ``bcc``
672 681 Optional. Comma-separated list of blind carbon copy recipients'
673 682 email addresses.
674 683
675 684 ``method``
676 685 Optional. Method to use to send email messages. If value is ``smtp``
677 686 (default), use SMTP (see the ``[smtp]`` section for configuration).
678 687 Otherwise, use as name of program to run that acts like sendmail
679 688 (takes ``-f`` option for sender, list of recipients on command line,
680 689 message on stdin). Normally, setting this to ``sendmail`` or
681 690 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
682 691
683 692 ``charsets``
684 693 Optional. Comma-separated list of character sets considered
685 694 convenient for recipients. Addresses, headers, and parts not
686 695 containing patches of outgoing messages will be encoded in the
687 696 first character set to which conversion from local encoding
688 697 (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
689 698 conversion fails, the text in question is sent as is.
690 699 (default: '')
691 700
692 701 Order of outgoing email character sets:
693 702
694 703 1. ``us-ascii``: always first, regardless of settings
695 704 2. ``email.charsets``: in order given by user
696 705 3. ``ui.fallbackencoding``: if not in email.charsets
697 706 4. ``$HGENCODING``: if not in email.charsets
698 707 5. ``utf-8``: always last, regardless of settings
699 708
700 709 Email example::
701 710
702 711 [email]
703 712 from = Joseph User <joe.user@example.com>
704 713 method = /usr/sbin/sendmail
705 714 # charsets for western Europeans
706 715 # us-ascii, utf-8 omitted, as they are tried first and last
707 716 charsets = iso-8859-1, iso-8859-15, windows-1252
708 717
709 718
710 719 ``extensions``
711 720 --------------
712 721
713 722 Mercurial has an extension mechanism for adding new features. To
714 723 enable an extension, create an entry for it in this section.
715 724
716 725 If you know that the extension is already in Python's search path,
717 726 you can give the name of the module, followed by ``=``, with nothing
718 727 after the ``=``.
719 728
720 729 Otherwise, give a name that you choose, followed by ``=``, followed by
721 730 the path to the ``.py`` file (including the file name extension) that
722 731 defines the extension.
723 732
724 733 To explicitly disable an extension that is enabled in an hgrc of
725 734 broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
726 735 or ``foo = !`` when path is not supplied.
727 736
728 737 Example for ``~/.hgrc``::
729 738
730 739 [extensions]
731 740 # (the churn extension will get loaded from Mercurial's path)
732 741 churn =
733 742 # (this extension will get loaded from the file specified)
734 743 myfeature = ~/.hgext/myfeature.py
735 744
736 745
737 746 ``format``
738 747 ----------
739 748
740 749 ``usegeneraldelta``
741 750 Enable or disable the "generaldelta" repository format which improves
742 751 repository compression by allowing "revlog" to store delta against arbitrary
743 752 revision instead of the previous stored one. This provides significant
744 753 improvement for repositories with branches.
745 754
746 755 Repositories with this on-disk format require Mercurial version 1.9.
747 756
748 757 Enabled by default.
749 758
750 759 ``dotencode``
751 760 Enable or disable the "dotencode" repository format which enhances
752 761 the "fncache" repository format (which has to be enabled to use
753 762 dotencode) to avoid issues with filenames starting with ._ on
754 763 Mac OS X and spaces on Windows.
755 764
756 765 Repositories with this on-disk format require Mercurial version 1.7.
757 766
758 767 Enabled by default.
759 768
760 769 ``usefncache``
761 770 Enable or disable the "fncache" repository format which enhances
762 771 the "store" repository format (which has to be enabled to use
763 772 fncache) to allow longer filenames and avoids using Windows
764 773 reserved names, e.g. "nul".
765 774
766 775 Repositories with this on-disk format require Mercurial version 1.1.
767 776
768 777 Enabled by default.
769 778
770 779 ``usestore``
771 780 Enable or disable the "store" repository format which improves
772 781 compatibility with systems that fold case or otherwise mangle
773 782 filenames. Disabling this option will allow you to store longer filenames
774 783 in some situations at the expense of compatibility.
775 784
776 785 Repositories with this on-disk format require Mercurial version 0.9.4.
777 786
778 787 Enabled by default.
779 788
780 789 ``graph``
781 790 ---------
782 791
783 792 Web graph view configuration. This section let you change graph
784 793 elements display properties by branches, for instance to make the
785 794 ``default`` branch stand out.
786 795
787 796 Each line has the following format::
788 797
789 798 <branch>.<argument> = <value>
790 799
791 800 where ``<branch>`` is the name of the branch being
792 801 customized. Example::
793 802
794 803 [graph]
795 804 # 2px width
796 805 default.width = 2
797 806 # red color
798 807 default.color = FF0000
799 808
800 809 Supported arguments:
801 810
802 811 ``width``
803 812 Set branch edges width in pixels.
804 813
805 814 ``color``
806 815 Set branch edges color in hexadecimal RGB notation.
807 816
808 817 ``hooks``
809 818 ---------
810 819
811 820 Commands or Python functions that get automatically executed by
812 821 various actions such as starting or finishing a commit. Multiple
813 822 hooks can be run for the same action by appending a suffix to the
814 823 action. Overriding a site-wide hook can be done by changing its
815 824 value or setting it to an empty string. Hooks can be prioritized
816 825 by adding a prefix of ``priority.`` to the hook name on a new line
817 826 and setting the priority. The default priority is 0.
818 827
819 828 Example ``.hg/hgrc``::
820 829
821 830 [hooks]
822 831 # update working directory after adding changesets
823 832 changegroup.update = hg update
824 833 # do not use the site-wide hook
825 834 incoming =
826 835 incoming.email = /my/email/hook
827 836 incoming.autobuild = /my/build/hook
828 837 # force autobuild hook to run before other incoming hooks
829 838 priority.incoming.autobuild = 1
830 839
831 840 Most hooks are run with environment variables set that give useful
832 841 additional information. For each hook below, the environment
833 842 variables it is passed are listed with names of the form ``$HG_foo``.
834 843
835 844 ``changegroup``
836 845 Run after a changegroup has been added via push, pull or unbundle. ID of the
837 846 first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL
838 847 from which changes came is in ``$HG_URL``.
839 848
840 849 ``commit``
841 850 Run after a changeset has been created in the local repository. ID
842 851 of the newly created changeset is in ``$HG_NODE``. Parent changeset
843 852 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
844 853
845 854 ``incoming``
846 855 Run after a changeset has been pulled, pushed, or unbundled into
847 856 the local repository. The ID of the newly arrived changeset is in
848 857 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
849 858
850 859 ``outgoing``
851 860 Run after sending changes from local repository to another. ID of
852 861 first changeset sent is in ``$HG_NODE``. Source of operation is in
853 862 ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook.
854 863
855 864 ``post-<command>``
856 865 Run after successful invocations of the associated command. The
857 866 contents of the command line are passed as ``$HG_ARGS`` and the result
858 867 code in ``$HG_RESULT``. Parsed command line arguments are passed as
859 868 ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of
860 869 the python data internally passed to <command>. ``$HG_OPTS`` is a
861 870 dictionary of options (with unspecified options set to their defaults).
862 871 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
863 872
864 873 ``fail-<command>``
865 874 Run after a failed invocation of an associated command. The contents
866 875 of the command line are passed as ``$HG_ARGS``. Parsed command line
867 876 arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain
868 877 string representations of the python data internally passed to
869 878 <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified
870 879 options set to their defaults). ``$HG_PATS`` is a list of arguments.
871 880 Hook failure is ignored.
872 881
873 882 ``pre-<command>``
874 883 Run before executing the associated command. The contents of the
875 884 command line are passed as ``$HG_ARGS``. Parsed command line arguments
876 885 are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string
877 886 representations of the data internally passed to <command>. ``$HG_OPTS``
878 887 is a dictionary of options (with unspecified options set to their
879 888 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
880 889 failure, the command doesn't execute and Mercurial returns the failure
881 890 code.
882 891
883 892 ``prechangegroup``
884 893 Run before a changegroup is added via push, pull or unbundle. Exit
885 894 status 0 allows the changegroup to proceed. Non-zero status will
886 895 cause the push, pull or unbundle to fail. URL from which changes
887 896 will come is in ``$HG_URL``.
888 897
889 898 ``precommit``
890 899 Run before starting a local commit. Exit status 0 allows the
891 900 commit to proceed. Non-zero status will cause the commit to fail.
892 901 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
893 902
894 903 ``prelistkeys``
895 904 Run before listing pushkeys (like bookmarks) in the
896 905 repository. Non-zero status will cause failure. The key namespace is
897 906 in ``$HG_NAMESPACE``.
898 907
899 908 ``preoutgoing``
900 909 Run before collecting changes to send from the local repository to
901 910 another. Non-zero status will cause failure. This lets you prevent
902 911 pull over HTTP or SSH. Also prevents against local pull, push
903 912 (outbound) or bundle commands, but not effective, since you can
904 913 just copy files instead then. Source of operation is in
905 914 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
906 915 SSH or HTTP repository. If "push", "pull" or "bundle", operation
907 916 is happening on behalf of repository on same system.
908 917
909 918 ``prepushkey``
910 919 Run before a pushkey (like a bookmark) is added to the
911 920 repository. Non-zero status will cause the key to be rejected. The
912 921 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
913 922 the old value (if any) is in ``$HG_OLD``, and the new value is in
914 923 ``$HG_NEW``.
915 924
916 925 ``pretag``
917 926 Run before creating a tag. Exit status 0 allows the tag to be
918 927 created. Non-zero status will cause the tag to fail. ID of
919 928 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
920 929 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
921 930
922 931 ``pretxnopen``
923 932 Run before any new repository transaction is open. The reason for the
924 933 transaction will be in ``$HG_TXNNAME`` and a unique identifier for the
925 934 transaction will be in ``HG_TXNID``. A non-zero status will prevent the
926 935 transaction from being opened.
927 936
928 937 ``pretxnclose``
929 938 Run right before the transaction is actually finalized. Any repository change
930 939 will be visible to the hook program. This lets you validate the transaction
931 940 content or change it. Exit status 0 allows the commit to proceed. Non-zero
932 941 status will cause the transaction to be rolled back. The reason for the
933 942 transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for
934 943 the transaction will be in ``HG_TXNID``. The rest of the available data will
935 944 vary according the transaction type. New changesets will add ``$HG_NODE`` (id
936 945 of the first added changeset), ``$HG_NODE_LAST`` (id of the last added
937 946 changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases
938 947 changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc.
939 948
940 949 ``txnclose``
941 950 Run after any repository transaction has been committed. At this
942 951 point, the transaction can no longer be rolled back. The hook will run
943 952 after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for
944 953 details about available variables.
945 954
946 955 ``txnabort``
947 956 Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose`
948 957 docs for details about available variables.
949 958
950 959 ``pretxnchangegroup``
951 960 Run after a changegroup has been added via push, pull or unbundle, but before
952 961 the transaction has been committed. Changegroup is visible to hook program.
953 962 This lets you validate incoming changes before accepting them. Passed the ID
954 963 of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.
955 964 Exit status 0 allows the transaction to commit. Non-zero status will cause
956 965 the transaction to be rolled back and the push, pull or unbundle will fail.
957 966 URL that was source of changes is in ``$HG_URL``.
958 967
959 968 ``pretxncommit``
960 969 Run after a changeset has been created but the transaction not yet
961 970 committed. Changeset is visible to hook program. This lets you
962 971 validate commit message and changes. Exit status 0 allows the
963 972 commit to proceed. Non-zero status will cause the transaction to
964 973 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
965 974 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
966 975
967 976 ``preupdate``
968 977 Run before updating the working directory. Exit status 0 allows
969 978 the update to proceed. Non-zero status will prevent the update.
970 979 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
971 980 of second new parent is in ``$HG_PARENT2``.
972 981
973 982 ``listkeys``
974 983 Run after listing pushkeys (like bookmarks) in the repository. The
975 984 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
976 985 dictionary containing the keys and values.
977 986
978 987 ``pushkey``
979 988 Run after a pushkey (like a bookmark) is added to the
980 989 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
981 990 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
982 991 value is in ``$HG_NEW``.
983 992
984 993 ``tag``
985 994 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
986 995 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
987 996 repository if ``$HG_LOCAL=0``.
988 997
989 998 ``update``
990 999 Run after updating the working directory. Changeset ID of first
991 1000 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
992 1001 in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
993 1002 update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
994 1003
995 1004 .. note::
996 1005
997 1006 It is generally better to use standard hooks rather than the
998 1007 generic pre- and post- command hooks as they are guaranteed to be
999 1008 called in the appropriate contexts for influencing transactions.
1000 1009 Also, hooks like "commit" will be called in all contexts that
1001 1010 generate a commit (e.g. tag) and not just the commit command.
1002 1011
1003 1012 .. note::
1004 1013
1005 1014 Environment variables with empty values may not be passed to
1006 1015 hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
1007 1016 will have an empty value under Unix-like platforms for non-merge
1008 1017 changesets, while it will not be available at all under Windows.
1009 1018
1010 1019 The syntax for Python hooks is as follows::
1011 1020
1012 1021 hookname = python:modulename.submodule.callable
1013 1022 hookname = python:/path/to/python/module.py:callable
1014 1023
1015 1024 Python hooks are run within the Mercurial process. Each hook is
1016 1025 called with at least three keyword arguments: a ui object (keyword
1017 1026 ``ui``), a repository object (keyword ``repo``), and a ``hooktype``
1018 1027 keyword that tells what kind of hook is used. Arguments listed as
1019 1028 environment variables above are passed as keyword arguments, with no
1020 1029 ``HG_`` prefix, and names in lower case.
1021 1030
1022 1031 If a Python hook returns a "true" value or raises an exception, this
1023 1032 is treated as a failure.
1024 1033
1025 1034
1026 1035 ``hostfingerprints``
1027 1036 --------------------
1028 1037
1029 1038 (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.)
1030 1039
1031 1040 Fingerprints of the certificates of known HTTPS servers.
1032 1041
1033 1042 A HTTPS connection to a server with a fingerprint configured here will
1034 1043 only succeed if the servers certificate matches the fingerprint.
1035 1044 This is very similar to how ssh known hosts works.
1036 1045
1037 1046 The fingerprint is the SHA-1 hash value of the DER encoded certificate.
1038 1047 Multiple values can be specified (separated by spaces or commas). This can
1039 1048 be used to define both old and new fingerprints while a host transitions
1040 1049 to a new certificate.
1041 1050
1042 1051 The CA chain and web.cacerts is not used for servers with a fingerprint.
1043 1052
1044 1053 For example::
1045 1054
1046 1055 [hostfingerprints]
1047 1056 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1048 1057 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1049 1058
1050 1059 ``hostsecurity``
1051 1060 ----------------
1052 1061
1053 1062 Used to specify global and per-host security settings for connecting to
1054 1063 other machines.
1055 1064
1056 1065 The following options control default behavior for all hosts.
1057 1066
1058 1067 ``ciphers``
1059 1068 Defines the cryptographic ciphers to use for connections.
1060 1069
1061 1070 Value must be a valid OpenSSL Cipher List Format as documented at
1062 1071 https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT.
1063 1072
1064 1073 This setting is for advanced users only. Setting to incorrect values
1065 1074 can significantly lower connection security or decrease performance.
1066 1075 You have been warned.
1067 1076
1068 1077 This option requires Python 2.7.
1069 1078
1070 1079 ``minimumprotocol``
1071 1080 Defines the minimum channel encryption protocol to use.
1072 1081
1073 1082 By default, the highest version of TLS supported by both client and server
1074 1083 is used.
1075 1084
1076 1085 Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``.
1077 1086
1078 1087 When running on an old Python version, only ``tls1.0`` is allowed since
1079 1088 old versions of Python only support up to TLS 1.0.
1080 1089
1081 1090 When running a Python that supports modern TLS versions, the default is
1082 1091 ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this
1083 1092 weakens security and should only be used as a feature of last resort if
1084 1093 a server does not support TLS 1.1+.
1085 1094
1086 1095 Options in the ``[hostsecurity]`` section can have the form
1087 1096 ``hostname``:``setting``. This allows multiple settings to be defined on a
1088 1097 per-host basis.
1089 1098
1090 1099 The following per-host settings can be defined.
1091 1100
1092 1101 ``ciphers``
1093 1102 This behaves like ``ciphers`` as described above except it only applies
1094 1103 to the host on which it is defined.
1095 1104
1096 1105 ``fingerprints``
1097 1106 A list of hashes of the DER encoded peer/remote certificate. Values have
1098 1107 the form ``algorithm``:``fingerprint``. e.g.
1099 1108 ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.
1100 1109
1101 1110 The following algorithms/prefixes are supported: ``sha1``, ``sha256``,
1102 1111 ``sha512``.
1103 1112
1104 1113 Use of ``sha256`` or ``sha512`` is preferred.
1105 1114
1106 1115 If a fingerprint is specified, the CA chain is not validated for this
1107 1116 host and Mercurial will require the remote certificate to match one
1108 1117 of the fingerprints specified. This means if the server updates its
1109 1118 certificate, Mercurial will abort until a new fingerprint is defined.
1110 1119 This can provide stronger security than traditional CA-based validation
1111 1120 at the expense of convenience.
1112 1121
1113 1122 This option takes precedence over ``verifycertsfile``.
1114 1123
1115 1124 ``minimumprotocol``
1116 1125 This behaves like ``minimumprotocol`` as described above except it
1117 1126 only applies to the host on which it is defined.
1118 1127
1119 1128 ``verifycertsfile``
1120 1129 Path to file a containing a list of PEM encoded certificates used to
1121 1130 verify the server certificate. Environment variables and ``~user``
1122 1131 constructs are expanded in the filename.
1123 1132
1124 1133 The server certificate or the certificate's certificate authority (CA)
1125 1134 must match a certificate from this file or certificate verification
1126 1135 will fail and connections to the server will be refused.
1127 1136
1128 1137 If defined, only certificates provided by this file will be used:
1129 1138 ``web.cacerts`` and any system/default certificates will not be
1130 1139 used.
1131 1140
1132 1141 This option has no effect if the per-host ``fingerprints`` option
1133 1142 is set.
1134 1143
1135 1144 The format of the file is as follows::
1136 1145
1137 1146 -----BEGIN CERTIFICATE-----
1138 1147 ... (certificate in base64 PEM encoding) ...
1139 1148 -----END CERTIFICATE-----
1140 1149 -----BEGIN CERTIFICATE-----
1141 1150 ... (certificate in base64 PEM encoding) ...
1142 1151 -----END CERTIFICATE-----
1143 1152
1144 1153 For example::
1145 1154
1146 1155 [hostsecurity]
1147 1156 hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
1148 1157 hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
1149 1158 foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem
1150 1159
1151 1160 To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
1152 1161 when connecting to ``hg.example.com``::
1153 1162
1154 1163 [hostsecurity]
1155 1164 minimumprotocol = tls1.2
1156 1165 hg.example.com:minimumprotocol = tls1.1
1157 1166
1158 1167 ``http_proxy``
1159 1168 --------------
1160 1169
1161 1170 Used to access web-based Mercurial repositories through a HTTP
1162 1171 proxy.
1163 1172
1164 1173 ``host``
1165 1174 Host name and (optional) port of the proxy server, for example
1166 1175 "myproxy:8000".
1167 1176
1168 1177 ``no``
1169 1178 Optional. Comma-separated list of host names that should bypass
1170 1179 the proxy.
1171 1180
1172 1181 ``passwd``
1173 1182 Optional. Password to authenticate with at the proxy server.
1174 1183
1175 1184 ``user``
1176 1185 Optional. User name to authenticate with at the proxy server.
1177 1186
1178 1187 ``always``
1179 1188 Optional. Always use the proxy, even for localhost and any entries
1180 1189 in ``http_proxy.no``. (default: False)
1181 1190
1182 1191 ``merge``
1183 1192 ---------
1184 1193
1185 1194 This section specifies behavior during merges and updates.
1186 1195
1187 1196 ``checkignored``
1188 1197 Controls behavior when an ignored file on disk has the same name as a tracked
1189 1198 file in the changeset being merged or updated to, and has different
1190 1199 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
1191 1200 abort on such files. With ``warn``, warn on such files and back them up as
1192 1201 ``.orig``. With ``ignore``, don't print a warning and back them up as
1193 1202 ``.orig``. (default: ``abort``)
1194 1203
1195 1204 ``checkunknown``
1196 1205 Controls behavior when an unknown file that isn't ignored has the same name
1197 1206 as a tracked file in the changeset being merged or updated to, and has
1198 1207 different contents. Similar to ``merge.checkignored``, except for files that
1199 1208 are not ignored. (default: ``abort``)
1200 1209
1201 1210 ``merge-patterns``
1202 1211 ------------------
1203 1212
1204 1213 This section specifies merge tools to associate with particular file
1205 1214 patterns. Tools matched here will take precedence over the default
1206 1215 merge tool. Patterns are globs by default, rooted at the repository
1207 1216 root.
1208 1217
1209 1218 Example::
1210 1219
1211 1220 [merge-patterns]
1212 1221 **.c = kdiff3
1213 1222 **.jpg = myimgmerge
1214 1223
1215 1224 ``merge-tools``
1216 1225 ---------------
1217 1226
1218 1227 This section configures external merge tools to use for file-level
1219 1228 merges. This section has likely been preconfigured at install time.
1220 1229 Use :hg:`config merge-tools` to check the existing configuration.
1221 1230 Also see :hg:`help merge-tools` for more details.
1222 1231
1223 1232 Example ``~/.hgrc``::
1224 1233
1225 1234 [merge-tools]
1226 1235 # Override stock tool location
1227 1236 kdiff3.executable = ~/bin/kdiff3
1228 1237 # Specify command line
1229 1238 kdiff3.args = $base $local $other -o $output
1230 1239 # Give higher priority
1231 1240 kdiff3.priority = 1
1232 1241
1233 1242 # Changing the priority of preconfigured tool
1234 1243 meld.priority = 0
1235 1244
1236 1245 # Disable a preconfigured tool
1237 1246 vimdiff.disabled = yes
1238 1247
1239 1248 # Define new tool
1240 1249 myHtmlTool.args = -m $local $other $base $output
1241 1250 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
1242 1251 myHtmlTool.priority = 1
1243 1252
1244 1253 Supported arguments:
1245 1254
1246 1255 ``priority``
1247 1256 The priority in which to evaluate this tool.
1248 1257 (default: 0)
1249 1258
1250 1259 ``executable``
1251 1260 Either just the name of the executable or its pathname.
1252 1261
1253 1262 .. container:: windows
1254 1263
1255 1264 On Windows, the path can use environment variables with ${ProgramFiles}
1256 1265 syntax.
1257 1266
1258 1267 (default: the tool name)
1259 1268
1260 1269 ``args``
1261 1270 The arguments to pass to the tool executable. You can refer to the
1262 1271 files being merged as well as the output file through these
1263 1272 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
1264 1273 of ``$local`` and ``$other`` can vary depending on which action is being
1265 1274 performed. During and update or merge, ``$local`` represents the original
1266 1275 state of the file, while ``$other`` represents the commit you are updating
1267 1276 to or the commit you are merging with. During a rebase ``$local``
1268 1277 represents the destination of the rebase, and ``$other`` represents the
1269 1278 commit being rebased.
1270 1279 (default: ``$local $base $other``)
1271 1280
1272 1281 ``premerge``
1273 1282 Attempt to run internal non-interactive 3-way merge tool before
1274 1283 launching external tool. Options are ``true``, ``false``, ``keep`` or
1275 1284 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
1276 1285 premerge fails. The ``keep-merge3`` will do the same but include information
1277 1286 about the base of the merge in the marker (see internal :merge3 in
1278 1287 :hg:`help merge-tools`).
1279 1288 (default: True)
1280 1289
1281 1290 ``binary``
1282 1291 This tool can merge binary files. (default: False, unless tool
1283 1292 was selected by file pattern match)
1284 1293
1285 1294 ``symlink``
1286 1295 This tool can merge symlinks. (default: False)
1287 1296
1288 1297 ``check``
1289 1298 A list of merge success-checking options:
1290 1299
1291 1300 ``changed``
1292 1301 Ask whether merge was successful when the merged file shows no changes.
1293 1302 ``conflicts``
1294 1303 Check whether there are conflicts even though the tool reported success.
1295 1304 ``prompt``
1296 1305 Always prompt for merge success, regardless of success reported by tool.
1297 1306
1298 1307 ``fixeol``
1299 1308 Attempt to fix up EOL changes caused by the merge tool.
1300 1309 (default: False)
1301 1310
1302 1311 ``gui``
1303 1312 This tool requires a graphical interface to run. (default: False)
1304 1313
1305 1314 .. container:: windows
1306 1315
1307 1316 ``regkey``
1308 1317 Windows registry key which describes install location of this
1309 1318 tool. Mercurial will search for this key first under
1310 1319 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
1311 1320 (default: None)
1312 1321
1313 1322 ``regkeyalt``
1314 1323 An alternate Windows registry key to try if the first key is not
1315 1324 found. The alternate key uses the same ``regname`` and ``regappend``
1316 1325 semantics of the primary key. The most common use for this key
1317 1326 is to search for 32bit applications on 64bit operating systems.
1318 1327 (default: None)
1319 1328
1320 1329 ``regname``
1321 1330 Name of value to read from specified registry key.
1322 1331 (default: the unnamed (default) value)
1323 1332
1324 1333 ``regappend``
1325 1334 String to append to the value read from the registry, typically
1326 1335 the executable name of the tool.
1327 1336 (default: None)
1328 1337
1329 1338
1330 1339 ``patch``
1331 1340 ---------
1332 1341
1333 1342 Settings used when applying patches, for instance through the 'import'
1334 1343 command or with Mercurial Queues extension.
1335 1344
1336 1345 ``eol``
1337 1346 When set to 'strict' patch content and patched files end of lines
1338 1347 are preserved. When set to ``lf`` or ``crlf``, both files end of
1339 1348 lines are ignored when patching and the result line endings are
1340 1349 normalized to either LF (Unix) or CRLF (Windows). When set to
1341 1350 ``auto``, end of lines are again ignored while patching but line
1342 1351 endings in patched files are normalized to their original setting
1343 1352 on a per-file basis. If target file does not exist or has no end
1344 1353 of line, patch line endings are preserved.
1345 1354 (default: strict)
1346 1355
1347 1356 ``fuzz``
1348 1357 The number of lines of 'fuzz' to allow when applying patches. This
1349 1358 controls how much context the patcher is allowed to ignore when
1350 1359 trying to apply a patch.
1351 1360 (default: 2)
1352 1361
1353 1362 ``paths``
1354 1363 ---------
1355 1364
1356 1365 Assigns symbolic names and behavior to repositories.
1357 1366
1358 1367 Options are symbolic names defining the URL or directory that is the
1359 1368 location of the repository. Example::
1360 1369
1361 1370 [paths]
1362 1371 my_server = https://example.com/my_repo
1363 1372 local_path = /home/me/repo
1364 1373
1365 1374 These symbolic names can be used from the command line. To pull
1366 1375 from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:
1367 1376 :hg:`push local_path`.
1368 1377
1369 1378 Options containing colons (``:``) denote sub-options that can influence
1370 1379 behavior for that specific path. Example::
1371 1380
1372 1381 [paths]
1373 1382 my_server = https://example.com/my_path
1374 1383 my_server:pushurl = ssh://example.com/my_path
1375 1384
1376 1385 The following sub-options can be defined:
1377 1386
1378 1387 ``pushurl``
1379 1388 The URL to use for push operations. If not defined, the location
1380 1389 defined by the path's main entry is used.
1381 1390
1382 1391 ``pushrev``
1383 1392 A revset defining which revisions to push by default.
1384 1393
1385 1394 When :hg:`push` is executed without a ``-r`` argument, the revset
1386 1395 defined by this sub-option is evaluated to determine what to push.
1387 1396
1388 1397 For example, a value of ``.`` will push the working directory's
1389 1398 revision by default.
1390 1399
1391 1400 Revsets specifying bookmarks will not result in the bookmark being
1392 1401 pushed.
1393 1402
1394 1403 The following special named paths exist:
1395 1404
1396 1405 ``default``
1397 1406 The URL or directory to use when no source or remote is specified.
1398 1407
1399 1408 :hg:`clone` will automatically define this path to the location the
1400 1409 repository was cloned from.
1401 1410
1402 1411 ``default-push``
1403 1412 (deprecated) The URL or directory for the default :hg:`push` location.
1404 1413 ``default:pushurl`` should be used instead.
1405 1414
1406 1415 ``phases``
1407 1416 ----------
1408 1417
1409 1418 Specifies default handling of phases. See :hg:`help phases` for more
1410 1419 information about working with phases.
1411 1420
1412 1421 ``publish``
1413 1422 Controls draft phase behavior when working as a server. When true,
1414 1423 pushed changesets are set to public in both client and server and
1415 1424 pulled or cloned changesets are set to public in the client.
1416 1425 (default: True)
1417 1426
1418 1427 ``new-commit``
1419 1428 Phase of newly-created commits.
1420 1429 (default: draft)
1421 1430
1422 1431 ``checksubrepos``
1423 1432 Check the phase of the current revision of each subrepository. Allowed
1424 1433 values are "ignore", "follow" and "abort". For settings other than
1425 1434 "ignore", the phase of the current revision of each subrepository is
1426 1435 checked before committing the parent repository. If any of those phases is
1427 1436 greater than the phase of the parent repository (e.g. if a subrepo is in a
1428 1437 "secret" phase while the parent repo is in "draft" phase), the commit is
1429 1438 either aborted (if checksubrepos is set to "abort") or the higher phase is
1430 1439 used for the parent repository commit (if set to "follow").
1431 1440 (default: follow)
1432 1441
1433 1442
1434 1443 ``profiling``
1435 1444 -------------
1436 1445
1437 1446 Specifies profiling type, format, and file output. Two profilers are
1438 1447 supported: an instrumenting profiler (named ``ls``), and a sampling
1439 1448 profiler (named ``stat``).
1440 1449
1441 1450 In this section description, 'profiling data' stands for the raw data
1442 1451 collected during profiling, while 'profiling report' stands for a
1443 1452 statistical text report generated from the profiling data. The
1444 1453 profiling is done using lsprof.
1445 1454
1446 1455 ``enabled``
1447 1456 Enable the profiler.
1448 1457 (default: false)
1449 1458
1450 1459 This is equivalent to passing ``--profile`` on the command line.
1451 1460
1452 1461 ``type``
1453 1462 The type of profiler to use.
1454 1463 (default: stat)
1455 1464
1456 1465 ``ls``
1457 1466 Use Python's built-in instrumenting profiler. This profiler
1458 1467 works on all platforms, but each line number it reports is the
1459 1468 first line of a function. This restriction makes it difficult to
1460 1469 identify the expensive parts of a non-trivial function.
1461 1470 ``stat``
1462 1471 Use a statistical profiler, statprof. This profiler is most
1463 1472 useful for profiling commands that run for longer than about 0.1
1464 1473 seconds.
1465 1474
1466 1475 ``format``
1467 1476 Profiling format. Specific to the ``ls`` instrumenting profiler.
1468 1477 (default: text)
1469 1478
1470 1479 ``text``
1471 1480 Generate a profiling report. When saving to a file, it should be
1472 1481 noted that only the report is saved, and the profiling data is
1473 1482 not kept.
1474 1483 ``kcachegrind``
1475 1484 Format profiling data for kcachegrind use: when saving to a
1476 1485 file, the generated file can directly be loaded into
1477 1486 kcachegrind.
1478 1487
1479 1488 ``statformat``
1480 1489 Profiling format for the ``stat`` profiler.
1481 1490 (default: hotpath)
1482 1491
1483 1492 ``hotpath``
1484 1493 Show a tree-based display containing the hot path of execution (where
1485 1494 most time was spent).
1486 1495 ``bymethod``
1487 1496 Show a table of methods ordered by how frequently they are active.
1488 1497 ``byline``
1489 1498 Show a table of lines in files ordered by how frequently they are active.
1490 1499 ``json``
1491 1500 Render profiling data as JSON.
1492 1501
1493 1502 ``frequency``
1494 1503 Sampling frequency. Specific to the ``stat`` sampling profiler.
1495 1504 (default: 1000)
1496 1505
1497 1506 ``output``
1498 1507 File path where profiling data or report should be saved. If the
1499 1508 file exists, it is replaced. (default: None, data is printed on
1500 1509 stderr)
1501 1510
1502 1511 ``sort``
1503 1512 Sort field. Specific to the ``ls`` instrumenting profiler.
1504 1513 One of ``callcount``, ``reccallcount``, ``totaltime`` and
1505 1514 ``inlinetime``.
1506 1515 (default: inlinetime)
1507 1516
1508 1517 ``limit``
1509 1518 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
1510 1519 (default: 30)
1511 1520
1512 1521 ``nested``
1513 1522 Show at most this number of lines of drill-down info after each main entry.
1514 1523 This can help explain the difference between Total and Inline.
1515 1524 Specific to the ``ls`` instrumenting profiler.
1516 1525 (default: 5)
1517 1526
1518 1527 ``progress``
1519 1528 ------------
1520 1529
1521 1530 Mercurial commands can draw progress bars that are as informative as
1522 1531 possible. Some progress bars only offer indeterminate information, while others
1523 1532 have a definite end point.
1524 1533
1525 1534 ``delay``
1526 1535 Number of seconds (float) before showing the progress bar. (default: 3)
1527 1536
1528 1537 ``changedelay``
1529 1538 Minimum delay before showing a new topic. When set to less than 3 * refresh,
1530 1539 that value will be used instead. (default: 1)
1531 1540
1532 1541 ``refresh``
1533 1542 Time in seconds between refreshes of the progress bar. (default: 0.1)
1534 1543
1535 1544 ``format``
1536 1545 Format of the progress bar.
1537 1546
1538 1547 Valid entries for the format field are ``topic``, ``bar``, ``number``,
1539 1548 ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the
1540 1549 last 20 characters of the item, but this can be changed by adding either
1541 1550 ``-<num>`` which would take the last num characters, or ``+<num>`` for the
1542 1551 first num characters.
1543 1552
1544 1553 (default: topic bar number estimate)
1545 1554
1546 1555 ``width``
1547 1556 If set, the maximum width of the progress information (that is, min(width,
1548 1557 term width) will be used).
1549 1558
1550 1559 ``clear-complete``
1551 1560 Clear the progress bar after it's done. (default: True)
1552 1561
1553 1562 ``disable``
1554 1563 If true, don't show a progress bar.
1555 1564
1556 1565 ``assume-tty``
1557 1566 If true, ALWAYS show a progress bar, unless disable is given.
1558 1567
1559 1568 ``rebase``
1560 1569 ----------
1561 1570
1562 1571 ``allowdivergence``
1563 1572 Default to False, when True allow creating divergence when performing
1564 1573 rebase of obsolete changesets.
1565 1574
1566 1575 ``revsetalias``
1567 1576 ---------------
1568 1577
1569 1578 Alias definitions for revsets. See :hg:`help revsets` for details.
1570 1579
1571 1580 ``server``
1572 1581 ----------
1573 1582
1574 1583 Controls generic server settings.
1575 1584
1576 1585 ``compressionengines``
1577 1586 List of compression engines and their relative priority to advertise
1578 1587 to clients.
1579 1588
1580 1589 The order of compression engines determines their priority, the first
1581 1590 having the highest priority. If a compression engine is not listed
1582 1591 here, it won't be advertised to clients.
1583 1592
1584 1593 If not set (the default), built-in defaults are used. Run
1585 1594 :hg:`debuginstall` to list available compression engines and their
1586 1595 default wire protocol priority.
1587 1596
1588 1597 Older Mercurial clients only support zlib compression and this setting
1589 1598 has no effect for legacy clients.
1590 1599
1591 1600 ``uncompressed``
1592 1601 Whether to allow clients to clone a repository using the
1593 1602 uncompressed streaming protocol. This transfers about 40% more
1594 1603 data than a regular clone, but uses less memory and CPU on both
1595 1604 server and client. Over a LAN (100 Mbps or better) or a very fast
1596 1605 WAN, an uncompressed streaming clone is a lot faster (~10x) than a
1597 1606 regular clone. Over most WAN connections (anything slower than
1598 1607 about 6 Mbps), uncompressed streaming is slower, because of the
1599 1608 extra data transfer overhead. This mode will also temporarily hold
1600 1609 the write lock while determining what data to transfer.
1601 1610 (default: True)
1602 1611
1603 1612 ``preferuncompressed``
1604 1613 When set, clients will try to use the uncompressed streaming
1605 1614 protocol. (default: False)
1606 1615
1607 1616 ``validate``
1608 1617 Whether to validate the completeness of pushed changesets by
1609 1618 checking that all new file revisions specified in manifests are
1610 1619 present. (default: False)
1611 1620
1612 1621 ``maxhttpheaderlen``
1613 1622 Instruct HTTP clients not to send request headers longer than this
1614 1623 many bytes. (default: 1024)
1615 1624
1616 1625 ``bundle1``
1617 1626 Whether to allow clients to push and pull using the legacy bundle1
1618 1627 exchange format. (default: True)
1619 1628
1620 1629 ``bundle1gd``
1621 1630 Like ``bundle1`` but only used if the repository is using the
1622 1631 *generaldelta* storage format. (default: True)
1623 1632
1624 1633 ``bundle1.push``
1625 1634 Whether to allow clients to push using the legacy bundle1 exchange
1626 1635 format. (default: True)
1627 1636
1628 1637 ``bundle1gd.push``
1629 1638 Like ``bundle1.push`` but only used if the repository is using the
1630 1639 *generaldelta* storage format. (default: True)
1631 1640
1632 1641 ``bundle1.pull``
1633 1642 Whether to allow clients to pull using the legacy bundle1 exchange
1634 1643 format. (default: True)
1635 1644
1636 1645 ``bundle1gd.pull``
1637 1646 Like ``bundle1.pull`` but only used if the repository is using the
1638 1647 *generaldelta* storage format. (default: True)
1639 1648
1640 1649 Large repositories using the *generaldelta* storage format should
1641 1650 consider setting this option because converting *generaldelta*
1642 1651 repositories to the exchange format required by the bundle1 data
1643 1652 format can consume a lot of CPU.
1644 1653
1645 1654 ``zliblevel``
1646 1655 Integer between ``-1`` and ``9`` that controls the zlib compression level
1647 1656 for wire protocol commands that send zlib compressed output (notably the
1648 1657 commands that send repository history data).
1649 1658
1650 1659 The default (``-1``) uses the default zlib compression level, which is
1651 1660 likely equivalent to ``6``. ``0`` means no compression. ``9`` means
1652 1661 maximum compression.
1653 1662
1654 1663 Setting this option allows server operators to make trade-offs between
1655 1664 bandwidth and CPU used. Lowering the compression lowers CPU utilization
1656 1665 but sends more bytes to clients.
1657 1666
1658 1667 This option only impacts the HTTP server.
1659 1668
1660 1669 ``zstdlevel``
1661 1670 Integer between ``1`` and ``22`` that controls the zstd compression level
1662 1671 for wire protocol commands. ``1`` is the minimal amount of compression and
1663 1672 ``22`` is the highest amount of compression.
1664 1673
1665 1674 The default (``3``) should be significantly faster than zlib while likely
1666 1675 delivering better compression ratios.
1667 1676
1668 1677 This option only impacts the HTTP server.
1669 1678
1670 1679 See also ``server.zliblevel``.
1671 1680
1672 1681 ``smtp``
1673 1682 --------
1674 1683
1675 1684 Configuration for extensions that need to send email messages.
1676 1685
1677 1686 ``host``
1678 1687 Host name of mail server, e.g. "mail.example.com".
1679 1688
1680 1689 ``port``
1681 1690 Optional. Port to connect to on mail server. (default: 465 if
1682 1691 ``tls`` is smtps; 25 otherwise)
1683 1692
1684 1693 ``tls``
1685 1694 Optional. Method to enable TLS when connecting to mail server: starttls,
1686 1695 smtps or none. (default: none)
1687 1696
1688 1697 ``username``
1689 1698 Optional. User name for authenticating with the SMTP server.
1690 1699 (default: None)
1691 1700
1692 1701 ``password``
1693 1702 Optional. Password for authenticating with the SMTP server. If not
1694 1703 specified, interactive sessions will prompt the user for a
1695 1704 password; non-interactive sessions will fail. (default: None)
1696 1705
1697 1706 ``local_hostname``
1698 1707 Optional. The hostname that the sender can use to identify
1699 1708 itself to the MTA.
1700 1709
1701 1710
1702 1711 ``subpaths``
1703 1712 ------------
1704 1713
1705 1714 Subrepository source URLs can go stale if a remote server changes name
1706 1715 or becomes temporarily unavailable. This section lets you define
1707 1716 rewrite rules of the form::
1708 1717
1709 1718 <pattern> = <replacement>
1710 1719
1711 1720 where ``pattern`` is a regular expression matching a subrepository
1712 1721 source URL and ``replacement`` is the replacement string used to
1713 1722 rewrite it. Groups can be matched in ``pattern`` and referenced in
1714 1723 ``replacements``. For instance::
1715 1724
1716 1725 http://server/(.*)-hg/ = http://hg.server/\1/
1717 1726
1718 1727 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
1719 1728
1720 1729 Relative subrepository paths are first made absolute, and the
1721 1730 rewrite rules are then applied on the full (absolute) path. If ``pattern``
1722 1731 doesn't match the full path, an attempt is made to apply it on the
1723 1732 relative path alone. The rules are applied in definition order.
1724 1733
1725 1734 ``templatealias``
1726 1735 -----------------
1727 1736
1728 1737 Alias definitions for templates. See :hg:`help templates` for details.
1729 1738
1730 1739 ``templates``
1731 1740 -------------
1732 1741
1733 1742 Use the ``[templates]`` section to define template strings.
1734 1743 See :hg:`help templates` for details.
1735 1744
1736 1745 ``trusted``
1737 1746 -----------
1738 1747
1739 1748 Mercurial will not use the settings in the
1740 1749 ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
1741 1750 user or to a trusted group, as various hgrc features allow arbitrary
1742 1751 commands to be run. This issue is often encountered when configuring
1743 1752 hooks or extensions for shared repositories or servers. However,
1744 1753 the web interface will use some safe settings from the ``[web]``
1745 1754 section.
1746 1755
1747 1756 This section specifies what users and groups are trusted. The
1748 1757 current user is always trusted. To trust everybody, list a user or a
1749 1758 group with name ``*``. These settings must be placed in an
1750 1759 *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the
1751 1760 user or service running Mercurial.
1752 1761
1753 1762 ``users``
1754 1763 Comma-separated list of trusted users.
1755 1764
1756 1765 ``groups``
1757 1766 Comma-separated list of trusted groups.
1758 1767
1759 1768
1760 1769 ``ui``
1761 1770 ------
1762 1771
1763 1772 User interface controls.
1764 1773
1765 1774 ``archivemeta``
1766 1775 Whether to include the .hg_archival.txt file containing meta data
1767 1776 (hashes for the repository base and for tip) in archives created
1768 1777 by the :hg:`archive` command or downloaded via hgweb.
1769 1778 (default: True)
1770 1779
1771 1780 ``askusername``
1772 1781 Whether to prompt for a username when committing. If True, and
1773 1782 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1774 1783 be prompted to enter a username. If no username is entered, the
1775 1784 default ``USER@HOST`` is used instead.
1776 1785 (default: False)
1777 1786
1778 1787 ``clonebundles``
1779 1788 Whether the "clone bundles" feature is enabled.
1780 1789
1781 1790 When enabled, :hg:`clone` may download and apply a server-advertised
1782 1791 bundle file from a URL instead of using the normal exchange mechanism.
1783 1792
1784 1793 This can likely result in faster and more reliable clones.
1785 1794
1786 1795 (default: True)
1787 1796
1788 1797 ``clonebundlefallback``
1789 1798 Whether failure to apply an advertised "clone bundle" from a server
1790 1799 should result in fallback to a regular clone.
1791 1800
1792 1801 This is disabled by default because servers advertising "clone
1793 1802 bundles" often do so to reduce server load. If advertised bundles
1794 1803 start mass failing and clients automatically fall back to a regular
1795 1804 clone, this would add significant and unexpected load to the server
1796 1805 since the server is expecting clone operations to be offloaded to
1797 1806 pre-generated bundles. Failing fast (the default behavior) ensures
1798 1807 clients don't overwhelm the server when "clone bundle" application
1799 1808 fails.
1800 1809
1801 1810 (default: False)
1802 1811
1803 1812 ``clonebundleprefers``
1804 1813 Defines preferences for which "clone bundles" to use.
1805 1814
1806 1815 Servers advertising "clone bundles" may advertise multiple available
1807 1816 bundles. Each bundle may have different attributes, such as the bundle
1808 1817 type and compression format. This option is used to prefer a particular
1809 1818 bundle over another.
1810 1819
1811 1820 The following keys are defined by Mercurial:
1812 1821
1813 1822 BUNDLESPEC
1814 1823 A bundle type specifier. These are strings passed to :hg:`bundle -t`.
1815 1824 e.g. ``gzip-v2`` or ``bzip2-v1``.
1816 1825
1817 1826 COMPRESSION
1818 1827 The compression format of the bundle. e.g. ``gzip`` and ``bzip2``.
1819 1828
1820 1829 Server operators may define custom keys.
1821 1830
1822 1831 Example values: ``COMPRESSION=bzip2``,
1823 1832 ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``.
1824 1833
1825 1834 By default, the first bundle advertised by the server is used.
1826 1835
1827 1836 ``color``
1828 1837 String: when to use to colorize output. possible value are auto, always,
1829 1838 never, or debug (default: never). 'auto' will use color whenever it seems
1830 1839 possible. See :hg:`help color` for details.
1831 1840
1832 1841 (in addition a boolean can be used in place always/never)
1833 1842
1834 1843 ``commitsubrepos``
1835 1844 Whether to commit modified subrepositories when committing the
1836 1845 parent repository. If False and one subrepository has uncommitted
1837 1846 changes, abort the commit.
1838 1847 (default: False)
1839 1848
1840 1849 ``debug``
1841 1850 Print debugging information. (default: False)
1842 1851
1843 1852 ``editor``
1844 1853 The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
1845 1854
1846 1855 ``fallbackencoding``
1847 1856 Encoding to try if it's not possible to decode the changelog using
1848 1857 UTF-8. (default: ISO-8859-1)
1849 1858
1850 1859 ``graphnodetemplate``
1851 1860 The template used to print changeset nodes in an ASCII revision graph.
1852 1861 (default: ``{graphnode}``)
1853 1862
1854 1863 ``ignore``
1855 1864 A file to read per-user ignore patterns from. This file should be
1856 1865 in the same format as a repository-wide .hgignore file. Filenames
1857 1866 are relative to the repository root. This option supports hook syntax,
1858 1867 so if you want to specify multiple ignore files, you can do so by
1859 1868 setting something like ``ignore.other = ~/.hgignore2``. For details
1860 1869 of the ignore file format, see the ``hgignore(5)`` man page.
1861 1870
1862 1871 ``interactive``
1863 1872 Allow to prompt the user. (default: True)
1864 1873
1865 1874 ``interface``
1866 1875 Select the default interface for interactive features (default: text).
1867 1876 Possible values are 'text' and 'curses'.
1868 1877
1869 1878 ``interface.chunkselector``
1870 1879 Select the interface for change recording (e.g. :hg:`commit -i`).
1871 1880 Possible values are 'text' and 'curses'.
1872 1881 This config overrides the interface specified by ui.interface.
1873 1882
1874 1883 ``logtemplate``
1875 1884 Template string for commands that print changesets.
1876 1885
1877 1886 ``merge``
1878 1887 The conflict resolution program to use during a manual merge.
1879 1888 For more information on merge tools see :hg:`help merge-tools`.
1880 1889 For configuring merge tools see the ``[merge-tools]`` section.
1881 1890
1882 1891 ``mergemarkers``
1883 1892 Sets the merge conflict marker label styling. The ``detailed``
1884 1893 style uses the ``mergemarkertemplate`` setting to style the labels.
1885 1894 The ``basic`` style just uses 'local' and 'other' as the marker label.
1886 1895 One of ``basic`` or ``detailed``.
1887 1896 (default: ``basic``)
1888 1897
1889 1898 ``mergemarkertemplate``
1890 1899 The template used to print the commit description next to each conflict
1891 1900 marker during merge conflicts. See :hg:`help templates` for the template
1892 1901 format.
1893 1902
1894 1903 Defaults to showing the hash, tags, branches, bookmarks, author, and
1895 1904 the first line of the commit description.
1896 1905
1897 1906 If you use non-ASCII characters in names for tags, branches, bookmarks,
1898 1907 authors, and/or commit descriptions, you must pay attention to encodings of
1899 1908 managed files. At template expansion, non-ASCII characters use the encoding
1900 1909 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1901 1910 environment variables that govern your locale. If the encoding of the merge
1902 1911 markers is different from the encoding of the merged files,
1903 1912 serious problems may occur.
1904 1913
1905 1914 ``origbackuppath``
1906 1915 The path to a directory used to store generated .orig files. If the path is
1907 1916 not a directory, one will be created.
1908 1917
1909 1918 ``patch``
1910 1919 An optional external tool that ``hg import`` and some extensions
1911 1920 will use for applying patches. By default Mercurial uses an
1912 1921 internal patch utility. The external tool must work as the common
1913 1922 Unix ``patch`` program. In particular, it must accept a ``-p``
1914 1923 argument to strip patch headers, a ``-d`` argument to specify the
1915 1924 current directory, a file name to patch, and a patch file to take
1916 1925 from stdin.
1917 1926
1918 1927 It is possible to specify a patch tool together with extra
1919 1928 arguments. For example, setting this option to ``patch --merge``
1920 1929 will use the ``patch`` program with its 2-way merge option.
1921 1930
1922 1931 ``portablefilenames``
1923 1932 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1924 1933 (default: ``warn``)
1925 1934
1926 1935 ``warn``
1927 1936 Print a warning message on POSIX platforms, if a file with a non-portable
1928 1937 filename is added (e.g. a file with a name that can't be created on
1929 1938 Windows because it contains reserved parts like ``AUX``, reserved
1930 1939 characters like ``:``, or would cause a case collision with an existing
1931 1940 file).
1932 1941
1933 1942 ``ignore``
1934 1943 Don't print a warning.
1935 1944
1936 1945 ``abort``
1937 1946 The command is aborted.
1938 1947
1939 1948 ``true``
1940 1949 Alias for ``warn``.
1941 1950
1942 1951 ``false``
1943 1952 Alias for ``ignore``.
1944 1953
1945 1954 .. container:: windows
1946 1955
1947 1956 On Windows, this configuration option is ignored and the command aborted.
1948 1957
1949 1958 ``quiet``
1950 1959 Reduce the amount of output printed.
1951 1960 (default: False)
1952 1961
1953 1962 ``remotecmd``
1954 1963 Remote command to use for clone/push/pull operations.
1955 1964 (default: ``hg``)
1956 1965
1957 1966 ``report_untrusted``
1958 1967 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1959 1968 trusted user or group.
1960 1969 (default: True)
1961 1970
1962 1971 ``slash``
1963 1972 Display paths using a slash (``/``) as the path separator. This
1964 1973 only makes a difference on systems where the default path
1965 1974 separator is not the slash character (e.g. Windows uses the
1966 1975 backslash character (``\``)).
1967 1976 (default: False)
1968 1977
1969 1978 ``statuscopies``
1970 1979 Display copies in the status command.
1971 1980
1972 1981 ``ssh``
1973 1982 Command to use for SSH connections. (default: ``ssh``)
1974 1983
1975 1984 ``strict``
1976 1985 Require exact command names, instead of allowing unambiguous
1977 1986 abbreviations. (default: False)
1978 1987
1979 1988 ``style``
1980 1989 Name of style to use for command output.
1981 1990
1982 1991 ``supportcontact``
1983 1992 A URL where users should report a Mercurial traceback. Use this if you are a
1984 1993 large organisation with its own Mercurial deployment process and crash
1985 1994 reports should be addressed to your internal support.
1986 1995
1987 1996 ``textwidth``
1988 1997 Maximum width of help text. A longer line generated by ``hg help`` or
1989 1998 ``hg subcommand --help`` will be broken after white space to get this
1990 1999 width or the terminal width, whichever comes first.
1991 2000 A non-positive value will disable this and the terminal width will be
1992 2001 used. (default: 78)
1993 2002
1994 2003 ``timeout``
1995 2004 The timeout used when a lock is held (in seconds), a negative value
1996 2005 means no timeout. (default: 600)
1997 2006
1998 2007 ``traceback``
1999 2008 Mercurial always prints a traceback when an unknown exception
2000 2009 occurs. Setting this to True will make Mercurial print a traceback
2001 2010 on all exceptions, even those recognized by Mercurial (such as
2002 2011 IOError or MemoryError). (default: False)
2003 2012
2004 2013 ``username``
2005 2014 The committer of a changeset created when running "commit".
2006 2015 Typically a person's name and email address, e.g. ``Fred Widget
2007 2016 <fred@example.com>``. Environment variables in the
2008 2017 username are expanded.
2009 2018
2010 2019 (default: ``$EMAIL`` or ``username@hostname``. If the username in
2011 2020 hgrc is empty, e.g. if the system admin set ``username =`` in the
2012 2021 system hgrc, it has to be specified manually or in a different
2013 2022 hgrc file)
2014 2023
2015 2024 ``verbose``
2016 2025 Increase the amount of output printed. (default: False)
2017 2026
2018 2027
2019 2028 ``web``
2020 2029 -------
2021 2030
2022 2031 Web interface configuration. The settings in this section apply to
2023 2032 both the builtin webserver (started by :hg:`serve`) and the script you
2024 2033 run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
2025 2034 and WSGI).
2026 2035
2027 2036 The Mercurial webserver does no authentication (it does not prompt for
2028 2037 usernames and passwords to validate *who* users are), but it does do
2029 2038 authorization (it grants or denies access for *authenticated users*
2030 2039 based on settings in this section). You must either configure your
2031 2040 webserver to do authentication for you, or disable the authorization
2032 2041 checks.
2033 2042
2034 2043 For a quick setup in a trusted environment, e.g., a private LAN, where
2035 2044 you want it to accept pushes from anybody, you can use the following
2036 2045 command line::
2037 2046
2038 2047 $ hg --config web.allow_push=* --config web.push_ssl=False serve
2039 2048
2040 2049 Note that this will allow anybody to push anything to the server and
2041 2050 that this should not be used for public servers.
2042 2051
2043 2052 The full set of options is:
2044 2053
2045 2054 ``accesslog``
2046 2055 Where to output the access log. (default: stdout)
2047 2056
2048 2057 ``address``
2049 2058 Interface address to bind to. (default: all)
2050 2059
2051 2060 ``allow_archive``
2052 2061 List of archive format (bz2, gz, zip) allowed for downloading.
2053 2062 (default: empty)
2054 2063
2055 2064 ``allowbz2``
2056 2065 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
2057 2066 revisions.
2058 2067 (default: False)
2059 2068
2060 2069 ``allowgz``
2061 2070 (DEPRECATED) Whether to allow .tar.gz downloading of repository
2062 2071 revisions.
2063 2072 (default: False)
2064 2073
2065 2074 ``allowpull``
2066 2075 Whether to allow pulling from the repository. (default: True)
2067 2076
2068 2077 ``allow_push``
2069 2078 Whether to allow pushing to the repository. If empty or not set,
2070 2079 pushing is not allowed. If the special value ``*``, any remote
2071 2080 user can push, including unauthenticated users. Otherwise, the
2072 2081 remote user must have been authenticated, and the authenticated
2073 2082 user name must be present in this list. The contents of the
2074 2083 allow_push list are examined after the deny_push list.
2075 2084
2076 2085 ``allow_read``
2077 2086 If the user has not already been denied repository access due to
2078 2087 the contents of deny_read, this list determines whether to grant
2079 2088 repository access to the user. If this list is not empty, and the
2080 2089 user is unauthenticated or not present in the list, then access is
2081 2090 denied for the user. If the list is empty or not set, then access
2082 2091 is permitted to all users by default. Setting allow_read to the
2083 2092 special value ``*`` is equivalent to it not being set (i.e. access
2084 2093 is permitted to all users). The contents of the allow_read list are
2085 2094 examined after the deny_read list.
2086 2095
2087 2096 ``allowzip``
2088 2097 (DEPRECATED) Whether to allow .zip downloading of repository
2089 2098 revisions. This feature creates temporary files.
2090 2099 (default: False)
2091 2100
2092 2101 ``archivesubrepos``
2093 2102 Whether to recurse into subrepositories when archiving.
2094 2103 (default: False)
2095 2104
2096 2105 ``baseurl``
2097 2106 Base URL to use when publishing URLs in other locations, so
2098 2107 third-party tools like email notification hooks can construct
2099 2108 URLs. Example: ``http://hgserver/repos/``.
2100 2109
2101 2110 ``cacerts``
2102 2111 Path to file containing a list of PEM encoded certificate
2103 2112 authority certificates. Environment variables and ``~user``
2104 2113 constructs are expanded in the filename. If specified on the
2105 2114 client, then it will verify the identity of remote HTTPS servers
2106 2115 with these certificates.
2107 2116
2108 2117 To disable SSL verification temporarily, specify ``--insecure`` from
2109 2118 command line.
2110 2119
2111 2120 You can use OpenSSL's CA certificate file if your platform has
2112 2121 one. On most Linux systems this will be
2113 2122 ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
2114 2123 generate this file manually. The form must be as follows::
2115 2124
2116 2125 -----BEGIN CERTIFICATE-----
2117 2126 ... (certificate in base64 PEM encoding) ...
2118 2127 -----END CERTIFICATE-----
2119 2128 -----BEGIN CERTIFICATE-----
2120 2129 ... (certificate in base64 PEM encoding) ...
2121 2130 -----END CERTIFICATE-----
2122 2131
2123 2132 ``cache``
2124 2133 Whether to support caching in hgweb. (default: True)
2125 2134
2126 2135 ``certificate``
2127 2136 Certificate to use when running :hg:`serve`.
2128 2137
2129 2138 ``collapse``
2130 2139 With ``descend`` enabled, repositories in subdirectories are shown at
2131 2140 a single level alongside repositories in the current path. With
2132 2141 ``collapse`` also enabled, repositories residing at a deeper level than
2133 2142 the current path are grouped behind navigable directory entries that
2134 2143 lead to the locations of these repositories. In effect, this setting
2135 2144 collapses each collection of repositories found within a subdirectory
2136 2145 into a single entry for that subdirectory. (default: False)
2137 2146
2138 2147 ``comparisoncontext``
2139 2148 Number of lines of context to show in side-by-side file comparison. If
2140 2149 negative or the value ``full``, whole files are shown. (default: 5)
2141 2150
2142 2151 This setting can be overridden by a ``context`` request parameter to the
2143 2152 ``comparison`` command, taking the same values.
2144 2153
2145 2154 ``contact``
2146 2155 Name or email address of the person in charge of the repository.
2147 2156 (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty)
2148 2157
2149 2158 ``csp``
2150 2159 Send a ``Content-Security-Policy`` HTTP header with this value.
2151 2160
2152 2161 The value may contain a special string ``%nonce%``, which will be replaced
2153 2162 by a randomly-generated one-time use value. If the value contains
2154 2163 ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the
2155 2164 one-time property of the nonce. This nonce will also be inserted into
2156 2165 ``<script>`` elements containing inline JavaScript.
2157 2166
2158 2167 Note: lots of HTML content sent by the server is derived from repository
2159 2168 data. Please consider the potential for malicious repository data to
2160 2169 "inject" itself into generated HTML content as part of your security
2161 2170 threat model.
2162 2171
2163 2172 ``deny_push``
2164 2173 Whether to deny pushing to the repository. If empty or not set,
2165 2174 push is not denied. If the special value ``*``, all remote users are
2166 2175 denied push. Otherwise, unauthenticated users are all denied, and
2167 2176 any authenticated user name present in this list is also denied. The
2168 2177 contents of the deny_push list are examined before the allow_push list.
2169 2178
2170 2179 ``deny_read``
2171 2180 Whether to deny reading/viewing of the repository. If this list is
2172 2181 not empty, unauthenticated users are all denied, and any
2173 2182 authenticated user name present in this list is also denied access to
2174 2183 the repository. If set to the special value ``*``, all remote users
2175 2184 are denied access (rarely needed ;). If deny_read is empty or not set,
2176 2185 the determination of repository access depends on the presence and
2177 2186 content of the allow_read list (see description). If both
2178 2187 deny_read and allow_read are empty or not set, then access is
2179 2188 permitted to all users by default. If the repository is being
2180 2189 served via hgwebdir, denied users will not be able to see it in
2181 2190 the list of repositories. The contents of the deny_read list have
2182 2191 priority over (are examined before) the contents of the allow_read
2183 2192 list.
2184 2193
2185 2194 ``descend``
2186 2195 hgwebdir indexes will not descend into subdirectories. Only repositories
2187 2196 directly in the current path will be shown (other repositories are still
2188 2197 available from the index corresponding to their containing path).
2189 2198
2190 2199 ``description``
2191 2200 Textual description of the repository's purpose or contents.
2192 2201 (default: "unknown")
2193 2202
2194 2203 ``encoding``
2195 2204 Character encoding name. (default: the current locale charset)
2196 2205 Example: "UTF-8".
2197 2206
2198 2207 ``errorlog``
2199 2208 Where to output the error log. (default: stderr)
2200 2209
2201 2210 ``guessmime``
2202 2211 Control MIME types for raw download of file content.
2203 2212 Set to True to let hgweb guess the content type from the file
2204 2213 extension. This will serve HTML files as ``text/html`` and might
2205 2214 allow cross-site scripting attacks when serving untrusted
2206 2215 repositories. (default: False)
2207 2216
2208 2217 ``hidden``
2209 2218 Whether to hide the repository in the hgwebdir index.
2210 2219 (default: False)
2211 2220
2212 2221 ``ipv6``
2213 2222 Whether to use IPv6. (default: False)
2214 2223
2215 2224 ``labels``
2216 2225 List of string *labels* associated with the repository.
2217 2226
2218 2227 Labels are exposed as a template keyword and can be used to customize
2219 2228 output. e.g. the ``index`` template can group or filter repositories
2220 2229 by labels and the ``summary`` template can display additional content
2221 2230 if a specific label is present.
2222 2231
2223 2232 ``logoimg``
2224 2233 File name of the logo image that some templates display on each page.
2225 2234 The file name is relative to ``staticurl``. That is, the full path to
2226 2235 the logo image is "staticurl/logoimg".
2227 2236 If unset, ``hglogo.png`` will be used.
2228 2237
2229 2238 ``logourl``
2230 2239 Base URL to use for logos. If unset, ``https://mercurial-scm.org/``
2231 2240 will be used.
2232 2241
2233 2242 ``maxchanges``
2234 2243 Maximum number of changes to list on the changelog. (default: 10)
2235 2244
2236 2245 ``maxfiles``
2237 2246 Maximum number of files to list per changeset. (default: 10)
2238 2247
2239 2248 ``maxshortchanges``
2240 2249 Maximum number of changes to list on the shortlog, graph or filelog
2241 2250 pages. (default: 60)
2242 2251
2243 2252 ``name``
2244 2253 Repository name to use in the web interface.
2245 2254 (default: current working directory)
2246 2255
2247 2256 ``port``
2248 2257 Port to listen on. (default: 8000)
2249 2258
2250 2259 ``prefix``
2251 2260 Prefix path to serve from. (default: '' (server root))
2252 2261
2253 2262 ``push_ssl``
2254 2263 Whether to require that inbound pushes be transported over SSL to
2255 2264 prevent password sniffing. (default: True)
2256 2265
2257 2266 ``refreshinterval``
2258 2267 How frequently directory listings re-scan the filesystem for new
2259 2268 repositories, in seconds. This is relevant when wildcards are used
2260 2269 to define paths. Depending on how much filesystem traversal is
2261 2270 required, refreshing may negatively impact performance.
2262 2271
2263 2272 Values less than or equal to 0 always refresh.
2264 2273 (default: 20)
2265 2274
2266 2275 ``staticurl``
2267 2276 Base URL to use for static files. If unset, static files (e.g. the
2268 2277 hgicon.png favicon) will be served by the CGI script itself. Use
2269 2278 this setting to serve them directly with the HTTP server.
2270 2279 Example: ``http://hgserver/static/``.
2271 2280
2272 2281 ``stripes``
2273 2282 How many lines a "zebra stripe" should span in multi-line output.
2274 2283 Set to 0 to disable. (default: 1)
2275 2284
2276 2285 ``style``
2277 2286 Which template map style to use. The available options are the names of
2278 2287 subdirectories in the HTML templates path. (default: ``paper``)
2279 2288 Example: ``monoblue``.
2280 2289
2281 2290 ``templates``
2282 2291 Where to find the HTML templates. The default path to the HTML templates
2283 2292 can be obtained from ``hg debuginstall``.
2284 2293
2285 2294 ``websub``
2286 2295 ----------
2287 2296
2288 2297 Web substitution filter definition. You can use this section to
2289 2298 define a set of regular expression substitution patterns which
2290 2299 let you automatically modify the hgweb server output.
2291 2300
2292 2301 The default hgweb templates only apply these substitution patterns
2293 2302 on the revision description fields. You can apply them anywhere
2294 2303 you want when you create your own templates by adding calls to the
2295 2304 "websub" filter (usually after calling the "escape" filter).
2296 2305
2297 2306 This can be used, for example, to convert issue references to links
2298 2307 to your issue tracker, or to convert "markdown-like" syntax into
2299 2308 HTML (see the examples below).
2300 2309
2301 2310 Each entry in this section names a substitution filter.
2302 2311 The value of each entry defines the substitution expression itself.
2303 2312 The websub expressions follow the old interhg extension syntax,
2304 2313 which in turn imitates the Unix sed replacement syntax::
2305 2314
2306 2315 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
2307 2316
2308 2317 You can use any separator other than "/". The final "i" is optional
2309 2318 and indicates that the search must be case insensitive.
2310 2319
2311 2320 Examples::
2312 2321
2313 2322 [websub]
2314 2323 issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i
2315 2324 italic = s/\b_(\S+)_\b/<i>\1<\/i>/
2316 2325 bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/
2317 2326
2318 2327 ``worker``
2319 2328 ----------
2320 2329
2321 2330 Parallel master/worker configuration. We currently perform working
2322 2331 directory updates in parallel on Unix-like systems, which greatly
2323 2332 helps performance.
2324 2333
2325 2334 ``numcpus``
2326 2335 Number of CPUs to use for parallel operations. A zero or
2327 2336 negative value is treated as ``use the default``.
2328 2337 (default: 4 or the number of CPUs on the system, whichever is larger)
2329 2338
2330 2339 ``backgroundclose``
2331 2340 Whether to enable closing file handles on background threads during certain
2332 2341 operations. Some platforms aren't very efficient at closing file
2333 2342 handles that have been written or appended to. By performing file closing
2334 2343 on background threads, file write rate can increase substantially.
2335 2344 (default: true on Windows, false elsewhere)
2336 2345
2337 2346 ``backgroundcloseminfilecount``
2338 2347 Minimum number of files required to trigger background file closing.
2339 2348 Operations not writing this many files won't start background close
2340 2349 threads.
2341 2350 (default: 2048)
2342 2351
2343 2352 ``backgroundclosemaxqueue``
2344 2353 The maximum number of opened file handles waiting to be closed in the
2345 2354 background. This option only has an effect if ``backgroundclose`` is
2346 2355 enabled.
2347 2356 (default: 384)
2348 2357
2349 2358 ``backgroundclosethreadcount``
2350 2359 Number of threads to process background file closes. Only relevant if
2351 2360 ``backgroundclose`` is enabled.
2352 2361 (default: 4)
@@ -1,90 +1,106 b''
1 1 Test update logic when there are renames or weird same-name cases between dirs
2 2 and files
3 3
4 4 Update with local changes across a file rename
5 5
6 6 $ hg init r1 && cd r1
7 7
8 8 $ echo a > a
9 9 $ hg add a
10 10 $ hg ci -m a
11 11
12 12 $ hg mv a b
13 13 $ hg ci -m rename
14 14
15 15 $ echo b > b
16 16 $ hg ci -m change
17 17
18 18 $ hg up -q 0
19 19
20 20 $ echo c > a
21 21
22 22 $ hg up
23 23 merging a and b to b
24 24 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
25 25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
26 26 use 'hg resolve' to retry unresolved file merges
27 27 [1]
28 28
29 29 Test update when local untracked directory exists with the same name as a
30 30 tracked file in a commit we are updating to
31 31 $ hg init r2 && cd r2
32 32 $ echo root > root && hg ci -Am root # rev 0
33 33 adding root
34 34 $ echo text > name && hg ci -Am "name is a file" # rev 1
35 35 adding name
36 36 $ hg up 0
37 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 38 $ mkdir name
39 39 $ hg up 1
40 40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 41
42 42 Test update when local untracked directory exists with some files in it and has
43 43 the same name a tracked file in a commit we are updating to. In future this
44 44 should be updated to give an friendlier error message, but now we should just
45 45 make sure that this does not erase untracked data
46 46 $ hg up 0
47 47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
48 48 $ mkdir name
49 49 $ echo text > name/file
50 50 $ hg st
51 51 ? name/file
52 52 $ hg up 1
53 53 abort: *: '$TESTTMP/r1/r2/name' (glob)
54 54 [255]
55 55 $ cd ..
56 56
57 57 #if symlink
58 58
59 59 Test update when two commits have symlinks that point to different folders
60 60 $ hg init r3 && cd r3
61 61 $ echo root > root && hg ci -Am root
62 62 adding root
63 63 $ mkdir folder1 && mkdir folder2
64 64 $ ln -s folder1 folder
65 65 $ hg ci -Am "symlink to folder1"
66 66 adding folder
67 67 $ rm folder
68 68 $ ln -s folder2 folder
69 69 $ hg ci -Am "symlink to folder2"
70 70 $ hg up 1
71 71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 72 $ cd ..
73 73
74 74 #endif
75 75
76 76 #if rmcwd
77 77
78 78 Test that warning is printed if cwd is deleted during update
79 79 $ hg init r4 && cd r4
80 80 $ mkdir dir
81 81 $ cd dir
82 82 $ echo a > a
83 83 $ echo b > b
84 84 $ hg add a b
85 85 $ hg ci -m "file and dir"
86 86 $ hg up -q null
87 87 current directory was removed
88 88 (consider changing to repo root: $TESTTMP/r1/r4)
89 89
90 90 #endif
91
92 $ cd $TESTTMP
93 $ cat >> $HGRCPATH <<EOF
94 > [commands]
95 > update.requiredest = True
96 > EOF
97 $ hg init dest
98 $ cd dest
99 $ echo a >> a
100 $ hg commit -qAm aa
101 $ hg up
102 abort: you must specify a destination
103 (for example: hg update ".::")
104 [255]
105 $ hg up .
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now