##// END OF EJS Templates
py3: use pycompat.bytestr() to convert error instances to bytes...
Pulkit Goyal -
r36510:6e90c59b default
parent child Browse files
Show More
@@ -1,5607 +1,5607
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 import sys
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 )
23 23 from . import (
24 24 archival,
25 25 bookmarks,
26 26 bundle2,
27 27 changegroup,
28 28 cmdutil,
29 29 copies,
30 30 debugcommands as debugcommandsmod,
31 31 destutil,
32 32 dirstateguard,
33 33 discovery,
34 34 encoding,
35 35 error,
36 36 exchange,
37 37 extensions,
38 38 formatter,
39 39 graphmod,
40 40 hbisect,
41 41 help,
42 42 hg,
43 43 lock as lockmod,
44 44 logcmdutil,
45 45 merge as mergemod,
46 46 obsolete,
47 47 obsutil,
48 48 patch,
49 49 phases,
50 50 pycompat,
51 51 rcutil,
52 52 registrar,
53 53 revsetlang,
54 54 rewriteutil,
55 55 scmutil,
56 56 server,
57 57 streamclone,
58 58 tags as tagsmod,
59 59 templatekw,
60 60 ui as uimod,
61 61 util,
62 62 wireprotoserver,
63 63 )
64 64
65 65 release = lockmod.release
66 66
67 67 table = {}
68 68 table.update(debugcommandsmod.command._table)
69 69
70 70 command = registrar.command(table)
71 71 readonly = registrar.command.readonly
72 72
73 73 # common command options
74 74
75 75 globalopts = [
76 76 ('R', 'repository', '',
77 77 _('repository root directory or name of overlay bundle file'),
78 78 _('REPO')),
79 79 ('', 'cwd', '',
80 80 _('change working directory'), _('DIR')),
81 81 ('y', 'noninteractive', None,
82 82 _('do not prompt, automatically pick the first choice for all prompts')),
83 83 ('q', 'quiet', None, _('suppress output')),
84 84 ('v', 'verbose', None, _('enable additional output')),
85 85 ('', 'color', '',
86 86 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
87 87 # and should not be translated
88 88 _("when to colorize (boolean, always, auto, never, or debug)"),
89 89 _('TYPE')),
90 90 ('', 'config', [],
91 91 _('set/override config option (use \'section.name=value\')'),
92 92 _('CONFIG')),
93 93 ('', 'debug', None, _('enable debugging output')),
94 94 ('', 'debugger', None, _('start debugger')),
95 95 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
96 96 _('ENCODE')),
97 97 ('', 'encodingmode', encoding.encodingmode,
98 98 _('set the charset encoding mode'), _('MODE')),
99 99 ('', 'traceback', None, _('always print a traceback on exception')),
100 100 ('', 'time', None, _('time how long the command takes')),
101 101 ('', 'profile', None, _('print command execution profile')),
102 102 ('', 'version', None, _('output version information and exit')),
103 103 ('h', 'help', None, _('display help and exit')),
104 104 ('', 'hidden', False, _('consider hidden changesets')),
105 105 ('', 'pager', 'auto',
106 106 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
107 107 ]
108 108
109 109 dryrunopts = cmdutil.dryrunopts
110 110 remoteopts = cmdutil.remoteopts
111 111 walkopts = cmdutil.walkopts
112 112 commitopts = cmdutil.commitopts
113 113 commitopts2 = cmdutil.commitopts2
114 114 formatteropts = cmdutil.formatteropts
115 115 templateopts = cmdutil.templateopts
116 116 logopts = cmdutil.logopts
117 117 diffopts = cmdutil.diffopts
118 118 diffwsopts = cmdutil.diffwsopts
119 119 diffopts2 = cmdutil.diffopts2
120 120 mergetoolopts = cmdutil.mergetoolopts
121 121 similarityopts = cmdutil.similarityopts
122 122 subrepoopts = cmdutil.subrepoopts
123 123 debugrevlogopts = cmdutil.debugrevlogopts
124 124
125 125 # Commands start here, listed alphabetically
126 126
127 127 @command('^add',
128 128 walkopts + subrepoopts + dryrunopts,
129 129 _('[OPTION]... [FILE]...'),
130 130 inferrepo=True)
131 131 def add(ui, repo, *pats, **opts):
132 132 """add the specified files on the next commit
133 133
134 134 Schedule files to be version controlled and added to the
135 135 repository.
136 136
137 137 The files will be added to the repository at the next commit. To
138 138 undo an add before that, see :hg:`forget`.
139 139
140 140 If no names are given, add all files to the repository (except
141 141 files matching ``.hgignore``).
142 142
143 143 .. container:: verbose
144 144
145 145 Examples:
146 146
147 147 - New (unknown) files are added
148 148 automatically by :hg:`add`::
149 149
150 150 $ ls
151 151 foo.c
152 152 $ hg status
153 153 ? foo.c
154 154 $ hg add
155 155 adding foo.c
156 156 $ hg status
157 157 A foo.c
158 158
159 159 - Specific files to be added can be specified::
160 160
161 161 $ ls
162 162 bar.c foo.c
163 163 $ hg status
164 164 ? bar.c
165 165 ? foo.c
166 166 $ hg add bar.c
167 167 $ hg status
168 168 A bar.c
169 169 ? foo.c
170 170
171 171 Returns 0 if all files are successfully added.
172 172 """
173 173
174 174 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
175 175 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
176 176 return rejected and 1 or 0
177 177
178 178 @command('addremove',
179 179 similarityopts + subrepoopts + walkopts + dryrunopts,
180 180 _('[OPTION]... [FILE]...'),
181 181 inferrepo=True)
182 182 def addremove(ui, repo, *pats, **opts):
183 183 """add all new files, delete all missing files
184 184
185 185 Add all new files and remove all missing files from the
186 186 repository.
187 187
188 188 Unless names are given, new files are ignored if they match any of
189 189 the patterns in ``.hgignore``. As with add, these changes take
190 190 effect at the next commit.
191 191
192 192 Use the -s/--similarity option to detect renamed files. This
193 193 option takes a percentage between 0 (disabled) and 100 (files must
194 194 be identical) as its parameter. With a parameter greater than 0,
195 195 this compares every removed file with every added file and records
196 196 those similar enough as renames. Detecting renamed files this way
197 197 can be expensive. After using this option, :hg:`status -C` can be
198 198 used to check which files were identified as moved or renamed. If
199 199 not specified, -s/--similarity defaults to 100 and only renames of
200 200 identical files are detected.
201 201
202 202 .. container:: verbose
203 203
204 204 Examples:
205 205
206 206 - A number of files (bar.c and foo.c) are new,
207 207 while foobar.c has been removed (without using :hg:`remove`)
208 208 from the repository::
209 209
210 210 $ ls
211 211 bar.c foo.c
212 212 $ hg status
213 213 ! foobar.c
214 214 ? bar.c
215 215 ? foo.c
216 216 $ hg addremove
217 217 adding bar.c
218 218 adding foo.c
219 219 removing foobar.c
220 220 $ hg status
221 221 A bar.c
222 222 A foo.c
223 223 R foobar.c
224 224
225 225 - A file foobar.c was moved to foo.c without using :hg:`rename`.
226 226 Afterwards, it was edited slightly::
227 227
228 228 $ ls
229 229 foo.c
230 230 $ hg status
231 231 ! foobar.c
232 232 ? foo.c
233 233 $ hg addremove --similarity 90
234 234 removing foobar.c
235 235 adding foo.c
236 236 recording removal of foobar.c as rename to foo.c (94% similar)
237 237 $ hg status -C
238 238 A foo.c
239 239 foobar.c
240 240 R foobar.c
241 241
242 242 Returns 0 if all files are successfully added.
243 243 """
244 244 opts = pycompat.byteskwargs(opts)
245 245 try:
246 246 sim = float(opts.get('similarity') or 100)
247 247 except ValueError:
248 248 raise error.Abort(_('similarity must be a number'))
249 249 if sim < 0 or sim > 100:
250 250 raise error.Abort(_('similarity must be between 0 and 100'))
251 251 matcher = scmutil.match(repo[None], pats, opts)
252 252 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
253 253
254 254 @command('^annotate|blame',
255 255 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
256 256 ('', 'follow', None,
257 257 _('follow copies/renames and list the filename (DEPRECATED)')),
258 258 ('', 'no-follow', None, _("don't follow copies and renames")),
259 259 ('a', 'text', None, _('treat all files as text')),
260 260 ('u', 'user', None, _('list the author (long with -v)')),
261 261 ('f', 'file', None, _('list the filename')),
262 262 ('d', 'date', None, _('list the date (short with -q)')),
263 263 ('n', 'number', None, _('list the revision number (default)')),
264 264 ('c', 'changeset', None, _('list the changeset')),
265 265 ('l', 'line-number', None, _('show line number at the first appearance')),
266 266 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
267 267 ] + diffwsopts + walkopts + formatteropts,
268 268 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
269 269 inferrepo=True)
270 270 def annotate(ui, repo, *pats, **opts):
271 271 """show changeset information by line for each file
272 272
273 273 List changes in files, showing the revision id responsible for
274 274 each line.
275 275
276 276 This command is useful for discovering when a change was made and
277 277 by whom.
278 278
279 279 If you include --file, --user, or --date, the revision number is
280 280 suppressed unless you also include --number.
281 281
282 282 Without the -a/--text option, annotate will avoid processing files
283 283 it detects as binary. With -a, annotate will annotate the file
284 284 anyway, although the results will probably be neither useful
285 285 nor desirable.
286 286
287 287 Returns 0 on success.
288 288 """
289 289 opts = pycompat.byteskwargs(opts)
290 290 if not pats:
291 291 raise error.Abort(_('at least one filename or pattern is required'))
292 292
293 293 if opts.get('follow'):
294 294 # --follow is deprecated and now just an alias for -f/--file
295 295 # to mimic the behavior of Mercurial before version 1.5
296 296 opts['file'] = True
297 297
298 298 rev = opts.get('rev')
299 299 if rev:
300 300 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
301 301 ctx = scmutil.revsingle(repo, rev)
302 302
303 303 rootfm = ui.formatter('annotate', opts)
304 304 if ui.quiet:
305 305 datefunc = util.shortdate
306 306 else:
307 307 datefunc = util.datestr
308 308 if ctx.rev() is None:
309 309 def hexfn(node):
310 310 if node is None:
311 311 return None
312 312 else:
313 313 return rootfm.hexfunc(node)
314 314 if opts.get('changeset'):
315 315 # omit "+" suffix which is appended to node hex
316 316 def formatrev(rev):
317 317 if rev is None:
318 318 return '%d' % ctx.p1().rev()
319 319 else:
320 320 return '%d' % rev
321 321 else:
322 322 def formatrev(rev):
323 323 if rev is None:
324 324 return '%d+' % ctx.p1().rev()
325 325 else:
326 326 return '%d ' % rev
327 327 def formathex(hex):
328 328 if hex is None:
329 329 return '%s+' % rootfm.hexfunc(ctx.p1().node())
330 330 else:
331 331 return '%s ' % hex
332 332 else:
333 333 hexfn = rootfm.hexfunc
334 334 formatrev = formathex = pycompat.bytestr
335 335
336 336 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
337 337 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
338 338 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
339 339 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
340 340 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
341 341 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
342 342 ]
343 343 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
344 344
345 345 if (not opts.get('user') and not opts.get('changeset')
346 346 and not opts.get('date') and not opts.get('file')):
347 347 opts['number'] = True
348 348
349 349 linenumber = opts.get('line_number') is not None
350 350 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
351 351 raise error.Abort(_('at least one of -n/-c is required for -l'))
352 352
353 353 ui.pager('annotate')
354 354
355 355 if rootfm.isplain():
356 356 def makefunc(get, fmt):
357 357 return lambda x: fmt(get(x))
358 358 else:
359 359 def makefunc(get, fmt):
360 360 return get
361 361 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
362 362 if opts.get(op)]
363 363 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
364 364 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
365 365 if opts.get(op))
366 366
367 367 def bad(x, y):
368 368 raise error.Abort("%s: %s" % (x, y))
369 369
370 370 m = scmutil.match(ctx, pats, opts, badfn=bad)
371 371
372 372 follow = not opts.get('no_follow')
373 373 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
374 374 whitespace=True)
375 375 skiprevs = opts.get('skip')
376 376 if skiprevs:
377 377 skiprevs = scmutil.revrange(repo, skiprevs)
378 378
379 379 for abs in ctx.walk(m):
380 380 fctx = ctx[abs]
381 381 rootfm.startitem()
382 382 rootfm.data(abspath=abs, path=m.rel(abs))
383 383 if not opts.get('text') and fctx.isbinary():
384 384 rootfm.plain(_("%s: binary file\n")
385 385 % ((pats and m.rel(abs)) or abs))
386 386 continue
387 387
388 388 fm = rootfm.nested('lines')
389 389 lines = fctx.annotate(follow=follow, linenumber=linenumber,
390 390 skiprevs=skiprevs, diffopts=diffopts)
391 391 if not lines:
392 392 fm.end()
393 393 continue
394 394 formats = []
395 395 pieces = []
396 396
397 397 for f, sep in funcmap:
398 398 l = [f(n) for n, dummy in lines]
399 399 if fm.isplain():
400 400 sizes = [encoding.colwidth(x) for x in l]
401 401 ml = max(sizes)
402 402 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
403 403 else:
404 404 formats.append(['%s' for x in l])
405 405 pieces.append(l)
406 406
407 407 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
408 408 fm.startitem()
409 409 fm.write(fields, "".join(f), *p)
410 410 if l[0].skip:
411 411 fmt = "* %s"
412 412 else:
413 413 fmt = ": %s"
414 414 fm.write('line', fmt, l[1])
415 415
416 416 if not lines[-1][1].endswith('\n'):
417 417 fm.plain('\n')
418 418 fm.end()
419 419
420 420 rootfm.end()
421 421
422 422 @command('archive',
423 423 [('', 'no-decode', None, _('do not pass files through decoders')),
424 424 ('p', 'prefix', '', _('directory prefix for files in archive'),
425 425 _('PREFIX')),
426 426 ('r', 'rev', '', _('revision to distribute'), _('REV')),
427 427 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
428 428 ] + subrepoopts + walkopts,
429 429 _('[OPTION]... DEST'))
430 430 def archive(ui, repo, dest, **opts):
431 431 '''create an unversioned archive of a repository revision
432 432
433 433 By default, the revision used is the parent of the working
434 434 directory; use -r/--rev to specify a different revision.
435 435
436 436 The archive type is automatically detected based on file
437 437 extension (to override, use -t/--type).
438 438
439 439 .. container:: verbose
440 440
441 441 Examples:
442 442
443 443 - create a zip file containing the 1.0 release::
444 444
445 445 hg archive -r 1.0 project-1.0.zip
446 446
447 447 - create a tarball excluding .hg files::
448 448
449 449 hg archive project.tar.gz -X ".hg*"
450 450
451 451 Valid types are:
452 452
453 453 :``files``: a directory full of files (default)
454 454 :``tar``: tar archive, uncompressed
455 455 :``tbz2``: tar archive, compressed using bzip2
456 456 :``tgz``: tar archive, compressed using gzip
457 457 :``uzip``: zip archive, uncompressed
458 458 :``zip``: zip archive, compressed using deflate
459 459
460 460 The exact name of the destination archive or directory is given
461 461 using a format string; see :hg:`help export` for details.
462 462
463 463 Each member added to an archive file has a directory prefix
464 464 prepended. Use -p/--prefix to specify a format string for the
465 465 prefix. The default is the basename of the archive, with suffixes
466 466 removed.
467 467
468 468 Returns 0 on success.
469 469 '''
470 470
471 471 opts = pycompat.byteskwargs(opts)
472 472 rev = opts.get('rev')
473 473 if rev:
474 474 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
475 475 ctx = scmutil.revsingle(repo, rev)
476 476 if not ctx:
477 477 raise error.Abort(_('no working directory: please specify a revision'))
478 478 node = ctx.node()
479 479 dest = cmdutil.makefilename(ctx, dest)
480 480 if os.path.realpath(dest) == repo.root:
481 481 raise error.Abort(_('repository root cannot be destination'))
482 482
483 483 kind = opts.get('type') or archival.guesskind(dest) or 'files'
484 484 prefix = opts.get('prefix')
485 485
486 486 if dest == '-':
487 487 if kind == 'files':
488 488 raise error.Abort(_('cannot archive plain files to stdout'))
489 489 dest = cmdutil.makefileobj(ctx, dest)
490 490 if not prefix:
491 491 prefix = os.path.basename(repo.root) + '-%h'
492 492
493 493 prefix = cmdutil.makefilename(ctx, prefix)
494 494 match = scmutil.match(ctx, [], opts)
495 495 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
496 496 match, prefix, subrepos=opts.get('subrepos'))
497 497
498 498 @command('backout',
499 499 [('', 'merge', None, _('merge with old dirstate parent after backout')),
500 500 ('', 'commit', None,
501 501 _('commit if no conflicts were encountered (DEPRECATED)')),
502 502 ('', 'no-commit', None, _('do not commit')),
503 503 ('', 'parent', '',
504 504 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
505 505 ('r', 'rev', '', _('revision to backout'), _('REV')),
506 506 ('e', 'edit', False, _('invoke editor on commit messages')),
507 507 ] + mergetoolopts + walkopts + commitopts + commitopts2,
508 508 _('[OPTION]... [-r] REV'))
509 509 def backout(ui, repo, node=None, rev=None, **opts):
510 510 '''reverse effect of earlier changeset
511 511
512 512 Prepare a new changeset with the effect of REV undone in the
513 513 current working directory. If no conflicts were encountered,
514 514 it will be committed immediately.
515 515
516 516 If REV is the parent of the working directory, then this new changeset
517 517 is committed automatically (unless --no-commit is specified).
518 518
519 519 .. note::
520 520
521 521 :hg:`backout` cannot be used to fix either an unwanted or
522 522 incorrect merge.
523 523
524 524 .. container:: verbose
525 525
526 526 Examples:
527 527
528 528 - Reverse the effect of the parent of the working directory.
529 529 This backout will be committed immediately::
530 530
531 531 hg backout -r .
532 532
533 533 - Reverse the effect of previous bad revision 23::
534 534
535 535 hg backout -r 23
536 536
537 537 - Reverse the effect of previous bad revision 23 and
538 538 leave changes uncommitted::
539 539
540 540 hg backout -r 23 --no-commit
541 541 hg commit -m "Backout revision 23"
542 542
543 543 By default, the pending changeset will have one parent,
544 544 maintaining a linear history. With --merge, the pending
545 545 changeset will instead have two parents: the old parent of the
546 546 working directory and a new child of REV that simply undoes REV.
547 547
548 548 Before version 1.7, the behavior without --merge was equivalent
549 549 to specifying --merge followed by :hg:`update --clean .` to
550 550 cancel the merge and leave the child of REV as a head to be
551 551 merged separately.
552 552
553 553 See :hg:`help dates` for a list of formats valid for -d/--date.
554 554
555 555 See :hg:`help revert` for a way to restore files to the state
556 556 of another revision.
557 557
558 558 Returns 0 on success, 1 if nothing to backout or there are unresolved
559 559 files.
560 560 '''
561 561 wlock = lock = None
562 562 try:
563 563 wlock = repo.wlock()
564 564 lock = repo.lock()
565 565 return _dobackout(ui, repo, node, rev, **opts)
566 566 finally:
567 567 release(lock, wlock)
568 568
569 569 def _dobackout(ui, repo, node=None, rev=None, **opts):
570 570 opts = pycompat.byteskwargs(opts)
571 571 if opts.get('commit') and opts.get('no_commit'):
572 572 raise error.Abort(_("cannot use --commit with --no-commit"))
573 573 if opts.get('merge') and opts.get('no_commit'):
574 574 raise error.Abort(_("cannot use --merge with --no-commit"))
575 575
576 576 if rev and node:
577 577 raise error.Abort(_("please specify just one revision"))
578 578
579 579 if not rev:
580 580 rev = node
581 581
582 582 if not rev:
583 583 raise error.Abort(_("please specify a revision to backout"))
584 584
585 585 date = opts.get('date')
586 586 if date:
587 587 opts['date'] = util.parsedate(date)
588 588
589 589 cmdutil.checkunfinished(repo)
590 590 cmdutil.bailifchanged(repo)
591 591 node = scmutil.revsingle(repo, rev).node()
592 592
593 593 op1, op2 = repo.dirstate.parents()
594 594 if not repo.changelog.isancestor(node, op1):
595 595 raise error.Abort(_('cannot backout change that is not an ancestor'))
596 596
597 597 p1, p2 = repo.changelog.parents(node)
598 598 if p1 == nullid:
599 599 raise error.Abort(_('cannot backout a change with no parents'))
600 600 if p2 != nullid:
601 601 if not opts.get('parent'):
602 602 raise error.Abort(_('cannot backout a merge changeset'))
603 603 p = repo.lookup(opts['parent'])
604 604 if p not in (p1, p2):
605 605 raise error.Abort(_('%s is not a parent of %s') %
606 606 (short(p), short(node)))
607 607 parent = p
608 608 else:
609 609 if opts.get('parent'):
610 610 raise error.Abort(_('cannot use --parent on non-merge changeset'))
611 611 parent = p1
612 612
613 613 # the backout should appear on the same branch
614 614 branch = repo.dirstate.branch()
615 615 bheads = repo.branchheads(branch)
616 616 rctx = scmutil.revsingle(repo, hex(parent))
617 617 if not opts.get('merge') and op1 != node:
618 618 dsguard = dirstateguard.dirstateguard(repo, 'backout')
619 619 try:
620 620 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
621 621 'backout')
622 622 stats = mergemod.update(repo, parent, True, True, node, False)
623 623 repo.setparents(op1, op2)
624 624 dsguard.close()
625 625 hg._showstats(repo, stats)
626 626 if stats[3]:
627 627 repo.ui.status(_("use 'hg resolve' to retry unresolved "
628 628 "file merges\n"))
629 629 return 1
630 630 finally:
631 631 ui.setconfig('ui', 'forcemerge', '', '')
632 632 lockmod.release(dsguard)
633 633 else:
634 634 hg.clean(repo, node, show_stats=False)
635 635 repo.dirstate.setbranch(branch)
636 636 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
637 637
638 638 if opts.get('no_commit'):
639 639 msg = _("changeset %s backed out, "
640 640 "don't forget to commit.\n")
641 641 ui.status(msg % short(node))
642 642 return 0
643 643
644 644 def commitfunc(ui, repo, message, match, opts):
645 645 editform = 'backout'
646 646 e = cmdutil.getcommiteditor(editform=editform,
647 647 **pycompat.strkwargs(opts))
648 648 if not message:
649 649 # we don't translate commit messages
650 650 message = "Backed out changeset %s" % short(node)
651 651 e = cmdutil.getcommiteditor(edit=True, editform=editform)
652 652 return repo.commit(message, opts.get('user'), opts.get('date'),
653 653 match, editor=e)
654 654 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
655 655 if not newnode:
656 656 ui.status(_("nothing changed\n"))
657 657 return 1
658 658 cmdutil.commitstatus(repo, newnode, branch, bheads)
659 659
660 660 def nice(node):
661 661 return '%d:%s' % (repo.changelog.rev(node), short(node))
662 662 ui.status(_('changeset %s backs out changeset %s\n') %
663 663 (nice(repo.changelog.tip()), nice(node)))
664 664 if opts.get('merge') and op1 != node:
665 665 hg.clean(repo, op1, show_stats=False)
666 666 ui.status(_('merging with changeset %s\n')
667 667 % nice(repo.changelog.tip()))
668 668 try:
669 669 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
670 670 'backout')
671 671 return hg.merge(repo, hex(repo.changelog.tip()))
672 672 finally:
673 673 ui.setconfig('ui', 'forcemerge', '', '')
674 674 return 0
675 675
676 676 @command('bisect',
677 677 [('r', 'reset', False, _('reset bisect state')),
678 678 ('g', 'good', False, _('mark changeset good')),
679 679 ('b', 'bad', False, _('mark changeset bad')),
680 680 ('s', 'skip', False, _('skip testing changeset')),
681 681 ('e', 'extend', False, _('extend the bisect range')),
682 682 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
683 683 ('U', 'noupdate', False, _('do not update to target'))],
684 684 _("[-gbsr] [-U] [-c CMD] [REV]"))
685 685 def bisect(ui, repo, rev=None, extra=None, command=None,
686 686 reset=None, good=None, bad=None, skip=None, extend=None,
687 687 noupdate=None):
688 688 """subdivision search of changesets
689 689
690 690 This command helps to find changesets which introduce problems. To
691 691 use, mark the earliest changeset you know exhibits the problem as
692 692 bad, then mark the latest changeset which is free from the problem
693 693 as good. Bisect will update your working directory to a revision
694 694 for testing (unless the -U/--noupdate option is specified). Once
695 695 you have performed tests, mark the working directory as good or
696 696 bad, and bisect will either update to another candidate changeset
697 697 or announce that it has found the bad revision.
698 698
699 699 As a shortcut, you can also use the revision argument to mark a
700 700 revision as good or bad without checking it out first.
701 701
702 702 If you supply a command, it will be used for automatic bisection.
703 703 The environment variable HG_NODE will contain the ID of the
704 704 changeset being tested. The exit status of the command will be
705 705 used to mark revisions as good or bad: status 0 means good, 125
706 706 means to skip the revision, 127 (command not found) will abort the
707 707 bisection, and any other non-zero exit status means the revision
708 708 is bad.
709 709
710 710 .. container:: verbose
711 711
712 712 Some examples:
713 713
714 714 - start a bisection with known bad revision 34, and good revision 12::
715 715
716 716 hg bisect --bad 34
717 717 hg bisect --good 12
718 718
719 719 - advance the current bisection by marking current revision as good or
720 720 bad::
721 721
722 722 hg bisect --good
723 723 hg bisect --bad
724 724
725 725 - mark the current revision, or a known revision, to be skipped (e.g. if
726 726 that revision is not usable because of another issue)::
727 727
728 728 hg bisect --skip
729 729 hg bisect --skip 23
730 730
731 731 - skip all revisions that do not touch directories ``foo`` or ``bar``::
732 732
733 733 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
734 734
735 735 - forget the current bisection::
736 736
737 737 hg bisect --reset
738 738
739 739 - use 'make && make tests' to automatically find the first broken
740 740 revision::
741 741
742 742 hg bisect --reset
743 743 hg bisect --bad 34
744 744 hg bisect --good 12
745 745 hg bisect --command "make && make tests"
746 746
747 747 - see all changesets whose states are already known in the current
748 748 bisection::
749 749
750 750 hg log -r "bisect(pruned)"
751 751
752 752 - see the changeset currently being bisected (especially useful
753 753 if running with -U/--noupdate)::
754 754
755 755 hg log -r "bisect(current)"
756 756
757 757 - see all changesets that took part in the current bisection::
758 758
759 759 hg log -r "bisect(range)"
760 760
761 761 - you can even get a nice graph::
762 762
763 763 hg log --graph -r "bisect(range)"
764 764
765 765 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
766 766
767 767 Returns 0 on success.
768 768 """
769 769 # backward compatibility
770 770 if rev in "good bad reset init".split():
771 771 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
772 772 cmd, rev, extra = rev, extra, None
773 773 if cmd == "good":
774 774 good = True
775 775 elif cmd == "bad":
776 776 bad = True
777 777 else:
778 778 reset = True
779 779 elif extra:
780 780 raise error.Abort(_('incompatible arguments'))
781 781
782 782 incompatibles = {
783 783 '--bad': bad,
784 784 '--command': bool(command),
785 785 '--extend': extend,
786 786 '--good': good,
787 787 '--reset': reset,
788 788 '--skip': skip,
789 789 }
790 790
791 791 enabled = [x for x in incompatibles if incompatibles[x]]
792 792
793 793 if len(enabled) > 1:
794 794 raise error.Abort(_('%s and %s are incompatible') %
795 795 tuple(sorted(enabled)[0:2]))
796 796
797 797 if reset:
798 798 hbisect.resetstate(repo)
799 799 return
800 800
801 801 state = hbisect.load_state(repo)
802 802
803 803 # update state
804 804 if good or bad or skip:
805 805 if rev:
806 806 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
807 807 else:
808 808 nodes = [repo.lookup('.')]
809 809 if good:
810 810 state['good'] += nodes
811 811 elif bad:
812 812 state['bad'] += nodes
813 813 elif skip:
814 814 state['skip'] += nodes
815 815 hbisect.save_state(repo, state)
816 816 if not (state['good'] and state['bad']):
817 817 return
818 818
819 819 def mayupdate(repo, node, show_stats=True):
820 820 """common used update sequence"""
821 821 if noupdate:
822 822 return
823 823 cmdutil.checkunfinished(repo)
824 824 cmdutil.bailifchanged(repo)
825 825 return hg.clean(repo, node, show_stats=show_stats)
826 826
827 827 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
828 828
829 829 if command:
830 830 changesets = 1
831 831 if noupdate:
832 832 try:
833 833 node = state['current'][0]
834 834 except LookupError:
835 835 raise error.Abort(_('current bisect revision is unknown - '
836 836 'start a new bisect to fix'))
837 837 else:
838 838 node, p2 = repo.dirstate.parents()
839 839 if p2 != nullid:
840 840 raise error.Abort(_('current bisect revision is a merge'))
841 841 if rev:
842 842 node = repo[scmutil.revsingle(repo, rev, node)].node()
843 843 try:
844 844 while changesets:
845 845 # update state
846 846 state['current'] = [node]
847 847 hbisect.save_state(repo, state)
848 848 status = ui.system(command, environ={'HG_NODE': hex(node)},
849 849 blockedtag='bisect_check')
850 850 if status == 125:
851 851 transition = "skip"
852 852 elif status == 0:
853 853 transition = "good"
854 854 # status < 0 means process was killed
855 855 elif status == 127:
856 856 raise error.Abort(_("failed to execute %s") % command)
857 857 elif status < 0:
858 858 raise error.Abort(_("%s killed") % command)
859 859 else:
860 860 transition = "bad"
861 861 state[transition].append(node)
862 862 ctx = repo[node]
863 863 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
864 864 transition))
865 865 hbisect.checkstate(state)
866 866 # bisect
867 867 nodes, changesets, bgood = hbisect.bisect(repo, state)
868 868 # update to next check
869 869 node = nodes[0]
870 870 mayupdate(repo, node, show_stats=False)
871 871 finally:
872 872 state['current'] = [node]
873 873 hbisect.save_state(repo, state)
874 874 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
875 875 return
876 876
877 877 hbisect.checkstate(state)
878 878
879 879 # actually bisect
880 880 nodes, changesets, good = hbisect.bisect(repo, state)
881 881 if extend:
882 882 if not changesets:
883 883 extendnode = hbisect.extendrange(repo, state, nodes, good)
884 884 if extendnode is not None:
885 885 ui.write(_("Extending search to changeset %d:%s\n")
886 886 % (extendnode.rev(), extendnode))
887 887 state['current'] = [extendnode.node()]
888 888 hbisect.save_state(repo, state)
889 889 return mayupdate(repo, extendnode.node())
890 890 raise error.Abort(_("nothing to extend"))
891 891
892 892 if changesets == 0:
893 893 hbisect.printresult(ui, repo, state, displayer, nodes, good)
894 894 else:
895 895 assert len(nodes) == 1 # only a single node can be tested next
896 896 node = nodes[0]
897 897 # compute the approximate number of remaining tests
898 898 tests, size = 0, 2
899 899 while size <= changesets:
900 900 tests, size = tests + 1, size * 2
901 901 rev = repo.changelog.rev(node)
902 902 ui.write(_("Testing changeset %d:%s "
903 903 "(%d changesets remaining, ~%d tests)\n")
904 904 % (rev, short(node), changesets, tests))
905 905 state['current'] = [node]
906 906 hbisect.save_state(repo, state)
907 907 return mayupdate(repo, node)
908 908
909 909 @command('bookmarks|bookmark',
910 910 [('f', 'force', False, _('force')),
911 911 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
912 912 ('d', 'delete', False, _('delete a given bookmark')),
913 913 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
914 914 ('i', 'inactive', False, _('mark a bookmark inactive')),
915 915 ] + formatteropts,
916 916 _('hg bookmarks [OPTIONS]... [NAME]...'))
917 917 def bookmark(ui, repo, *names, **opts):
918 918 '''create a new bookmark or list existing bookmarks
919 919
920 920 Bookmarks are labels on changesets to help track lines of development.
921 921 Bookmarks are unversioned and can be moved, renamed and deleted.
922 922 Deleting or moving a bookmark has no effect on the associated changesets.
923 923
924 924 Creating or updating to a bookmark causes it to be marked as 'active'.
925 925 The active bookmark is indicated with a '*'.
926 926 When a commit is made, the active bookmark will advance to the new commit.
927 927 A plain :hg:`update` will also advance an active bookmark, if possible.
928 928 Updating away from a bookmark will cause it to be deactivated.
929 929
930 930 Bookmarks can be pushed and pulled between repositories (see
931 931 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
932 932 diverged, a new 'divergent bookmark' of the form 'name@path' will
933 933 be created. Using :hg:`merge` will resolve the divergence.
934 934
935 935 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
936 936 the active bookmark's name.
937 937
938 938 A bookmark named '@' has the special property that :hg:`clone` will
939 939 check it out by default if it exists.
940 940
941 941 .. container:: verbose
942 942
943 943 Examples:
944 944
945 945 - create an active bookmark for a new line of development::
946 946
947 947 hg book new-feature
948 948
949 949 - create an inactive bookmark as a place marker::
950 950
951 951 hg book -i reviewed
952 952
953 953 - create an inactive bookmark on another changeset::
954 954
955 955 hg book -r .^ tested
956 956
957 957 - rename bookmark turkey to dinner::
958 958
959 959 hg book -m turkey dinner
960 960
961 961 - move the '@' bookmark from another branch::
962 962
963 963 hg book -f @
964 964 '''
965 965 force = opts.get(r'force')
966 966 rev = opts.get(r'rev')
967 967 delete = opts.get(r'delete')
968 968 rename = opts.get(r'rename')
969 969 inactive = opts.get(r'inactive')
970 970
971 971 if delete and rename:
972 972 raise error.Abort(_("--delete and --rename are incompatible"))
973 973 if delete and rev:
974 974 raise error.Abort(_("--rev is incompatible with --delete"))
975 975 if rename and rev:
976 976 raise error.Abort(_("--rev is incompatible with --rename"))
977 977 if not names and (delete or rev):
978 978 raise error.Abort(_("bookmark name required"))
979 979
980 980 if delete or rename or names or inactive:
981 981 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
982 982 if delete:
983 983 names = pycompat.maplist(repo._bookmarks.expandname, names)
984 984 bookmarks.delete(repo, tr, names)
985 985 elif rename:
986 986 if not names:
987 987 raise error.Abort(_("new bookmark name required"))
988 988 elif len(names) > 1:
989 989 raise error.Abort(_("only one new bookmark name allowed"))
990 990 rename = repo._bookmarks.expandname(rename)
991 991 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
992 992 elif names:
993 993 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
994 994 elif inactive:
995 995 if len(repo._bookmarks) == 0:
996 996 ui.status(_("no bookmarks set\n"))
997 997 elif not repo._activebookmark:
998 998 ui.status(_("no active bookmark\n"))
999 999 else:
1000 1000 bookmarks.deactivate(repo)
1001 1001 else: # show bookmarks
1002 1002 bookmarks.printbookmarks(ui, repo, **opts)
1003 1003
1004 1004 @command('branch',
1005 1005 [('f', 'force', None,
1006 1006 _('set branch name even if it shadows an existing branch')),
1007 1007 ('C', 'clean', None, _('reset branch name to parent branch name')),
1008 1008 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1009 1009 ],
1010 1010 _('[-fC] [NAME]'))
1011 1011 def branch(ui, repo, label=None, **opts):
1012 1012 """set or show the current branch name
1013 1013
1014 1014 .. note::
1015 1015
1016 1016 Branch names are permanent and global. Use :hg:`bookmark` to create a
1017 1017 light-weight bookmark instead. See :hg:`help glossary` for more
1018 1018 information about named branches and bookmarks.
1019 1019
1020 1020 With no argument, show the current branch name. With one argument,
1021 1021 set the working directory branch name (the branch will not exist
1022 1022 in the repository until the next commit). Standard practice
1023 1023 recommends that primary development take place on the 'default'
1024 1024 branch.
1025 1025
1026 1026 Unless -f/--force is specified, branch will not let you set a
1027 1027 branch name that already exists.
1028 1028
1029 1029 Use -C/--clean to reset the working directory branch to that of
1030 1030 the parent of the working directory, negating a previous branch
1031 1031 change.
1032 1032
1033 1033 Use the command :hg:`update` to switch to an existing branch. Use
1034 1034 :hg:`commit --close-branch` to mark this branch head as closed.
1035 1035 When all heads of a branch are closed, the branch will be
1036 1036 considered closed.
1037 1037
1038 1038 Returns 0 on success.
1039 1039 """
1040 1040 opts = pycompat.byteskwargs(opts)
1041 1041 revs = opts.get('rev')
1042 1042 if label:
1043 1043 label = label.strip()
1044 1044
1045 1045 if not opts.get('clean') and not label:
1046 1046 if revs:
1047 1047 raise error.Abort(_("no branch name specified for the revisions"))
1048 1048 ui.write("%s\n" % repo.dirstate.branch())
1049 1049 return
1050 1050
1051 1051 with repo.wlock():
1052 1052 if opts.get('clean'):
1053 1053 label = repo[None].p1().branch()
1054 1054 repo.dirstate.setbranch(label)
1055 1055 ui.status(_('reset working directory to branch %s\n') % label)
1056 1056 elif label:
1057 1057
1058 1058 scmutil.checknewlabel(repo, label, 'branch')
1059 1059 if revs:
1060 1060 return cmdutil.changebranch(ui, repo, revs, label)
1061 1061
1062 1062 if not opts.get('force') and label in repo.branchmap():
1063 1063 if label not in [p.branch() for p in repo[None].parents()]:
1064 1064 raise error.Abort(_('a branch of the same name already'
1065 1065 ' exists'),
1066 1066 # i18n: "it" refers to an existing branch
1067 1067 hint=_("use 'hg update' to switch to it"))
1068 1068
1069 1069 repo.dirstate.setbranch(label)
1070 1070 ui.status(_('marked working directory as branch %s\n') % label)
1071 1071
1072 1072 # find any open named branches aside from default
1073 1073 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1074 1074 if n != "default" and not c]
1075 1075 if not others:
1076 1076 ui.status(_('(branches are permanent and global, '
1077 1077 'did you want a bookmark?)\n'))
1078 1078
1079 1079 @command('branches',
1080 1080 [('a', 'active', False,
1081 1081 _('show only branches that have unmerged heads (DEPRECATED)')),
1082 1082 ('c', 'closed', False, _('show normal and closed branches')),
1083 1083 ] + formatteropts,
1084 1084 _('[-c]'), cmdtype=readonly)
1085 1085 def branches(ui, repo, active=False, closed=False, **opts):
1086 1086 """list repository named branches
1087 1087
1088 1088 List the repository's named branches, indicating which ones are
1089 1089 inactive. If -c/--closed is specified, also list branches which have
1090 1090 been marked closed (see :hg:`commit --close-branch`).
1091 1091
1092 1092 Use the command :hg:`update` to switch to an existing branch.
1093 1093
1094 1094 Returns 0.
1095 1095 """
1096 1096
1097 1097 opts = pycompat.byteskwargs(opts)
1098 1098 ui.pager('branches')
1099 1099 fm = ui.formatter('branches', opts)
1100 1100 hexfunc = fm.hexfunc
1101 1101
1102 1102 allheads = set(repo.heads())
1103 1103 branches = []
1104 1104 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1105 1105 isactive = False
1106 1106 if not isclosed:
1107 1107 openheads = set(repo.branchmap().iteropen(heads))
1108 1108 isactive = bool(openheads & allheads)
1109 1109 branches.append((tag, repo[tip], isactive, not isclosed))
1110 1110 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1111 1111 reverse=True)
1112 1112
1113 1113 for tag, ctx, isactive, isopen in branches:
1114 1114 if active and not isactive:
1115 1115 continue
1116 1116 if isactive:
1117 1117 label = 'branches.active'
1118 1118 notice = ''
1119 1119 elif not isopen:
1120 1120 if not closed:
1121 1121 continue
1122 1122 label = 'branches.closed'
1123 1123 notice = _(' (closed)')
1124 1124 else:
1125 1125 label = 'branches.inactive'
1126 1126 notice = _(' (inactive)')
1127 1127 current = (tag == repo.dirstate.branch())
1128 1128 if current:
1129 1129 label = 'branches.current'
1130 1130
1131 1131 fm.startitem()
1132 1132 fm.write('branch', '%s', tag, label=label)
1133 1133 rev = ctx.rev()
1134 1134 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1135 1135 fmt = ' ' * padsize + ' %d:%s'
1136 1136 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1137 1137 label='log.changeset changeset.%s' % ctx.phasestr())
1138 1138 fm.context(ctx=ctx)
1139 1139 fm.data(active=isactive, closed=not isopen, current=current)
1140 1140 if not ui.quiet:
1141 1141 fm.plain(notice)
1142 1142 fm.plain('\n')
1143 1143 fm.end()
1144 1144
1145 1145 @command('bundle',
1146 1146 [('f', 'force', None, _('run even when the destination is unrelated')),
1147 1147 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1148 1148 _('REV')),
1149 1149 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1150 1150 _('BRANCH')),
1151 1151 ('', 'base', [],
1152 1152 _('a base changeset assumed to be available at the destination'),
1153 1153 _('REV')),
1154 1154 ('a', 'all', None, _('bundle all changesets in the repository')),
1155 1155 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1156 1156 ] + remoteopts,
1157 1157 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1158 1158 def bundle(ui, repo, fname, dest=None, **opts):
1159 1159 """create a bundle file
1160 1160
1161 1161 Generate a bundle file containing data to be transferred to another
1162 1162 repository.
1163 1163
1164 1164 To create a bundle containing all changesets, use -a/--all
1165 1165 (or --base null). Otherwise, hg assumes the destination will have
1166 1166 all the nodes you specify with --base parameters. Otherwise, hg
1167 1167 will assume the repository has all the nodes in destination, or
1168 1168 default-push/default if no destination is specified, where destination
1169 1169 is the repository you provide through DEST option.
1170 1170
1171 1171 You can change bundle format with the -t/--type option. See
1172 1172 :hg:`help bundlespec` for documentation on this format. By default,
1173 1173 the most appropriate format is used and compression defaults to
1174 1174 bzip2.
1175 1175
1176 1176 The bundle file can then be transferred using conventional means
1177 1177 and applied to another repository with the unbundle or pull
1178 1178 command. This is useful when direct push and pull are not
1179 1179 available or when exporting an entire repository is undesirable.
1180 1180
1181 1181 Applying bundles preserves all changeset contents including
1182 1182 permissions, copy/rename information, and revision history.
1183 1183
1184 1184 Returns 0 on success, 1 if no changes found.
1185 1185 """
1186 1186 opts = pycompat.byteskwargs(opts)
1187 1187 revs = None
1188 1188 if 'rev' in opts:
1189 1189 revstrings = opts['rev']
1190 1190 revs = scmutil.revrange(repo, revstrings)
1191 1191 if revstrings and not revs:
1192 1192 raise error.Abort(_('no commits to bundle'))
1193 1193
1194 1194 bundletype = opts.get('type', 'bzip2').lower()
1195 1195 try:
1196 1196 bcompression, cgversion, params = exchange.parsebundlespec(
1197 1197 repo, bundletype, strict=False)
1198 1198 except error.UnsupportedBundleSpecification as e:
1199 1199 raise error.Abort(str(e),
1200 1200 hint=_("see 'hg help bundlespec' for supported "
1201 1201 "values for --type"))
1202 1202
1203 1203 # Packed bundles are a pseudo bundle format for now.
1204 1204 if cgversion == 's1':
1205 1205 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1206 1206 hint=_("use 'hg debugcreatestreamclonebundle'"))
1207 1207
1208 1208 if opts.get('all'):
1209 1209 if dest:
1210 1210 raise error.Abort(_("--all is incompatible with specifying "
1211 1211 "a destination"))
1212 1212 if opts.get('base'):
1213 1213 ui.warn(_("ignoring --base because --all was specified\n"))
1214 1214 base = ['null']
1215 1215 else:
1216 1216 base = scmutil.revrange(repo, opts.get('base'))
1217 1217 if cgversion not in changegroup.supportedoutgoingversions(repo):
1218 1218 raise error.Abort(_("repository does not support bundle version %s") %
1219 1219 cgversion)
1220 1220
1221 1221 if base:
1222 1222 if dest:
1223 1223 raise error.Abort(_("--base is incompatible with specifying "
1224 1224 "a destination"))
1225 1225 common = [repo.lookup(rev) for rev in base]
1226 1226 heads = [repo.lookup(r) for r in revs] if revs else None
1227 1227 outgoing = discovery.outgoing(repo, common, heads)
1228 1228 else:
1229 1229 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1230 1230 dest, branches = hg.parseurl(dest, opts.get('branch'))
1231 1231 other = hg.peer(repo, opts, dest)
1232 1232 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1233 1233 heads = revs and map(repo.lookup, revs) or revs
1234 1234 outgoing = discovery.findcommonoutgoing(repo, other,
1235 1235 onlyheads=heads,
1236 1236 force=opts.get('force'),
1237 1237 portable=True)
1238 1238
1239 1239 if not outgoing.missing:
1240 1240 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1241 1241 return 1
1242 1242
1243 1243 if cgversion == '01': #bundle1
1244 1244 if bcompression is None:
1245 1245 bcompression = 'UN'
1246 1246 bversion = 'HG10' + bcompression
1247 1247 bcompression = None
1248 1248 elif cgversion in ('02', '03'):
1249 1249 bversion = 'HG20'
1250 1250 else:
1251 1251 raise error.ProgrammingError(
1252 1252 'bundle: unexpected changegroup version %s' % cgversion)
1253 1253
1254 1254 # TODO compression options should be derived from bundlespec parsing.
1255 1255 # This is a temporary hack to allow adjusting bundle compression
1256 1256 # level without a) formalizing the bundlespec changes to declare it
1257 1257 # b) introducing a command flag.
1258 1258 compopts = {}
1259 1259 complevel = ui.configint('experimental', 'bundlecomplevel')
1260 1260 if complevel is not None:
1261 1261 compopts['level'] = complevel
1262 1262
1263 1263
1264 1264 contentopts = {'cg.version': cgversion}
1265 1265 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1266 1266 contentopts['obsolescence'] = True
1267 1267 if repo.ui.configbool('experimental', 'bundle-phases'):
1268 1268 contentopts['phases'] = True
1269 1269 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1270 1270 contentopts, compression=bcompression,
1271 1271 compopts=compopts)
1272 1272
1273 1273 @command('cat',
1274 1274 [('o', 'output', '',
1275 1275 _('print output to file with formatted name'), _('FORMAT')),
1276 1276 ('r', 'rev', '', _('print the given revision'), _('REV')),
1277 1277 ('', 'decode', None, _('apply any matching decode filter')),
1278 1278 ] + walkopts + formatteropts,
1279 1279 _('[OPTION]... FILE...'),
1280 1280 inferrepo=True, cmdtype=readonly)
1281 1281 def cat(ui, repo, file1, *pats, **opts):
1282 1282 """output the current or given revision of files
1283 1283
1284 1284 Print the specified files as they were at the given revision. If
1285 1285 no revision is given, the parent of the working directory is used.
1286 1286
1287 1287 Output may be to a file, in which case the name of the file is
1288 1288 given using a format string. The formatting rules as follows:
1289 1289
1290 1290 :``%%``: literal "%" character
1291 1291 :``%s``: basename of file being printed
1292 1292 :``%d``: dirname of file being printed, or '.' if in repository root
1293 1293 :``%p``: root-relative path name of file being printed
1294 1294 :``%H``: changeset hash (40 hexadecimal digits)
1295 1295 :``%R``: changeset revision number
1296 1296 :``%h``: short-form changeset hash (12 hexadecimal digits)
1297 1297 :``%r``: zero-padded changeset revision number
1298 1298 :``%b``: basename of the exporting repository
1299 1299
1300 1300 Returns 0 on success.
1301 1301 """
1302 1302 opts = pycompat.byteskwargs(opts)
1303 1303 rev = opts.get('rev')
1304 1304 if rev:
1305 1305 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1306 1306 ctx = scmutil.revsingle(repo, rev)
1307 1307 m = scmutil.match(ctx, (file1,) + pats, opts)
1308 1308 fntemplate = opts.pop('output', '')
1309 1309 if cmdutil.isstdiofilename(fntemplate):
1310 1310 fntemplate = ''
1311 1311
1312 1312 if fntemplate:
1313 1313 fm = formatter.nullformatter(ui, 'cat')
1314 1314 else:
1315 1315 ui.pager('cat')
1316 1316 fm = ui.formatter('cat', opts)
1317 1317 with fm:
1318 1318 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1319 1319 **pycompat.strkwargs(opts))
1320 1320
1321 1321 @command('^clone',
1322 1322 [('U', 'noupdate', None, _('the clone will include an empty working '
1323 1323 'directory (only a repository)')),
1324 1324 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1325 1325 _('REV')),
1326 1326 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1327 1327 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1328 1328 ('', 'pull', None, _('use pull protocol to copy metadata')),
1329 1329 ('', 'uncompressed', None,
1330 1330 _('an alias to --stream (DEPRECATED)')),
1331 1331 ('', 'stream', None,
1332 1332 _('clone with minimal data processing')),
1333 1333 ] + remoteopts,
1334 1334 _('[OPTION]... SOURCE [DEST]'),
1335 1335 norepo=True)
1336 1336 def clone(ui, source, dest=None, **opts):
1337 1337 """make a copy of an existing repository
1338 1338
1339 1339 Create a copy of an existing repository in a new directory.
1340 1340
1341 1341 If no destination directory name is specified, it defaults to the
1342 1342 basename of the source.
1343 1343
1344 1344 The location of the source is added to the new repository's
1345 1345 ``.hg/hgrc`` file, as the default to be used for future pulls.
1346 1346
1347 1347 Only local paths and ``ssh://`` URLs are supported as
1348 1348 destinations. For ``ssh://`` destinations, no working directory or
1349 1349 ``.hg/hgrc`` will be created on the remote side.
1350 1350
1351 1351 If the source repository has a bookmark called '@' set, that
1352 1352 revision will be checked out in the new repository by default.
1353 1353
1354 1354 To check out a particular version, use -u/--update, or
1355 1355 -U/--noupdate to create a clone with no working directory.
1356 1356
1357 1357 To pull only a subset of changesets, specify one or more revisions
1358 1358 identifiers with -r/--rev or branches with -b/--branch. The
1359 1359 resulting clone will contain only the specified changesets and
1360 1360 their ancestors. These options (or 'clone src#rev dest') imply
1361 1361 --pull, even for local source repositories.
1362 1362
1363 1363 In normal clone mode, the remote normalizes repository data into a common
1364 1364 exchange format and the receiving end translates this data into its local
1365 1365 storage format. --stream activates a different clone mode that essentially
1366 1366 copies repository files from the remote with minimal data processing. This
1367 1367 significantly reduces the CPU cost of a clone both remotely and locally.
1368 1368 However, it often increases the transferred data size by 30-40%. This can
1369 1369 result in substantially faster clones where I/O throughput is plentiful,
1370 1370 especially for larger repositories. A side-effect of --stream clones is
1371 1371 that storage settings and requirements on the remote are applied locally:
1372 1372 a modern client may inherit legacy or inefficient storage used by the
1373 1373 remote or a legacy Mercurial client may not be able to clone from a
1374 1374 modern Mercurial remote.
1375 1375
1376 1376 .. note::
1377 1377
1378 1378 Specifying a tag will include the tagged changeset but not the
1379 1379 changeset containing the tag.
1380 1380
1381 1381 .. container:: verbose
1382 1382
1383 1383 For efficiency, hardlinks are used for cloning whenever the
1384 1384 source and destination are on the same filesystem (note this
1385 1385 applies only to the repository data, not to the working
1386 1386 directory). Some filesystems, such as AFS, implement hardlinking
1387 1387 incorrectly, but do not report errors. In these cases, use the
1388 1388 --pull option to avoid hardlinking.
1389 1389
1390 1390 Mercurial will update the working directory to the first applicable
1391 1391 revision from this list:
1392 1392
1393 1393 a) null if -U or the source repository has no changesets
1394 1394 b) if -u . and the source repository is local, the first parent of
1395 1395 the source repository's working directory
1396 1396 c) the changeset specified with -u (if a branch name, this means the
1397 1397 latest head of that branch)
1398 1398 d) the changeset specified with -r
1399 1399 e) the tipmost head specified with -b
1400 1400 f) the tipmost head specified with the url#branch source syntax
1401 1401 g) the revision marked with the '@' bookmark, if present
1402 1402 h) the tipmost head of the default branch
1403 1403 i) tip
1404 1404
1405 1405 When cloning from servers that support it, Mercurial may fetch
1406 1406 pre-generated data from a server-advertised URL. When this is done,
1407 1407 hooks operating on incoming changesets and changegroups may fire twice,
1408 1408 once for the bundle fetched from the URL and another for any additional
1409 1409 data not fetched from this URL. In addition, if an error occurs, the
1410 1410 repository may be rolled back to a partial clone. This behavior may
1411 1411 change in future releases. See :hg:`help -e clonebundles` for more.
1412 1412
1413 1413 Examples:
1414 1414
1415 1415 - clone a remote repository to a new directory named hg/::
1416 1416
1417 1417 hg clone https://www.mercurial-scm.org/repo/hg/
1418 1418
1419 1419 - create a lightweight local clone::
1420 1420
1421 1421 hg clone project/ project-feature/
1422 1422
1423 1423 - clone from an absolute path on an ssh server (note double-slash)::
1424 1424
1425 1425 hg clone ssh://user@server//home/projects/alpha/
1426 1426
1427 1427 - do a streaming clone while checking out a specified version::
1428 1428
1429 1429 hg clone --stream http://server/repo -u 1.5
1430 1430
1431 1431 - create a repository without changesets after a particular revision::
1432 1432
1433 1433 hg clone -r 04e544 experimental/ good/
1434 1434
1435 1435 - clone (and track) a particular named branch::
1436 1436
1437 1437 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1438 1438
1439 1439 See :hg:`help urls` for details on specifying URLs.
1440 1440
1441 1441 Returns 0 on success.
1442 1442 """
1443 1443 opts = pycompat.byteskwargs(opts)
1444 1444 if opts.get('noupdate') and opts.get('updaterev'):
1445 1445 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1446 1446
1447 1447 r = hg.clone(ui, opts, source, dest,
1448 1448 pull=opts.get('pull'),
1449 1449 stream=opts.get('stream') or opts.get('uncompressed'),
1450 1450 rev=opts.get('rev'),
1451 1451 update=opts.get('updaterev') or not opts.get('noupdate'),
1452 1452 branch=opts.get('branch'),
1453 1453 shareopts=opts.get('shareopts'))
1454 1454
1455 1455 return r is None
1456 1456
1457 1457 @command('^commit|ci',
1458 1458 [('A', 'addremove', None,
1459 1459 _('mark new/missing files as added/removed before committing')),
1460 1460 ('', 'close-branch', None,
1461 1461 _('mark a branch head as closed')),
1462 1462 ('', 'amend', None, _('amend the parent of the working directory')),
1463 1463 ('s', 'secret', None, _('use the secret phase for committing')),
1464 1464 ('e', 'edit', None, _('invoke editor on commit messages')),
1465 1465 ('i', 'interactive', None, _('use interactive mode')),
1466 1466 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1467 1467 _('[OPTION]... [FILE]...'),
1468 1468 inferrepo=True)
1469 1469 def commit(ui, repo, *pats, **opts):
1470 1470 """commit the specified files or all outstanding changes
1471 1471
1472 1472 Commit changes to the given files into the repository. Unlike a
1473 1473 centralized SCM, this operation is a local operation. See
1474 1474 :hg:`push` for a way to actively distribute your changes.
1475 1475
1476 1476 If a list of files is omitted, all changes reported by :hg:`status`
1477 1477 will be committed.
1478 1478
1479 1479 If you are committing the result of a merge, do not provide any
1480 1480 filenames or -I/-X filters.
1481 1481
1482 1482 If no commit message is specified, Mercurial starts your
1483 1483 configured editor where you can enter a message. In case your
1484 1484 commit fails, you will find a backup of your message in
1485 1485 ``.hg/last-message.txt``.
1486 1486
1487 1487 The --close-branch flag can be used to mark the current branch
1488 1488 head closed. When all heads of a branch are closed, the branch
1489 1489 will be considered closed and no longer listed.
1490 1490
1491 1491 The --amend flag can be used to amend the parent of the
1492 1492 working directory with a new commit that contains the changes
1493 1493 in the parent in addition to those currently reported by :hg:`status`,
1494 1494 if there are any. The old commit is stored in a backup bundle in
1495 1495 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1496 1496 on how to restore it).
1497 1497
1498 1498 Message, user and date are taken from the amended commit unless
1499 1499 specified. When a message isn't specified on the command line,
1500 1500 the editor will open with the message of the amended commit.
1501 1501
1502 1502 It is not possible to amend public changesets (see :hg:`help phases`)
1503 1503 or changesets that have children.
1504 1504
1505 1505 See :hg:`help dates` for a list of formats valid for -d/--date.
1506 1506
1507 1507 Returns 0 on success, 1 if nothing changed.
1508 1508
1509 1509 .. container:: verbose
1510 1510
1511 1511 Examples:
1512 1512
1513 1513 - commit all files ending in .py::
1514 1514
1515 1515 hg commit --include "set:**.py"
1516 1516
1517 1517 - commit all non-binary files::
1518 1518
1519 1519 hg commit --exclude "set:binary()"
1520 1520
1521 1521 - amend the current commit and set the date to now::
1522 1522
1523 1523 hg commit --amend --date now
1524 1524 """
1525 1525 wlock = lock = None
1526 1526 try:
1527 1527 wlock = repo.wlock()
1528 1528 lock = repo.lock()
1529 1529 return _docommit(ui, repo, *pats, **opts)
1530 1530 finally:
1531 1531 release(lock, wlock)
1532 1532
1533 1533 def _docommit(ui, repo, *pats, **opts):
1534 1534 if opts.get(r'interactive'):
1535 1535 opts.pop(r'interactive')
1536 1536 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1537 1537 cmdutil.recordfilter, *pats,
1538 1538 **opts)
1539 1539 # ret can be 0 (no changes to record) or the value returned by
1540 1540 # commit(), 1 if nothing changed or None on success.
1541 1541 return 1 if ret == 0 else ret
1542 1542
1543 1543 opts = pycompat.byteskwargs(opts)
1544 1544 if opts.get('subrepos'):
1545 1545 if opts.get('amend'):
1546 1546 raise error.Abort(_('cannot amend with --subrepos'))
1547 1547 # Let --subrepos on the command line override config setting.
1548 1548 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1549 1549
1550 1550 cmdutil.checkunfinished(repo, commit=True)
1551 1551
1552 1552 branch = repo[None].branch()
1553 1553 bheads = repo.branchheads(branch)
1554 1554
1555 1555 extra = {}
1556 1556 if opts.get('close_branch'):
1557 1557 extra['close'] = '1'
1558 1558
1559 1559 if not bheads:
1560 1560 raise error.Abort(_('can only close branch heads'))
1561 1561 elif opts.get('amend'):
1562 1562 if repo[None].parents()[0].p1().branch() != branch and \
1563 1563 repo[None].parents()[0].p2().branch() != branch:
1564 1564 raise error.Abort(_('can only close branch heads'))
1565 1565
1566 1566 if opts.get('amend'):
1567 1567 if ui.configbool('ui', 'commitsubrepos'):
1568 1568 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1569 1569
1570 1570 old = repo['.']
1571 1571 rewriteutil.precheck(repo, [old.rev()], 'amend')
1572 1572
1573 1573 # Currently histedit gets confused if an amend happens while histedit
1574 1574 # is in progress. Since we have a checkunfinished command, we are
1575 1575 # temporarily honoring it.
1576 1576 #
1577 1577 # Note: eventually this guard will be removed. Please do not expect
1578 1578 # this behavior to remain.
1579 1579 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1580 1580 cmdutil.checkunfinished(repo)
1581 1581
1582 1582 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1583 1583 if node == old.node():
1584 1584 ui.status(_("nothing changed\n"))
1585 1585 return 1
1586 1586 else:
1587 1587 def commitfunc(ui, repo, message, match, opts):
1588 1588 overrides = {}
1589 1589 if opts.get('secret'):
1590 1590 overrides[('phases', 'new-commit')] = 'secret'
1591 1591
1592 1592 baseui = repo.baseui
1593 1593 with baseui.configoverride(overrides, 'commit'):
1594 1594 with ui.configoverride(overrides, 'commit'):
1595 1595 editform = cmdutil.mergeeditform(repo[None],
1596 1596 'commit.normal')
1597 1597 editor = cmdutil.getcommiteditor(
1598 1598 editform=editform, **pycompat.strkwargs(opts))
1599 1599 return repo.commit(message,
1600 1600 opts.get('user'),
1601 1601 opts.get('date'),
1602 1602 match,
1603 1603 editor=editor,
1604 1604 extra=extra)
1605 1605
1606 1606 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1607 1607
1608 1608 if not node:
1609 1609 stat = cmdutil.postcommitstatus(repo, pats, opts)
1610 1610 if stat[3]:
1611 1611 ui.status(_("nothing changed (%d missing files, see "
1612 1612 "'hg status')\n") % len(stat[3]))
1613 1613 else:
1614 1614 ui.status(_("nothing changed\n"))
1615 1615 return 1
1616 1616
1617 1617 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1618 1618
1619 1619 @command('config|showconfig|debugconfig',
1620 1620 [('u', 'untrusted', None, _('show untrusted configuration options')),
1621 1621 ('e', 'edit', None, _('edit user config')),
1622 1622 ('l', 'local', None, _('edit repository config')),
1623 1623 ('g', 'global', None, _('edit global config'))] + formatteropts,
1624 1624 _('[-u] [NAME]...'),
1625 1625 optionalrepo=True, cmdtype=readonly)
1626 1626 def config(ui, repo, *values, **opts):
1627 1627 """show combined config settings from all hgrc files
1628 1628
1629 1629 With no arguments, print names and values of all config items.
1630 1630
1631 1631 With one argument of the form section.name, print just the value
1632 1632 of that config item.
1633 1633
1634 1634 With multiple arguments, print names and values of all config
1635 1635 items with matching section names or section.names.
1636 1636
1637 1637 With --edit, start an editor on the user-level config file. With
1638 1638 --global, edit the system-wide config file. With --local, edit the
1639 1639 repository-level config file.
1640 1640
1641 1641 With --debug, the source (filename and line number) is printed
1642 1642 for each config item.
1643 1643
1644 1644 See :hg:`help config` for more information about config files.
1645 1645
1646 1646 Returns 0 on success, 1 if NAME does not exist.
1647 1647
1648 1648 """
1649 1649
1650 1650 opts = pycompat.byteskwargs(opts)
1651 1651 if opts.get('edit') or opts.get('local') or opts.get('global'):
1652 1652 if opts.get('local') and opts.get('global'):
1653 1653 raise error.Abort(_("can't use --local and --global together"))
1654 1654
1655 1655 if opts.get('local'):
1656 1656 if not repo:
1657 1657 raise error.Abort(_("can't use --local outside a repository"))
1658 1658 paths = [repo.vfs.join('hgrc')]
1659 1659 elif opts.get('global'):
1660 1660 paths = rcutil.systemrcpath()
1661 1661 else:
1662 1662 paths = rcutil.userrcpath()
1663 1663
1664 1664 for f in paths:
1665 1665 if os.path.exists(f):
1666 1666 break
1667 1667 else:
1668 1668 if opts.get('global'):
1669 1669 samplehgrc = uimod.samplehgrcs['global']
1670 1670 elif opts.get('local'):
1671 1671 samplehgrc = uimod.samplehgrcs['local']
1672 1672 else:
1673 1673 samplehgrc = uimod.samplehgrcs['user']
1674 1674
1675 1675 f = paths[0]
1676 1676 fp = open(f, "wb")
1677 1677 fp.write(util.tonativeeol(samplehgrc))
1678 1678 fp.close()
1679 1679
1680 1680 editor = ui.geteditor()
1681 1681 ui.system("%s \"%s\"" % (editor, f),
1682 1682 onerr=error.Abort, errprefix=_("edit failed"),
1683 1683 blockedtag='config_edit')
1684 1684 return
1685 1685 ui.pager('config')
1686 1686 fm = ui.formatter('config', opts)
1687 1687 for t, f in rcutil.rccomponents():
1688 1688 if t == 'path':
1689 1689 ui.debug('read config from: %s\n' % f)
1690 1690 elif t == 'items':
1691 1691 for section, name, value, source in f:
1692 1692 ui.debug('set config by: %s\n' % source)
1693 1693 else:
1694 1694 raise error.ProgrammingError('unknown rctype: %s' % t)
1695 1695 untrusted = bool(opts.get('untrusted'))
1696 1696
1697 1697 selsections = selentries = []
1698 1698 if values:
1699 1699 selsections = [v for v in values if '.' not in v]
1700 1700 selentries = [v for v in values if '.' in v]
1701 1701 uniquesel = (len(selentries) == 1 and not selsections)
1702 1702 selsections = set(selsections)
1703 1703 selentries = set(selentries)
1704 1704
1705 1705 matched = False
1706 1706 for section, name, value in ui.walkconfig(untrusted=untrusted):
1707 1707 source = ui.configsource(section, name, untrusted)
1708 1708 value = pycompat.bytestr(value)
1709 1709 if fm.isplain():
1710 1710 source = source or 'none'
1711 1711 value = value.replace('\n', '\\n')
1712 1712 entryname = section + '.' + name
1713 1713 if values and not (section in selsections or entryname in selentries):
1714 1714 continue
1715 1715 fm.startitem()
1716 1716 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1717 1717 if uniquesel:
1718 1718 fm.data(name=entryname)
1719 1719 fm.write('value', '%s\n', value)
1720 1720 else:
1721 1721 fm.write('name value', '%s=%s\n', entryname, value)
1722 1722 matched = True
1723 1723 fm.end()
1724 1724 if matched:
1725 1725 return 0
1726 1726 return 1
1727 1727
1728 1728 @command('copy|cp',
1729 1729 [('A', 'after', None, _('record a copy that has already occurred')),
1730 1730 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1731 1731 ] + walkopts + dryrunopts,
1732 1732 _('[OPTION]... [SOURCE]... DEST'))
1733 1733 def copy(ui, repo, *pats, **opts):
1734 1734 """mark files as copied for the next commit
1735 1735
1736 1736 Mark dest as having copies of source files. If dest is a
1737 1737 directory, copies are put in that directory. If dest is a file,
1738 1738 the source must be a single file.
1739 1739
1740 1740 By default, this command copies the contents of files as they
1741 1741 exist in the working directory. If invoked with -A/--after, the
1742 1742 operation is recorded, but no copying is performed.
1743 1743
1744 1744 This command takes effect with the next commit. To undo a copy
1745 1745 before that, see :hg:`revert`.
1746 1746
1747 1747 Returns 0 on success, 1 if errors are encountered.
1748 1748 """
1749 1749 opts = pycompat.byteskwargs(opts)
1750 1750 with repo.wlock(False):
1751 1751 return cmdutil.copy(ui, repo, pats, opts)
1752 1752
1753 1753 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1754 1754 def debugcommands(ui, cmd='', *args):
1755 1755 """list all available commands and options"""
1756 1756 for cmd, vals in sorted(table.iteritems()):
1757 1757 cmd = cmd.split('|')[0].strip('^')
1758 1758 opts = ', '.join([i[1] for i in vals[1]])
1759 1759 ui.write('%s: %s\n' % (cmd, opts))
1760 1760
1761 1761 @command('debugcomplete',
1762 1762 [('o', 'options', None, _('show the command options'))],
1763 1763 _('[-o] CMD'),
1764 1764 norepo=True)
1765 1765 def debugcomplete(ui, cmd='', **opts):
1766 1766 """returns the completion list associated with the given command"""
1767 1767
1768 1768 if opts.get(r'options'):
1769 1769 options = []
1770 1770 otables = [globalopts]
1771 1771 if cmd:
1772 1772 aliases, entry = cmdutil.findcmd(cmd, table, False)
1773 1773 otables.append(entry[1])
1774 1774 for t in otables:
1775 1775 for o in t:
1776 1776 if "(DEPRECATED)" in o[3]:
1777 1777 continue
1778 1778 if o[0]:
1779 1779 options.append('-%s' % o[0])
1780 1780 options.append('--%s' % o[1])
1781 1781 ui.write("%s\n" % "\n".join(options))
1782 1782 return
1783 1783
1784 1784 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1785 1785 if ui.verbose:
1786 1786 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1787 1787 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1788 1788
1789 1789 @command('^diff',
1790 1790 [('r', 'rev', [], _('revision'), _('REV')),
1791 1791 ('c', 'change', '', _('change made by revision'), _('REV'))
1792 1792 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1793 1793 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1794 1794 inferrepo=True, cmdtype=readonly)
1795 1795 def diff(ui, repo, *pats, **opts):
1796 1796 """diff repository (or selected files)
1797 1797
1798 1798 Show differences between revisions for the specified files.
1799 1799
1800 1800 Differences between files are shown using the unified diff format.
1801 1801
1802 1802 .. note::
1803 1803
1804 1804 :hg:`diff` may generate unexpected results for merges, as it will
1805 1805 default to comparing against the working directory's first
1806 1806 parent changeset if no revisions are specified.
1807 1807
1808 1808 When two revision arguments are given, then changes are shown
1809 1809 between those revisions. If only one revision is specified then
1810 1810 that revision is compared to the working directory, and, when no
1811 1811 revisions are specified, the working directory files are compared
1812 1812 to its first parent.
1813 1813
1814 1814 Alternatively you can specify -c/--change with a revision to see
1815 1815 the changes in that changeset relative to its first parent.
1816 1816
1817 1817 Without the -a/--text option, diff will avoid generating diffs of
1818 1818 files it detects as binary. With -a, diff will generate a diff
1819 1819 anyway, probably with undesirable results.
1820 1820
1821 1821 Use the -g/--git option to generate diffs in the git extended diff
1822 1822 format. For more information, read :hg:`help diffs`.
1823 1823
1824 1824 .. container:: verbose
1825 1825
1826 1826 Examples:
1827 1827
1828 1828 - compare a file in the current working directory to its parent::
1829 1829
1830 1830 hg diff foo.c
1831 1831
1832 1832 - compare two historical versions of a directory, with rename info::
1833 1833
1834 1834 hg diff --git -r 1.0:1.2 lib/
1835 1835
1836 1836 - get change stats relative to the last change on some date::
1837 1837
1838 1838 hg diff --stat -r "date('may 2')"
1839 1839
1840 1840 - diff all newly-added files that contain a keyword::
1841 1841
1842 1842 hg diff "set:added() and grep(GNU)"
1843 1843
1844 1844 - compare a revision and its parents::
1845 1845
1846 1846 hg diff -c 9353 # compare against first parent
1847 1847 hg diff -r 9353^:9353 # same using revset syntax
1848 1848 hg diff -r 9353^2:9353 # compare against the second parent
1849 1849
1850 1850 Returns 0 on success.
1851 1851 """
1852 1852
1853 1853 opts = pycompat.byteskwargs(opts)
1854 1854 revs = opts.get('rev')
1855 1855 change = opts.get('change')
1856 1856 stat = opts.get('stat')
1857 1857 reverse = opts.get('reverse')
1858 1858
1859 1859 if revs and change:
1860 1860 msg = _('cannot specify --rev and --change at the same time')
1861 1861 raise error.Abort(msg)
1862 1862 elif change:
1863 1863 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1864 1864 node2 = scmutil.revsingle(repo, change, None).node()
1865 1865 node1 = repo[node2].p1().node()
1866 1866 else:
1867 1867 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1868 1868 node1, node2 = scmutil.revpair(repo, revs)
1869 1869
1870 1870 if reverse:
1871 1871 node1, node2 = node2, node1
1872 1872
1873 1873 diffopts = patch.diffallopts(ui, opts)
1874 1874 m = scmutil.match(repo[node2], pats, opts)
1875 1875 ui.pager('diff')
1876 1876 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1877 1877 listsubrepos=opts.get('subrepos'),
1878 1878 root=opts.get('root'))
1879 1879
1880 1880 @command('^export',
1881 1881 [('o', 'output', '',
1882 1882 _('print output to file with formatted name'), _('FORMAT')),
1883 1883 ('', 'switch-parent', None, _('diff against the second parent')),
1884 1884 ('r', 'rev', [], _('revisions to export'), _('REV')),
1885 1885 ] + diffopts,
1886 1886 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly)
1887 1887 def export(ui, repo, *changesets, **opts):
1888 1888 """dump the header and diffs for one or more changesets
1889 1889
1890 1890 Print the changeset header and diffs for one or more revisions.
1891 1891 If no revision is given, the parent of the working directory is used.
1892 1892
1893 1893 The information shown in the changeset header is: author, date,
1894 1894 branch name (if non-default), changeset hash, parent(s) and commit
1895 1895 comment.
1896 1896
1897 1897 .. note::
1898 1898
1899 1899 :hg:`export` may generate unexpected diff output for merge
1900 1900 changesets, as it will compare the merge changeset against its
1901 1901 first parent only.
1902 1902
1903 1903 Output may be to a file, in which case the name of the file is
1904 1904 given using a format string. The formatting rules are as follows:
1905 1905
1906 1906 :``%%``: literal "%" character
1907 1907 :``%H``: changeset hash (40 hexadecimal digits)
1908 1908 :``%N``: number of patches being generated
1909 1909 :``%R``: changeset revision number
1910 1910 :``%b``: basename of the exporting repository
1911 1911 :``%h``: short-form changeset hash (12 hexadecimal digits)
1912 1912 :``%m``: first line of the commit message (only alphanumeric characters)
1913 1913 :``%n``: zero-padded sequence number, starting at 1
1914 1914 :``%r``: zero-padded changeset revision number
1915 1915
1916 1916 Without the -a/--text option, export will avoid generating diffs
1917 1917 of files it detects as binary. With -a, export will generate a
1918 1918 diff anyway, probably with undesirable results.
1919 1919
1920 1920 Use the -g/--git option to generate diffs in the git extended diff
1921 1921 format. See :hg:`help diffs` for more information.
1922 1922
1923 1923 With the --switch-parent option, the diff will be against the
1924 1924 second parent. It can be useful to review a merge.
1925 1925
1926 1926 .. container:: verbose
1927 1927
1928 1928 Examples:
1929 1929
1930 1930 - use export and import to transplant a bugfix to the current
1931 1931 branch::
1932 1932
1933 1933 hg export -r 9353 | hg import -
1934 1934
1935 1935 - export all the changesets between two revisions to a file with
1936 1936 rename information::
1937 1937
1938 1938 hg export --git -r 123:150 > changes.txt
1939 1939
1940 1940 - split outgoing changes into a series of patches with
1941 1941 descriptive names::
1942 1942
1943 1943 hg export -r "outgoing()" -o "%n-%m.patch"
1944 1944
1945 1945 Returns 0 on success.
1946 1946 """
1947 1947 opts = pycompat.byteskwargs(opts)
1948 1948 changesets += tuple(opts.get('rev', []))
1949 1949 if not changesets:
1950 1950 changesets = ['.']
1951 1951 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1952 1952 revs = scmutil.revrange(repo, changesets)
1953 1953 if not revs:
1954 1954 raise error.Abort(_("export requires at least one changeset"))
1955 1955 if len(revs) > 1:
1956 1956 ui.note(_('exporting patches:\n'))
1957 1957 else:
1958 1958 ui.note(_('exporting patch:\n'))
1959 1959 ui.pager('export')
1960 1960 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1961 1961 switch_parent=opts.get('switch_parent'),
1962 1962 opts=patch.diffallopts(ui, opts))
1963 1963
1964 1964 @command('files',
1965 1965 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1966 1966 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1967 1967 ] + walkopts + formatteropts + subrepoopts,
1968 1968 _('[OPTION]... [FILE]...'), cmdtype=readonly)
1969 1969 def files(ui, repo, *pats, **opts):
1970 1970 """list tracked files
1971 1971
1972 1972 Print files under Mercurial control in the working directory or
1973 1973 specified revision for given files (excluding removed files).
1974 1974 Files can be specified as filenames or filesets.
1975 1975
1976 1976 If no files are given to match, this command prints the names
1977 1977 of all files under Mercurial control.
1978 1978
1979 1979 .. container:: verbose
1980 1980
1981 1981 Examples:
1982 1982
1983 1983 - list all files under the current directory::
1984 1984
1985 1985 hg files .
1986 1986
1987 1987 - shows sizes and flags for current revision::
1988 1988
1989 1989 hg files -vr .
1990 1990
1991 1991 - list all files named README::
1992 1992
1993 1993 hg files -I "**/README"
1994 1994
1995 1995 - list all binary files::
1996 1996
1997 1997 hg files "set:binary()"
1998 1998
1999 1999 - find files containing a regular expression::
2000 2000
2001 2001 hg files "set:grep('bob')"
2002 2002
2003 2003 - search tracked file contents with xargs and grep::
2004 2004
2005 2005 hg files -0 | xargs -0 grep foo
2006 2006
2007 2007 See :hg:`help patterns` and :hg:`help filesets` for more information
2008 2008 on specifying file patterns.
2009 2009
2010 2010 Returns 0 if a match is found, 1 otherwise.
2011 2011
2012 2012 """
2013 2013
2014 2014 opts = pycompat.byteskwargs(opts)
2015 2015 rev = opts.get('rev')
2016 2016 if rev:
2017 2017 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2018 2018 ctx = scmutil.revsingle(repo, rev, None)
2019 2019
2020 2020 end = '\n'
2021 2021 if opts.get('print0'):
2022 2022 end = '\0'
2023 2023 fmt = '%s' + end
2024 2024
2025 2025 m = scmutil.match(ctx, pats, opts)
2026 2026 ui.pager('files')
2027 2027 with ui.formatter('files', opts) as fm:
2028 2028 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2029 2029
2030 2030 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2031 2031 def forget(ui, repo, *pats, **opts):
2032 2032 """forget the specified files on the next commit
2033 2033
2034 2034 Mark the specified files so they will no longer be tracked
2035 2035 after the next commit.
2036 2036
2037 2037 This only removes files from the current branch, not from the
2038 2038 entire project history, and it does not delete them from the
2039 2039 working directory.
2040 2040
2041 2041 To delete the file from the working directory, see :hg:`remove`.
2042 2042
2043 2043 To undo a forget before the next commit, see :hg:`add`.
2044 2044
2045 2045 .. container:: verbose
2046 2046
2047 2047 Examples:
2048 2048
2049 2049 - forget newly-added binary files::
2050 2050
2051 2051 hg forget "set:added() and binary()"
2052 2052
2053 2053 - forget files that would be excluded by .hgignore::
2054 2054
2055 2055 hg forget "set:hgignore()"
2056 2056
2057 2057 Returns 0 on success.
2058 2058 """
2059 2059
2060 2060 opts = pycompat.byteskwargs(opts)
2061 2061 if not pats:
2062 2062 raise error.Abort(_('no files specified'))
2063 2063
2064 2064 m = scmutil.match(repo[None], pats, opts)
2065 2065 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2066 2066 return rejected and 1 or 0
2067 2067
2068 2068 @command(
2069 2069 'graft',
2070 2070 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2071 2071 ('c', 'continue', False, _('resume interrupted graft')),
2072 2072 ('e', 'edit', False, _('invoke editor on commit messages')),
2073 2073 ('', 'log', None, _('append graft info to log message')),
2074 2074 ('f', 'force', False, _('force graft')),
2075 2075 ('D', 'currentdate', False,
2076 2076 _('record the current date as commit date')),
2077 2077 ('U', 'currentuser', False,
2078 2078 _('record the current user as committer'), _('DATE'))]
2079 2079 + commitopts2 + mergetoolopts + dryrunopts,
2080 2080 _('[OPTION]... [-r REV]... REV...'))
2081 2081 def graft(ui, repo, *revs, **opts):
2082 2082 '''copy changes from other branches onto the current branch
2083 2083
2084 2084 This command uses Mercurial's merge logic to copy individual
2085 2085 changes from other branches without merging branches in the
2086 2086 history graph. This is sometimes known as 'backporting' or
2087 2087 'cherry-picking'. By default, graft will copy user, date, and
2088 2088 description from the source changesets.
2089 2089
2090 2090 Changesets that are ancestors of the current revision, that have
2091 2091 already been grafted, or that are merges will be skipped.
2092 2092
2093 2093 If --log is specified, log messages will have a comment appended
2094 2094 of the form::
2095 2095
2096 2096 (grafted from CHANGESETHASH)
2097 2097
2098 2098 If --force is specified, revisions will be grafted even if they
2099 2099 are already ancestors of, or have been grafted to, the destination.
2100 2100 This is useful when the revisions have since been backed out.
2101 2101
2102 2102 If a graft merge results in conflicts, the graft process is
2103 2103 interrupted so that the current merge can be manually resolved.
2104 2104 Once all conflicts are addressed, the graft process can be
2105 2105 continued with the -c/--continue option.
2106 2106
2107 2107 .. note::
2108 2108
2109 2109 The -c/--continue option does not reapply earlier options, except
2110 2110 for --force.
2111 2111
2112 2112 .. container:: verbose
2113 2113
2114 2114 Examples:
2115 2115
2116 2116 - copy a single change to the stable branch and edit its description::
2117 2117
2118 2118 hg update stable
2119 2119 hg graft --edit 9393
2120 2120
2121 2121 - graft a range of changesets with one exception, updating dates::
2122 2122
2123 2123 hg graft -D "2085::2093 and not 2091"
2124 2124
2125 2125 - continue a graft after resolving conflicts::
2126 2126
2127 2127 hg graft -c
2128 2128
2129 2129 - show the source of a grafted changeset::
2130 2130
2131 2131 hg log --debug -r .
2132 2132
2133 2133 - show revisions sorted by date::
2134 2134
2135 2135 hg log -r "sort(all(), date)"
2136 2136
2137 2137 See :hg:`help revisions` for more about specifying revisions.
2138 2138
2139 2139 Returns 0 on successful completion.
2140 2140 '''
2141 2141 with repo.wlock():
2142 2142 return _dograft(ui, repo, *revs, **opts)
2143 2143
2144 2144 def _dograft(ui, repo, *revs, **opts):
2145 2145 opts = pycompat.byteskwargs(opts)
2146 2146 if revs and opts.get('rev'):
2147 2147 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2148 2148 'revision ordering!\n'))
2149 2149
2150 2150 revs = list(revs)
2151 2151 revs.extend(opts.get('rev'))
2152 2152
2153 2153 if not opts.get('user') and opts.get('currentuser'):
2154 2154 opts['user'] = ui.username()
2155 2155 if not opts.get('date') and opts.get('currentdate'):
2156 2156 opts['date'] = "%d %d" % util.makedate()
2157 2157
2158 2158 editor = cmdutil.getcommiteditor(editform='graft',
2159 2159 **pycompat.strkwargs(opts))
2160 2160
2161 2161 cont = False
2162 2162 if opts.get('continue'):
2163 2163 cont = True
2164 2164 if revs:
2165 2165 raise error.Abort(_("can't specify --continue and revisions"))
2166 2166 # read in unfinished revisions
2167 2167 try:
2168 2168 nodes = repo.vfs.read('graftstate').splitlines()
2169 2169 revs = [repo[node].rev() for node in nodes]
2170 2170 except IOError as inst:
2171 2171 if inst.errno != errno.ENOENT:
2172 2172 raise
2173 2173 cmdutil.wrongtooltocontinue(repo, _('graft'))
2174 2174 else:
2175 2175 cmdutil.checkunfinished(repo)
2176 2176 cmdutil.bailifchanged(repo)
2177 2177 if not revs:
2178 2178 raise error.Abort(_('no revisions specified'))
2179 2179 revs = scmutil.revrange(repo, revs)
2180 2180
2181 2181 skipped = set()
2182 2182 # check for merges
2183 2183 for rev in repo.revs('%ld and merge()', revs):
2184 2184 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2185 2185 skipped.add(rev)
2186 2186 revs = [r for r in revs if r not in skipped]
2187 2187 if not revs:
2188 2188 return -1
2189 2189
2190 2190 # Don't check in the --continue case, in effect retaining --force across
2191 2191 # --continues. That's because without --force, any revisions we decided to
2192 2192 # skip would have been filtered out here, so they wouldn't have made their
2193 2193 # way to the graftstate. With --force, any revisions we would have otherwise
2194 2194 # skipped would not have been filtered out, and if they hadn't been applied
2195 2195 # already, they'd have been in the graftstate.
2196 2196 if not (cont or opts.get('force')):
2197 2197 # check for ancestors of dest branch
2198 2198 crev = repo['.'].rev()
2199 2199 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2200 2200 # XXX make this lazy in the future
2201 2201 # don't mutate while iterating, create a copy
2202 2202 for rev in list(revs):
2203 2203 if rev in ancestors:
2204 2204 ui.warn(_('skipping ancestor revision %d:%s\n') %
2205 2205 (rev, repo[rev]))
2206 2206 # XXX remove on list is slow
2207 2207 revs.remove(rev)
2208 2208 if not revs:
2209 2209 return -1
2210 2210
2211 2211 # analyze revs for earlier grafts
2212 2212 ids = {}
2213 2213 for ctx in repo.set("%ld", revs):
2214 2214 ids[ctx.hex()] = ctx.rev()
2215 2215 n = ctx.extra().get('source')
2216 2216 if n:
2217 2217 ids[n] = ctx.rev()
2218 2218
2219 2219 # check ancestors for earlier grafts
2220 2220 ui.debug('scanning for duplicate grafts\n')
2221 2221
2222 2222 # The only changesets we can be sure doesn't contain grafts of any
2223 2223 # revs, are the ones that are common ancestors of *all* revs:
2224 2224 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2225 2225 ctx = repo[rev]
2226 2226 n = ctx.extra().get('source')
2227 2227 if n in ids:
2228 2228 try:
2229 2229 r = repo[n].rev()
2230 2230 except error.RepoLookupError:
2231 2231 r = None
2232 2232 if r in revs:
2233 2233 ui.warn(_('skipping revision %d:%s '
2234 2234 '(already grafted to %d:%s)\n')
2235 2235 % (r, repo[r], rev, ctx))
2236 2236 revs.remove(r)
2237 2237 elif ids[n] in revs:
2238 2238 if r is None:
2239 2239 ui.warn(_('skipping already grafted revision %d:%s '
2240 2240 '(%d:%s also has unknown origin %s)\n')
2241 2241 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2242 2242 else:
2243 2243 ui.warn(_('skipping already grafted revision %d:%s '
2244 2244 '(%d:%s also has origin %d:%s)\n')
2245 2245 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2246 2246 revs.remove(ids[n])
2247 2247 elif ctx.hex() in ids:
2248 2248 r = ids[ctx.hex()]
2249 2249 ui.warn(_('skipping already grafted revision %d:%s '
2250 2250 '(was grafted from %d:%s)\n') %
2251 2251 (r, repo[r], rev, ctx))
2252 2252 revs.remove(r)
2253 2253 if not revs:
2254 2254 return -1
2255 2255
2256 2256 for pos, ctx in enumerate(repo.set("%ld", revs)):
2257 2257 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2258 2258 ctx.description().split('\n', 1)[0])
2259 2259 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2260 2260 if names:
2261 2261 desc += ' (%s)' % ' '.join(names)
2262 2262 ui.status(_('grafting %s\n') % desc)
2263 2263 if opts.get('dry_run'):
2264 2264 continue
2265 2265
2266 2266 source = ctx.extra().get('source')
2267 2267 extra = {}
2268 2268 if source:
2269 2269 extra['source'] = source
2270 2270 extra['intermediate-source'] = ctx.hex()
2271 2271 else:
2272 2272 extra['source'] = ctx.hex()
2273 2273 user = ctx.user()
2274 2274 if opts.get('user'):
2275 2275 user = opts['user']
2276 2276 date = ctx.date()
2277 2277 if opts.get('date'):
2278 2278 date = opts['date']
2279 2279 message = ctx.description()
2280 2280 if opts.get('log'):
2281 2281 message += '\n(grafted from %s)' % ctx.hex()
2282 2282
2283 2283 # we don't merge the first commit when continuing
2284 2284 if not cont:
2285 2285 # perform the graft merge with p1(rev) as 'ancestor'
2286 2286 try:
2287 2287 # ui.forcemerge is an internal variable, do not document
2288 2288 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2289 2289 'graft')
2290 2290 stats = mergemod.graft(repo, ctx, ctx.p1(),
2291 2291 ['local', 'graft'])
2292 2292 finally:
2293 2293 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2294 2294 # report any conflicts
2295 2295 if stats and stats[3] > 0:
2296 2296 # write out state for --continue
2297 2297 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2298 2298 repo.vfs.write('graftstate', ''.join(nodelines))
2299 2299 extra = ''
2300 2300 if opts.get('user'):
2301 2301 extra += ' --user %s' % util.shellquote(opts['user'])
2302 2302 if opts.get('date'):
2303 2303 extra += ' --date %s' % util.shellquote(opts['date'])
2304 2304 if opts.get('log'):
2305 2305 extra += ' --log'
2306 2306 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2307 2307 raise error.Abort(
2308 2308 _("unresolved conflicts, can't continue"),
2309 2309 hint=hint)
2310 2310 else:
2311 2311 cont = False
2312 2312
2313 2313 # commit
2314 2314 node = repo.commit(text=message, user=user,
2315 2315 date=date, extra=extra, editor=editor)
2316 2316 if node is None:
2317 2317 ui.warn(
2318 2318 _('note: graft of %d:%s created no changes to commit\n') %
2319 2319 (ctx.rev(), ctx))
2320 2320
2321 2321 # remove state when we complete successfully
2322 2322 if not opts.get('dry_run'):
2323 2323 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2324 2324
2325 2325 return 0
2326 2326
2327 2327 @command('grep',
2328 2328 [('0', 'print0', None, _('end fields with NUL')),
2329 2329 ('', 'all', None, _('print all revisions that match')),
2330 2330 ('a', 'text', None, _('treat all files as text')),
2331 2331 ('f', 'follow', None,
2332 2332 _('follow changeset history,'
2333 2333 ' or file history across copies and renames')),
2334 2334 ('i', 'ignore-case', None, _('ignore case when matching')),
2335 2335 ('l', 'files-with-matches', None,
2336 2336 _('print only filenames and revisions that match')),
2337 2337 ('n', 'line-number', None, _('print matching line numbers')),
2338 2338 ('r', 'rev', [],
2339 2339 _('only search files changed within revision range'), _('REV')),
2340 2340 ('u', 'user', None, _('list the author (long with -v)')),
2341 2341 ('d', 'date', None, _('list the date (short with -q)')),
2342 2342 ] + formatteropts + walkopts,
2343 2343 _('[OPTION]... PATTERN [FILE]...'),
2344 2344 inferrepo=True, cmdtype=readonly)
2345 2345 def grep(ui, repo, pattern, *pats, **opts):
2346 2346 """search revision history for a pattern in specified files
2347 2347
2348 2348 Search revision history for a regular expression in the specified
2349 2349 files or the entire project.
2350 2350
2351 2351 By default, grep prints the most recent revision number for each
2352 2352 file in which it finds a match. To get it to print every revision
2353 2353 that contains a change in match status ("-" for a match that becomes
2354 2354 a non-match, or "+" for a non-match that becomes a match), use the
2355 2355 --all flag.
2356 2356
2357 2357 PATTERN can be any Python (roughly Perl-compatible) regular
2358 2358 expression.
2359 2359
2360 2360 If no FILEs are specified (and -f/--follow isn't set), all files in
2361 2361 the repository are searched, including those that don't exist in the
2362 2362 current branch or have been deleted in a prior changeset.
2363 2363
2364 2364 Returns 0 if a match is found, 1 otherwise.
2365 2365 """
2366 2366 opts = pycompat.byteskwargs(opts)
2367 2367 reflags = re.M
2368 2368 if opts.get('ignore_case'):
2369 2369 reflags |= re.I
2370 2370 try:
2371 2371 regexp = util.re.compile(pattern, reflags)
2372 2372 except re.error as inst:
2373 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2373 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2374 2374 return 1
2375 2375 sep, eol = ':', '\n'
2376 2376 if opts.get('print0'):
2377 2377 sep = eol = '\0'
2378 2378
2379 2379 getfile = util.lrucachefunc(repo.file)
2380 2380
2381 2381 def matchlines(body):
2382 2382 begin = 0
2383 2383 linenum = 0
2384 2384 while begin < len(body):
2385 2385 match = regexp.search(body, begin)
2386 2386 if not match:
2387 2387 break
2388 2388 mstart, mend = match.span()
2389 2389 linenum += body.count('\n', begin, mstart) + 1
2390 2390 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2391 2391 begin = body.find('\n', mend) + 1 or len(body) + 1
2392 2392 lend = begin - 1
2393 2393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2394 2394
2395 2395 class linestate(object):
2396 2396 def __init__(self, line, linenum, colstart, colend):
2397 2397 self.line = line
2398 2398 self.linenum = linenum
2399 2399 self.colstart = colstart
2400 2400 self.colend = colend
2401 2401
2402 2402 def __hash__(self):
2403 2403 return hash((self.linenum, self.line))
2404 2404
2405 2405 def __eq__(self, other):
2406 2406 return self.line == other.line
2407 2407
2408 2408 def findpos(self):
2409 2409 """Iterate all (start, end) indices of matches"""
2410 2410 yield self.colstart, self.colend
2411 2411 p = self.colend
2412 2412 while p < len(self.line):
2413 2413 m = regexp.search(self.line, p)
2414 2414 if not m:
2415 2415 break
2416 2416 yield m.span()
2417 2417 p = m.end()
2418 2418
2419 2419 matches = {}
2420 2420 copies = {}
2421 2421 def grepbody(fn, rev, body):
2422 2422 matches[rev].setdefault(fn, [])
2423 2423 m = matches[rev][fn]
2424 2424 for lnum, cstart, cend, line in matchlines(body):
2425 2425 s = linestate(line, lnum, cstart, cend)
2426 2426 m.append(s)
2427 2427
2428 2428 def difflinestates(a, b):
2429 2429 sm = difflib.SequenceMatcher(None, a, b)
2430 2430 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2431 2431 if tag == 'insert':
2432 2432 for i in xrange(blo, bhi):
2433 2433 yield ('+', b[i])
2434 2434 elif tag == 'delete':
2435 2435 for i in xrange(alo, ahi):
2436 2436 yield ('-', a[i])
2437 2437 elif tag == 'replace':
2438 2438 for i in xrange(alo, ahi):
2439 2439 yield ('-', a[i])
2440 2440 for i in xrange(blo, bhi):
2441 2441 yield ('+', b[i])
2442 2442
2443 2443 def display(fm, fn, ctx, pstates, states):
2444 2444 rev = ctx.rev()
2445 2445 if fm.isplain():
2446 2446 formatuser = ui.shortuser
2447 2447 else:
2448 2448 formatuser = str
2449 2449 if ui.quiet:
2450 2450 datefmt = '%Y-%m-%d'
2451 2451 else:
2452 2452 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2453 2453 found = False
2454 2454 @util.cachefunc
2455 2455 def binary():
2456 2456 flog = getfile(fn)
2457 2457 return util.binary(flog.read(ctx.filenode(fn)))
2458 2458
2459 2459 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2460 2460 if opts.get('all'):
2461 2461 iter = difflinestates(pstates, states)
2462 2462 else:
2463 2463 iter = [('', l) for l in states]
2464 2464 for change, l in iter:
2465 2465 fm.startitem()
2466 2466 fm.data(node=fm.hexfunc(ctx.node()))
2467 2467 cols = [
2468 2468 ('filename', fn, True),
2469 2469 ('rev', rev, True),
2470 2470 ('linenumber', l.linenum, opts.get('line_number')),
2471 2471 ]
2472 2472 if opts.get('all'):
2473 2473 cols.append(('change', change, True))
2474 2474 cols.extend([
2475 2475 ('user', formatuser(ctx.user()), opts.get('user')),
2476 2476 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2477 2477 ])
2478 2478 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2479 2479 for name, data, cond in cols:
2480 2480 field = fieldnamemap.get(name, name)
2481 2481 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2482 2482 if cond and name != lastcol:
2483 2483 fm.plain(sep, label='grep.sep')
2484 2484 if not opts.get('files_with_matches'):
2485 2485 fm.plain(sep, label='grep.sep')
2486 2486 if not opts.get('text') and binary():
2487 2487 fm.plain(_(" Binary file matches"))
2488 2488 else:
2489 2489 displaymatches(fm.nested('texts'), l)
2490 2490 fm.plain(eol)
2491 2491 found = True
2492 2492 if opts.get('files_with_matches'):
2493 2493 break
2494 2494 return found
2495 2495
2496 2496 def displaymatches(fm, l):
2497 2497 p = 0
2498 2498 for s, e in l.findpos():
2499 2499 if p < s:
2500 2500 fm.startitem()
2501 2501 fm.write('text', '%s', l.line[p:s])
2502 2502 fm.data(matched=False)
2503 2503 fm.startitem()
2504 2504 fm.write('text', '%s', l.line[s:e], label='grep.match')
2505 2505 fm.data(matched=True)
2506 2506 p = e
2507 2507 if p < len(l.line):
2508 2508 fm.startitem()
2509 2509 fm.write('text', '%s', l.line[p:])
2510 2510 fm.data(matched=False)
2511 2511 fm.end()
2512 2512
2513 2513 skip = {}
2514 2514 revfiles = {}
2515 2515 match = scmutil.match(repo[None], pats, opts)
2516 2516 found = False
2517 2517 follow = opts.get('follow')
2518 2518
2519 2519 def prep(ctx, fns):
2520 2520 rev = ctx.rev()
2521 2521 pctx = ctx.p1()
2522 2522 parent = pctx.rev()
2523 2523 matches.setdefault(rev, {})
2524 2524 matches.setdefault(parent, {})
2525 2525 files = revfiles.setdefault(rev, [])
2526 2526 for fn in fns:
2527 2527 flog = getfile(fn)
2528 2528 try:
2529 2529 fnode = ctx.filenode(fn)
2530 2530 except error.LookupError:
2531 2531 continue
2532 2532
2533 2533 copied = flog.renamed(fnode)
2534 2534 copy = follow and copied and copied[0]
2535 2535 if copy:
2536 2536 copies.setdefault(rev, {})[fn] = copy
2537 2537 if fn in skip:
2538 2538 if copy:
2539 2539 skip[copy] = True
2540 2540 continue
2541 2541 files.append(fn)
2542 2542
2543 2543 if fn not in matches[rev]:
2544 2544 grepbody(fn, rev, flog.read(fnode))
2545 2545
2546 2546 pfn = copy or fn
2547 2547 if pfn not in matches[parent]:
2548 2548 try:
2549 2549 fnode = pctx.filenode(pfn)
2550 2550 grepbody(pfn, parent, flog.read(fnode))
2551 2551 except error.LookupError:
2552 2552 pass
2553 2553
2554 2554 ui.pager('grep')
2555 2555 fm = ui.formatter('grep', opts)
2556 2556 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2557 2557 rev = ctx.rev()
2558 2558 parent = ctx.p1().rev()
2559 2559 for fn in sorted(revfiles.get(rev, [])):
2560 2560 states = matches[rev][fn]
2561 2561 copy = copies.get(rev, {}).get(fn)
2562 2562 if fn in skip:
2563 2563 if copy:
2564 2564 skip[copy] = True
2565 2565 continue
2566 2566 pstates = matches.get(parent, {}).get(copy or fn, [])
2567 2567 if pstates or states:
2568 2568 r = display(fm, fn, ctx, pstates, states)
2569 2569 found = found or r
2570 2570 if r and not opts.get('all'):
2571 2571 skip[fn] = True
2572 2572 if copy:
2573 2573 skip[copy] = True
2574 2574 del matches[rev]
2575 2575 del revfiles[rev]
2576 2576 fm.end()
2577 2577
2578 2578 return not found
2579 2579
2580 2580 @command('heads',
2581 2581 [('r', 'rev', '',
2582 2582 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2583 2583 ('t', 'topo', False, _('show topological heads only')),
2584 2584 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2585 2585 ('c', 'closed', False, _('show normal and closed branch heads')),
2586 2586 ] + templateopts,
2587 2587 _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly)
2588 2588 def heads(ui, repo, *branchrevs, **opts):
2589 2589 """show branch heads
2590 2590
2591 2591 With no arguments, show all open branch heads in the repository.
2592 2592 Branch heads are changesets that have no descendants on the
2593 2593 same branch. They are where development generally takes place and
2594 2594 are the usual targets for update and merge operations.
2595 2595
2596 2596 If one or more REVs are given, only open branch heads on the
2597 2597 branches associated with the specified changesets are shown. This
2598 2598 means that you can use :hg:`heads .` to see the heads on the
2599 2599 currently checked-out branch.
2600 2600
2601 2601 If -c/--closed is specified, also show branch heads marked closed
2602 2602 (see :hg:`commit --close-branch`).
2603 2603
2604 2604 If STARTREV is specified, only those heads that are descendants of
2605 2605 STARTREV will be displayed.
2606 2606
2607 2607 If -t/--topo is specified, named branch mechanics will be ignored and only
2608 2608 topological heads (changesets with no children) will be shown.
2609 2609
2610 2610 Returns 0 if matching heads are found, 1 if not.
2611 2611 """
2612 2612
2613 2613 opts = pycompat.byteskwargs(opts)
2614 2614 start = None
2615 2615 rev = opts.get('rev')
2616 2616 if rev:
2617 2617 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2618 2618 start = scmutil.revsingle(repo, rev, None).node()
2619 2619
2620 2620 if opts.get('topo'):
2621 2621 heads = [repo[h] for h in repo.heads(start)]
2622 2622 else:
2623 2623 heads = []
2624 2624 for branch in repo.branchmap():
2625 2625 heads += repo.branchheads(branch, start, opts.get('closed'))
2626 2626 heads = [repo[h] for h in heads]
2627 2627
2628 2628 if branchrevs:
2629 2629 branches = set(repo[br].branch() for br in branchrevs)
2630 2630 heads = [h for h in heads if h.branch() in branches]
2631 2631
2632 2632 if opts.get('active') and branchrevs:
2633 2633 dagheads = repo.heads(start)
2634 2634 heads = [h for h in heads if h.node() in dagheads]
2635 2635
2636 2636 if branchrevs:
2637 2637 haveheads = set(h.branch() for h in heads)
2638 2638 if branches - haveheads:
2639 2639 headless = ', '.join(b for b in branches - haveheads)
2640 2640 msg = _('no open branch heads found on branches %s')
2641 2641 if opts.get('rev'):
2642 2642 msg += _(' (started at %s)') % opts['rev']
2643 2643 ui.warn((msg + '\n') % headless)
2644 2644
2645 2645 if not heads:
2646 2646 return 1
2647 2647
2648 2648 ui.pager('heads')
2649 2649 heads = sorted(heads, key=lambda x: -x.rev())
2650 2650 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2651 2651 for ctx in heads:
2652 2652 displayer.show(ctx)
2653 2653 displayer.close()
2654 2654
2655 2655 @command('help',
2656 2656 [('e', 'extension', None, _('show only help for extensions')),
2657 2657 ('c', 'command', None, _('show only help for commands')),
2658 2658 ('k', 'keyword', None, _('show topics matching keyword')),
2659 2659 ('s', 'system', [], _('show help for specific platform(s)')),
2660 2660 ],
2661 2661 _('[-ecks] [TOPIC]'),
2662 2662 norepo=True, cmdtype=readonly)
2663 2663 def help_(ui, name=None, **opts):
2664 2664 """show help for a given topic or a help overview
2665 2665
2666 2666 With no arguments, print a list of commands with short help messages.
2667 2667
2668 2668 Given a topic, extension, or command name, print help for that
2669 2669 topic.
2670 2670
2671 2671 Returns 0 if successful.
2672 2672 """
2673 2673
2674 2674 keep = opts.get(r'system') or []
2675 2675 if len(keep) == 0:
2676 2676 if pycompat.sysplatform.startswith('win'):
2677 2677 keep.append('windows')
2678 2678 elif pycompat.sysplatform == 'OpenVMS':
2679 2679 keep.append('vms')
2680 2680 elif pycompat.sysplatform == 'plan9':
2681 2681 keep.append('plan9')
2682 2682 else:
2683 2683 keep.append('unix')
2684 2684 keep.append(pycompat.sysplatform.lower())
2685 2685 if ui.verbose:
2686 2686 keep.append('verbose')
2687 2687
2688 2688 commands = sys.modules[__name__]
2689 2689 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2690 2690 ui.pager('help')
2691 2691 ui.write(formatted)
2692 2692
2693 2693
2694 2694 @command('identify|id',
2695 2695 [('r', 'rev', '',
2696 2696 _('identify the specified revision'), _('REV')),
2697 2697 ('n', 'num', None, _('show local revision number')),
2698 2698 ('i', 'id', None, _('show global revision id')),
2699 2699 ('b', 'branch', None, _('show branch')),
2700 2700 ('t', 'tags', None, _('show tags')),
2701 2701 ('B', 'bookmarks', None, _('show bookmarks')),
2702 2702 ] + remoteopts + formatteropts,
2703 2703 _('[-nibtB] [-r REV] [SOURCE]'),
2704 2704 optionalrepo=True, cmdtype=readonly)
2705 2705 def identify(ui, repo, source=None, rev=None,
2706 2706 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2707 2707 """identify the working directory or specified revision
2708 2708
2709 2709 Print a summary identifying the repository state at REV using one or
2710 2710 two parent hash identifiers, followed by a "+" if the working
2711 2711 directory has uncommitted changes, the branch name (if not default),
2712 2712 a list of tags, and a list of bookmarks.
2713 2713
2714 2714 When REV is not given, print a summary of the current state of the
2715 2715 repository including the working directory. Specify -r. to get information
2716 2716 of the working directory parent without scanning uncommitted changes.
2717 2717
2718 2718 Specifying a path to a repository root or Mercurial bundle will
2719 2719 cause lookup to operate on that repository/bundle.
2720 2720
2721 2721 .. container:: verbose
2722 2722
2723 2723 Examples:
2724 2724
2725 2725 - generate a build identifier for the working directory::
2726 2726
2727 2727 hg id --id > build-id.dat
2728 2728
2729 2729 - find the revision corresponding to a tag::
2730 2730
2731 2731 hg id -n -r 1.3
2732 2732
2733 2733 - check the most recent revision of a remote repository::
2734 2734
2735 2735 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2736 2736
2737 2737 See :hg:`log` for generating more information about specific revisions,
2738 2738 including full hash identifiers.
2739 2739
2740 2740 Returns 0 if successful.
2741 2741 """
2742 2742
2743 2743 opts = pycompat.byteskwargs(opts)
2744 2744 if not repo and not source:
2745 2745 raise error.Abort(_("there is no Mercurial repository here "
2746 2746 "(.hg not found)"))
2747 2747
2748 2748 if ui.debugflag:
2749 2749 hexfunc = hex
2750 2750 else:
2751 2751 hexfunc = short
2752 2752 default = not (num or id or branch or tags or bookmarks)
2753 2753 output = []
2754 2754 revs = []
2755 2755
2756 2756 if source:
2757 2757 source, branches = hg.parseurl(ui.expandpath(source))
2758 2758 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2759 2759 repo = peer.local()
2760 2760 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2761 2761
2762 2762 fm = ui.formatter('identify', opts)
2763 2763 fm.startitem()
2764 2764
2765 2765 if not repo:
2766 2766 if num or branch or tags:
2767 2767 raise error.Abort(
2768 2768 _("can't query remote revision number, branch, or tags"))
2769 2769 if not rev and revs:
2770 2770 rev = revs[0]
2771 2771 if not rev:
2772 2772 rev = "tip"
2773 2773
2774 2774 remoterev = peer.lookup(rev)
2775 2775 hexrev = hexfunc(remoterev)
2776 2776 if default or id:
2777 2777 output = [hexrev]
2778 2778 fm.data(id=hexrev)
2779 2779
2780 2780 def getbms():
2781 2781 bms = []
2782 2782
2783 2783 if 'bookmarks' in peer.listkeys('namespaces'):
2784 2784 hexremoterev = hex(remoterev)
2785 2785 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2786 2786 if bmr == hexremoterev]
2787 2787
2788 2788 return sorted(bms)
2789 2789
2790 2790 bms = getbms()
2791 2791 if bookmarks:
2792 2792 output.extend(bms)
2793 2793 elif default and not ui.quiet:
2794 2794 # multiple bookmarks for a single parent separated by '/'
2795 2795 bm = '/'.join(bms)
2796 2796 if bm:
2797 2797 output.append(bm)
2798 2798
2799 2799 fm.data(node=hex(remoterev))
2800 2800 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2801 2801 else:
2802 2802 if rev:
2803 2803 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2804 2804 ctx = scmutil.revsingle(repo, rev, None)
2805 2805
2806 2806 if ctx.rev() is None:
2807 2807 ctx = repo[None]
2808 2808 parents = ctx.parents()
2809 2809 taglist = []
2810 2810 for p in parents:
2811 2811 taglist.extend(p.tags())
2812 2812
2813 2813 dirty = ""
2814 2814 if ctx.dirty(missing=True, merge=False, branch=False):
2815 2815 dirty = '+'
2816 2816 fm.data(dirty=dirty)
2817 2817
2818 2818 hexoutput = [hexfunc(p.node()) for p in parents]
2819 2819 if default or id:
2820 2820 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2821 2821 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2822 2822
2823 2823 if num:
2824 2824 numoutput = ["%d" % p.rev() for p in parents]
2825 2825 output.append("%s%s" % ('+'.join(numoutput), dirty))
2826 2826
2827 2827 fn = fm.nested('parents')
2828 2828 for p in parents:
2829 2829 fn.startitem()
2830 2830 fn.data(rev=p.rev())
2831 2831 fn.data(node=p.hex())
2832 2832 fn.context(ctx=p)
2833 2833 fn.end()
2834 2834 else:
2835 2835 hexoutput = hexfunc(ctx.node())
2836 2836 if default or id:
2837 2837 output = [hexoutput]
2838 2838 fm.data(id=hexoutput)
2839 2839
2840 2840 if num:
2841 2841 output.append(pycompat.bytestr(ctx.rev()))
2842 2842 taglist = ctx.tags()
2843 2843
2844 2844 if default and not ui.quiet:
2845 2845 b = ctx.branch()
2846 2846 if b != 'default':
2847 2847 output.append("(%s)" % b)
2848 2848
2849 2849 # multiple tags for a single parent separated by '/'
2850 2850 t = '/'.join(taglist)
2851 2851 if t:
2852 2852 output.append(t)
2853 2853
2854 2854 # multiple bookmarks for a single parent separated by '/'
2855 2855 bm = '/'.join(ctx.bookmarks())
2856 2856 if bm:
2857 2857 output.append(bm)
2858 2858 else:
2859 2859 if branch:
2860 2860 output.append(ctx.branch())
2861 2861
2862 2862 if tags:
2863 2863 output.extend(taglist)
2864 2864
2865 2865 if bookmarks:
2866 2866 output.extend(ctx.bookmarks())
2867 2867
2868 2868 fm.data(node=ctx.hex())
2869 2869 fm.data(branch=ctx.branch())
2870 2870 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2871 2871 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2872 2872 fm.context(ctx=ctx)
2873 2873
2874 2874 fm.plain("%s\n" % ' '.join(output))
2875 2875 fm.end()
2876 2876
2877 2877 @command('import|patch',
2878 2878 [('p', 'strip', 1,
2879 2879 _('directory strip option for patch. This has the same '
2880 2880 'meaning as the corresponding patch option'), _('NUM')),
2881 2881 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2882 2882 ('e', 'edit', False, _('invoke editor on commit messages')),
2883 2883 ('f', 'force', None,
2884 2884 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2885 2885 ('', 'no-commit', None,
2886 2886 _("don't commit, just update the working directory")),
2887 2887 ('', 'bypass', None,
2888 2888 _("apply patch without touching the working directory")),
2889 2889 ('', 'partial', None,
2890 2890 _('commit even if some hunks fail')),
2891 2891 ('', 'exact', None,
2892 2892 _('abort if patch would apply lossily')),
2893 2893 ('', 'prefix', '',
2894 2894 _('apply patch to subdirectory'), _('DIR')),
2895 2895 ('', 'import-branch', None,
2896 2896 _('use any branch information in patch (implied by --exact)'))] +
2897 2897 commitopts + commitopts2 + similarityopts,
2898 2898 _('[OPTION]... PATCH...'))
2899 2899 def import_(ui, repo, patch1=None, *patches, **opts):
2900 2900 """import an ordered set of patches
2901 2901
2902 2902 Import a list of patches and commit them individually (unless
2903 2903 --no-commit is specified).
2904 2904
2905 2905 To read a patch from standard input (stdin), use "-" as the patch
2906 2906 name. If a URL is specified, the patch will be downloaded from
2907 2907 there.
2908 2908
2909 2909 Import first applies changes to the working directory (unless
2910 2910 --bypass is specified), import will abort if there are outstanding
2911 2911 changes.
2912 2912
2913 2913 Use --bypass to apply and commit patches directly to the
2914 2914 repository, without affecting the working directory. Without
2915 2915 --exact, patches will be applied on top of the working directory
2916 2916 parent revision.
2917 2917
2918 2918 You can import a patch straight from a mail message. Even patches
2919 2919 as attachments work (to use the body part, it must have type
2920 2920 text/plain or text/x-patch). From and Subject headers of email
2921 2921 message are used as default committer and commit message. All
2922 2922 text/plain body parts before first diff are added to the commit
2923 2923 message.
2924 2924
2925 2925 If the imported patch was generated by :hg:`export`, user and
2926 2926 description from patch override values from message headers and
2927 2927 body. Values given on command line with -m/--message and -u/--user
2928 2928 override these.
2929 2929
2930 2930 If --exact is specified, import will set the working directory to
2931 2931 the parent of each patch before applying it, and will abort if the
2932 2932 resulting changeset has a different ID than the one recorded in
2933 2933 the patch. This will guard against various ways that portable
2934 2934 patch formats and mail systems might fail to transfer Mercurial
2935 2935 data or metadata. See :hg:`bundle` for lossless transmission.
2936 2936
2937 2937 Use --partial to ensure a changeset will be created from the patch
2938 2938 even if some hunks fail to apply. Hunks that fail to apply will be
2939 2939 written to a <target-file>.rej file. Conflicts can then be resolved
2940 2940 by hand before :hg:`commit --amend` is run to update the created
2941 2941 changeset. This flag exists to let people import patches that
2942 2942 partially apply without losing the associated metadata (author,
2943 2943 date, description, ...).
2944 2944
2945 2945 .. note::
2946 2946
2947 2947 When no hunks apply cleanly, :hg:`import --partial` will create
2948 2948 an empty changeset, importing only the patch metadata.
2949 2949
2950 2950 With -s/--similarity, hg will attempt to discover renames and
2951 2951 copies in the patch in the same way as :hg:`addremove`.
2952 2952
2953 2953 It is possible to use external patch programs to perform the patch
2954 2954 by setting the ``ui.patch`` configuration option. For the default
2955 2955 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2956 2956 See :hg:`help config` for more information about configuration
2957 2957 files and how to use these options.
2958 2958
2959 2959 See :hg:`help dates` for a list of formats valid for -d/--date.
2960 2960
2961 2961 .. container:: verbose
2962 2962
2963 2963 Examples:
2964 2964
2965 2965 - import a traditional patch from a website and detect renames::
2966 2966
2967 2967 hg import -s 80 http://example.com/bugfix.patch
2968 2968
2969 2969 - import a changeset from an hgweb server::
2970 2970
2971 2971 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2972 2972
2973 2973 - import all the patches in an Unix-style mbox::
2974 2974
2975 2975 hg import incoming-patches.mbox
2976 2976
2977 2977 - import patches from stdin::
2978 2978
2979 2979 hg import -
2980 2980
2981 2981 - attempt to exactly restore an exported changeset (not always
2982 2982 possible)::
2983 2983
2984 2984 hg import --exact proposed-fix.patch
2985 2985
2986 2986 - use an external tool to apply a patch which is too fuzzy for
2987 2987 the default internal tool.
2988 2988
2989 2989 hg import --config ui.patch="patch --merge" fuzzy.patch
2990 2990
2991 2991 - change the default fuzzing from 2 to a less strict 7
2992 2992
2993 2993 hg import --config ui.fuzz=7 fuzz.patch
2994 2994
2995 2995 Returns 0 on success, 1 on partial success (see --partial).
2996 2996 """
2997 2997
2998 2998 opts = pycompat.byteskwargs(opts)
2999 2999 if not patch1:
3000 3000 raise error.Abort(_('need at least one patch to import'))
3001 3001
3002 3002 patches = (patch1,) + patches
3003 3003
3004 3004 date = opts.get('date')
3005 3005 if date:
3006 3006 opts['date'] = util.parsedate(date)
3007 3007
3008 3008 exact = opts.get('exact')
3009 3009 update = not opts.get('bypass')
3010 3010 if not update and opts.get('no_commit'):
3011 3011 raise error.Abort(_('cannot use --no-commit with --bypass'))
3012 3012 try:
3013 3013 sim = float(opts.get('similarity') or 0)
3014 3014 except ValueError:
3015 3015 raise error.Abort(_('similarity must be a number'))
3016 3016 if sim < 0 or sim > 100:
3017 3017 raise error.Abort(_('similarity must be between 0 and 100'))
3018 3018 if sim and not update:
3019 3019 raise error.Abort(_('cannot use --similarity with --bypass'))
3020 3020 if exact:
3021 3021 if opts.get('edit'):
3022 3022 raise error.Abort(_('cannot use --exact with --edit'))
3023 3023 if opts.get('prefix'):
3024 3024 raise error.Abort(_('cannot use --exact with --prefix'))
3025 3025
3026 3026 base = opts["base"]
3027 3027 wlock = dsguard = lock = tr = None
3028 3028 msgs = []
3029 3029 ret = 0
3030 3030
3031 3031
3032 3032 try:
3033 3033 wlock = repo.wlock()
3034 3034
3035 3035 if update:
3036 3036 cmdutil.checkunfinished(repo)
3037 3037 if (exact or not opts.get('force')):
3038 3038 cmdutil.bailifchanged(repo)
3039 3039
3040 3040 if not opts.get('no_commit'):
3041 3041 lock = repo.lock()
3042 3042 tr = repo.transaction('import')
3043 3043 else:
3044 3044 dsguard = dirstateguard.dirstateguard(repo, 'import')
3045 3045 parents = repo[None].parents()
3046 3046 for patchurl in patches:
3047 3047 if patchurl == '-':
3048 3048 ui.status(_('applying patch from stdin\n'))
3049 3049 patchfile = ui.fin
3050 3050 patchurl = 'stdin' # for error message
3051 3051 else:
3052 3052 patchurl = os.path.join(base, patchurl)
3053 3053 ui.status(_('applying %s\n') % patchurl)
3054 3054 patchfile = hg.openpath(ui, patchurl)
3055 3055
3056 3056 haspatch = False
3057 3057 for hunk in patch.split(patchfile):
3058 3058 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3059 3059 parents, opts,
3060 3060 msgs, hg.clean)
3061 3061 if msg:
3062 3062 haspatch = True
3063 3063 ui.note(msg + '\n')
3064 3064 if update or exact:
3065 3065 parents = repo[None].parents()
3066 3066 else:
3067 3067 parents = [repo[node]]
3068 3068 if rej:
3069 3069 ui.write_err(_("patch applied partially\n"))
3070 3070 ui.write_err(_("(fix the .rej files and run "
3071 3071 "`hg commit --amend`)\n"))
3072 3072 ret = 1
3073 3073 break
3074 3074
3075 3075 if not haspatch:
3076 3076 raise error.Abort(_('%s: no diffs found') % patchurl)
3077 3077
3078 3078 if tr:
3079 3079 tr.close()
3080 3080 if msgs:
3081 3081 repo.savecommitmessage('\n* * *\n'.join(msgs))
3082 3082 if dsguard:
3083 3083 dsguard.close()
3084 3084 return ret
3085 3085 finally:
3086 3086 if tr:
3087 3087 tr.release()
3088 3088 release(lock, dsguard, wlock)
3089 3089
3090 3090 @command('incoming|in',
3091 3091 [('f', 'force', None,
3092 3092 _('run even if remote repository is unrelated')),
3093 3093 ('n', 'newest-first', None, _('show newest record first')),
3094 3094 ('', 'bundle', '',
3095 3095 _('file to store the bundles into'), _('FILE')),
3096 3096 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3097 3097 ('B', 'bookmarks', False, _("compare bookmarks")),
3098 3098 ('b', 'branch', [],
3099 3099 _('a specific branch you would like to pull'), _('BRANCH')),
3100 3100 ] + logopts + remoteopts + subrepoopts,
3101 3101 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3102 3102 def incoming(ui, repo, source="default", **opts):
3103 3103 """show new changesets found in source
3104 3104
3105 3105 Show new changesets found in the specified path/URL or the default
3106 3106 pull location. These are the changesets that would have been pulled
3107 3107 by :hg:`pull` at the time you issued this command.
3108 3108
3109 3109 See pull for valid source format details.
3110 3110
3111 3111 .. container:: verbose
3112 3112
3113 3113 With -B/--bookmarks, the result of bookmark comparison between
3114 3114 local and remote repositories is displayed. With -v/--verbose,
3115 3115 status is also displayed for each bookmark like below::
3116 3116
3117 3117 BM1 01234567890a added
3118 3118 BM2 1234567890ab advanced
3119 3119 BM3 234567890abc diverged
3120 3120 BM4 34567890abcd changed
3121 3121
3122 3122 The action taken locally when pulling depends on the
3123 3123 status of each bookmark:
3124 3124
3125 3125 :``added``: pull will create it
3126 3126 :``advanced``: pull will update it
3127 3127 :``diverged``: pull will create a divergent bookmark
3128 3128 :``changed``: result depends on remote changesets
3129 3129
3130 3130 From the point of view of pulling behavior, bookmark
3131 3131 existing only in the remote repository are treated as ``added``,
3132 3132 even if it is in fact locally deleted.
3133 3133
3134 3134 .. container:: verbose
3135 3135
3136 3136 For remote repository, using --bundle avoids downloading the
3137 3137 changesets twice if the incoming is followed by a pull.
3138 3138
3139 3139 Examples:
3140 3140
3141 3141 - show incoming changes with patches and full description::
3142 3142
3143 3143 hg incoming -vp
3144 3144
3145 3145 - show incoming changes excluding merges, store a bundle::
3146 3146
3147 3147 hg in -vpM --bundle incoming.hg
3148 3148 hg pull incoming.hg
3149 3149
3150 3150 - briefly list changes inside a bundle::
3151 3151
3152 3152 hg in changes.hg -T "{desc|firstline}\\n"
3153 3153
3154 3154 Returns 0 if there are incoming changes, 1 otherwise.
3155 3155 """
3156 3156 opts = pycompat.byteskwargs(opts)
3157 3157 if opts.get('graph'):
3158 3158 logcmdutil.checkunsupportedgraphflags([], opts)
3159 3159 def display(other, chlist, displayer):
3160 3160 revdag = logcmdutil.graphrevs(other, chlist, opts)
3161 3161 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3162 3162 graphmod.asciiedges)
3163 3163
3164 3164 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3165 3165 return 0
3166 3166
3167 3167 if opts.get('bundle') and opts.get('subrepos'):
3168 3168 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3169 3169
3170 3170 if opts.get('bookmarks'):
3171 3171 source, branches = hg.parseurl(ui.expandpath(source),
3172 3172 opts.get('branch'))
3173 3173 other = hg.peer(repo, opts, source)
3174 3174 if 'bookmarks' not in other.listkeys('namespaces'):
3175 3175 ui.warn(_("remote doesn't support bookmarks\n"))
3176 3176 return 0
3177 3177 ui.pager('incoming')
3178 3178 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3179 3179 return bookmarks.incoming(ui, repo, other)
3180 3180
3181 3181 repo._subtoppath = ui.expandpath(source)
3182 3182 try:
3183 3183 return hg.incoming(ui, repo, source, opts)
3184 3184 finally:
3185 3185 del repo._subtoppath
3186 3186
3187 3187
3188 3188 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3189 3189 norepo=True)
3190 3190 def init(ui, dest=".", **opts):
3191 3191 """create a new repository in the given directory
3192 3192
3193 3193 Initialize a new repository in the given directory. If the given
3194 3194 directory does not exist, it will be created.
3195 3195
3196 3196 If no directory is given, the current directory is used.
3197 3197
3198 3198 It is possible to specify an ``ssh://`` URL as the destination.
3199 3199 See :hg:`help urls` for more information.
3200 3200
3201 3201 Returns 0 on success.
3202 3202 """
3203 3203 opts = pycompat.byteskwargs(opts)
3204 3204 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3205 3205
3206 3206 @command('locate',
3207 3207 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3208 3208 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3209 3209 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3210 3210 ] + walkopts,
3211 3211 _('[OPTION]... [PATTERN]...'))
3212 3212 def locate(ui, repo, *pats, **opts):
3213 3213 """locate files matching specific patterns (DEPRECATED)
3214 3214
3215 3215 Print files under Mercurial control in the working directory whose
3216 3216 names match the given patterns.
3217 3217
3218 3218 By default, this command searches all directories in the working
3219 3219 directory. To search just the current directory and its
3220 3220 subdirectories, use "--include .".
3221 3221
3222 3222 If no patterns are given to match, this command prints the names
3223 3223 of all files under Mercurial control in the working directory.
3224 3224
3225 3225 If you want to feed the output of this command into the "xargs"
3226 3226 command, use the -0 option to both this command and "xargs". This
3227 3227 will avoid the problem of "xargs" treating single filenames that
3228 3228 contain whitespace as multiple filenames.
3229 3229
3230 3230 See :hg:`help files` for a more versatile command.
3231 3231
3232 3232 Returns 0 if a match is found, 1 otherwise.
3233 3233 """
3234 3234 opts = pycompat.byteskwargs(opts)
3235 3235 if opts.get('print0'):
3236 3236 end = '\0'
3237 3237 else:
3238 3238 end = '\n'
3239 3239 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3240 3240
3241 3241 ret = 1
3242 3242 ctx = repo[rev]
3243 3243 m = scmutil.match(ctx, pats, opts, default='relglob',
3244 3244 badfn=lambda x, y: False)
3245 3245
3246 3246 ui.pager('locate')
3247 3247 for abs in ctx.matches(m):
3248 3248 if opts.get('fullpath'):
3249 3249 ui.write(repo.wjoin(abs), end)
3250 3250 else:
3251 3251 ui.write(((pats and m.rel(abs)) or abs), end)
3252 3252 ret = 0
3253 3253
3254 3254 return ret
3255 3255
3256 3256 @command('^log|history',
3257 3257 [('f', 'follow', None,
3258 3258 _('follow changeset history, or file history across copies and renames')),
3259 3259 ('', 'follow-first', None,
3260 3260 _('only follow the first parent of merge changesets (DEPRECATED)')),
3261 3261 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3262 3262 ('C', 'copies', None, _('show copied files')),
3263 3263 ('k', 'keyword', [],
3264 3264 _('do case-insensitive search for a given text'), _('TEXT')),
3265 3265 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3266 3266 ('L', 'line-range', [],
3267 3267 _('follow line range of specified file (EXPERIMENTAL)'),
3268 3268 _('FILE,RANGE')),
3269 3269 ('', 'removed', None, _('include revisions where files were removed')),
3270 3270 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3271 3271 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3272 3272 ('', 'only-branch', [],
3273 3273 _('show only changesets within the given named branch (DEPRECATED)'),
3274 3274 _('BRANCH')),
3275 3275 ('b', 'branch', [],
3276 3276 _('show changesets within the given named branch'), _('BRANCH')),
3277 3277 ('P', 'prune', [],
3278 3278 _('do not display revision or any of its ancestors'), _('REV')),
3279 3279 ] + logopts + walkopts,
3280 3280 _('[OPTION]... [FILE]'),
3281 3281 inferrepo=True, cmdtype=readonly)
3282 3282 def log(ui, repo, *pats, **opts):
3283 3283 """show revision history of entire repository or files
3284 3284
3285 3285 Print the revision history of the specified files or the entire
3286 3286 project.
3287 3287
3288 3288 If no revision range is specified, the default is ``tip:0`` unless
3289 3289 --follow is set, in which case the working directory parent is
3290 3290 used as the starting revision.
3291 3291
3292 3292 File history is shown without following rename or copy history of
3293 3293 files. Use -f/--follow with a filename to follow history across
3294 3294 renames and copies. --follow without a filename will only show
3295 3295 ancestors of the starting revision.
3296 3296
3297 3297 By default this command prints revision number and changeset id,
3298 3298 tags, non-trivial parents, user, date and time, and a summary for
3299 3299 each commit. When the -v/--verbose switch is used, the list of
3300 3300 changed files and full commit message are shown.
3301 3301
3302 3302 With --graph the revisions are shown as an ASCII art DAG with the most
3303 3303 recent changeset at the top.
3304 3304 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3305 3305 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3306 3306 changeset from the lines below is a parent of the 'o' merge on the same
3307 3307 line.
3308 3308 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3309 3309 of a '|' indicates one or more revisions in a path are omitted.
3310 3310
3311 3311 .. container:: verbose
3312 3312
3313 3313 Use -L/--line-range FILE,M:N options to follow the history of lines
3314 3314 from M to N in FILE. With -p/--patch only diff hunks affecting
3315 3315 specified line range will be shown. This option requires --follow;
3316 3316 it can be specified multiple times. Currently, this option is not
3317 3317 compatible with --graph. This option is experimental.
3318 3318
3319 3319 .. note::
3320 3320
3321 3321 :hg:`log --patch` may generate unexpected diff output for merge
3322 3322 changesets, as it will only compare the merge changeset against
3323 3323 its first parent. Also, only files different from BOTH parents
3324 3324 will appear in files:.
3325 3325
3326 3326 .. note::
3327 3327
3328 3328 For performance reasons, :hg:`log FILE` may omit duplicate changes
3329 3329 made on branches and will not show removals or mode changes. To
3330 3330 see all such changes, use the --removed switch.
3331 3331
3332 3332 .. container:: verbose
3333 3333
3334 3334 .. note::
3335 3335
3336 3336 The history resulting from -L/--line-range options depends on diff
3337 3337 options; for instance if white-spaces are ignored, respective changes
3338 3338 with only white-spaces in specified line range will not be listed.
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 - changesets touching lines 13 to 23 for file.c::
3389 3389
3390 3390 hg log -L file.c,13:23
3391 3391
3392 3392 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3393 3393 main.c with patch::
3394 3394
3395 3395 hg log -L file.c,13:23 -L main.c,2:6 -p
3396 3396
3397 3397 See :hg:`help dates` for a list of formats valid for -d/--date.
3398 3398
3399 3399 See :hg:`help revisions` for more about specifying and ordering
3400 3400 revisions.
3401 3401
3402 3402 See :hg:`help templates` for more about pre-packaged styles and
3403 3403 specifying custom templates. The default template used by the log
3404 3404 command can be customized via the ``ui.logtemplate`` configuration
3405 3405 setting.
3406 3406
3407 3407 Returns 0 on success.
3408 3408
3409 3409 """
3410 3410 opts = pycompat.byteskwargs(opts)
3411 3411 linerange = opts.get('line_range')
3412 3412
3413 3413 if linerange and not opts.get('follow'):
3414 3414 raise error.Abort(_('--line-range requires --follow'))
3415 3415
3416 3416 if linerange and pats:
3417 3417 # TODO: take pats as patterns with no line-range filter
3418 3418 raise error.Abort(
3419 3419 _('FILE arguments are not compatible with --line-range option')
3420 3420 )
3421 3421
3422 3422 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3423 3423 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3424 3424 if linerange:
3425 3425 # TODO: should follow file history from logcmdutil._initialrevs(),
3426 3426 # then filter the result by logcmdutil._makerevset() and --limit
3427 3427 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3428 3428
3429 3429 getrenamed = None
3430 3430 if opts.get('copies'):
3431 3431 endrev = None
3432 3432 if opts.get('rev'):
3433 3433 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3434 3434 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3435 3435
3436 3436 ui.pager('log')
3437 3437 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3438 3438 buffered=True)
3439 3439 if opts.get('graph'):
3440 3440 displayfn = logcmdutil.displaygraphrevs
3441 3441 else:
3442 3442 displayfn = logcmdutil.displayrevs
3443 3443 displayfn(ui, repo, revs, displayer, getrenamed)
3444 3444
3445 3445 @command('manifest',
3446 3446 [('r', 'rev', '', _('revision to display'), _('REV')),
3447 3447 ('', 'all', False, _("list files from all revisions"))]
3448 3448 + formatteropts,
3449 3449 _('[-r REV]'), cmdtype=readonly)
3450 3450 def manifest(ui, repo, node=None, rev=None, **opts):
3451 3451 """output the current or given revision of the project manifest
3452 3452
3453 3453 Print a list of version controlled files for the given revision.
3454 3454 If no revision is given, the first parent of the working directory
3455 3455 is used, or the null revision if no revision is checked out.
3456 3456
3457 3457 With -v, print file permissions, symlink and executable bits.
3458 3458 With --debug, print file revision hashes.
3459 3459
3460 3460 If option --all is specified, the list of all files from all revisions
3461 3461 is printed. This includes deleted and renamed files.
3462 3462
3463 3463 Returns 0 on success.
3464 3464 """
3465 3465 opts = pycompat.byteskwargs(opts)
3466 3466 fm = ui.formatter('manifest', opts)
3467 3467
3468 3468 if opts.get('all'):
3469 3469 if rev or node:
3470 3470 raise error.Abort(_("can't specify a revision with --all"))
3471 3471
3472 3472 res = []
3473 3473 prefix = "data/"
3474 3474 suffix = ".i"
3475 3475 plen = len(prefix)
3476 3476 slen = len(suffix)
3477 3477 with repo.lock():
3478 3478 for fn, b, size in repo.store.datafiles():
3479 3479 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3480 3480 res.append(fn[plen:-slen])
3481 3481 ui.pager('manifest')
3482 3482 for f in res:
3483 3483 fm.startitem()
3484 3484 fm.write("path", '%s\n', f)
3485 3485 fm.end()
3486 3486 return
3487 3487
3488 3488 if rev and node:
3489 3489 raise error.Abort(_("please specify just one revision"))
3490 3490
3491 3491 if not node:
3492 3492 node = rev
3493 3493
3494 3494 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3495 3495 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3496 3496 if node:
3497 3497 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3498 3498 ctx = scmutil.revsingle(repo, node)
3499 3499 mf = ctx.manifest()
3500 3500 ui.pager('manifest')
3501 3501 for f in ctx:
3502 3502 fm.startitem()
3503 3503 fl = ctx[f].flags()
3504 3504 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3505 3505 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3506 3506 fm.write('path', '%s\n', f)
3507 3507 fm.end()
3508 3508
3509 3509 @command('^merge',
3510 3510 [('f', 'force', None,
3511 3511 _('force a merge including outstanding changes (DEPRECATED)')),
3512 3512 ('r', 'rev', '', _('revision to merge'), _('REV')),
3513 3513 ('P', 'preview', None,
3514 3514 _('review revisions to merge (no merge is performed)')),
3515 3515 ('', 'abort', None, _('abort the ongoing merge')),
3516 3516 ] + mergetoolopts,
3517 3517 _('[-P] [[-r] REV]'))
3518 3518 def merge(ui, repo, node=None, **opts):
3519 3519 """merge another revision into working directory
3520 3520
3521 3521 The current working directory is updated with all changes made in
3522 3522 the requested revision since the last common predecessor revision.
3523 3523
3524 3524 Files that changed between either parent are marked as changed for
3525 3525 the next commit and a commit must be performed before any further
3526 3526 updates to the repository are allowed. The next commit will have
3527 3527 two parents.
3528 3528
3529 3529 ``--tool`` can be used to specify the merge tool used for file
3530 3530 merges. It overrides the HGMERGE environment variable and your
3531 3531 configuration files. See :hg:`help merge-tools` for options.
3532 3532
3533 3533 If no revision is specified, the working directory's parent is a
3534 3534 head revision, and the current branch contains exactly one other
3535 3535 head, the other head is merged with by default. Otherwise, an
3536 3536 explicit revision with which to merge with must be provided.
3537 3537
3538 3538 See :hg:`help resolve` for information on handling file conflicts.
3539 3539
3540 3540 To undo an uncommitted merge, use :hg:`merge --abort` which
3541 3541 will check out a clean copy of the original merge parent, losing
3542 3542 all changes.
3543 3543
3544 3544 Returns 0 on success, 1 if there are unresolved files.
3545 3545 """
3546 3546
3547 3547 opts = pycompat.byteskwargs(opts)
3548 3548 abort = opts.get('abort')
3549 3549 if abort and repo.dirstate.p2() == nullid:
3550 3550 cmdutil.wrongtooltocontinue(repo, _('merge'))
3551 3551 if abort:
3552 3552 if node:
3553 3553 raise error.Abort(_("cannot specify a node with --abort"))
3554 3554 if opts.get('rev'):
3555 3555 raise error.Abort(_("cannot specify both --rev and --abort"))
3556 3556 if opts.get('preview'):
3557 3557 raise error.Abort(_("cannot specify --preview with --abort"))
3558 3558 if opts.get('rev') and node:
3559 3559 raise error.Abort(_("please specify just one revision"))
3560 3560 if not node:
3561 3561 node = opts.get('rev')
3562 3562
3563 3563 if node:
3564 3564 node = scmutil.revsingle(repo, node).node()
3565 3565
3566 3566 if not node and not abort:
3567 3567 node = repo[destutil.destmerge(repo)].node()
3568 3568
3569 3569 if opts.get('preview'):
3570 3570 # find nodes that are ancestors of p2 but not of p1
3571 3571 p1 = repo.lookup('.')
3572 3572 p2 = repo.lookup(node)
3573 3573 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3574 3574
3575 3575 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3576 3576 for node in nodes:
3577 3577 displayer.show(repo[node])
3578 3578 displayer.close()
3579 3579 return 0
3580 3580
3581 3581 try:
3582 3582 # ui.forcemerge is an internal variable, do not document
3583 3583 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3584 3584 force = opts.get('force')
3585 3585 labels = ['working copy', 'merge rev']
3586 3586 return hg.merge(repo, node, force=force, mergeforce=force,
3587 3587 labels=labels, abort=abort)
3588 3588 finally:
3589 3589 ui.setconfig('ui', 'forcemerge', '', 'merge')
3590 3590
3591 3591 @command('outgoing|out',
3592 3592 [('f', 'force', None, _('run even when the destination is unrelated')),
3593 3593 ('r', 'rev', [],
3594 3594 _('a changeset intended to be included in the destination'), _('REV')),
3595 3595 ('n', 'newest-first', None, _('show newest record first')),
3596 3596 ('B', 'bookmarks', False, _('compare bookmarks')),
3597 3597 ('b', 'branch', [], _('a specific branch you would like to push'),
3598 3598 _('BRANCH')),
3599 3599 ] + logopts + remoteopts + subrepoopts,
3600 3600 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3601 3601 def outgoing(ui, repo, dest=None, **opts):
3602 3602 """show changesets not found in the destination
3603 3603
3604 3604 Show changesets not found in the specified destination repository
3605 3605 or the default push location. These are the changesets that would
3606 3606 be pushed if a push was requested.
3607 3607
3608 3608 See pull for details of valid destination formats.
3609 3609
3610 3610 .. container:: verbose
3611 3611
3612 3612 With -B/--bookmarks, the result of bookmark comparison between
3613 3613 local and remote repositories is displayed. With -v/--verbose,
3614 3614 status is also displayed for each bookmark like below::
3615 3615
3616 3616 BM1 01234567890a added
3617 3617 BM2 deleted
3618 3618 BM3 234567890abc advanced
3619 3619 BM4 34567890abcd diverged
3620 3620 BM5 4567890abcde changed
3621 3621
3622 3622 The action taken when pushing depends on the
3623 3623 status of each bookmark:
3624 3624
3625 3625 :``added``: push with ``-B`` will create it
3626 3626 :``deleted``: push with ``-B`` will delete it
3627 3627 :``advanced``: push will update it
3628 3628 :``diverged``: push with ``-B`` will update it
3629 3629 :``changed``: push with ``-B`` will update it
3630 3630
3631 3631 From the point of view of pushing behavior, bookmarks
3632 3632 existing only in the remote repository are treated as
3633 3633 ``deleted``, even if it is in fact added remotely.
3634 3634
3635 3635 Returns 0 if there are outgoing changes, 1 otherwise.
3636 3636 """
3637 3637 opts = pycompat.byteskwargs(opts)
3638 3638 if opts.get('graph'):
3639 3639 logcmdutil.checkunsupportedgraphflags([], opts)
3640 3640 o, other = hg._outgoing(ui, repo, dest, opts)
3641 3641 if not o:
3642 3642 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3643 3643 return
3644 3644
3645 3645 revdag = logcmdutil.graphrevs(repo, o, opts)
3646 3646 ui.pager('outgoing')
3647 3647 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3648 3648 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3649 3649 graphmod.asciiedges)
3650 3650 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3651 3651 return 0
3652 3652
3653 3653 if opts.get('bookmarks'):
3654 3654 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3655 3655 dest, branches = hg.parseurl(dest, opts.get('branch'))
3656 3656 other = hg.peer(repo, opts, dest)
3657 3657 if 'bookmarks' not in other.listkeys('namespaces'):
3658 3658 ui.warn(_("remote doesn't support bookmarks\n"))
3659 3659 return 0
3660 3660 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3661 3661 ui.pager('outgoing')
3662 3662 return bookmarks.outgoing(ui, repo, other)
3663 3663
3664 3664 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3665 3665 try:
3666 3666 return hg.outgoing(ui, repo, dest, opts)
3667 3667 finally:
3668 3668 del repo._subtoppath
3669 3669
3670 3670 @command('parents',
3671 3671 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3672 3672 ] + templateopts,
3673 3673 _('[-r REV] [FILE]'),
3674 3674 inferrepo=True)
3675 3675 def parents(ui, repo, file_=None, **opts):
3676 3676 """show the parents of the working directory or revision (DEPRECATED)
3677 3677
3678 3678 Print the working directory's parent revisions. If a revision is
3679 3679 given via -r/--rev, the parent of that revision will be printed.
3680 3680 If a file argument is given, the revision in which the file was
3681 3681 last changed (before the working directory revision or the
3682 3682 argument to --rev if given) is printed.
3683 3683
3684 3684 This command is equivalent to::
3685 3685
3686 3686 hg log -r "p1()+p2()" or
3687 3687 hg log -r "p1(REV)+p2(REV)" or
3688 3688 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3689 3689 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3690 3690
3691 3691 See :hg:`summary` and :hg:`help revsets` for related information.
3692 3692
3693 3693 Returns 0 on success.
3694 3694 """
3695 3695
3696 3696 opts = pycompat.byteskwargs(opts)
3697 3697 rev = opts.get('rev')
3698 3698 if rev:
3699 3699 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3700 3700 ctx = scmutil.revsingle(repo, rev, None)
3701 3701
3702 3702 if file_:
3703 3703 m = scmutil.match(ctx, (file_,), opts)
3704 3704 if m.anypats() or len(m.files()) != 1:
3705 3705 raise error.Abort(_('can only specify an explicit filename'))
3706 3706 file_ = m.files()[0]
3707 3707 filenodes = []
3708 3708 for cp in ctx.parents():
3709 3709 if not cp:
3710 3710 continue
3711 3711 try:
3712 3712 filenodes.append(cp.filenode(file_))
3713 3713 except error.LookupError:
3714 3714 pass
3715 3715 if not filenodes:
3716 3716 raise error.Abort(_("'%s' not found in manifest!") % file_)
3717 3717 p = []
3718 3718 for fn in filenodes:
3719 3719 fctx = repo.filectx(file_, fileid=fn)
3720 3720 p.append(fctx.node())
3721 3721 else:
3722 3722 p = [cp.node() for cp in ctx.parents()]
3723 3723
3724 3724 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3725 3725 for n in p:
3726 3726 if n != nullid:
3727 3727 displayer.show(repo[n])
3728 3728 displayer.close()
3729 3729
3730 3730 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3731 3731 cmdtype=readonly)
3732 3732 def paths(ui, repo, search=None, **opts):
3733 3733 """show aliases for remote repositories
3734 3734
3735 3735 Show definition of symbolic path name NAME. If no name is given,
3736 3736 show definition of all available names.
3737 3737
3738 3738 Option -q/--quiet suppresses all output when searching for NAME
3739 3739 and shows only the path names when listing all definitions.
3740 3740
3741 3741 Path names are defined in the [paths] section of your
3742 3742 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3743 3743 repository, ``.hg/hgrc`` is used, too.
3744 3744
3745 3745 The path names ``default`` and ``default-push`` have a special
3746 3746 meaning. When performing a push or pull operation, they are used
3747 3747 as fallbacks if no location is specified on the command-line.
3748 3748 When ``default-push`` is set, it will be used for push and
3749 3749 ``default`` will be used for pull; otherwise ``default`` is used
3750 3750 as the fallback for both. When cloning a repository, the clone
3751 3751 source is written as ``default`` in ``.hg/hgrc``.
3752 3752
3753 3753 .. note::
3754 3754
3755 3755 ``default`` and ``default-push`` apply to all inbound (e.g.
3756 3756 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3757 3757 and :hg:`bundle`) operations.
3758 3758
3759 3759 See :hg:`help urls` for more information.
3760 3760
3761 3761 Returns 0 on success.
3762 3762 """
3763 3763
3764 3764 opts = pycompat.byteskwargs(opts)
3765 3765 ui.pager('paths')
3766 3766 if search:
3767 3767 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3768 3768 if name == search]
3769 3769 else:
3770 3770 pathitems = sorted(ui.paths.iteritems())
3771 3771
3772 3772 fm = ui.formatter('paths', opts)
3773 3773 if fm.isplain():
3774 3774 hidepassword = util.hidepassword
3775 3775 else:
3776 3776 hidepassword = str
3777 3777 if ui.quiet:
3778 3778 namefmt = '%s\n'
3779 3779 else:
3780 3780 namefmt = '%s = '
3781 3781 showsubopts = not search and not ui.quiet
3782 3782
3783 3783 for name, path in pathitems:
3784 3784 fm.startitem()
3785 3785 fm.condwrite(not search, 'name', namefmt, name)
3786 3786 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3787 3787 for subopt, value in sorted(path.suboptions.items()):
3788 3788 assert subopt not in ('name', 'url')
3789 3789 if showsubopts:
3790 3790 fm.plain('%s:%s = ' % (name, subopt))
3791 3791 fm.condwrite(showsubopts, subopt, '%s\n', value)
3792 3792
3793 3793 fm.end()
3794 3794
3795 3795 if search and not pathitems:
3796 3796 if not ui.quiet:
3797 3797 ui.warn(_("not found!\n"))
3798 3798 return 1
3799 3799 else:
3800 3800 return 0
3801 3801
3802 3802 @command('phase',
3803 3803 [('p', 'public', False, _('set changeset phase to public')),
3804 3804 ('d', 'draft', False, _('set changeset phase to draft')),
3805 3805 ('s', 'secret', False, _('set changeset phase to secret')),
3806 3806 ('f', 'force', False, _('allow to move boundary backward')),
3807 3807 ('r', 'rev', [], _('target revision'), _('REV')),
3808 3808 ],
3809 3809 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3810 3810 def phase(ui, repo, *revs, **opts):
3811 3811 """set or show the current phase name
3812 3812
3813 3813 With no argument, show the phase name of the current revision(s).
3814 3814
3815 3815 With one of -p/--public, -d/--draft or -s/--secret, change the
3816 3816 phase value of the specified revisions.
3817 3817
3818 3818 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3819 3819 lower phase to a higher phase. Phases are ordered as follows::
3820 3820
3821 3821 public < draft < secret
3822 3822
3823 3823 Returns 0 on success, 1 if some phases could not be changed.
3824 3824
3825 3825 (For more information about the phases concept, see :hg:`help phases`.)
3826 3826 """
3827 3827 opts = pycompat.byteskwargs(opts)
3828 3828 # search for a unique phase argument
3829 3829 targetphase = None
3830 3830 for idx, name in enumerate(phases.phasenames):
3831 3831 if opts[name]:
3832 3832 if targetphase is not None:
3833 3833 raise error.Abort(_('only one phase can be specified'))
3834 3834 targetphase = idx
3835 3835
3836 3836 # look for specified revision
3837 3837 revs = list(revs)
3838 3838 revs.extend(opts['rev'])
3839 3839 if not revs:
3840 3840 # display both parents as the second parent phase can influence
3841 3841 # the phase of a merge commit
3842 3842 revs = [c.rev() for c in repo[None].parents()]
3843 3843
3844 3844 revs = scmutil.revrange(repo, revs)
3845 3845
3846 3846 ret = 0
3847 3847 if targetphase is None:
3848 3848 # display
3849 3849 for r in revs:
3850 3850 ctx = repo[r]
3851 3851 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3852 3852 else:
3853 3853 with repo.lock(), repo.transaction("phase") as tr:
3854 3854 # set phase
3855 3855 if not revs:
3856 3856 raise error.Abort(_('empty revision set'))
3857 3857 nodes = [repo[r].node() for r in revs]
3858 3858 # moving revision from public to draft may hide them
3859 3859 # We have to check result on an unfiltered repository
3860 3860 unfi = repo.unfiltered()
3861 3861 getphase = unfi._phasecache.phase
3862 3862 olddata = [getphase(unfi, r) for r in unfi]
3863 3863 phases.advanceboundary(repo, tr, targetphase, nodes)
3864 3864 if opts['force']:
3865 3865 phases.retractboundary(repo, tr, targetphase, nodes)
3866 3866 getphase = unfi._phasecache.phase
3867 3867 newdata = [getphase(unfi, r) for r in unfi]
3868 3868 changes = sum(newdata[r] != olddata[r] for r in unfi)
3869 3869 cl = unfi.changelog
3870 3870 rejected = [n for n in nodes
3871 3871 if newdata[cl.rev(n)] < targetphase]
3872 3872 if rejected:
3873 3873 ui.warn(_('cannot move %i changesets to a higher '
3874 3874 'phase, use --force\n') % len(rejected))
3875 3875 ret = 1
3876 3876 if changes:
3877 3877 msg = _('phase changed for %i changesets\n') % changes
3878 3878 if ret:
3879 3879 ui.status(msg)
3880 3880 else:
3881 3881 ui.note(msg)
3882 3882 else:
3883 3883 ui.warn(_('no phases changed\n'))
3884 3884 return ret
3885 3885
3886 3886 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3887 3887 """Run after a changegroup has been added via pull/unbundle
3888 3888
3889 3889 This takes arguments below:
3890 3890
3891 3891 :modheads: change of heads by pull/unbundle
3892 3892 :optupdate: updating working directory is needed or not
3893 3893 :checkout: update destination revision (or None to default destination)
3894 3894 :brev: a name, which might be a bookmark to be activated after updating
3895 3895 """
3896 3896 if modheads == 0:
3897 3897 return
3898 3898 if optupdate:
3899 3899 try:
3900 3900 return hg.updatetotally(ui, repo, checkout, brev)
3901 3901 except error.UpdateAbort as inst:
3902 3902 msg = _("not updating: %s") % util.forcebytestr(inst)
3903 3903 hint = inst.hint
3904 3904 raise error.UpdateAbort(msg, hint=hint)
3905 3905 if modheads > 1:
3906 3906 currentbranchheads = len(repo.branchheads())
3907 3907 if currentbranchheads == modheads:
3908 3908 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3909 3909 elif currentbranchheads > 1:
3910 3910 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3911 3911 "merge)\n"))
3912 3912 else:
3913 3913 ui.status(_("(run 'hg heads' to see heads)\n"))
3914 3914 elif not ui.configbool('commands', 'update.requiredest'):
3915 3915 ui.status(_("(run 'hg update' to get a working copy)\n"))
3916 3916
3917 3917 @command('^pull',
3918 3918 [('u', 'update', None,
3919 3919 _('update to new branch head if new descendants were pulled')),
3920 3920 ('f', 'force', None, _('run even when remote repository is unrelated')),
3921 3921 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3922 3922 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3923 3923 ('b', 'branch', [], _('a specific branch you would like to pull'),
3924 3924 _('BRANCH')),
3925 3925 ] + remoteopts,
3926 3926 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3927 3927 def pull(ui, repo, source="default", **opts):
3928 3928 """pull changes from the specified source
3929 3929
3930 3930 Pull changes from a remote repository to a local one.
3931 3931
3932 3932 This finds all changes from the repository at the specified path
3933 3933 or URL and adds them to a local repository (the current one unless
3934 3934 -R is specified). By default, this does not update the copy of the
3935 3935 project in the working directory.
3936 3936
3937 3937 Use :hg:`incoming` if you want to see what would have been added
3938 3938 by a pull at the time you issued this command. If you then decide
3939 3939 to add those changes to the repository, you should use :hg:`pull
3940 3940 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3941 3941
3942 3942 If SOURCE is omitted, the 'default' path will be used.
3943 3943 See :hg:`help urls` for more information.
3944 3944
3945 3945 Specifying bookmark as ``.`` is equivalent to specifying the active
3946 3946 bookmark's name.
3947 3947
3948 3948 Returns 0 on success, 1 if an update had unresolved files.
3949 3949 """
3950 3950
3951 3951 opts = pycompat.byteskwargs(opts)
3952 3952 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3953 3953 msg = _('update destination required by configuration')
3954 3954 hint = _('use hg pull followed by hg update DEST')
3955 3955 raise error.Abort(msg, hint=hint)
3956 3956
3957 3957 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3958 3958 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3959 3959 other = hg.peer(repo, opts, source)
3960 3960 try:
3961 3961 revs, checkout = hg.addbranchrevs(repo, other, branches,
3962 3962 opts.get('rev'))
3963 3963
3964 3964
3965 3965 pullopargs = {}
3966 3966 if opts.get('bookmark'):
3967 3967 if not revs:
3968 3968 revs = []
3969 3969 # The list of bookmark used here is not the one used to actually
3970 3970 # update the bookmark name. This can result in the revision pulled
3971 3971 # not ending up with the name of the bookmark because of a race
3972 3972 # condition on the server. (See issue 4689 for details)
3973 3973 remotebookmarks = other.listkeys('bookmarks')
3974 3974 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3975 3975 pullopargs['remotebookmarks'] = remotebookmarks
3976 3976 for b in opts['bookmark']:
3977 3977 b = repo._bookmarks.expandname(b)
3978 3978 if b not in remotebookmarks:
3979 3979 raise error.Abort(_('remote bookmark %s not found!') % b)
3980 3980 revs.append(hex(remotebookmarks[b]))
3981 3981
3982 3982 if revs:
3983 3983 try:
3984 3984 # When 'rev' is a bookmark name, we cannot guarantee that it
3985 3985 # will be updated with that name because of a race condition
3986 3986 # server side. (See issue 4689 for details)
3987 3987 oldrevs = revs
3988 3988 revs = [] # actually, nodes
3989 3989 for r in oldrevs:
3990 3990 node = other.lookup(r)
3991 3991 revs.append(node)
3992 3992 if r == checkout:
3993 3993 checkout = node
3994 3994 except error.CapabilityError:
3995 3995 err = _("other repository doesn't support revision lookup, "
3996 3996 "so a rev cannot be specified.")
3997 3997 raise error.Abort(err)
3998 3998
3999 3999 wlock = util.nullcontextmanager()
4000 4000 if opts.get('update'):
4001 4001 wlock = repo.wlock()
4002 4002 with wlock:
4003 4003 pullopargs.update(opts.get('opargs', {}))
4004 4004 modheads = exchange.pull(repo, other, heads=revs,
4005 4005 force=opts.get('force'),
4006 4006 bookmarks=opts.get('bookmark', ()),
4007 4007 opargs=pullopargs).cgresult
4008 4008
4009 4009 # brev is a name, which might be a bookmark to be activated at
4010 4010 # the end of the update. In other words, it is an explicit
4011 4011 # destination of the update
4012 4012 brev = None
4013 4013
4014 4014 if checkout:
4015 4015 checkout = "%d" % repo.changelog.rev(checkout)
4016 4016
4017 4017 # order below depends on implementation of
4018 4018 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4019 4019 # because 'checkout' is determined without it.
4020 4020 if opts.get('rev'):
4021 4021 brev = opts['rev'][0]
4022 4022 elif opts.get('branch'):
4023 4023 brev = opts['branch'][0]
4024 4024 else:
4025 4025 brev = branches[0]
4026 4026 repo._subtoppath = source
4027 4027 try:
4028 4028 ret = postincoming(ui, repo, modheads, opts.get('update'),
4029 4029 checkout, brev)
4030 4030
4031 4031 finally:
4032 4032 del repo._subtoppath
4033 4033
4034 4034 finally:
4035 4035 other.close()
4036 4036 return ret
4037 4037
4038 4038 @command('^push',
4039 4039 [('f', 'force', None, _('force push')),
4040 4040 ('r', 'rev', [],
4041 4041 _('a changeset intended to be included in the destination'),
4042 4042 _('REV')),
4043 4043 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4044 4044 ('b', 'branch', [],
4045 4045 _('a specific branch you would like to push'), _('BRANCH')),
4046 4046 ('', 'new-branch', False, _('allow pushing a new branch')),
4047 4047 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4048 4048 ] + remoteopts,
4049 4049 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4050 4050 def push(ui, repo, dest=None, **opts):
4051 4051 """push changes to the specified destination
4052 4052
4053 4053 Push changesets from the local repository to the specified
4054 4054 destination.
4055 4055
4056 4056 This operation is symmetrical to pull: it is identical to a pull
4057 4057 in the destination repository from the current one.
4058 4058
4059 4059 By default, push will not allow creation of new heads at the
4060 4060 destination, since multiple heads would make it unclear which head
4061 4061 to use. In this situation, it is recommended to pull and merge
4062 4062 before pushing.
4063 4063
4064 4064 Use --new-branch if you want to allow push to create a new named
4065 4065 branch that is not present at the destination. This allows you to
4066 4066 only create a new branch without forcing other changes.
4067 4067
4068 4068 .. note::
4069 4069
4070 4070 Extra care should be taken with the -f/--force option,
4071 4071 which will push all new heads on all branches, an action which will
4072 4072 almost always cause confusion for collaborators.
4073 4073
4074 4074 If -r/--rev is used, the specified revision and all its ancestors
4075 4075 will be pushed to the remote repository.
4076 4076
4077 4077 If -B/--bookmark is used, the specified bookmarked revision, its
4078 4078 ancestors, and the bookmark will be pushed to the remote
4079 4079 repository. Specifying ``.`` is equivalent to specifying the active
4080 4080 bookmark's name.
4081 4081
4082 4082 Please see :hg:`help urls` for important details about ``ssh://``
4083 4083 URLs. If DESTINATION is omitted, a default path will be used.
4084 4084
4085 4085 .. container:: verbose
4086 4086
4087 4087 The --pushvars option sends strings to the server that become
4088 4088 environment variables prepended with ``HG_USERVAR_``. For example,
4089 4089 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4090 4090 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4091 4091
4092 4092 pushvars can provide for user-overridable hooks as well as set debug
4093 4093 levels. One example is having a hook that blocks commits containing
4094 4094 conflict markers, but enables the user to override the hook if the file
4095 4095 is using conflict markers for testing purposes or the file format has
4096 4096 strings that look like conflict markers.
4097 4097
4098 4098 By default, servers will ignore `--pushvars`. To enable it add the
4099 4099 following to your configuration file::
4100 4100
4101 4101 [push]
4102 4102 pushvars.server = true
4103 4103
4104 4104 Returns 0 if push was successful, 1 if nothing to push.
4105 4105 """
4106 4106
4107 4107 opts = pycompat.byteskwargs(opts)
4108 4108 if opts.get('bookmark'):
4109 4109 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4110 4110 for b in opts['bookmark']:
4111 4111 # translate -B options to -r so changesets get pushed
4112 4112 b = repo._bookmarks.expandname(b)
4113 4113 if b in repo._bookmarks:
4114 4114 opts.setdefault('rev', []).append(b)
4115 4115 else:
4116 4116 # if we try to push a deleted bookmark, translate it to null
4117 4117 # this lets simultaneous -r, -b options continue working
4118 4118 opts.setdefault('rev', []).append("null")
4119 4119
4120 4120 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4121 4121 if not path:
4122 4122 raise error.Abort(_('default repository not configured!'),
4123 4123 hint=_("see 'hg help config.paths'"))
4124 4124 dest = path.pushloc or path.loc
4125 4125 branches = (path.branch, opts.get('branch') or [])
4126 4126 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4127 4127 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4128 4128 other = hg.peer(repo, opts, dest)
4129 4129
4130 4130 if revs:
4131 4131 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4132 4132 if not revs:
4133 4133 raise error.Abort(_("specified revisions evaluate to an empty set"),
4134 4134 hint=_("use different revision arguments"))
4135 4135 elif path.pushrev:
4136 4136 # It doesn't make any sense to specify ancestor revisions. So limit
4137 4137 # to DAG heads to make discovery simpler.
4138 4138 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4139 4139 revs = scmutil.revrange(repo, [expr])
4140 4140 revs = [repo[rev].node() for rev in revs]
4141 4141 if not revs:
4142 4142 raise error.Abort(_('default push revset for path evaluates to an '
4143 4143 'empty set'))
4144 4144
4145 4145 repo._subtoppath = dest
4146 4146 try:
4147 4147 # push subrepos depth-first for coherent ordering
4148 4148 c = repo['']
4149 4149 subs = c.substate # only repos that are committed
4150 4150 for s in sorted(subs):
4151 4151 result = c.sub(s).push(opts)
4152 4152 if result == 0:
4153 4153 return not result
4154 4154 finally:
4155 4155 del repo._subtoppath
4156 4156
4157 4157 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4158 4158 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4159 4159
4160 4160 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4161 4161 newbranch=opts.get('new_branch'),
4162 4162 bookmarks=opts.get('bookmark', ()),
4163 4163 opargs=opargs)
4164 4164
4165 4165 result = not pushop.cgresult
4166 4166
4167 4167 if pushop.bkresult is not None:
4168 4168 if pushop.bkresult == 2:
4169 4169 result = 2
4170 4170 elif not result and pushop.bkresult:
4171 4171 result = 2
4172 4172
4173 4173 return result
4174 4174
4175 4175 @command('recover', [])
4176 4176 def recover(ui, repo):
4177 4177 """roll back an interrupted transaction
4178 4178
4179 4179 Recover from an interrupted commit or pull.
4180 4180
4181 4181 This command tries to fix the repository status after an
4182 4182 interrupted operation. It should only be necessary when Mercurial
4183 4183 suggests it.
4184 4184
4185 4185 Returns 0 if successful, 1 if nothing to recover or verify fails.
4186 4186 """
4187 4187 if repo.recover():
4188 4188 return hg.verify(repo)
4189 4189 return 1
4190 4190
4191 4191 @command('^remove|rm',
4192 4192 [('A', 'after', None, _('record delete for missing files')),
4193 4193 ('f', 'force', None,
4194 4194 _('forget added files, delete modified files')),
4195 4195 ] + subrepoopts + walkopts,
4196 4196 _('[OPTION]... FILE...'),
4197 4197 inferrepo=True)
4198 4198 def remove(ui, repo, *pats, **opts):
4199 4199 """remove the specified files on the next commit
4200 4200
4201 4201 Schedule the indicated files for removal from the current branch.
4202 4202
4203 4203 This command schedules the files to be removed at the next commit.
4204 4204 To undo a remove before that, see :hg:`revert`. To undo added
4205 4205 files, see :hg:`forget`.
4206 4206
4207 4207 .. container:: verbose
4208 4208
4209 4209 -A/--after can be used to remove only files that have already
4210 4210 been deleted, -f/--force can be used to force deletion, and -Af
4211 4211 can be used to remove files from the next revision without
4212 4212 deleting them from the working directory.
4213 4213
4214 4214 The following table details the behavior of remove for different
4215 4215 file states (columns) and option combinations (rows). The file
4216 4216 states are Added [A], Clean [C], Modified [M] and Missing [!]
4217 4217 (as reported by :hg:`status`). The actions are Warn, Remove
4218 4218 (from branch) and Delete (from disk):
4219 4219
4220 4220 ========= == == == ==
4221 4221 opt/state A C M !
4222 4222 ========= == == == ==
4223 4223 none W RD W R
4224 4224 -f R RD RD R
4225 4225 -A W W W R
4226 4226 -Af R R R R
4227 4227 ========= == == == ==
4228 4228
4229 4229 .. note::
4230 4230
4231 4231 :hg:`remove` never deletes files in Added [A] state from the
4232 4232 working directory, not even if ``--force`` is specified.
4233 4233
4234 4234 Returns 0 on success, 1 if any warnings encountered.
4235 4235 """
4236 4236
4237 4237 opts = pycompat.byteskwargs(opts)
4238 4238 after, force = opts.get('after'), opts.get('force')
4239 4239 if not pats and not after:
4240 4240 raise error.Abort(_('no files specified'))
4241 4241
4242 4242 m = scmutil.match(repo[None], pats, opts)
4243 4243 subrepos = opts.get('subrepos')
4244 4244 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4245 4245
4246 4246 @command('rename|move|mv',
4247 4247 [('A', 'after', None, _('record a rename that has already occurred')),
4248 4248 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4249 4249 ] + walkopts + dryrunopts,
4250 4250 _('[OPTION]... SOURCE... DEST'))
4251 4251 def rename(ui, repo, *pats, **opts):
4252 4252 """rename files; equivalent of copy + remove
4253 4253
4254 4254 Mark dest as copies of sources; mark sources for deletion. If dest
4255 4255 is a directory, copies are put in that directory. If dest is a
4256 4256 file, there can only be one source.
4257 4257
4258 4258 By default, this command copies the contents of files as they
4259 4259 exist in the working directory. If invoked with -A/--after, the
4260 4260 operation is recorded, but no copying is performed.
4261 4261
4262 4262 This command takes effect at the next commit. To undo a rename
4263 4263 before that, see :hg:`revert`.
4264 4264
4265 4265 Returns 0 on success, 1 if errors are encountered.
4266 4266 """
4267 4267 opts = pycompat.byteskwargs(opts)
4268 4268 with repo.wlock(False):
4269 4269 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4270 4270
4271 4271 @command('resolve',
4272 4272 [('a', 'all', None, _('select all unresolved files')),
4273 4273 ('l', 'list', None, _('list state of files needing merge')),
4274 4274 ('m', 'mark', None, _('mark files as resolved')),
4275 4275 ('u', 'unmark', None, _('mark files as unresolved')),
4276 4276 ('n', 'no-status', None, _('hide status prefix'))]
4277 4277 + mergetoolopts + walkopts + formatteropts,
4278 4278 _('[OPTION]... [FILE]...'),
4279 4279 inferrepo=True)
4280 4280 def resolve(ui, repo, *pats, **opts):
4281 4281 """redo merges or set/view the merge status of files
4282 4282
4283 4283 Merges with unresolved conflicts are often the result of
4284 4284 non-interactive merging using the ``internal:merge`` configuration
4285 4285 setting, or a command-line merge tool like ``diff3``. The resolve
4286 4286 command is used to manage the files involved in a merge, after
4287 4287 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4288 4288 working directory must have two parents). See :hg:`help
4289 4289 merge-tools` for information on configuring merge tools.
4290 4290
4291 4291 The resolve command can be used in the following ways:
4292 4292
4293 4293 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4294 4294 files, discarding any previous merge attempts. Re-merging is not
4295 4295 performed for files already marked as resolved. Use ``--all/-a``
4296 4296 to select all unresolved files. ``--tool`` can be used to specify
4297 4297 the merge tool used for the given files. It overrides the HGMERGE
4298 4298 environment variable and your configuration files. Previous file
4299 4299 contents are saved with a ``.orig`` suffix.
4300 4300
4301 4301 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4302 4302 (e.g. after having manually fixed-up the files). The default is
4303 4303 to mark all unresolved files.
4304 4304
4305 4305 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4306 4306 default is to mark all resolved files.
4307 4307
4308 4308 - :hg:`resolve -l`: list files which had or still have conflicts.
4309 4309 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4310 4310 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4311 4311 the list. See :hg:`help filesets` for details.
4312 4312
4313 4313 .. note::
4314 4314
4315 4315 Mercurial will not let you commit files with unresolved merge
4316 4316 conflicts. You must use :hg:`resolve -m ...` before you can
4317 4317 commit after a conflicting merge.
4318 4318
4319 4319 Returns 0 on success, 1 if any files fail a resolve attempt.
4320 4320 """
4321 4321
4322 4322 opts = pycompat.byteskwargs(opts)
4323 4323 flaglist = 'all mark unmark list no_status'.split()
4324 4324 all, mark, unmark, show, nostatus = \
4325 4325 [opts.get(o) for o in flaglist]
4326 4326
4327 4327 if (show and (mark or unmark)) or (mark and unmark):
4328 4328 raise error.Abort(_("too many options specified"))
4329 4329 if pats and all:
4330 4330 raise error.Abort(_("can't specify --all and patterns"))
4331 4331 if not (all or pats or show or mark or unmark):
4332 4332 raise error.Abort(_('no files or directories specified'),
4333 4333 hint=('use --all to re-merge all unresolved files'))
4334 4334
4335 4335 if show:
4336 4336 ui.pager('resolve')
4337 4337 fm = ui.formatter('resolve', opts)
4338 4338 ms = mergemod.mergestate.read(repo)
4339 4339 m = scmutil.match(repo[None], pats, opts)
4340 4340
4341 4341 # Labels and keys based on merge state. Unresolved path conflicts show
4342 4342 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4343 4343 # resolved conflicts.
4344 4344 mergestateinfo = {
4345 4345 'u': ('resolve.unresolved', 'U'),
4346 4346 'r': ('resolve.resolved', 'R'),
4347 4347 'pu': ('resolve.unresolved', 'P'),
4348 4348 'pr': ('resolve.resolved', 'R'),
4349 4349 'd': ('resolve.driverresolved', 'D'),
4350 4350 }
4351 4351
4352 4352 for f in ms:
4353 4353 if not m(f):
4354 4354 continue
4355 4355
4356 4356 label, key = mergestateinfo[ms[f]]
4357 4357 fm.startitem()
4358 4358 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4359 4359 fm.write('path', '%s\n', f, label=label)
4360 4360 fm.end()
4361 4361 return 0
4362 4362
4363 4363 with repo.wlock():
4364 4364 ms = mergemod.mergestate.read(repo)
4365 4365
4366 4366 if not (ms.active() or repo.dirstate.p2() != nullid):
4367 4367 raise error.Abort(
4368 4368 _('resolve command not applicable when not merging'))
4369 4369
4370 4370 wctx = repo[None]
4371 4371
4372 4372 if ms.mergedriver and ms.mdstate() == 'u':
4373 4373 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4374 4374 ms.commit()
4375 4375 # allow mark and unmark to go through
4376 4376 if not mark and not unmark and not proceed:
4377 4377 return 1
4378 4378
4379 4379 m = scmutil.match(wctx, pats, opts)
4380 4380 ret = 0
4381 4381 didwork = False
4382 4382 runconclude = False
4383 4383
4384 4384 tocomplete = []
4385 4385 for f in ms:
4386 4386 if not m(f):
4387 4387 continue
4388 4388
4389 4389 didwork = True
4390 4390
4391 4391 # don't let driver-resolved files be marked, and run the conclude
4392 4392 # step if asked to resolve
4393 4393 if ms[f] == "d":
4394 4394 exact = m.exact(f)
4395 4395 if mark:
4396 4396 if exact:
4397 4397 ui.warn(_('not marking %s as it is driver-resolved\n')
4398 4398 % f)
4399 4399 elif unmark:
4400 4400 if exact:
4401 4401 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4402 4402 % f)
4403 4403 else:
4404 4404 runconclude = True
4405 4405 continue
4406 4406
4407 4407 # path conflicts must be resolved manually
4408 4408 if ms[f] in ("pu", "pr"):
4409 4409 if mark:
4410 4410 ms.mark(f, "pr")
4411 4411 elif unmark:
4412 4412 ms.mark(f, "pu")
4413 4413 elif ms[f] == "pu":
4414 4414 ui.warn(_('%s: path conflict must be resolved manually\n')
4415 4415 % f)
4416 4416 continue
4417 4417
4418 4418 if mark:
4419 4419 ms.mark(f, "r")
4420 4420 elif unmark:
4421 4421 ms.mark(f, "u")
4422 4422 else:
4423 4423 # backup pre-resolve (merge uses .orig for its own purposes)
4424 4424 a = repo.wjoin(f)
4425 4425 try:
4426 4426 util.copyfile(a, a + ".resolve")
4427 4427 except (IOError, OSError) as inst:
4428 4428 if inst.errno != errno.ENOENT:
4429 4429 raise
4430 4430
4431 4431 try:
4432 4432 # preresolve file
4433 4433 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4434 4434 'resolve')
4435 4435 complete, r = ms.preresolve(f, wctx)
4436 4436 if not complete:
4437 4437 tocomplete.append(f)
4438 4438 elif r:
4439 4439 ret = 1
4440 4440 finally:
4441 4441 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4442 4442 ms.commit()
4443 4443
4444 4444 # replace filemerge's .orig file with our resolve file, but only
4445 4445 # for merges that are complete
4446 4446 if complete:
4447 4447 try:
4448 4448 util.rename(a + ".resolve",
4449 4449 scmutil.origpath(ui, repo, a))
4450 4450 except OSError as inst:
4451 4451 if inst.errno != errno.ENOENT:
4452 4452 raise
4453 4453
4454 4454 for f in tocomplete:
4455 4455 try:
4456 4456 # resolve file
4457 4457 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4458 4458 'resolve')
4459 4459 r = ms.resolve(f, wctx)
4460 4460 if r:
4461 4461 ret = 1
4462 4462 finally:
4463 4463 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4464 4464 ms.commit()
4465 4465
4466 4466 # replace filemerge's .orig file with our resolve file
4467 4467 a = repo.wjoin(f)
4468 4468 try:
4469 4469 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4470 4470 except OSError as inst:
4471 4471 if inst.errno != errno.ENOENT:
4472 4472 raise
4473 4473
4474 4474 ms.commit()
4475 4475 ms.recordactions()
4476 4476
4477 4477 if not didwork and pats:
4478 4478 hint = None
4479 4479 if not any([p for p in pats if p.find(':') >= 0]):
4480 4480 pats = ['path:%s' % p for p in pats]
4481 4481 m = scmutil.match(wctx, pats, opts)
4482 4482 for f in ms:
4483 4483 if not m(f):
4484 4484 continue
4485 4485 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4486 4486 if opts.get(o)])
4487 4487 hint = _("(try: hg resolve %s%s)\n") % (
4488 4488 flags,
4489 4489 ' '.join(pats))
4490 4490 break
4491 4491 ui.warn(_("arguments do not match paths that need resolving\n"))
4492 4492 if hint:
4493 4493 ui.warn(hint)
4494 4494 elif ms.mergedriver and ms.mdstate() != 's':
4495 4495 # run conclude step when either a driver-resolved file is requested
4496 4496 # or there are no driver-resolved files
4497 4497 # we can't use 'ret' to determine whether any files are unresolved
4498 4498 # because we might not have tried to resolve some
4499 4499 if ((runconclude or not list(ms.driverresolved()))
4500 4500 and not list(ms.unresolved())):
4501 4501 proceed = mergemod.driverconclude(repo, ms, wctx)
4502 4502 ms.commit()
4503 4503 if not proceed:
4504 4504 return 1
4505 4505
4506 4506 # Nudge users into finishing an unfinished operation
4507 4507 unresolvedf = list(ms.unresolved())
4508 4508 driverresolvedf = list(ms.driverresolved())
4509 4509 if not unresolvedf and not driverresolvedf:
4510 4510 ui.status(_('(no more unresolved files)\n'))
4511 4511 cmdutil.checkafterresolved(repo)
4512 4512 elif not unresolvedf:
4513 4513 ui.status(_('(no more unresolved files -- '
4514 4514 'run "hg resolve --all" to conclude)\n'))
4515 4515
4516 4516 return ret
4517 4517
4518 4518 @command('revert',
4519 4519 [('a', 'all', None, _('revert all changes when no arguments given')),
4520 4520 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4521 4521 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4522 4522 ('C', 'no-backup', None, _('do not save backup copies of files')),
4523 4523 ('i', 'interactive', None, _('interactively select the changes')),
4524 4524 ] + walkopts + dryrunopts,
4525 4525 _('[OPTION]... [-r REV] [NAME]...'))
4526 4526 def revert(ui, repo, *pats, **opts):
4527 4527 """restore files to their checkout state
4528 4528
4529 4529 .. note::
4530 4530
4531 4531 To check out earlier revisions, you should use :hg:`update REV`.
4532 4532 To cancel an uncommitted merge (and lose your changes),
4533 4533 use :hg:`merge --abort`.
4534 4534
4535 4535 With no revision specified, revert the specified files or directories
4536 4536 to the contents they had in the parent of the working directory.
4537 4537 This restores the contents of files to an unmodified
4538 4538 state and unschedules adds, removes, copies, and renames. If the
4539 4539 working directory has two parents, you must explicitly specify a
4540 4540 revision.
4541 4541
4542 4542 Using the -r/--rev or -d/--date options, revert the given files or
4543 4543 directories to their states as of a specific revision. Because
4544 4544 revert does not change the working directory parents, this will
4545 4545 cause these files to appear modified. This can be helpful to "back
4546 4546 out" some or all of an earlier change. See :hg:`backout` for a
4547 4547 related method.
4548 4548
4549 4549 Modified files are saved with a .orig suffix before reverting.
4550 4550 To disable these backups, use --no-backup. It is possible to store
4551 4551 the backup files in a custom directory relative to the root of the
4552 4552 repository by setting the ``ui.origbackuppath`` configuration
4553 4553 option.
4554 4554
4555 4555 See :hg:`help dates` for a list of formats valid for -d/--date.
4556 4556
4557 4557 See :hg:`help backout` for a way to reverse the effect of an
4558 4558 earlier changeset.
4559 4559
4560 4560 Returns 0 on success.
4561 4561 """
4562 4562
4563 4563 opts = pycompat.byteskwargs(opts)
4564 4564 if opts.get("date"):
4565 4565 if opts.get("rev"):
4566 4566 raise error.Abort(_("you can't specify a revision and a date"))
4567 4567 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4568 4568
4569 4569 parent, p2 = repo.dirstate.parents()
4570 4570 if not opts.get('rev') and p2 != nullid:
4571 4571 # revert after merge is a trap for new users (issue2915)
4572 4572 raise error.Abort(_('uncommitted merge with no revision specified'),
4573 4573 hint=_("use 'hg update' or see 'hg help revert'"))
4574 4574
4575 4575 rev = opts.get('rev')
4576 4576 if rev:
4577 4577 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4578 4578 ctx = scmutil.revsingle(repo, rev)
4579 4579
4580 4580 if (not (pats or opts.get('include') or opts.get('exclude') or
4581 4581 opts.get('all') or opts.get('interactive'))):
4582 4582 msg = _("no files or directories specified")
4583 4583 if p2 != nullid:
4584 4584 hint = _("uncommitted merge, use --all to discard all changes,"
4585 4585 " or 'hg update -C .' to abort the merge")
4586 4586 raise error.Abort(msg, hint=hint)
4587 4587 dirty = any(repo.status())
4588 4588 node = ctx.node()
4589 4589 if node != parent:
4590 4590 if dirty:
4591 4591 hint = _("uncommitted changes, use --all to discard all"
4592 4592 " changes, or 'hg update %s' to update") % ctx.rev()
4593 4593 else:
4594 4594 hint = _("use --all to revert all files,"
4595 4595 " or 'hg update %s' to update") % ctx.rev()
4596 4596 elif dirty:
4597 4597 hint = _("uncommitted changes, use --all to discard all changes")
4598 4598 else:
4599 4599 hint = _("use --all to revert all files")
4600 4600 raise error.Abort(msg, hint=hint)
4601 4601
4602 4602 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4603 4603 **pycompat.strkwargs(opts))
4604 4604
4605 4605 @command('rollback', dryrunopts +
4606 4606 [('f', 'force', False, _('ignore safety measures'))])
4607 4607 def rollback(ui, repo, **opts):
4608 4608 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4609 4609
4610 4610 Please use :hg:`commit --amend` instead of rollback to correct
4611 4611 mistakes in the last commit.
4612 4612
4613 4613 This command should be used with care. There is only one level of
4614 4614 rollback, and there is no way to undo a rollback. It will also
4615 4615 restore the dirstate at the time of the last transaction, losing
4616 4616 any dirstate changes since that time. This command does not alter
4617 4617 the working directory.
4618 4618
4619 4619 Transactions are used to encapsulate the effects of all commands
4620 4620 that create new changesets or propagate existing changesets into a
4621 4621 repository.
4622 4622
4623 4623 .. container:: verbose
4624 4624
4625 4625 For example, the following commands are transactional, and their
4626 4626 effects can be rolled back:
4627 4627
4628 4628 - commit
4629 4629 - import
4630 4630 - pull
4631 4631 - push (with this repository as the destination)
4632 4632 - unbundle
4633 4633
4634 4634 To avoid permanent data loss, rollback will refuse to rollback a
4635 4635 commit transaction if it isn't checked out. Use --force to
4636 4636 override this protection.
4637 4637
4638 4638 The rollback command can be entirely disabled by setting the
4639 4639 ``ui.rollback`` configuration setting to false. If you're here
4640 4640 because you want to use rollback and it's disabled, you can
4641 4641 re-enable the command by setting ``ui.rollback`` to true.
4642 4642
4643 4643 This command is not intended for use on public repositories. Once
4644 4644 changes are visible for pull by other users, rolling a transaction
4645 4645 back locally is ineffective (someone else may already have pulled
4646 4646 the changes). Furthermore, a race is possible with readers of the
4647 4647 repository; for example an in-progress pull from the repository
4648 4648 may fail if a rollback is performed.
4649 4649
4650 4650 Returns 0 on success, 1 if no rollback data is available.
4651 4651 """
4652 4652 if not ui.configbool('ui', 'rollback'):
4653 4653 raise error.Abort(_('rollback is disabled because it is unsafe'),
4654 4654 hint=('see `hg help -v rollback` for information'))
4655 4655 return repo.rollback(dryrun=opts.get(r'dry_run'),
4656 4656 force=opts.get(r'force'))
4657 4657
4658 4658 @command('root', [], cmdtype=readonly)
4659 4659 def root(ui, repo):
4660 4660 """print the root (top) of the current working directory
4661 4661
4662 4662 Print the root directory of the current repository.
4663 4663
4664 4664 Returns 0 on success.
4665 4665 """
4666 4666 ui.write(repo.root + "\n")
4667 4667
4668 4668 @command('^serve',
4669 4669 [('A', 'accesslog', '', _('name of access log file to write to'),
4670 4670 _('FILE')),
4671 4671 ('d', 'daemon', None, _('run server in background')),
4672 4672 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4673 4673 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4674 4674 # use string type, then we can check if something was passed
4675 4675 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4676 4676 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4677 4677 _('ADDR')),
4678 4678 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4679 4679 _('PREFIX')),
4680 4680 ('n', 'name', '',
4681 4681 _('name to show in web pages (default: working directory)'), _('NAME')),
4682 4682 ('', 'web-conf', '',
4683 4683 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4684 4684 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4685 4685 _('FILE')),
4686 4686 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4687 4687 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4688 4688 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4689 4689 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4690 4690 ('', 'style', '', _('template style to use'), _('STYLE')),
4691 4691 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4692 4692 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4693 4693 + subrepoopts,
4694 4694 _('[OPTION]...'),
4695 4695 optionalrepo=True)
4696 4696 def serve(ui, repo, **opts):
4697 4697 """start stand-alone webserver
4698 4698
4699 4699 Start a local HTTP repository browser and pull server. You can use
4700 4700 this for ad-hoc sharing and browsing of repositories. It is
4701 4701 recommended to use a real web server to serve a repository for
4702 4702 longer periods of time.
4703 4703
4704 4704 Please note that the server does not implement access control.
4705 4705 This means that, by default, anybody can read from the server and
4706 4706 nobody can write to it by default. Set the ``web.allow-push``
4707 4707 option to ``*`` to allow everybody to push to the server. You
4708 4708 should use a real web server if you need to authenticate users.
4709 4709
4710 4710 By default, the server logs accesses to stdout and errors to
4711 4711 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4712 4712 files.
4713 4713
4714 4714 To have the server choose a free port number to listen on, specify
4715 4715 a port number of 0; in this case, the server will print the port
4716 4716 number it uses.
4717 4717
4718 4718 Returns 0 on success.
4719 4719 """
4720 4720
4721 4721 opts = pycompat.byteskwargs(opts)
4722 4722 if opts["stdio"] and opts["cmdserver"]:
4723 4723 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4724 4724
4725 4725 if opts["stdio"]:
4726 4726 if repo is None:
4727 4727 raise error.RepoError(_("there is no Mercurial repository here"
4728 4728 " (.hg not found)"))
4729 4729 s = wireprotoserver.sshserver(ui, repo)
4730 4730 s.serve_forever()
4731 4731
4732 4732 service = server.createservice(ui, repo, opts)
4733 4733 return server.runservice(opts, initfn=service.init, runfn=service.run)
4734 4734
4735 4735 @command('^status|st',
4736 4736 [('A', 'all', None, _('show status of all files')),
4737 4737 ('m', 'modified', None, _('show only modified files')),
4738 4738 ('a', 'added', None, _('show only added files')),
4739 4739 ('r', 'removed', None, _('show only removed files')),
4740 4740 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4741 4741 ('c', 'clean', None, _('show only files without changes')),
4742 4742 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4743 4743 ('i', 'ignored', None, _('show only ignored files')),
4744 4744 ('n', 'no-status', None, _('hide status prefix')),
4745 4745 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4746 4746 ('C', 'copies', None, _('show source of copied files')),
4747 4747 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4748 4748 ('', 'rev', [], _('show difference from revision'), _('REV')),
4749 4749 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4750 4750 ] + walkopts + subrepoopts + formatteropts,
4751 4751 _('[OPTION]... [FILE]...'),
4752 4752 inferrepo=True, cmdtype=readonly)
4753 4753 def status(ui, repo, *pats, **opts):
4754 4754 """show changed files in the working directory
4755 4755
4756 4756 Show status of files in the repository. If names are given, only
4757 4757 files that match are shown. Files that are clean or ignored or
4758 4758 the source of a copy/move operation, are not listed unless
4759 4759 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4760 4760 Unless options described with "show only ..." are given, the
4761 4761 options -mardu are used.
4762 4762
4763 4763 Option -q/--quiet hides untracked (unknown and ignored) files
4764 4764 unless explicitly requested with -u/--unknown or -i/--ignored.
4765 4765
4766 4766 .. note::
4767 4767
4768 4768 :hg:`status` may appear to disagree with diff if permissions have
4769 4769 changed or a merge has occurred. The standard diff format does
4770 4770 not report permission changes and diff only reports changes
4771 4771 relative to one merge parent.
4772 4772
4773 4773 If one revision is given, it is used as the base revision.
4774 4774 If two revisions are given, the differences between them are
4775 4775 shown. The --change option can also be used as a shortcut to list
4776 4776 the changed files of a revision from its first parent.
4777 4777
4778 4778 The codes used to show the status of files are::
4779 4779
4780 4780 M = modified
4781 4781 A = added
4782 4782 R = removed
4783 4783 C = clean
4784 4784 ! = missing (deleted by non-hg command, but still tracked)
4785 4785 ? = not tracked
4786 4786 I = ignored
4787 4787 = origin of the previous file (with --copies)
4788 4788
4789 4789 .. container:: verbose
4790 4790
4791 4791 The -t/--terse option abbreviates the output by showing only the directory
4792 4792 name if all the files in it share the same status. The option takes an
4793 4793 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4794 4794 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4795 4795 for 'ignored' and 'c' for clean.
4796 4796
4797 4797 It abbreviates only those statuses which are passed. Note that clean and
4798 4798 ignored files are not displayed with '--terse ic' unless the -c/--clean
4799 4799 and -i/--ignored options are also used.
4800 4800
4801 4801 The -v/--verbose option shows information when the repository is in an
4802 4802 unfinished merge, shelve, rebase state etc. You can have this behavior
4803 4803 turned on by default by enabling the ``commands.status.verbose`` option.
4804 4804
4805 4805 You can skip displaying some of these states by setting
4806 4806 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4807 4807 'histedit', 'merge', 'rebase', or 'unshelve'.
4808 4808
4809 4809 Examples:
4810 4810
4811 4811 - show changes in the working directory relative to a
4812 4812 changeset::
4813 4813
4814 4814 hg status --rev 9353
4815 4815
4816 4816 - show changes in the working directory relative to the
4817 4817 current directory (see :hg:`help patterns` for more information)::
4818 4818
4819 4819 hg status re:
4820 4820
4821 4821 - show all changes including copies in an existing changeset::
4822 4822
4823 4823 hg status --copies --change 9353
4824 4824
4825 4825 - get a NUL separated list of added files, suitable for xargs::
4826 4826
4827 4827 hg status -an0
4828 4828
4829 4829 - show more information about the repository status, abbreviating
4830 4830 added, removed, modified, deleted, and untracked paths::
4831 4831
4832 4832 hg status -v -t mardu
4833 4833
4834 4834 Returns 0 on success.
4835 4835
4836 4836 """
4837 4837
4838 4838 opts = pycompat.byteskwargs(opts)
4839 4839 revs = opts.get('rev')
4840 4840 change = opts.get('change')
4841 4841 terse = opts.get('terse')
4842 4842
4843 4843 if revs and change:
4844 4844 msg = _('cannot specify --rev and --change at the same time')
4845 4845 raise error.Abort(msg)
4846 4846 elif revs and terse:
4847 4847 msg = _('cannot use --terse with --rev')
4848 4848 raise error.Abort(msg)
4849 4849 elif change:
4850 4850 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4851 4851 node2 = scmutil.revsingle(repo, change, None).node()
4852 4852 node1 = repo[node2].p1().node()
4853 4853 else:
4854 4854 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4855 4855 node1, node2 = scmutil.revpair(repo, revs)
4856 4856
4857 4857 if pats or ui.configbool('commands', 'status.relative'):
4858 4858 cwd = repo.getcwd()
4859 4859 else:
4860 4860 cwd = ''
4861 4861
4862 4862 if opts.get('print0'):
4863 4863 end = '\0'
4864 4864 else:
4865 4865 end = '\n'
4866 4866 copy = {}
4867 4867 states = 'modified added removed deleted unknown ignored clean'.split()
4868 4868 show = [k for k in states if opts.get(k)]
4869 4869 if opts.get('all'):
4870 4870 show += ui.quiet and (states[:4] + ['clean']) or states
4871 4871
4872 4872 if not show:
4873 4873 if ui.quiet:
4874 4874 show = states[:4]
4875 4875 else:
4876 4876 show = states[:5]
4877 4877
4878 4878 m = scmutil.match(repo[node2], pats, opts)
4879 4879 if terse:
4880 4880 # we need to compute clean and unknown to terse
4881 4881 stat = repo.status(node1, node2, m,
4882 4882 'ignored' in show or 'i' in terse,
4883 4883 True, True, opts.get('subrepos'))
4884 4884
4885 4885 stat = cmdutil.tersedir(stat, terse)
4886 4886 else:
4887 4887 stat = repo.status(node1, node2, m,
4888 4888 'ignored' in show, 'clean' in show,
4889 4889 'unknown' in show, opts.get('subrepos'))
4890 4890
4891 4891 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4892 4892
4893 4893 if (opts.get('all') or opts.get('copies')
4894 4894 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4895 4895 copy = copies.pathcopies(repo[node1], repo[node2], m)
4896 4896
4897 4897 ui.pager('status')
4898 4898 fm = ui.formatter('status', opts)
4899 4899 fmt = '%s' + end
4900 4900 showchar = not opts.get('no_status')
4901 4901
4902 4902 for state, char, files in changestates:
4903 4903 if state in show:
4904 4904 label = 'status.' + state
4905 4905 for f in files:
4906 4906 fm.startitem()
4907 4907 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4908 4908 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4909 4909 if f in copy:
4910 4910 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4911 4911 label='status.copied')
4912 4912
4913 4913 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4914 4914 and not ui.plain()):
4915 4915 cmdutil.morestatus(repo, fm)
4916 4916 fm.end()
4917 4917
4918 4918 @command('^summary|sum',
4919 4919 [('', 'remote', None, _('check for push and pull'))],
4920 4920 '[--remote]', cmdtype=readonly)
4921 4921 def summary(ui, repo, **opts):
4922 4922 """summarize working directory state
4923 4923
4924 4924 This generates a brief summary of the working directory state,
4925 4925 including parents, branch, commit status, phase and available updates.
4926 4926
4927 4927 With the --remote option, this will check the default paths for
4928 4928 incoming and outgoing changes. This can be time-consuming.
4929 4929
4930 4930 Returns 0 on success.
4931 4931 """
4932 4932
4933 4933 opts = pycompat.byteskwargs(opts)
4934 4934 ui.pager('summary')
4935 4935 ctx = repo[None]
4936 4936 parents = ctx.parents()
4937 4937 pnode = parents[0].node()
4938 4938 marks = []
4939 4939
4940 4940 ms = None
4941 4941 try:
4942 4942 ms = mergemod.mergestate.read(repo)
4943 4943 except error.UnsupportedMergeRecords as e:
4944 4944 s = ' '.join(e.recordtypes)
4945 4945 ui.warn(
4946 4946 _('warning: merge state has unsupported record types: %s\n') % s)
4947 4947 unresolved = []
4948 4948 else:
4949 4949 unresolved = list(ms.unresolved())
4950 4950
4951 4951 for p in parents:
4952 4952 # label with log.changeset (instead of log.parent) since this
4953 4953 # shows a working directory parent *changeset*:
4954 4954 # i18n: column positioning for "hg summary"
4955 4955 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4956 4956 label=logcmdutil.changesetlabels(p))
4957 4957 ui.write(' '.join(p.tags()), label='log.tag')
4958 4958 if p.bookmarks():
4959 4959 marks.extend(p.bookmarks())
4960 4960 if p.rev() == -1:
4961 4961 if not len(repo):
4962 4962 ui.write(_(' (empty repository)'))
4963 4963 else:
4964 4964 ui.write(_(' (no revision checked out)'))
4965 4965 if p.obsolete():
4966 4966 ui.write(_(' (obsolete)'))
4967 4967 if p.isunstable():
4968 4968 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4969 4969 for instability in p.instabilities())
4970 4970 ui.write(' ('
4971 4971 + ', '.join(instabilities)
4972 4972 + ')')
4973 4973 ui.write('\n')
4974 4974 if p.description():
4975 4975 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4976 4976 label='log.summary')
4977 4977
4978 4978 branch = ctx.branch()
4979 4979 bheads = repo.branchheads(branch)
4980 4980 # i18n: column positioning for "hg summary"
4981 4981 m = _('branch: %s\n') % branch
4982 4982 if branch != 'default':
4983 4983 ui.write(m, label='log.branch')
4984 4984 else:
4985 4985 ui.status(m, label='log.branch')
4986 4986
4987 4987 if marks:
4988 4988 active = repo._activebookmark
4989 4989 # i18n: column positioning for "hg summary"
4990 4990 ui.write(_('bookmarks:'), label='log.bookmark')
4991 4991 if active is not None:
4992 4992 if active in marks:
4993 4993 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4994 4994 marks.remove(active)
4995 4995 else:
4996 4996 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4997 4997 for m in marks:
4998 4998 ui.write(' ' + m, label='log.bookmark')
4999 4999 ui.write('\n', label='log.bookmark')
5000 5000
5001 5001 status = repo.status(unknown=True)
5002 5002
5003 5003 c = repo.dirstate.copies()
5004 5004 copied, renamed = [], []
5005 5005 for d, s in c.iteritems():
5006 5006 if s in status.removed:
5007 5007 status.removed.remove(s)
5008 5008 renamed.append(d)
5009 5009 else:
5010 5010 copied.append(d)
5011 5011 if d in status.added:
5012 5012 status.added.remove(d)
5013 5013
5014 5014 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5015 5015
5016 5016 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5017 5017 (ui.label(_('%d added'), 'status.added'), status.added),
5018 5018 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5019 5019 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5020 5020 (ui.label(_('%d copied'), 'status.copied'), copied),
5021 5021 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5022 5022 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5023 5023 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5024 5024 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5025 5025 t = []
5026 5026 for l, s in labels:
5027 5027 if s:
5028 5028 t.append(l % len(s))
5029 5029
5030 5030 t = ', '.join(t)
5031 5031 cleanworkdir = False
5032 5032
5033 5033 if repo.vfs.exists('graftstate'):
5034 5034 t += _(' (graft in progress)')
5035 5035 if repo.vfs.exists('updatestate'):
5036 5036 t += _(' (interrupted update)')
5037 5037 elif len(parents) > 1:
5038 5038 t += _(' (merge)')
5039 5039 elif branch != parents[0].branch():
5040 5040 t += _(' (new branch)')
5041 5041 elif (parents[0].closesbranch() and
5042 5042 pnode in repo.branchheads(branch, closed=True)):
5043 5043 t += _(' (head closed)')
5044 5044 elif not (status.modified or status.added or status.removed or renamed or
5045 5045 copied or subs):
5046 5046 t += _(' (clean)')
5047 5047 cleanworkdir = True
5048 5048 elif pnode not in bheads:
5049 5049 t += _(' (new branch head)')
5050 5050
5051 5051 if parents:
5052 5052 pendingphase = max(p.phase() for p in parents)
5053 5053 else:
5054 5054 pendingphase = phases.public
5055 5055
5056 5056 if pendingphase > phases.newcommitphase(ui):
5057 5057 t += ' (%s)' % phases.phasenames[pendingphase]
5058 5058
5059 5059 if cleanworkdir:
5060 5060 # i18n: column positioning for "hg summary"
5061 5061 ui.status(_('commit: %s\n') % t.strip())
5062 5062 else:
5063 5063 # i18n: column positioning for "hg summary"
5064 5064 ui.write(_('commit: %s\n') % t.strip())
5065 5065
5066 5066 # all ancestors of branch heads - all ancestors of parent = new csets
5067 5067 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5068 5068 bheads))
5069 5069
5070 5070 if new == 0:
5071 5071 # i18n: column positioning for "hg summary"
5072 5072 ui.status(_('update: (current)\n'))
5073 5073 elif pnode not in bheads:
5074 5074 # i18n: column positioning for "hg summary"
5075 5075 ui.write(_('update: %d new changesets (update)\n') % new)
5076 5076 else:
5077 5077 # i18n: column positioning for "hg summary"
5078 5078 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5079 5079 (new, len(bheads)))
5080 5080
5081 5081 t = []
5082 5082 draft = len(repo.revs('draft()'))
5083 5083 if draft:
5084 5084 t.append(_('%d draft') % draft)
5085 5085 secret = len(repo.revs('secret()'))
5086 5086 if secret:
5087 5087 t.append(_('%d secret') % secret)
5088 5088
5089 5089 if draft or secret:
5090 5090 ui.status(_('phases: %s\n') % ', '.join(t))
5091 5091
5092 5092 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5093 5093 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5094 5094 numtrouble = len(repo.revs(trouble + "()"))
5095 5095 # We write all the possibilities to ease translation
5096 5096 troublemsg = {
5097 5097 "orphan": _("orphan: %d changesets"),
5098 5098 "contentdivergent": _("content-divergent: %d changesets"),
5099 5099 "phasedivergent": _("phase-divergent: %d changesets"),
5100 5100 }
5101 5101 if numtrouble > 0:
5102 5102 ui.status(troublemsg[trouble] % numtrouble + "\n")
5103 5103
5104 5104 cmdutil.summaryhooks(ui, repo)
5105 5105
5106 5106 if opts.get('remote'):
5107 5107 needsincoming, needsoutgoing = True, True
5108 5108 else:
5109 5109 needsincoming, needsoutgoing = False, False
5110 5110 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5111 5111 if i:
5112 5112 needsincoming = True
5113 5113 if o:
5114 5114 needsoutgoing = True
5115 5115 if not needsincoming and not needsoutgoing:
5116 5116 return
5117 5117
5118 5118 def getincoming():
5119 5119 source, branches = hg.parseurl(ui.expandpath('default'))
5120 5120 sbranch = branches[0]
5121 5121 try:
5122 5122 other = hg.peer(repo, {}, source)
5123 5123 except error.RepoError:
5124 5124 if opts.get('remote'):
5125 5125 raise
5126 5126 return source, sbranch, None, None, None
5127 5127 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5128 5128 if revs:
5129 5129 revs = [other.lookup(rev) for rev in revs]
5130 5130 ui.debug('comparing with %s\n' % util.hidepassword(source))
5131 5131 repo.ui.pushbuffer()
5132 5132 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5133 5133 repo.ui.popbuffer()
5134 5134 return source, sbranch, other, commoninc, commoninc[1]
5135 5135
5136 5136 if needsincoming:
5137 5137 source, sbranch, sother, commoninc, incoming = getincoming()
5138 5138 else:
5139 5139 source = sbranch = sother = commoninc = incoming = None
5140 5140
5141 5141 def getoutgoing():
5142 5142 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5143 5143 dbranch = branches[0]
5144 5144 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5145 5145 if source != dest:
5146 5146 try:
5147 5147 dother = hg.peer(repo, {}, dest)
5148 5148 except error.RepoError:
5149 5149 if opts.get('remote'):
5150 5150 raise
5151 5151 return dest, dbranch, None, None
5152 5152 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5153 5153 elif sother is None:
5154 5154 # there is no explicit destination peer, but source one is invalid
5155 5155 return dest, dbranch, None, None
5156 5156 else:
5157 5157 dother = sother
5158 5158 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5159 5159 common = None
5160 5160 else:
5161 5161 common = commoninc
5162 5162 if revs:
5163 5163 revs = [repo.lookup(rev) for rev in revs]
5164 5164 repo.ui.pushbuffer()
5165 5165 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5166 5166 commoninc=common)
5167 5167 repo.ui.popbuffer()
5168 5168 return dest, dbranch, dother, outgoing
5169 5169
5170 5170 if needsoutgoing:
5171 5171 dest, dbranch, dother, outgoing = getoutgoing()
5172 5172 else:
5173 5173 dest = dbranch = dother = outgoing = None
5174 5174
5175 5175 if opts.get('remote'):
5176 5176 t = []
5177 5177 if incoming:
5178 5178 t.append(_('1 or more incoming'))
5179 5179 o = outgoing.missing
5180 5180 if o:
5181 5181 t.append(_('%d outgoing') % len(o))
5182 5182 other = dother or sother
5183 5183 if 'bookmarks' in other.listkeys('namespaces'):
5184 5184 counts = bookmarks.summary(repo, other)
5185 5185 if counts[0] > 0:
5186 5186 t.append(_('%d incoming bookmarks') % counts[0])
5187 5187 if counts[1] > 0:
5188 5188 t.append(_('%d outgoing bookmarks') % counts[1])
5189 5189
5190 5190 if t:
5191 5191 # i18n: column positioning for "hg summary"
5192 5192 ui.write(_('remote: %s\n') % (', '.join(t)))
5193 5193 else:
5194 5194 # i18n: column positioning for "hg summary"
5195 5195 ui.status(_('remote: (synced)\n'))
5196 5196
5197 5197 cmdutil.summaryremotehooks(ui, repo, opts,
5198 5198 ((source, sbranch, sother, commoninc),
5199 5199 (dest, dbranch, dother, outgoing)))
5200 5200
5201 5201 @command('tag',
5202 5202 [('f', 'force', None, _('force tag')),
5203 5203 ('l', 'local', None, _('make the tag local')),
5204 5204 ('r', 'rev', '', _('revision to tag'), _('REV')),
5205 5205 ('', 'remove', None, _('remove a tag')),
5206 5206 # -l/--local is already there, commitopts cannot be used
5207 5207 ('e', 'edit', None, _('invoke editor on commit messages')),
5208 5208 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5209 5209 ] + commitopts2,
5210 5210 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5211 5211 def tag(ui, repo, name1, *names, **opts):
5212 5212 """add one or more tags for the current or given revision
5213 5213
5214 5214 Name a particular revision using <name>.
5215 5215
5216 5216 Tags are used to name particular revisions of the repository and are
5217 5217 very useful to compare different revisions, to go back to significant
5218 5218 earlier versions or to mark branch points as releases, etc. Changing
5219 5219 an existing tag is normally disallowed; use -f/--force to override.
5220 5220
5221 5221 If no revision is given, the parent of the working directory is
5222 5222 used.
5223 5223
5224 5224 To facilitate version control, distribution, and merging of tags,
5225 5225 they are stored as a file named ".hgtags" which is managed similarly
5226 5226 to other project files and can be hand-edited if necessary. This
5227 5227 also means that tagging creates a new commit. The file
5228 5228 ".hg/localtags" is used for local tags (not shared among
5229 5229 repositories).
5230 5230
5231 5231 Tag commits are usually made at the head of a branch. If the parent
5232 5232 of the working directory is not a branch head, :hg:`tag` aborts; use
5233 5233 -f/--force to force the tag commit to be based on a non-head
5234 5234 changeset.
5235 5235
5236 5236 See :hg:`help dates` for a list of formats valid for -d/--date.
5237 5237
5238 5238 Since tag names have priority over branch names during revision
5239 5239 lookup, using an existing branch name as a tag name is discouraged.
5240 5240
5241 5241 Returns 0 on success.
5242 5242 """
5243 5243 opts = pycompat.byteskwargs(opts)
5244 5244 wlock = lock = None
5245 5245 try:
5246 5246 wlock = repo.wlock()
5247 5247 lock = repo.lock()
5248 5248 rev_ = "."
5249 5249 names = [t.strip() for t in (name1,) + names]
5250 5250 if len(names) != len(set(names)):
5251 5251 raise error.Abort(_('tag names must be unique'))
5252 5252 for n in names:
5253 5253 scmutil.checknewlabel(repo, n, 'tag')
5254 5254 if not n:
5255 5255 raise error.Abort(_('tag names cannot consist entirely of '
5256 5256 'whitespace'))
5257 5257 if opts.get('rev') and opts.get('remove'):
5258 5258 raise error.Abort(_("--rev and --remove are incompatible"))
5259 5259 if opts.get('rev'):
5260 5260 rev_ = opts['rev']
5261 5261 message = opts.get('message')
5262 5262 if opts.get('remove'):
5263 5263 if opts.get('local'):
5264 5264 expectedtype = 'local'
5265 5265 else:
5266 5266 expectedtype = 'global'
5267 5267
5268 5268 for n in names:
5269 5269 if not repo.tagtype(n):
5270 5270 raise error.Abort(_("tag '%s' does not exist") % n)
5271 5271 if repo.tagtype(n) != expectedtype:
5272 5272 if expectedtype == 'global':
5273 5273 raise error.Abort(_("tag '%s' is not a global tag") % n)
5274 5274 else:
5275 5275 raise error.Abort(_("tag '%s' is not a local tag") % n)
5276 5276 rev_ = 'null'
5277 5277 if not message:
5278 5278 # we don't translate commit messages
5279 5279 message = 'Removed tag %s' % ', '.join(names)
5280 5280 elif not opts.get('force'):
5281 5281 for n in names:
5282 5282 if n in repo.tags():
5283 5283 raise error.Abort(_("tag '%s' already exists "
5284 5284 "(use -f to force)") % n)
5285 5285 if not opts.get('local'):
5286 5286 p1, p2 = repo.dirstate.parents()
5287 5287 if p2 != nullid:
5288 5288 raise error.Abort(_('uncommitted merge'))
5289 5289 bheads = repo.branchheads()
5290 5290 if not opts.get('force') and bheads and p1 not in bheads:
5291 5291 raise error.Abort(_('working directory is not at a branch head '
5292 5292 '(use -f to force)'))
5293 5293 r = scmutil.revsingle(repo, rev_).node()
5294 5294
5295 5295 if not message:
5296 5296 # we don't translate commit messages
5297 5297 message = ('Added tag %s for changeset %s' %
5298 5298 (', '.join(names), short(r)))
5299 5299
5300 5300 date = opts.get('date')
5301 5301 if date:
5302 5302 date = util.parsedate(date)
5303 5303
5304 5304 if opts.get('remove'):
5305 5305 editform = 'tag.remove'
5306 5306 else:
5307 5307 editform = 'tag.add'
5308 5308 editor = cmdutil.getcommiteditor(editform=editform,
5309 5309 **pycompat.strkwargs(opts))
5310 5310
5311 5311 # don't allow tagging the null rev
5312 5312 if (not opts.get('remove') and
5313 5313 scmutil.revsingle(repo, rev_).rev() == nullrev):
5314 5314 raise error.Abort(_("cannot tag null revision"))
5315 5315
5316 5316 tagsmod.tag(repo, names, r, message, opts.get('local'),
5317 5317 opts.get('user'), date, editor=editor)
5318 5318 finally:
5319 5319 release(lock, wlock)
5320 5320
5321 5321 @command('tags', formatteropts, '', cmdtype=readonly)
5322 5322 def tags(ui, repo, **opts):
5323 5323 """list repository tags
5324 5324
5325 5325 This lists both regular and local tags. When the -v/--verbose
5326 5326 switch is used, a third column "local" is printed for local tags.
5327 5327 When the -q/--quiet switch is used, only the tag name is printed.
5328 5328
5329 5329 Returns 0 on success.
5330 5330 """
5331 5331
5332 5332 opts = pycompat.byteskwargs(opts)
5333 5333 ui.pager('tags')
5334 5334 fm = ui.formatter('tags', opts)
5335 5335 hexfunc = fm.hexfunc
5336 5336 tagtype = ""
5337 5337
5338 5338 for t, n in reversed(repo.tagslist()):
5339 5339 hn = hexfunc(n)
5340 5340 label = 'tags.normal'
5341 5341 tagtype = ''
5342 5342 if repo.tagtype(t) == 'local':
5343 5343 label = 'tags.local'
5344 5344 tagtype = 'local'
5345 5345
5346 5346 fm.startitem()
5347 5347 fm.write('tag', '%s', t, label=label)
5348 5348 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5349 5349 fm.condwrite(not ui.quiet, 'rev node', fmt,
5350 5350 repo.changelog.rev(n), hn, label=label)
5351 5351 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5352 5352 tagtype, label=label)
5353 5353 fm.plain('\n')
5354 5354 fm.end()
5355 5355
5356 5356 @command('tip',
5357 5357 [('p', 'patch', None, _('show patch')),
5358 5358 ('g', 'git', None, _('use git extended diff format')),
5359 5359 ] + templateopts,
5360 5360 _('[-p] [-g]'))
5361 5361 def tip(ui, repo, **opts):
5362 5362 """show the tip revision (DEPRECATED)
5363 5363
5364 5364 The tip revision (usually just called the tip) is the changeset
5365 5365 most recently added to the repository (and therefore the most
5366 5366 recently changed head).
5367 5367
5368 5368 If you have just made a commit, that commit will be the tip. If
5369 5369 you have just pulled changes from another repository, the tip of
5370 5370 that repository becomes the current tip. The "tip" tag is special
5371 5371 and cannot be renamed or assigned to a different changeset.
5372 5372
5373 5373 This command is deprecated, please use :hg:`heads` instead.
5374 5374
5375 5375 Returns 0 on success.
5376 5376 """
5377 5377 opts = pycompat.byteskwargs(opts)
5378 5378 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5379 5379 displayer.show(repo['tip'])
5380 5380 displayer.close()
5381 5381
5382 5382 @command('unbundle',
5383 5383 [('u', 'update', None,
5384 5384 _('update to new branch head if changesets were unbundled'))],
5385 5385 _('[-u] FILE...'))
5386 5386 def unbundle(ui, repo, fname1, *fnames, **opts):
5387 5387 """apply one or more bundle files
5388 5388
5389 5389 Apply one or more bundle files generated by :hg:`bundle`.
5390 5390
5391 5391 Returns 0 on success, 1 if an update has unresolved files.
5392 5392 """
5393 5393 fnames = (fname1,) + fnames
5394 5394
5395 5395 with repo.lock():
5396 5396 for fname in fnames:
5397 5397 f = hg.openpath(ui, fname)
5398 5398 gen = exchange.readbundle(ui, f, fname)
5399 5399 if isinstance(gen, streamclone.streamcloneapplier):
5400 5400 raise error.Abort(
5401 5401 _('packed bundles cannot be applied with '
5402 5402 '"hg unbundle"'),
5403 5403 hint=_('use "hg debugapplystreamclonebundle"'))
5404 5404 url = 'bundle:' + fname
5405 5405 try:
5406 5406 txnname = 'unbundle'
5407 5407 if not isinstance(gen, bundle2.unbundle20):
5408 5408 txnname = 'unbundle\n%s' % util.hidepassword(url)
5409 5409 with repo.transaction(txnname) as tr:
5410 5410 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5411 5411 url=url)
5412 5412 except error.BundleUnknownFeatureError as exc:
5413 5413 raise error.Abort(
5414 5414 _('%s: unknown bundle feature, %s') % (fname, exc),
5415 5415 hint=_("see https://mercurial-scm.org/"
5416 5416 "wiki/BundleFeature for more "
5417 5417 "information"))
5418 5418 modheads = bundle2.combinechangegroupresults(op)
5419 5419
5420 5420 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5421 5421
5422 5422 @command('^update|up|checkout|co',
5423 5423 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5424 5424 ('c', 'check', None, _('require clean working directory')),
5425 5425 ('m', 'merge', None, _('merge uncommitted changes')),
5426 5426 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5427 5427 ('r', 'rev', '', _('revision'), _('REV'))
5428 5428 ] + mergetoolopts,
5429 5429 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5430 5430 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5431 5431 merge=None, tool=None):
5432 5432 """update working directory (or switch revisions)
5433 5433
5434 5434 Update the repository's working directory to the specified
5435 5435 changeset. If no changeset is specified, update to the tip of the
5436 5436 current named branch and move the active bookmark (see :hg:`help
5437 5437 bookmarks`).
5438 5438
5439 5439 Update sets the working directory's parent revision to the specified
5440 5440 changeset (see :hg:`help parents`).
5441 5441
5442 5442 If the changeset is not a descendant or ancestor of the working
5443 5443 directory's parent and there are uncommitted changes, the update is
5444 5444 aborted. With the -c/--check option, the working directory is checked
5445 5445 for uncommitted changes; if none are found, the working directory is
5446 5446 updated to the specified changeset.
5447 5447
5448 5448 .. container:: verbose
5449 5449
5450 5450 The -C/--clean, -c/--check, and -m/--merge options control what
5451 5451 happens if the working directory contains uncommitted changes.
5452 5452 At most of one of them can be specified.
5453 5453
5454 5454 1. If no option is specified, and if
5455 5455 the requested changeset is an ancestor or descendant of
5456 5456 the working directory's parent, the uncommitted changes
5457 5457 are merged into the requested changeset and the merged
5458 5458 result is left uncommitted. If the requested changeset is
5459 5459 not an ancestor or descendant (that is, it is on another
5460 5460 branch), the update is aborted and the uncommitted changes
5461 5461 are preserved.
5462 5462
5463 5463 2. With the -m/--merge option, the update is allowed even if the
5464 5464 requested changeset is not an ancestor or descendant of
5465 5465 the working directory's parent.
5466 5466
5467 5467 3. With the -c/--check option, the update is aborted and the
5468 5468 uncommitted changes are preserved.
5469 5469
5470 5470 4. With the -C/--clean option, uncommitted changes are discarded and
5471 5471 the working directory is updated to the requested changeset.
5472 5472
5473 5473 To cancel an uncommitted merge (and lose your changes), use
5474 5474 :hg:`merge --abort`.
5475 5475
5476 5476 Use null as the changeset to remove the working directory (like
5477 5477 :hg:`clone -U`).
5478 5478
5479 5479 If you want to revert just one file to an older revision, use
5480 5480 :hg:`revert [-r REV] NAME`.
5481 5481
5482 5482 See :hg:`help dates` for a list of formats valid for -d/--date.
5483 5483
5484 5484 Returns 0 on success, 1 if there are unresolved files.
5485 5485 """
5486 5486 if rev and node:
5487 5487 raise error.Abort(_("please specify just one revision"))
5488 5488
5489 5489 if ui.configbool('commands', 'update.requiredest'):
5490 5490 if not node and not rev and not date:
5491 5491 raise error.Abort(_('you must specify a destination'),
5492 5492 hint=_('for example: hg update ".::"'))
5493 5493
5494 5494 if rev is None or rev == '':
5495 5495 rev = node
5496 5496
5497 5497 if date and rev is not None:
5498 5498 raise error.Abort(_("you can't specify a revision and a date"))
5499 5499
5500 5500 if len([x for x in (clean, check, merge) if x]) > 1:
5501 5501 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5502 5502 "or -m/--merge"))
5503 5503
5504 5504 updatecheck = None
5505 5505 if check:
5506 5506 updatecheck = 'abort'
5507 5507 elif merge:
5508 5508 updatecheck = 'none'
5509 5509
5510 5510 with repo.wlock():
5511 5511 cmdutil.clearunfinished(repo)
5512 5512
5513 5513 if date:
5514 5514 rev = cmdutil.finddate(ui, repo, date)
5515 5515
5516 5516 # if we defined a bookmark, we have to remember the original name
5517 5517 brev = rev
5518 5518 if rev:
5519 5519 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5520 5520 ctx = scmutil.revsingle(repo, rev, rev)
5521 5521 rev = ctx.rev()
5522 5522 if ctx.hidden():
5523 5523 ctxstr = ctx.hex()[:12]
5524 5524 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5525 5525
5526 5526 if ctx.obsolete():
5527 5527 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5528 5528 ui.warn("(%s)\n" % obsfatemsg)
5529 5529
5530 5530 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5531 5531
5532 5532 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5533 5533 updatecheck=updatecheck)
5534 5534
5535 5535 @command('verify', [])
5536 5536 def verify(ui, repo):
5537 5537 """verify the integrity of the repository
5538 5538
5539 5539 Verify the integrity of the current repository.
5540 5540
5541 5541 This will perform an extensive check of the repository's
5542 5542 integrity, validating the hashes and checksums of each entry in
5543 5543 the changelog, manifest, and tracked files, as well as the
5544 5544 integrity of their crosslinks and indices.
5545 5545
5546 5546 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5547 5547 for more information about recovery from corruption of the
5548 5548 repository.
5549 5549
5550 5550 Returns 0 on success, 1 if errors are encountered.
5551 5551 """
5552 5552 return hg.verify(repo)
5553 5553
5554 5554 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5555 5555 def version_(ui, **opts):
5556 5556 """output version and copyright information"""
5557 5557 opts = pycompat.byteskwargs(opts)
5558 5558 if ui.verbose:
5559 5559 ui.pager('version')
5560 5560 fm = ui.formatter("version", opts)
5561 5561 fm.startitem()
5562 5562 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5563 5563 util.version())
5564 5564 license = _(
5565 5565 "(see https://mercurial-scm.org for more information)\n"
5566 5566 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5567 5567 "This is free software; see the source for copying conditions. "
5568 5568 "There is NO\nwarranty; "
5569 5569 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5570 5570 )
5571 5571 if not ui.quiet:
5572 5572 fm.plain(license)
5573 5573
5574 5574 if ui.verbose:
5575 5575 fm.plain(_("\nEnabled extensions:\n\n"))
5576 5576 # format names and versions into columns
5577 5577 names = []
5578 5578 vers = []
5579 5579 isinternals = []
5580 5580 for name, module in extensions.extensions():
5581 5581 names.append(name)
5582 5582 vers.append(extensions.moduleversion(module) or None)
5583 5583 isinternals.append(extensions.ismoduleinternal(module))
5584 5584 fn = fm.nested("extensions")
5585 5585 if names:
5586 5586 namefmt = " %%-%ds " % max(len(n) for n in names)
5587 5587 places = [_("external"), _("internal")]
5588 5588 for n, v, p in zip(names, vers, isinternals):
5589 5589 fn.startitem()
5590 5590 fn.condwrite(ui.verbose, "name", namefmt, n)
5591 5591 if ui.verbose:
5592 5592 fn.plain("%s " % places[p])
5593 5593 fn.data(bundled=p)
5594 5594 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5595 5595 if ui.verbose:
5596 5596 fn.plain("\n")
5597 5597 fn.end()
5598 5598 fm.end()
5599 5599
5600 5600 def loadcmdtable(ui, name, cmdtable):
5601 5601 """Load command functions from specified cmdtable
5602 5602 """
5603 5603 overrides = [cmd for cmd in cmdtable if cmd in table]
5604 5604 if overrides:
5605 5605 ui.warn(_("extension '%s' overrides commands: %s\n")
5606 5606 % (name, " ".join(overrides)))
5607 5607 table.update(cmdtable)
@@ -1,2498 +1,2499
1 1 # debugcommands.py - command processing for debug* commands
2 2 #
3 3 # Copyright 2005-2016 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 codecs
11 11 import collections
12 12 import difflib
13 13 import errno
14 14 import operator
15 15 import os
16 16 import random
17 17 import socket
18 18 import ssl
19 19 import string
20 20 import sys
21 21 import tempfile
22 22 import time
23 23
24 24 from .i18n import _
25 25 from .node import (
26 26 bin,
27 27 hex,
28 28 nullhex,
29 29 nullid,
30 30 nullrev,
31 31 short,
32 32 )
33 33 from . import (
34 34 bundle2,
35 35 changegroup,
36 36 cmdutil,
37 37 color,
38 38 context,
39 39 dagparser,
40 40 dagutil,
41 41 encoding,
42 42 error,
43 43 exchange,
44 44 extensions,
45 45 filemerge,
46 46 fileset,
47 47 formatter,
48 48 hg,
49 49 localrepo,
50 50 lock as lockmod,
51 51 logcmdutil,
52 52 merge as mergemod,
53 53 obsolete,
54 54 obsutil,
55 55 phases,
56 56 policy,
57 57 pvec,
58 58 pycompat,
59 59 registrar,
60 60 repair,
61 61 revlog,
62 62 revset,
63 63 revsetlang,
64 64 scmutil,
65 65 setdiscovery,
66 66 simplemerge,
67 67 smartset,
68 68 sslutil,
69 69 streamclone,
70 70 templater,
71 71 treediscovery,
72 72 upgrade,
73 73 url as urlmod,
74 74 util,
75 75 vfs as vfsmod,
76 76 )
77 77
78 78 release = lockmod.release
79 79
80 80 command = registrar.command()
81 81
82 82 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
83 83 def debugancestor(ui, repo, *args):
84 84 """find the ancestor revision of two revisions in a given index"""
85 85 if len(args) == 3:
86 86 index, rev1, rev2 = args
87 87 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False), index)
88 88 lookup = r.lookup
89 89 elif len(args) == 2:
90 90 if not repo:
91 91 raise error.Abort(_('there is no Mercurial repository here '
92 92 '(.hg not found)'))
93 93 rev1, rev2 = args
94 94 r = repo.changelog
95 95 lookup = repo.lookup
96 96 else:
97 97 raise error.Abort(_('either two or three arguments required'))
98 98 a = r.ancestor(lookup(rev1), lookup(rev2))
99 99 ui.write('%d:%s\n' % (r.rev(a), hex(a)))
100 100
101 101 @command('debugapplystreamclonebundle', [], 'FILE')
102 102 def debugapplystreamclonebundle(ui, repo, fname):
103 103 """apply a stream clone bundle file"""
104 104 f = hg.openpath(ui, fname)
105 105 gen = exchange.readbundle(ui, f, fname)
106 106 gen.apply(repo)
107 107
108 108 @command('debugbuilddag',
109 109 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
110 110 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
111 111 ('n', 'new-file', None, _('add new file at each rev'))],
112 112 _('[OPTION]... [TEXT]'))
113 113 def debugbuilddag(ui, repo, text=None,
114 114 mergeable_file=False,
115 115 overwritten_file=False,
116 116 new_file=False):
117 117 """builds a repo with a given DAG from scratch in the current empty repo
118 118
119 119 The description of the DAG is read from stdin if not given on the
120 120 command line.
121 121
122 122 Elements:
123 123
124 124 - "+n" is a linear run of n nodes based on the current default parent
125 125 - "." is a single node based on the current default parent
126 126 - "$" resets the default parent to null (implied at the start);
127 127 otherwise the default parent is always the last node created
128 128 - "<p" sets the default parent to the backref p
129 129 - "*p" is a fork at parent p, which is a backref
130 130 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
131 131 - "/p2" is a merge of the preceding node and p2
132 132 - ":tag" defines a local tag for the preceding node
133 133 - "@branch" sets the named branch for subsequent nodes
134 134 - "#...\\n" is a comment up to the end of the line
135 135
136 136 Whitespace between the above elements is ignored.
137 137
138 138 A backref is either
139 139
140 140 - a number n, which references the node curr-n, where curr is the current
141 141 node, or
142 142 - the name of a local tag you placed earlier using ":tag", or
143 143 - empty to denote the default parent.
144 144
145 145 All string valued-elements are either strictly alphanumeric, or must
146 146 be enclosed in double quotes ("..."), with "\\" as escape character.
147 147 """
148 148
149 149 if text is None:
150 150 ui.status(_("reading DAG from stdin\n"))
151 151 text = ui.fin.read()
152 152
153 153 cl = repo.changelog
154 154 if len(cl) > 0:
155 155 raise error.Abort(_('repository is not empty'))
156 156
157 157 # determine number of revs in DAG
158 158 total = 0
159 159 for type, data in dagparser.parsedag(text):
160 160 if type == 'n':
161 161 total += 1
162 162
163 163 if mergeable_file:
164 164 linesperrev = 2
165 165 # make a file with k lines per rev
166 166 initialmergedlines = ['%d' % i for i in xrange(0, total * linesperrev)]
167 167 initialmergedlines.append("")
168 168
169 169 tags = []
170 170
171 171 wlock = lock = tr = None
172 172 try:
173 173 wlock = repo.wlock()
174 174 lock = repo.lock()
175 175 tr = repo.transaction("builddag")
176 176
177 177 at = -1
178 178 atbranch = 'default'
179 179 nodeids = []
180 180 id = 0
181 181 ui.progress(_('building'), id, unit=_('revisions'), total=total)
182 182 for type, data in dagparser.parsedag(text):
183 183 if type == 'n':
184 184 ui.note(('node %s\n' % pycompat.bytestr(data)))
185 185 id, ps = data
186 186
187 187 files = []
188 188 filecontent = {}
189 189
190 190 p2 = None
191 191 if mergeable_file:
192 192 fn = "mf"
193 193 p1 = repo[ps[0]]
194 194 if len(ps) > 1:
195 195 p2 = repo[ps[1]]
196 196 pa = p1.ancestor(p2)
197 197 base, local, other = [x[fn].data() for x in (pa, p1,
198 198 p2)]
199 199 m3 = simplemerge.Merge3Text(base, local, other)
200 200 ml = [l.strip() for l in m3.merge_lines()]
201 201 ml.append("")
202 202 elif at > 0:
203 203 ml = p1[fn].data().split("\n")
204 204 else:
205 205 ml = initialmergedlines
206 206 ml[id * linesperrev] += " r%i" % id
207 207 mergedtext = "\n".join(ml)
208 208 files.append(fn)
209 209 filecontent[fn] = mergedtext
210 210
211 211 if overwritten_file:
212 212 fn = "of"
213 213 files.append(fn)
214 214 filecontent[fn] = "r%i\n" % id
215 215
216 216 if new_file:
217 217 fn = "nf%i" % id
218 218 files.append(fn)
219 219 filecontent[fn] = "r%i\n" % id
220 220 if len(ps) > 1:
221 221 if not p2:
222 222 p2 = repo[ps[1]]
223 223 for fn in p2:
224 224 if fn.startswith("nf"):
225 225 files.append(fn)
226 226 filecontent[fn] = p2[fn].data()
227 227
228 228 def fctxfn(repo, cx, path):
229 229 if path in filecontent:
230 230 return context.memfilectx(repo, cx, path,
231 231 filecontent[path])
232 232 return None
233 233
234 234 if len(ps) == 0 or ps[0] < 0:
235 235 pars = [None, None]
236 236 elif len(ps) == 1:
237 237 pars = [nodeids[ps[0]], None]
238 238 else:
239 239 pars = [nodeids[p] for p in ps]
240 240 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
241 241 date=(id, 0),
242 242 user="debugbuilddag",
243 243 extra={'branch': atbranch})
244 244 nodeid = repo.commitctx(cx)
245 245 nodeids.append(nodeid)
246 246 at = id
247 247 elif type == 'l':
248 248 id, name = data
249 249 ui.note(('tag %s\n' % name))
250 250 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
251 251 elif type == 'a':
252 252 ui.note(('branch %s\n' % data))
253 253 atbranch = data
254 254 ui.progress(_('building'), id, unit=_('revisions'), total=total)
255 255 tr.close()
256 256
257 257 if tags:
258 258 repo.vfs.write("localtags", "".join(tags))
259 259 finally:
260 260 ui.progress(_('building'), None)
261 261 release(tr, lock, wlock)
262 262
263 263 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
264 264 indent_string = ' ' * indent
265 265 if all:
266 266 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
267 267 % indent_string)
268 268
269 269 def showchunks(named):
270 270 ui.write("\n%s%s\n" % (indent_string, named))
271 271 for deltadata in gen.deltaiter():
272 272 node, p1, p2, cs, deltabase, delta, flags = deltadata
273 273 ui.write("%s%s %s %s %s %s %d\n" %
274 274 (indent_string, hex(node), hex(p1), hex(p2),
275 275 hex(cs), hex(deltabase), len(delta)))
276 276
277 277 chunkdata = gen.changelogheader()
278 278 showchunks("changelog")
279 279 chunkdata = gen.manifestheader()
280 280 showchunks("manifest")
281 281 for chunkdata in iter(gen.filelogheader, {}):
282 282 fname = chunkdata['filename']
283 283 showchunks(fname)
284 284 else:
285 285 if isinstance(gen, bundle2.unbundle20):
286 286 raise error.Abort(_('use debugbundle2 for this file'))
287 287 chunkdata = gen.changelogheader()
288 288 for deltadata in gen.deltaiter():
289 289 node, p1, p2, cs, deltabase, delta, flags = deltadata
290 290 ui.write("%s%s\n" % (indent_string, hex(node)))
291 291
292 292 def _debugobsmarkers(ui, part, indent=0, **opts):
293 293 """display version and markers contained in 'data'"""
294 294 opts = pycompat.byteskwargs(opts)
295 295 data = part.read()
296 296 indent_string = ' ' * indent
297 297 try:
298 298 version, markers = obsolete._readmarkers(data)
299 299 except error.UnknownVersion as exc:
300 300 msg = "%sunsupported version: %s (%d bytes)\n"
301 301 msg %= indent_string, exc.version, len(data)
302 302 ui.write(msg)
303 303 else:
304 304 msg = "%sversion: %d (%d bytes)\n"
305 305 msg %= indent_string, version, len(data)
306 306 ui.write(msg)
307 307 fm = ui.formatter('debugobsolete', opts)
308 308 for rawmarker in sorted(markers):
309 309 m = obsutil.marker(None, rawmarker)
310 310 fm.startitem()
311 311 fm.plain(indent_string)
312 312 cmdutil.showmarker(fm, m)
313 313 fm.end()
314 314
315 315 def _debugphaseheads(ui, data, indent=0):
316 316 """display version and markers contained in 'data'"""
317 317 indent_string = ' ' * indent
318 318 headsbyphase = phases.binarydecode(data)
319 319 for phase in phases.allphases:
320 320 for head in headsbyphase[phase]:
321 321 ui.write(indent_string)
322 322 ui.write('%s %s\n' % (hex(head), phases.phasenames[phase]))
323 323
324 324 def _quasirepr(thing):
325 325 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
326 326 return '{%s}' % (
327 327 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing)))
328 328 return pycompat.bytestr(repr(thing))
329 329
330 330 def _debugbundle2(ui, gen, all=None, **opts):
331 331 """lists the contents of a bundle2"""
332 332 if not isinstance(gen, bundle2.unbundle20):
333 333 raise error.Abort(_('not a bundle2 file'))
334 334 ui.write(('Stream params: %s\n' % _quasirepr(gen.params)))
335 335 parttypes = opts.get(r'part_type', [])
336 336 for part in gen.iterparts():
337 337 if parttypes and part.type not in parttypes:
338 338 continue
339 339 ui.write('%s -- %s\n' % (part.type, _quasirepr(part.params)))
340 340 if part.type == 'changegroup':
341 341 version = part.params.get('version', '01')
342 342 cg = changegroup.getunbundler(version, part, 'UN')
343 343 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
344 344 if part.type == 'obsmarkers':
345 345 _debugobsmarkers(ui, part, indent=4, **opts)
346 346 if part.type == 'phase-heads':
347 347 _debugphaseheads(ui, part, indent=4)
348 348
349 349 @command('debugbundle',
350 350 [('a', 'all', None, _('show all details')),
351 351 ('', 'part-type', [], _('show only the named part type')),
352 352 ('', 'spec', None, _('print the bundlespec of the bundle'))],
353 353 _('FILE'),
354 354 norepo=True)
355 355 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
356 356 """lists the contents of a bundle"""
357 357 with hg.openpath(ui, bundlepath) as f:
358 358 if spec:
359 359 spec = exchange.getbundlespec(ui, f)
360 360 ui.write('%s\n' % spec)
361 361 return
362 362
363 363 gen = exchange.readbundle(ui, f, bundlepath)
364 364 if isinstance(gen, bundle2.unbundle20):
365 365 return _debugbundle2(ui, gen, all=all, **opts)
366 366 _debugchangegroup(ui, gen, all=all, **opts)
367 367
368 368 @command('debugcapabilities',
369 369 [], _('PATH'),
370 370 norepo=True)
371 371 def debugcapabilities(ui, path, **opts):
372 372 """lists the capabilities of a remote peer"""
373 373 opts = pycompat.byteskwargs(opts)
374 374 peer = hg.peer(ui, opts, path)
375 375 caps = peer.capabilities()
376 376 ui.write(('Main capabilities:\n'))
377 377 for c in sorted(caps):
378 378 ui.write((' %s\n') % c)
379 379 b2caps = bundle2.bundle2caps(peer)
380 380 if b2caps:
381 381 ui.write(('Bundle2 capabilities:\n'))
382 382 for key, values in sorted(b2caps.iteritems()):
383 383 ui.write((' %s\n') % key)
384 384 for v in values:
385 385 ui.write((' %s\n') % v)
386 386
387 387 @command('debugcheckstate', [], '')
388 388 def debugcheckstate(ui, repo):
389 389 """validate the correctness of the current dirstate"""
390 390 parent1, parent2 = repo.dirstate.parents()
391 391 m1 = repo[parent1].manifest()
392 392 m2 = repo[parent2].manifest()
393 393 errors = 0
394 394 for f in repo.dirstate:
395 395 state = repo.dirstate[f]
396 396 if state in "nr" and f not in m1:
397 397 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
398 398 errors += 1
399 399 if state in "a" and f in m1:
400 400 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
401 401 errors += 1
402 402 if state in "m" and f not in m1 and f not in m2:
403 403 ui.warn(_("%s in state %s, but not in either manifest\n") %
404 404 (f, state))
405 405 errors += 1
406 406 for f in m1:
407 407 state = repo.dirstate[f]
408 408 if state not in "nrm":
409 409 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
410 410 errors += 1
411 411 if errors:
412 412 error = _(".hg/dirstate inconsistent with current parent's manifest")
413 413 raise error.Abort(error)
414 414
415 415 @command('debugcolor',
416 416 [('', 'style', None, _('show all configured styles'))],
417 417 'hg debugcolor')
418 418 def debugcolor(ui, repo, **opts):
419 419 """show available color, effects or style"""
420 420 ui.write(('color mode: %s\n') % ui._colormode)
421 421 if opts.get(r'style'):
422 422 return _debugdisplaystyle(ui)
423 423 else:
424 424 return _debugdisplaycolor(ui)
425 425
426 426 def _debugdisplaycolor(ui):
427 427 ui = ui.copy()
428 428 ui._styles.clear()
429 429 for effect in color._activeeffects(ui).keys():
430 430 ui._styles[effect] = effect
431 431 if ui._terminfoparams:
432 432 for k, v in ui.configitems('color'):
433 433 if k.startswith('color.'):
434 434 ui._styles[k] = k[6:]
435 435 elif k.startswith('terminfo.'):
436 436 ui._styles[k] = k[9:]
437 437 ui.write(_('available colors:\n'))
438 438 # sort label with a '_' after the other to group '_background' entry.
439 439 items = sorted(ui._styles.items(),
440 440 key=lambda i: ('_' in i[0], i[0], i[1]))
441 441 for colorname, label in items:
442 442 ui.write(('%s\n') % colorname, label=label)
443 443
444 444 def _debugdisplaystyle(ui):
445 445 ui.write(_('available style:\n'))
446 446 width = max(len(s) for s in ui._styles)
447 447 for label, effects in sorted(ui._styles.items()):
448 448 ui.write('%s' % label, label=label)
449 449 if effects:
450 450 # 50
451 451 ui.write(': ')
452 452 ui.write(' ' * (max(0, width - len(label))))
453 453 ui.write(', '.join(ui.label(e, e) for e in effects.split()))
454 454 ui.write('\n')
455 455
456 456 @command('debugcreatestreamclonebundle', [], 'FILE')
457 457 def debugcreatestreamclonebundle(ui, repo, fname):
458 458 """create a stream clone bundle file
459 459
460 460 Stream bundles are special bundles that are essentially archives of
461 461 revlog files. They are commonly used for cloning very quickly.
462 462 """
463 463 # TODO we may want to turn this into an abort when this functionality
464 464 # is moved into `hg bundle`.
465 465 if phases.hassecret(repo):
466 466 ui.warn(_('(warning: stream clone bundle will contain secret '
467 467 'revisions)\n'))
468 468
469 469 requirements, gen = streamclone.generatebundlev1(repo)
470 470 changegroup.writechunks(ui, gen, fname)
471 471
472 472 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
473 473
474 474 @command('debugdag',
475 475 [('t', 'tags', None, _('use tags as labels')),
476 476 ('b', 'branches', None, _('annotate with branch names')),
477 477 ('', 'dots', None, _('use dots for runs')),
478 478 ('s', 'spaces', None, _('separate elements by spaces'))],
479 479 _('[OPTION]... [FILE [REV]...]'),
480 480 optionalrepo=True)
481 481 def debugdag(ui, repo, file_=None, *revs, **opts):
482 482 """format the changelog or an index DAG as a concise textual description
483 483
484 484 If you pass a revlog index, the revlog's DAG is emitted. If you list
485 485 revision numbers, they get labeled in the output as rN.
486 486
487 487 Otherwise, the changelog DAG of the current repo is emitted.
488 488 """
489 489 spaces = opts.get(r'spaces')
490 490 dots = opts.get(r'dots')
491 491 if file_:
492 492 rlog = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
493 493 file_)
494 494 revs = set((int(r) for r in revs))
495 495 def events():
496 496 for r in rlog:
497 497 yield 'n', (r, list(p for p in rlog.parentrevs(r)
498 498 if p != -1))
499 499 if r in revs:
500 500 yield 'l', (r, "r%i" % r)
501 501 elif repo:
502 502 cl = repo.changelog
503 503 tags = opts.get(r'tags')
504 504 branches = opts.get(r'branches')
505 505 if tags:
506 506 labels = {}
507 507 for l, n in repo.tags().items():
508 508 labels.setdefault(cl.rev(n), []).append(l)
509 509 def events():
510 510 b = "default"
511 511 for r in cl:
512 512 if branches:
513 513 newb = cl.read(cl.node(r))[5]['branch']
514 514 if newb != b:
515 515 yield 'a', newb
516 516 b = newb
517 517 yield 'n', (r, list(p for p in cl.parentrevs(r)
518 518 if p != -1))
519 519 if tags:
520 520 ls = labels.get(r)
521 521 if ls:
522 522 for l in ls:
523 523 yield 'l', (r, l)
524 524 else:
525 525 raise error.Abort(_('need repo for changelog dag'))
526 526
527 527 for line in dagparser.dagtextlines(events(),
528 528 addspaces=spaces,
529 529 wraplabels=True,
530 530 wrapannotations=True,
531 531 wrapnonlinear=dots,
532 532 usedots=dots,
533 533 maxlinewidth=70):
534 534 ui.write(line)
535 535 ui.write("\n")
536 536
537 537 @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
538 538 def debugdata(ui, repo, file_, rev=None, **opts):
539 539 """dump the contents of a data file revision"""
540 540 opts = pycompat.byteskwargs(opts)
541 541 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
542 542 if rev is not None:
543 543 raise error.CommandError('debugdata', _('invalid arguments'))
544 544 file_, rev = None, file_
545 545 elif rev is None:
546 546 raise error.CommandError('debugdata', _('invalid arguments'))
547 547 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
548 548 try:
549 549 ui.write(r.revision(r.lookup(rev), raw=True))
550 550 except KeyError:
551 551 raise error.Abort(_('invalid revision identifier %s') % rev)
552 552
553 553 @command('debugdate',
554 554 [('e', 'extended', None, _('try extended date formats'))],
555 555 _('[-e] DATE [RANGE]'),
556 556 norepo=True, optionalrepo=True)
557 557 def debugdate(ui, date, range=None, **opts):
558 558 """parse and display a date"""
559 559 if opts[r"extended"]:
560 560 d = util.parsedate(date, util.extendeddateformats)
561 561 else:
562 562 d = util.parsedate(date)
563 563 ui.write(("internal: %d %d\n") % d)
564 564 ui.write(("standard: %s\n") % util.datestr(d))
565 565 if range:
566 566 m = util.matchdate(range)
567 567 ui.write(("match: %s\n") % m(d[0]))
568 568
569 569 @command('debugdeltachain',
570 570 cmdutil.debugrevlogopts + cmdutil.formatteropts,
571 571 _('-c|-m|FILE'),
572 572 optionalrepo=True)
573 573 def debugdeltachain(ui, repo, file_=None, **opts):
574 574 """dump information about delta chains in a revlog
575 575
576 576 Output can be templatized. Available template keywords are:
577 577
578 578 :``rev``: revision number
579 579 :``chainid``: delta chain identifier (numbered by unique base)
580 580 :``chainlen``: delta chain length to this revision
581 581 :``prevrev``: previous revision in delta chain
582 582 :``deltatype``: role of delta / how it was computed
583 583 :``compsize``: compressed size of revision
584 584 :``uncompsize``: uncompressed size of revision
585 585 :``chainsize``: total size of compressed revisions in chain
586 586 :``chainratio``: total chain size divided by uncompressed revision size
587 587 (new delta chains typically start at ratio 2.00)
588 588 :``lindist``: linear distance from base revision in delta chain to end
589 589 of this revision
590 590 :``extradist``: total size of revisions not part of this delta chain from
591 591 base of delta chain to end of this revision; a measurement
592 592 of how much extra data we need to read/seek across to read
593 593 the delta chain for this revision
594 594 :``extraratio``: extradist divided by chainsize; another representation of
595 595 how much unrelated data is needed to load this delta chain
596 596
597 597 If the repository is configured to use the sparse read, additional keywords
598 598 are available:
599 599
600 600 :``readsize``: total size of data read from the disk for a revision
601 601 (sum of the sizes of all the blocks)
602 602 :``largestblock``: size of the largest block of data read from the disk
603 603 :``readdensity``: density of useful bytes in the data read from the disk
604 604 :``srchunks``: in how many data hunks the whole revision would be read
605 605
606 606 The sparse read can be enabled with experimental.sparse-read = True
607 607 """
608 608 opts = pycompat.byteskwargs(opts)
609 609 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
610 610 index = r.index
611 611 generaldelta = r.version & revlog.FLAG_GENERALDELTA
612 612 withsparseread = getattr(r, '_withsparseread', False)
613 613
614 614 def revinfo(rev):
615 615 e = index[rev]
616 616 compsize = e[1]
617 617 uncompsize = e[2]
618 618 chainsize = 0
619 619
620 620 if generaldelta:
621 621 if e[3] == e[5]:
622 622 deltatype = 'p1'
623 623 elif e[3] == e[6]:
624 624 deltatype = 'p2'
625 625 elif e[3] == rev - 1:
626 626 deltatype = 'prev'
627 627 elif e[3] == rev:
628 628 deltatype = 'base'
629 629 else:
630 630 deltatype = 'other'
631 631 else:
632 632 if e[3] == rev:
633 633 deltatype = 'base'
634 634 else:
635 635 deltatype = 'prev'
636 636
637 637 chain = r._deltachain(rev)[0]
638 638 for iterrev in chain:
639 639 e = index[iterrev]
640 640 chainsize += e[1]
641 641
642 642 return compsize, uncompsize, deltatype, chain, chainsize
643 643
644 644 fm = ui.formatter('debugdeltachain', opts)
645 645
646 646 fm.plain(' rev chain# chainlen prev delta '
647 647 'size rawsize chainsize ratio lindist extradist '
648 648 'extraratio')
649 649 if withsparseread:
650 650 fm.plain(' readsize largestblk rddensity srchunks')
651 651 fm.plain('\n')
652 652
653 653 chainbases = {}
654 654 for rev in r:
655 655 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
656 656 chainbase = chain[0]
657 657 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
658 658 start = r.start
659 659 length = r.length
660 660 basestart = start(chainbase)
661 661 revstart = start(rev)
662 662 lineardist = revstart + comp - basestart
663 663 extradist = lineardist - chainsize
664 664 try:
665 665 prevrev = chain[-2]
666 666 except IndexError:
667 667 prevrev = -1
668 668
669 669 chainratio = float(chainsize) / float(uncomp)
670 670 extraratio = float(extradist) / float(chainsize)
671 671
672 672 fm.startitem()
673 673 fm.write('rev chainid chainlen prevrev deltatype compsize '
674 674 'uncompsize chainsize chainratio lindist extradist '
675 675 'extraratio',
676 676 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
677 677 rev, chainid, len(chain), prevrev, deltatype, comp,
678 678 uncomp, chainsize, chainratio, lineardist, extradist,
679 679 extraratio,
680 680 rev=rev, chainid=chainid, chainlen=len(chain),
681 681 prevrev=prevrev, deltatype=deltatype, compsize=comp,
682 682 uncompsize=uncomp, chainsize=chainsize,
683 683 chainratio=chainratio, lindist=lineardist,
684 684 extradist=extradist, extraratio=extraratio)
685 685 if withsparseread:
686 686 readsize = 0
687 687 largestblock = 0
688 688 srchunks = 0
689 689
690 690 for revschunk in revlog._slicechunk(r, chain):
691 691 srchunks += 1
692 692 blkend = start(revschunk[-1]) + length(revschunk[-1])
693 693 blksize = blkend - start(revschunk[0])
694 694
695 695 readsize += blksize
696 696 if largestblock < blksize:
697 697 largestblock = blksize
698 698
699 699 readdensity = float(chainsize) / float(readsize)
700 700
701 701 fm.write('readsize largestblock readdensity srchunks',
702 702 ' %10d %10d %9.5f %8d',
703 703 readsize, largestblock, readdensity, srchunks,
704 704 readsize=readsize, largestblock=largestblock,
705 705 readdensity=readdensity, srchunks=srchunks)
706 706
707 707 fm.plain('\n')
708 708
709 709 fm.end()
710 710
711 711 @command('debugdirstate|debugstate',
712 712 [('', 'nodates', None, _('do not display the saved mtime')),
713 713 ('', 'datesort', None, _('sort by saved mtime'))],
714 714 _('[OPTION]...'))
715 715 def debugstate(ui, repo, **opts):
716 716 """show the contents of the current dirstate"""
717 717
718 718 nodates = opts.get(r'nodates')
719 719 datesort = opts.get(r'datesort')
720 720
721 721 timestr = ""
722 722 if datesort:
723 723 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
724 724 else:
725 725 keyfunc = None # sort by filename
726 726 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
727 727 if ent[3] == -1:
728 728 timestr = 'unset '
729 729 elif nodates:
730 730 timestr = 'set '
731 731 else:
732 732 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
733 733 time.localtime(ent[3]))
734 734 timestr = encoding.strtolocal(timestr)
735 735 if ent[1] & 0o20000:
736 736 mode = 'lnk'
737 737 else:
738 738 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
739 739 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
740 740 for f in repo.dirstate.copies():
741 741 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
742 742
743 743 @command('debugdiscovery',
744 744 [('', 'old', None, _('use old-style discovery')),
745 745 ('', 'nonheads', None,
746 746 _('use old-style discovery with non-heads included')),
747 747 ('', 'rev', [], 'restrict discovery to this set of revs'),
748 748 ] + cmdutil.remoteopts,
749 749 _('[--rev REV] [OTHER]'))
750 750 def debugdiscovery(ui, repo, remoteurl="default", **opts):
751 751 """runs the changeset discovery protocol in isolation"""
752 752 opts = pycompat.byteskwargs(opts)
753 753 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
754 754 remote = hg.peer(repo, opts, remoteurl)
755 755 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
756 756
757 757 # make sure tests are repeatable
758 758 random.seed(12323)
759 759
760 760 def doit(pushedrevs, remoteheads, remote=remote):
761 761 if opts.get('old'):
762 762 if not util.safehasattr(remote, 'branches'):
763 763 # enable in-client legacy support
764 764 remote = localrepo.locallegacypeer(remote.local())
765 765 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
766 766 force=True)
767 767 common = set(common)
768 768 if not opts.get('nonheads'):
769 769 ui.write(("unpruned common: %s\n") %
770 770 " ".join(sorted(short(n) for n in common)))
771 771 dag = dagutil.revlogdag(repo.changelog)
772 772 all = dag.ancestorset(dag.internalizeall(common))
773 773 common = dag.externalizeall(dag.headsetofconnecteds(all))
774 774 else:
775 775 nodes = None
776 776 if pushedrevs:
777 777 revs = scmutil.revrange(repo, pushedrevs)
778 778 nodes = [repo[r].node() for r in revs]
779 779 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote,
780 780 ancestorsof=nodes)
781 781 common = set(common)
782 782 rheads = set(hds)
783 783 lheads = set(repo.heads())
784 784 ui.write(("common heads: %s\n") %
785 785 " ".join(sorted(short(n) for n in common)))
786 786 if lheads <= common:
787 787 ui.write(("local is subset\n"))
788 788 elif rheads <= common:
789 789 ui.write(("remote is subset\n"))
790 790
791 791 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
792 792 localrevs = opts['rev']
793 793 doit(localrevs, remoterevs)
794 794
795 795 _chunksize = 4 << 10
796 796
797 797 @command('debugdownload',
798 798 [
799 799 ('o', 'output', '', _('path')),
800 800 ],
801 801 optionalrepo=True)
802 802 def debugdownload(ui, repo, url, output=None, **opts):
803 803 """download a resource using Mercurial logic and config
804 804 """
805 805 fh = urlmod.open(ui, url, output)
806 806
807 807 dest = ui
808 808 if output:
809 809 dest = open(output, "wb", _chunksize)
810 810 try:
811 811 data = fh.read(_chunksize)
812 812 while data:
813 813 dest.write(data)
814 814 data = fh.read(_chunksize)
815 815 finally:
816 816 if output:
817 817 dest.close()
818 818
819 819 @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
820 820 def debugextensions(ui, **opts):
821 821 '''show information about active extensions'''
822 822 opts = pycompat.byteskwargs(opts)
823 823 exts = extensions.extensions(ui)
824 824 hgver = util.version()
825 825 fm = ui.formatter('debugextensions', opts)
826 826 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
827 827 isinternal = extensions.ismoduleinternal(extmod)
828 828 extsource = pycompat.fsencode(extmod.__file__)
829 829 if isinternal:
830 830 exttestedwith = [] # never expose magic string to users
831 831 else:
832 832 exttestedwith = getattr(extmod, 'testedwith', '').split()
833 833 extbuglink = getattr(extmod, 'buglink', None)
834 834
835 835 fm.startitem()
836 836
837 837 if ui.quiet or ui.verbose:
838 838 fm.write('name', '%s\n', extname)
839 839 else:
840 840 fm.write('name', '%s', extname)
841 841 if isinternal or hgver in exttestedwith:
842 842 fm.plain('\n')
843 843 elif not exttestedwith:
844 844 fm.plain(_(' (untested!)\n'))
845 845 else:
846 846 lasttestedversion = exttestedwith[-1]
847 847 fm.plain(' (%s!)\n' % lasttestedversion)
848 848
849 849 fm.condwrite(ui.verbose and extsource, 'source',
850 850 _(' location: %s\n'), extsource or "")
851 851
852 852 if ui.verbose:
853 853 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
854 854 fm.data(bundled=isinternal)
855 855
856 856 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
857 857 _(' tested with: %s\n'),
858 858 fm.formatlist(exttestedwith, name='ver'))
859 859
860 860 fm.condwrite(ui.verbose and extbuglink, 'buglink',
861 861 _(' bug reporting: %s\n'), extbuglink or "")
862 862
863 863 fm.end()
864 864
865 865 @command('debugfileset',
866 866 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
867 867 _('[-r REV] FILESPEC'))
868 868 def debugfileset(ui, repo, expr, **opts):
869 869 '''parse and apply a fileset specification'''
870 870 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
871 871 if ui.verbose:
872 872 tree = fileset.parse(expr)
873 873 ui.note(fileset.prettyformat(tree), "\n")
874 874
875 875 for f in ctx.getfileset(expr):
876 876 ui.write("%s\n" % f)
877 877
878 878 @command('debugformat',
879 879 [] + cmdutil.formatteropts,
880 880 _(''))
881 881 def debugformat(ui, repo, **opts):
882 882 """display format information about the current repository
883 883
884 884 Use --verbose to get extra information about current config value and
885 885 Mercurial default."""
886 886 opts = pycompat.byteskwargs(opts)
887 887 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
888 888 maxvariantlength = max(len('format-variant'), maxvariantlength)
889 889
890 890 def makeformatname(name):
891 891 return '%s:' + (' ' * (maxvariantlength - len(name)))
892 892
893 893 fm = ui.formatter('debugformat', opts)
894 894 if fm.isplain():
895 895 def formatvalue(value):
896 896 if util.safehasattr(value, 'startswith'):
897 897 return value
898 898 if value:
899 899 return 'yes'
900 900 else:
901 901 return 'no'
902 902 else:
903 903 formatvalue = pycompat.identity
904 904
905 905 fm.plain('format-variant')
906 906 fm.plain(' ' * (maxvariantlength - len('format-variant')))
907 907 fm.plain(' repo')
908 908 if ui.verbose:
909 909 fm.plain(' config default')
910 910 fm.plain('\n')
911 911 for fv in upgrade.allformatvariant:
912 912 fm.startitem()
913 913 repovalue = fv.fromrepo(repo)
914 914 configvalue = fv.fromconfig(repo)
915 915
916 916 if repovalue != configvalue:
917 917 namelabel = 'formatvariant.name.mismatchconfig'
918 918 repolabel = 'formatvariant.repo.mismatchconfig'
919 919 elif repovalue != fv.default:
920 920 namelabel = 'formatvariant.name.mismatchdefault'
921 921 repolabel = 'formatvariant.repo.mismatchdefault'
922 922 else:
923 923 namelabel = 'formatvariant.name.uptodate'
924 924 repolabel = 'formatvariant.repo.uptodate'
925 925
926 926 fm.write('name', makeformatname(fv.name), fv.name,
927 927 label=namelabel)
928 928 fm.write('repo', ' %3s', formatvalue(repovalue),
929 929 label=repolabel)
930 930 if fv.default != configvalue:
931 931 configlabel = 'formatvariant.config.special'
932 932 else:
933 933 configlabel = 'formatvariant.config.default'
934 934 fm.condwrite(ui.verbose, 'config', ' %6s', formatvalue(configvalue),
935 935 label=configlabel)
936 936 fm.condwrite(ui.verbose, 'default', ' %7s', formatvalue(fv.default),
937 937 label='formatvariant.default')
938 938 fm.plain('\n')
939 939 fm.end()
940 940
941 941 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
942 942 def debugfsinfo(ui, path="."):
943 943 """show information detected about current filesystem"""
944 944 ui.write(('path: %s\n') % path)
945 945 ui.write(('mounted on: %s\n') % (util.getfsmountpoint(path) or '(unknown)'))
946 946 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
947 947 ui.write(('fstype: %s\n') % (util.getfstype(path) or '(unknown)'))
948 948 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
949 949 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
950 950 casesensitive = '(unknown)'
951 951 try:
952 952 with tempfile.NamedTemporaryFile(prefix='.debugfsinfo', dir=path) as f:
953 953 casesensitive = util.fscasesensitive(f.name) and 'yes' or 'no'
954 954 except OSError:
955 955 pass
956 956 ui.write(('case-sensitive: %s\n') % casesensitive)
957 957
958 958 @command('debuggetbundle',
959 959 [('H', 'head', [], _('id of head node'), _('ID')),
960 960 ('C', 'common', [], _('id of common node'), _('ID')),
961 961 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
962 962 _('REPO FILE [-H|-C ID]...'),
963 963 norepo=True)
964 964 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
965 965 """retrieves a bundle from a repo
966 966
967 967 Every ID must be a full-length hex node id string. Saves the bundle to the
968 968 given file.
969 969 """
970 970 opts = pycompat.byteskwargs(opts)
971 971 repo = hg.peer(ui, opts, repopath)
972 972 if not repo.capable('getbundle'):
973 973 raise error.Abort("getbundle() not supported by target repository")
974 974 args = {}
975 975 if common:
976 976 args[r'common'] = [bin(s) for s in common]
977 977 if head:
978 978 args[r'heads'] = [bin(s) for s in head]
979 979 # TODO: get desired bundlecaps from command line.
980 980 args[r'bundlecaps'] = None
981 981 bundle = repo.getbundle('debug', **args)
982 982
983 983 bundletype = opts.get('type', 'bzip2').lower()
984 984 btypes = {'none': 'HG10UN',
985 985 'bzip2': 'HG10BZ',
986 986 'gzip': 'HG10GZ',
987 987 'bundle2': 'HG20'}
988 988 bundletype = btypes.get(bundletype)
989 989 if bundletype not in bundle2.bundletypes:
990 990 raise error.Abort(_('unknown bundle type specified with --type'))
991 991 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
992 992
993 993 @command('debugignore', [], '[FILE]')
994 994 def debugignore(ui, repo, *files, **opts):
995 995 """display the combined ignore pattern and information about ignored files
996 996
997 997 With no argument display the combined ignore pattern.
998 998
999 999 Given space separated file names, shows if the given file is ignored and
1000 1000 if so, show the ignore rule (file and line number) that matched it.
1001 1001 """
1002 1002 ignore = repo.dirstate._ignore
1003 1003 if not files:
1004 1004 # Show all the patterns
1005 1005 ui.write("%s\n" % repr(ignore))
1006 1006 else:
1007 1007 m = scmutil.match(repo[None], pats=files)
1008 1008 for f in m.files():
1009 1009 nf = util.normpath(f)
1010 1010 ignored = None
1011 1011 ignoredata = None
1012 1012 if nf != '.':
1013 1013 if ignore(nf):
1014 1014 ignored = nf
1015 1015 ignoredata = repo.dirstate._ignorefileandline(nf)
1016 1016 else:
1017 1017 for p in util.finddirs(nf):
1018 1018 if ignore(p):
1019 1019 ignored = p
1020 1020 ignoredata = repo.dirstate._ignorefileandline(p)
1021 1021 break
1022 1022 if ignored:
1023 1023 if ignored == nf:
1024 1024 ui.write(_("%s is ignored\n") % m.uipath(f))
1025 1025 else:
1026 1026 ui.write(_("%s is ignored because of "
1027 1027 "containing folder %s\n")
1028 1028 % (m.uipath(f), ignored))
1029 1029 ignorefile, lineno, line = ignoredata
1030 1030 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1031 1031 % (ignorefile, lineno, line))
1032 1032 else:
1033 1033 ui.write(_("%s is not ignored\n") % m.uipath(f))
1034 1034
1035 1035 @command('debugindex', cmdutil.debugrevlogopts +
1036 1036 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1037 1037 _('[-f FORMAT] -c|-m|FILE'),
1038 1038 optionalrepo=True)
1039 1039 def debugindex(ui, repo, file_=None, **opts):
1040 1040 """dump the contents of an index file"""
1041 1041 opts = pycompat.byteskwargs(opts)
1042 1042 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1043 1043 format = opts.get('format', 0)
1044 1044 if format not in (0, 1):
1045 1045 raise error.Abort(_("unknown format %d") % format)
1046 1046
1047 1047 generaldelta = r.version & revlog.FLAG_GENERALDELTA
1048 1048 if generaldelta:
1049 1049 basehdr = ' delta'
1050 1050 else:
1051 1051 basehdr = ' base'
1052 1052
1053 1053 if ui.debugflag:
1054 1054 shortfn = hex
1055 1055 else:
1056 1056 shortfn = short
1057 1057
1058 1058 # There might not be anything in r, so have a sane default
1059 1059 idlen = 12
1060 1060 for i in r:
1061 1061 idlen = len(shortfn(r.node(i)))
1062 1062 break
1063 1063
1064 1064 if format == 0:
1065 1065 ui.write((" rev offset length " + basehdr + " linkrev"
1066 1066 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
1067 1067 elif format == 1:
1068 1068 ui.write((" rev flag offset length"
1069 1069 " size " + basehdr + " link p1 p2"
1070 1070 " %s\n") % "nodeid".rjust(idlen))
1071 1071
1072 1072 for i in r:
1073 1073 node = r.node(i)
1074 1074 if generaldelta:
1075 1075 base = r.deltaparent(i)
1076 1076 else:
1077 1077 base = r.chainbase(i)
1078 1078 if format == 0:
1079 1079 try:
1080 1080 pp = r.parents(node)
1081 1081 except Exception:
1082 1082 pp = [nullid, nullid]
1083 1083 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1084 1084 i, r.start(i), r.length(i), base, r.linkrev(i),
1085 1085 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
1086 1086 elif format == 1:
1087 1087 pr = r.parentrevs(i)
1088 1088 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1089 1089 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1090 1090 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
1091 1091
1092 1092 @command('debugindexdot', cmdutil.debugrevlogopts,
1093 1093 _('-c|-m|FILE'), optionalrepo=True)
1094 1094 def debugindexdot(ui, repo, file_=None, **opts):
1095 1095 """dump an index DAG as a graphviz dot file"""
1096 1096 opts = pycompat.byteskwargs(opts)
1097 1097 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
1098 1098 ui.write(("digraph G {\n"))
1099 1099 for i in r:
1100 1100 node = r.node(i)
1101 1101 pp = r.parents(node)
1102 1102 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1103 1103 if pp[1] != nullid:
1104 1104 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1105 1105 ui.write("}\n")
1106 1106
1107 1107 @command('debuginstall', [] + cmdutil.formatteropts, '', norepo=True)
1108 1108 def debuginstall(ui, **opts):
1109 1109 '''test Mercurial installation
1110 1110
1111 1111 Returns 0 on success.
1112 1112 '''
1113 1113 opts = pycompat.byteskwargs(opts)
1114 1114
1115 1115 def writetemp(contents):
1116 1116 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1117 1117 f = os.fdopen(fd, pycompat.sysstr("wb"))
1118 1118 f.write(contents)
1119 1119 f.close()
1120 1120 return name
1121 1121
1122 1122 problems = 0
1123 1123
1124 1124 fm = ui.formatter('debuginstall', opts)
1125 1125 fm.startitem()
1126 1126
1127 1127 # encoding
1128 1128 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1129 1129 err = None
1130 1130 try:
1131 1131 codecs.lookup(pycompat.sysstr(encoding.encoding))
1132 1132 except LookupError as inst:
1133 1133 err = util.forcebytestr(inst)
1134 1134 problems += 1
1135 1135 fm.condwrite(err, 'encodingerror', _(" %s\n"
1136 1136 " (check that your locale is properly set)\n"), err)
1137 1137
1138 1138 # Python
1139 1139 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1140 1140 pycompat.sysexecutable)
1141 1141 fm.write('pythonver', _("checking Python version (%s)\n"),
1142 1142 ("%d.%d.%d" % sys.version_info[:3]))
1143 1143 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1144 1144 os.path.dirname(pycompat.fsencode(os.__file__)))
1145 1145
1146 1146 security = set(sslutil.supportedprotocols)
1147 1147 if sslutil.hassni:
1148 1148 security.add('sni')
1149 1149
1150 1150 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1151 1151 fm.formatlist(sorted(security), name='protocol',
1152 1152 fmt='%s', sep=','))
1153 1153
1154 1154 # These are warnings, not errors. So don't increment problem count. This
1155 1155 # may change in the future.
1156 1156 if 'tls1.2' not in security:
1157 1157 fm.plain(_(' TLS 1.2 not supported by Python install; '
1158 1158 'network connections lack modern security\n'))
1159 1159 if 'sni' not in security:
1160 1160 fm.plain(_(' SNI not supported by Python install; may have '
1161 1161 'connectivity issues with some servers\n'))
1162 1162
1163 1163 # TODO print CA cert info
1164 1164
1165 1165 # hg version
1166 1166 hgver = util.version()
1167 1167 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1168 1168 hgver.split('+')[0])
1169 1169 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1170 1170 '+'.join(hgver.split('+')[1:]))
1171 1171
1172 1172 # compiled modules
1173 1173 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1174 1174 policy.policy)
1175 1175 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1176 1176 os.path.dirname(pycompat.fsencode(__file__)))
1177 1177
1178 1178 if policy.policy in ('c', 'allow'):
1179 1179 err = None
1180 1180 try:
1181 1181 from .cext import (
1182 1182 base85,
1183 1183 bdiff,
1184 1184 mpatch,
1185 1185 osutil,
1186 1186 )
1187 1187 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1188 1188 except Exception as inst:
1189 1189 err = util.forcebytestr(inst)
1190 1190 problems += 1
1191 1191 fm.condwrite(err, 'extensionserror', " %s\n", err)
1192 1192
1193 1193 compengines = util.compengines._engines.values()
1194 1194 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1195 1195 fm.formatlist(sorted(e.name() for e in compengines),
1196 1196 name='compengine', fmt='%s', sep=', '))
1197 1197 fm.write('compenginesavail', _('checking available compression engines '
1198 1198 '(%s)\n'),
1199 1199 fm.formatlist(sorted(e.name() for e in compengines
1200 1200 if e.available()),
1201 1201 name='compengine', fmt='%s', sep=', '))
1202 1202 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1203 1203 fm.write('compenginesserver', _('checking available compression engines '
1204 1204 'for wire protocol (%s)\n'),
1205 1205 fm.formatlist([e.name() for e in wirecompengines
1206 1206 if e.wireprotosupport()],
1207 1207 name='compengine', fmt='%s', sep=', '))
1208 1208 re2 = 'missing'
1209 1209 if util._re2:
1210 1210 re2 = 'available'
1211 1211 fm.plain(_('checking "re2" regexp engine (%s)\n') % re2)
1212 1212 fm.data(re2=bool(util._re2))
1213 1213
1214 1214 # templates
1215 1215 p = templater.templatepaths()
1216 1216 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1217 1217 fm.condwrite(not p, '', _(" no template directories found\n"))
1218 1218 if p:
1219 1219 m = templater.templatepath("map-cmdline.default")
1220 1220 if m:
1221 1221 # template found, check if it is working
1222 1222 err = None
1223 1223 try:
1224 1224 templater.templater.frommapfile(m)
1225 1225 except Exception as inst:
1226 1226 err = util.forcebytestr(inst)
1227 1227 p = None
1228 1228 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1229 1229 else:
1230 1230 p = None
1231 1231 fm.condwrite(p, 'defaulttemplate',
1232 1232 _("checking default template (%s)\n"), m)
1233 1233 fm.condwrite(not m, 'defaulttemplatenotfound',
1234 1234 _(" template '%s' not found\n"), "default")
1235 1235 if not p:
1236 1236 problems += 1
1237 1237 fm.condwrite(not p, '',
1238 1238 _(" (templates seem to have been installed incorrectly)\n"))
1239 1239
1240 1240 # editor
1241 1241 editor = ui.geteditor()
1242 1242 editor = util.expandpath(editor)
1243 1243 editorbin = util.shellsplit(editor)[0]
1244 1244 fm.write('editor', _("checking commit editor... (%s)\n"), editorbin)
1245 1245 cmdpath = util.findexe(editorbin)
1246 1246 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1247 1247 _(" No commit editor set and can't find %s in PATH\n"
1248 1248 " (specify a commit editor in your configuration"
1249 1249 " file)\n"), not cmdpath and editor == 'vi' and editorbin)
1250 1250 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1251 1251 _(" Can't find editor '%s' in PATH\n"
1252 1252 " (specify a commit editor in your configuration"
1253 1253 " file)\n"), not cmdpath and editorbin)
1254 1254 if not cmdpath and editor != 'vi':
1255 1255 problems += 1
1256 1256
1257 1257 # check username
1258 1258 username = None
1259 1259 err = None
1260 1260 try:
1261 1261 username = ui.username()
1262 1262 except error.Abort as e:
1263 1263 err = util.forcebytestr(e)
1264 1264 problems += 1
1265 1265
1266 1266 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
1267 1267 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
1268 1268 " (specify a username in your configuration file)\n"), err)
1269 1269
1270 1270 fm.condwrite(not problems, '',
1271 1271 _("no problems detected\n"))
1272 1272 if not problems:
1273 1273 fm.data(problems=problems)
1274 1274 fm.condwrite(problems, 'problems',
1275 1275 _("%d problems detected,"
1276 1276 " please check your install!\n"), problems)
1277 1277 fm.end()
1278 1278
1279 1279 return problems
1280 1280
1281 1281 @command('debugknown', [], _('REPO ID...'), norepo=True)
1282 1282 def debugknown(ui, repopath, *ids, **opts):
1283 1283 """test whether node ids are known to a repo
1284 1284
1285 1285 Every ID must be a full-length hex node id string. Returns a list of 0s
1286 1286 and 1s indicating unknown/known.
1287 1287 """
1288 1288 opts = pycompat.byteskwargs(opts)
1289 1289 repo = hg.peer(ui, opts, repopath)
1290 1290 if not repo.capable('known'):
1291 1291 raise error.Abort("known() not supported by target repository")
1292 1292 flags = repo.known([bin(s) for s in ids])
1293 1293 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1294 1294
1295 1295 @command('debuglabelcomplete', [], _('LABEL...'))
1296 1296 def debuglabelcomplete(ui, repo, *args):
1297 1297 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
1298 1298 debugnamecomplete(ui, repo, *args)
1299 1299
1300 1300 @command('debuglocks',
1301 1301 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
1302 1302 ('W', 'force-wlock', None,
1303 1303 _('free the working state lock (DANGEROUS)')),
1304 1304 ('s', 'set-lock', None, _('set the store lock until stopped')),
1305 1305 ('S', 'set-wlock', None,
1306 1306 _('set the working state lock until stopped'))],
1307 1307 _('[OPTION]...'))
1308 1308 def debuglocks(ui, repo, **opts):
1309 1309 """show or modify state of locks
1310 1310
1311 1311 By default, this command will show which locks are held. This
1312 1312 includes the user and process holding the lock, the amount of time
1313 1313 the lock has been held, and the machine name where the process is
1314 1314 running if it's not local.
1315 1315
1316 1316 Locks protect the integrity of Mercurial's data, so should be
1317 1317 treated with care. System crashes or other interruptions may cause
1318 1318 locks to not be properly released, though Mercurial will usually
1319 1319 detect and remove such stale locks automatically.
1320 1320
1321 1321 However, detecting stale locks may not always be possible (for
1322 1322 instance, on a shared filesystem). Removing locks may also be
1323 1323 blocked by filesystem permissions.
1324 1324
1325 1325 Setting a lock will prevent other commands from changing the data.
1326 1326 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
1327 1327 The set locks are removed when the command exits.
1328 1328
1329 1329 Returns 0 if no locks are held.
1330 1330
1331 1331 """
1332 1332
1333 1333 if opts.get(r'force_lock'):
1334 1334 repo.svfs.unlink('lock')
1335 1335 if opts.get(r'force_wlock'):
1336 1336 repo.vfs.unlink('wlock')
1337 1337 if opts.get(r'force_lock') or opts.get(r'force_wlock'):
1338 1338 return 0
1339 1339
1340 1340 locks = []
1341 1341 try:
1342 1342 if opts.get(r'set_wlock'):
1343 1343 try:
1344 1344 locks.append(repo.wlock(False))
1345 1345 except error.LockHeld:
1346 1346 raise error.Abort(_('wlock is already held'))
1347 1347 if opts.get(r'set_lock'):
1348 1348 try:
1349 1349 locks.append(repo.lock(False))
1350 1350 except error.LockHeld:
1351 1351 raise error.Abort(_('lock is already held'))
1352 1352 if len(locks):
1353 1353 ui.promptchoice(_("ready to release the lock (y)? $$ &Yes"))
1354 1354 return 0
1355 1355 finally:
1356 1356 release(*locks)
1357 1357
1358 1358 now = time.time()
1359 1359 held = 0
1360 1360
1361 1361 def report(vfs, name, method):
1362 1362 # this causes stale locks to get reaped for more accurate reporting
1363 1363 try:
1364 1364 l = method(False)
1365 1365 except error.LockHeld:
1366 1366 l = None
1367 1367
1368 1368 if l:
1369 1369 l.release()
1370 1370 else:
1371 1371 try:
1372 1372 stat = vfs.lstat(name)
1373 1373 age = now - stat.st_mtime
1374 1374 user = util.username(stat.st_uid)
1375 1375 locker = vfs.readlock(name)
1376 1376 if ":" in locker:
1377 1377 host, pid = locker.split(':')
1378 1378 if host == socket.gethostname():
1379 1379 locker = 'user %s, process %s' % (user, pid)
1380 1380 else:
1381 1381 locker = 'user %s, process %s, host %s' \
1382 1382 % (user, pid, host)
1383 1383 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1384 1384 return 1
1385 1385 except OSError as e:
1386 1386 if e.errno != errno.ENOENT:
1387 1387 raise
1388 1388
1389 1389 ui.write(("%-6s free\n") % (name + ":"))
1390 1390 return 0
1391 1391
1392 1392 held += report(repo.svfs, "lock", repo.lock)
1393 1393 held += report(repo.vfs, "wlock", repo.wlock)
1394 1394
1395 1395 return held
1396 1396
1397 1397 @command('debugmergestate', [], '')
1398 1398 def debugmergestate(ui, repo, *args):
1399 1399 """print merge state
1400 1400
1401 1401 Use --verbose to print out information about whether v1 or v2 merge state
1402 1402 was chosen."""
1403 1403 def _hashornull(h):
1404 1404 if h == nullhex:
1405 1405 return 'null'
1406 1406 else:
1407 1407 return h
1408 1408
1409 1409 def printrecords(version):
1410 1410 ui.write(('* version %d records\n') % version)
1411 1411 if version == 1:
1412 1412 records = v1records
1413 1413 else:
1414 1414 records = v2records
1415 1415
1416 1416 for rtype, record in records:
1417 1417 # pretty print some record types
1418 1418 if rtype == 'L':
1419 1419 ui.write(('local: %s\n') % record)
1420 1420 elif rtype == 'O':
1421 1421 ui.write(('other: %s\n') % record)
1422 1422 elif rtype == 'm':
1423 1423 driver, mdstate = record.split('\0', 1)
1424 1424 ui.write(('merge driver: %s (state "%s")\n')
1425 1425 % (driver, mdstate))
1426 1426 elif rtype in 'FDC':
1427 1427 r = record.split('\0')
1428 1428 f, state, hash, lfile, afile, anode, ofile = r[0:7]
1429 1429 if version == 1:
1430 1430 onode = 'not stored in v1 format'
1431 1431 flags = r[7]
1432 1432 else:
1433 1433 onode, flags = r[7:9]
1434 1434 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
1435 1435 % (f, rtype, state, _hashornull(hash)))
1436 1436 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
1437 1437 ui.write((' ancestor path: %s (node %s)\n')
1438 1438 % (afile, _hashornull(anode)))
1439 1439 ui.write((' other path: %s (node %s)\n')
1440 1440 % (ofile, _hashornull(onode)))
1441 1441 elif rtype == 'f':
1442 1442 filename, rawextras = record.split('\0', 1)
1443 1443 extras = rawextras.split('\0')
1444 1444 i = 0
1445 1445 extrastrings = []
1446 1446 while i < len(extras):
1447 1447 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
1448 1448 i += 2
1449 1449
1450 1450 ui.write(('file extras: %s (%s)\n')
1451 1451 % (filename, ', '.join(extrastrings)))
1452 1452 elif rtype == 'l':
1453 1453 labels = record.split('\0', 2)
1454 1454 labels = [l for l in labels if len(l) > 0]
1455 1455 ui.write(('labels:\n'))
1456 1456 ui.write((' local: %s\n' % labels[0]))
1457 1457 ui.write((' other: %s\n' % labels[1]))
1458 1458 if len(labels) > 2:
1459 1459 ui.write((' base: %s\n' % labels[2]))
1460 1460 else:
1461 1461 ui.write(('unrecognized entry: %s\t%s\n')
1462 1462 % (rtype, record.replace('\0', '\t')))
1463 1463
1464 1464 # Avoid mergestate.read() since it may raise an exception for unsupported
1465 1465 # merge state records. We shouldn't be doing this, but this is OK since this
1466 1466 # command is pretty low-level.
1467 1467 ms = mergemod.mergestate(repo)
1468 1468
1469 1469 # sort so that reasonable information is on top
1470 1470 v1records = ms._readrecordsv1()
1471 1471 v2records = ms._readrecordsv2()
1472 1472 order = 'LOml'
1473 1473 def key(r):
1474 1474 idx = order.find(r[0])
1475 1475 if idx == -1:
1476 1476 return (1, r[1])
1477 1477 else:
1478 1478 return (0, idx)
1479 1479 v1records.sort(key=key)
1480 1480 v2records.sort(key=key)
1481 1481
1482 1482 if not v1records and not v2records:
1483 1483 ui.write(('no merge state found\n'))
1484 1484 elif not v2records:
1485 1485 ui.note(('no version 2 merge state\n'))
1486 1486 printrecords(1)
1487 1487 elif ms._v1v2match(v1records, v2records):
1488 1488 ui.note(('v1 and v2 states match: using v2\n'))
1489 1489 printrecords(2)
1490 1490 else:
1491 1491 ui.note(('v1 and v2 states mismatch: using v1\n'))
1492 1492 printrecords(1)
1493 1493 if ui.verbose:
1494 1494 printrecords(2)
1495 1495
1496 1496 @command('debugnamecomplete', [], _('NAME...'))
1497 1497 def debugnamecomplete(ui, repo, *args):
1498 1498 '''complete "names" - tags, open branch names, bookmark names'''
1499 1499
1500 1500 names = set()
1501 1501 # since we previously only listed open branches, we will handle that
1502 1502 # specially (after this for loop)
1503 1503 for name, ns in repo.names.iteritems():
1504 1504 if name != 'branches':
1505 1505 names.update(ns.listnames(repo))
1506 1506 names.update(tag for (tag, heads, tip, closed)
1507 1507 in repo.branchmap().iterbranches() if not closed)
1508 1508 completions = set()
1509 1509 if not args:
1510 1510 args = ['']
1511 1511 for a in args:
1512 1512 completions.update(n for n in names if n.startswith(a))
1513 1513 ui.write('\n'.join(sorted(completions)))
1514 1514 ui.write('\n')
1515 1515
1516 1516 @command('debugobsolete',
1517 1517 [('', 'flags', 0, _('markers flag')),
1518 1518 ('', 'record-parents', False,
1519 1519 _('record parent information for the precursor')),
1520 1520 ('r', 'rev', [], _('display markers relevant to REV')),
1521 1521 ('', 'exclusive', False, _('restrict display to markers only '
1522 1522 'relevant to REV')),
1523 1523 ('', 'index', False, _('display index of the marker')),
1524 1524 ('', 'delete', [], _('delete markers specified by indices')),
1525 1525 ] + cmdutil.commitopts2 + cmdutil.formatteropts,
1526 1526 _('[OBSOLETED [REPLACEMENT ...]]'))
1527 1527 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
1528 1528 """create arbitrary obsolete marker
1529 1529
1530 1530 With no arguments, displays the list of obsolescence markers."""
1531 1531
1532 1532 opts = pycompat.byteskwargs(opts)
1533 1533
1534 1534 def parsenodeid(s):
1535 1535 try:
1536 1536 # We do not use revsingle/revrange functions here to accept
1537 1537 # arbitrary node identifiers, possibly not present in the
1538 1538 # local repository.
1539 1539 n = bin(s)
1540 1540 if len(n) != len(nullid):
1541 1541 raise TypeError()
1542 1542 return n
1543 1543 except TypeError:
1544 1544 raise error.Abort('changeset references must be full hexadecimal '
1545 1545 'node identifiers')
1546 1546
1547 1547 if opts.get('delete'):
1548 1548 indices = []
1549 1549 for v in opts.get('delete'):
1550 1550 try:
1551 1551 indices.append(int(v))
1552 1552 except ValueError:
1553 1553 raise error.Abort(_('invalid index value: %r') % v,
1554 1554 hint=_('use integers for indices'))
1555 1555
1556 1556 if repo.currenttransaction():
1557 1557 raise error.Abort(_('cannot delete obsmarkers in the middle '
1558 1558 'of transaction.'))
1559 1559
1560 1560 with repo.lock():
1561 1561 n = repair.deleteobsmarkers(repo.obsstore, indices)
1562 1562 ui.write(_('deleted %i obsolescence markers\n') % n)
1563 1563
1564 1564 return
1565 1565
1566 1566 if precursor is not None:
1567 1567 if opts['rev']:
1568 1568 raise error.Abort('cannot select revision when creating marker')
1569 1569 metadata = {}
1570 1570 metadata['user'] = opts['user'] or ui.username()
1571 1571 succs = tuple(parsenodeid(succ) for succ in successors)
1572 1572 l = repo.lock()
1573 1573 try:
1574 1574 tr = repo.transaction('debugobsolete')
1575 1575 try:
1576 1576 date = opts.get('date')
1577 1577 if date:
1578 1578 date = util.parsedate(date)
1579 1579 else:
1580 1580 date = None
1581 1581 prec = parsenodeid(precursor)
1582 1582 parents = None
1583 1583 if opts['record_parents']:
1584 1584 if prec not in repo.unfiltered():
1585 1585 raise error.Abort('cannot used --record-parents on '
1586 1586 'unknown changesets')
1587 1587 parents = repo.unfiltered()[prec].parents()
1588 1588 parents = tuple(p.node() for p in parents)
1589 1589 repo.obsstore.create(tr, prec, succs, opts['flags'],
1590 1590 parents=parents, date=date,
1591 1591 metadata=metadata, ui=ui)
1592 1592 tr.close()
1593 1593 except ValueError as exc:
1594 raise error.Abort(_('bad obsmarker input: %s') % exc)
1594 raise error.Abort(_('bad obsmarker input: %s') %
1595 pycompat.bytestr(exc))
1595 1596 finally:
1596 1597 tr.release()
1597 1598 finally:
1598 1599 l.release()
1599 1600 else:
1600 1601 if opts['rev']:
1601 1602 revs = scmutil.revrange(repo, opts['rev'])
1602 1603 nodes = [repo[r].node() for r in revs]
1603 1604 markers = list(obsutil.getmarkers(repo, nodes=nodes,
1604 1605 exclusive=opts['exclusive']))
1605 1606 markers.sort(key=lambda x: x._data)
1606 1607 else:
1607 1608 markers = obsutil.getmarkers(repo)
1608 1609
1609 1610 markerstoiter = markers
1610 1611 isrelevant = lambda m: True
1611 1612 if opts.get('rev') and opts.get('index'):
1612 1613 markerstoiter = obsutil.getmarkers(repo)
1613 1614 markerset = set(markers)
1614 1615 isrelevant = lambda m: m in markerset
1615 1616
1616 1617 fm = ui.formatter('debugobsolete', opts)
1617 1618 for i, m in enumerate(markerstoiter):
1618 1619 if not isrelevant(m):
1619 1620 # marker can be irrelevant when we're iterating over a set
1620 1621 # of markers (markerstoiter) which is bigger than the set
1621 1622 # of markers we want to display (markers)
1622 1623 # this can happen if both --index and --rev options are
1623 1624 # provided and thus we need to iterate over all of the markers
1624 1625 # to get the correct indices, but only display the ones that
1625 1626 # are relevant to --rev value
1626 1627 continue
1627 1628 fm.startitem()
1628 1629 ind = i if opts.get('index') else None
1629 1630 cmdutil.showmarker(fm, m, index=ind)
1630 1631 fm.end()
1631 1632
1632 1633 @command('debugpathcomplete',
1633 1634 [('f', 'full', None, _('complete an entire path')),
1634 1635 ('n', 'normal', None, _('show only normal files')),
1635 1636 ('a', 'added', None, _('show only added files')),
1636 1637 ('r', 'removed', None, _('show only removed files'))],
1637 1638 _('FILESPEC...'))
1638 1639 def debugpathcomplete(ui, repo, *specs, **opts):
1639 1640 '''complete part or all of a tracked path
1640 1641
1641 1642 This command supports shells that offer path name completion. It
1642 1643 currently completes only files already known to the dirstate.
1643 1644
1644 1645 Completion extends only to the next path segment unless
1645 1646 --full is specified, in which case entire paths are used.'''
1646 1647
1647 1648 def complete(path, acceptable):
1648 1649 dirstate = repo.dirstate
1649 1650 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
1650 1651 rootdir = repo.root + pycompat.ossep
1651 1652 if spec != repo.root and not spec.startswith(rootdir):
1652 1653 return [], []
1653 1654 if os.path.isdir(spec):
1654 1655 spec += '/'
1655 1656 spec = spec[len(rootdir):]
1656 1657 fixpaths = pycompat.ossep != '/'
1657 1658 if fixpaths:
1658 1659 spec = spec.replace(pycompat.ossep, '/')
1659 1660 speclen = len(spec)
1660 1661 fullpaths = opts[r'full']
1661 1662 files, dirs = set(), set()
1662 1663 adddir, addfile = dirs.add, files.add
1663 1664 for f, st in dirstate.iteritems():
1664 1665 if f.startswith(spec) and st[0] in acceptable:
1665 1666 if fixpaths:
1666 1667 f = f.replace('/', pycompat.ossep)
1667 1668 if fullpaths:
1668 1669 addfile(f)
1669 1670 continue
1670 1671 s = f.find(pycompat.ossep, speclen)
1671 1672 if s >= 0:
1672 1673 adddir(f[:s])
1673 1674 else:
1674 1675 addfile(f)
1675 1676 return files, dirs
1676 1677
1677 1678 acceptable = ''
1678 1679 if opts[r'normal']:
1679 1680 acceptable += 'nm'
1680 1681 if opts[r'added']:
1681 1682 acceptable += 'a'
1682 1683 if opts[r'removed']:
1683 1684 acceptable += 'r'
1684 1685 cwd = repo.getcwd()
1685 1686 if not specs:
1686 1687 specs = ['.']
1687 1688
1688 1689 files, dirs = set(), set()
1689 1690 for spec in specs:
1690 1691 f, d = complete(spec, acceptable or 'nmar')
1691 1692 files.update(f)
1692 1693 dirs.update(d)
1693 1694 files.update(dirs)
1694 1695 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
1695 1696 ui.write('\n')
1696 1697
1697 1698 @command('debugpeer', [], _('PATH'), norepo=True)
1698 1699 def debugpeer(ui, path):
1699 1700 """establish a connection to a peer repository"""
1700 1701 # Always enable peer request logging. Requires --debug to display
1701 1702 # though.
1702 1703 overrides = {
1703 1704 ('devel', 'debug.peer-request'): True,
1704 1705 }
1705 1706
1706 1707 with ui.configoverride(overrides):
1707 1708 peer = hg.peer(ui, {}, path)
1708 1709
1709 1710 local = peer.local() is not None
1710 1711 canpush = peer.canpush()
1711 1712
1712 1713 ui.write(_('url: %s\n') % peer.url())
1713 1714 ui.write(_('local: %s\n') % (_('yes') if local else _('no')))
1714 1715 ui.write(_('pushable: %s\n') % (_('yes') if canpush else _('no')))
1715 1716
1716 1717 @command('debugpickmergetool',
1717 1718 [('r', 'rev', '', _('check for files in this revision'), _('REV')),
1718 1719 ('', 'changedelete', None, _('emulate merging change and delete')),
1719 1720 ] + cmdutil.walkopts + cmdutil.mergetoolopts,
1720 1721 _('[PATTERN]...'),
1721 1722 inferrepo=True)
1722 1723 def debugpickmergetool(ui, repo, *pats, **opts):
1723 1724 """examine which merge tool is chosen for specified file
1724 1725
1725 1726 As described in :hg:`help merge-tools`, Mercurial examines
1726 1727 configurations below in this order to decide which merge tool is
1727 1728 chosen for specified file.
1728 1729
1729 1730 1. ``--tool`` option
1730 1731 2. ``HGMERGE`` environment variable
1731 1732 3. configurations in ``merge-patterns`` section
1732 1733 4. configuration of ``ui.merge``
1733 1734 5. configurations in ``merge-tools`` section
1734 1735 6. ``hgmerge`` tool (for historical reason only)
1735 1736 7. default tool for fallback (``:merge`` or ``:prompt``)
1736 1737
1737 1738 This command writes out examination result in the style below::
1738 1739
1739 1740 FILE = MERGETOOL
1740 1741
1741 1742 By default, all files known in the first parent context of the
1742 1743 working directory are examined. Use file patterns and/or -I/-X
1743 1744 options to limit target files. -r/--rev is also useful to examine
1744 1745 files in another context without actual updating to it.
1745 1746
1746 1747 With --debug, this command shows warning messages while matching
1747 1748 against ``merge-patterns`` and so on, too. It is recommended to
1748 1749 use this option with explicit file patterns and/or -I/-X options,
1749 1750 because this option increases amount of output per file according
1750 1751 to configurations in hgrc.
1751 1752
1752 1753 With -v/--verbose, this command shows configurations below at
1753 1754 first (only if specified).
1754 1755
1755 1756 - ``--tool`` option
1756 1757 - ``HGMERGE`` environment variable
1757 1758 - configuration of ``ui.merge``
1758 1759
1759 1760 If merge tool is chosen before matching against
1760 1761 ``merge-patterns``, this command can't show any helpful
1761 1762 information, even with --debug. In such case, information above is
1762 1763 useful to know why a merge tool is chosen.
1763 1764 """
1764 1765 opts = pycompat.byteskwargs(opts)
1765 1766 overrides = {}
1766 1767 if opts['tool']:
1767 1768 overrides[('ui', 'forcemerge')] = opts['tool']
1768 1769 ui.note(('with --tool %r\n') % (opts['tool']))
1769 1770
1770 1771 with ui.configoverride(overrides, 'debugmergepatterns'):
1771 1772 hgmerge = encoding.environ.get("HGMERGE")
1772 1773 if hgmerge is not None:
1773 1774 ui.note(('with HGMERGE=%r\n') % (hgmerge))
1774 1775 uimerge = ui.config("ui", "merge")
1775 1776 if uimerge:
1776 1777 ui.note(('with ui.merge=%r\n') % (uimerge))
1777 1778
1778 1779 ctx = scmutil.revsingle(repo, opts.get('rev'))
1779 1780 m = scmutil.match(ctx, pats, opts)
1780 1781 changedelete = opts['changedelete']
1781 1782 for path in ctx.walk(m):
1782 1783 fctx = ctx[path]
1783 1784 try:
1784 1785 if not ui.debugflag:
1785 1786 ui.pushbuffer(error=True)
1786 1787 tool, toolpath = filemerge._picktool(repo, ui, path,
1787 1788 fctx.isbinary(),
1788 1789 'l' in fctx.flags(),
1789 1790 changedelete)
1790 1791 finally:
1791 1792 if not ui.debugflag:
1792 1793 ui.popbuffer()
1793 1794 ui.write(('%s = %s\n') % (path, tool))
1794 1795
1795 1796 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
1796 1797 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1797 1798 '''access the pushkey key/value protocol
1798 1799
1799 1800 With two args, list the keys in the given namespace.
1800 1801
1801 1802 With five args, set a key to new if it currently is set to old.
1802 1803 Reports success or failure.
1803 1804 '''
1804 1805
1805 1806 target = hg.peer(ui, {}, repopath)
1806 1807 if keyinfo:
1807 1808 key, old, new = keyinfo
1808 1809 r = target.pushkey(namespace, key, old, new)
1809 1810 ui.status(str(r) + '\n')
1810 1811 return not r
1811 1812 else:
1812 1813 for k, v in sorted(target.listkeys(namespace).iteritems()):
1813 1814 ui.write("%s\t%s\n" % (util.escapestr(k),
1814 1815 util.escapestr(v)))
1815 1816
1816 1817 @command('debugpvec', [], _('A B'))
1817 1818 def debugpvec(ui, repo, a, b=None):
1818 1819 ca = scmutil.revsingle(repo, a)
1819 1820 cb = scmutil.revsingle(repo, b)
1820 1821 pa = pvec.ctxpvec(ca)
1821 1822 pb = pvec.ctxpvec(cb)
1822 1823 if pa == pb:
1823 1824 rel = "="
1824 1825 elif pa > pb:
1825 1826 rel = ">"
1826 1827 elif pa < pb:
1827 1828 rel = "<"
1828 1829 elif pa | pb:
1829 1830 rel = "|"
1830 1831 ui.write(_("a: %s\n") % pa)
1831 1832 ui.write(_("b: %s\n") % pb)
1832 1833 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1833 1834 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1834 1835 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1835 1836 pa.distance(pb), rel))
1836 1837
1837 1838 @command('debugrebuilddirstate|debugrebuildstate',
1838 1839 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
1839 1840 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
1840 1841 'the working copy parent')),
1841 1842 ],
1842 1843 _('[-r REV]'))
1843 1844 def debugrebuilddirstate(ui, repo, rev, **opts):
1844 1845 """rebuild the dirstate as it would look like for the given revision
1845 1846
1846 1847 If no revision is specified the first current parent will be used.
1847 1848
1848 1849 The dirstate will be set to the files of the given revision.
1849 1850 The actual working directory content or existing dirstate
1850 1851 information such as adds or removes is not considered.
1851 1852
1852 1853 ``minimal`` will only rebuild the dirstate status for files that claim to be
1853 1854 tracked but are not in the parent manifest, or that exist in the parent
1854 1855 manifest but are not in the dirstate. It will not change adds, removes, or
1855 1856 modified files that are in the working copy parent.
1856 1857
1857 1858 One use of this command is to make the next :hg:`status` invocation
1858 1859 check the actual file content.
1859 1860 """
1860 1861 ctx = scmutil.revsingle(repo, rev)
1861 1862 with repo.wlock():
1862 1863 dirstate = repo.dirstate
1863 1864 changedfiles = None
1864 1865 # See command doc for what minimal does.
1865 1866 if opts.get(r'minimal'):
1866 1867 manifestfiles = set(ctx.manifest().keys())
1867 1868 dirstatefiles = set(dirstate)
1868 1869 manifestonly = manifestfiles - dirstatefiles
1869 1870 dsonly = dirstatefiles - manifestfiles
1870 1871 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
1871 1872 changedfiles = manifestonly | dsnotadded
1872 1873
1873 1874 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
1874 1875
1875 1876 @command('debugrebuildfncache', [], '')
1876 1877 def debugrebuildfncache(ui, repo):
1877 1878 """rebuild the fncache file"""
1878 1879 repair.rebuildfncache(ui, repo)
1879 1880
1880 1881 @command('debugrename',
1881 1882 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1882 1883 _('[-r REV] FILE'))
1883 1884 def debugrename(ui, repo, file1, *pats, **opts):
1884 1885 """dump rename information"""
1885 1886
1886 1887 opts = pycompat.byteskwargs(opts)
1887 1888 ctx = scmutil.revsingle(repo, opts.get('rev'))
1888 1889 m = scmutil.match(ctx, (file1,) + pats, opts)
1889 1890 for abs in ctx.walk(m):
1890 1891 fctx = ctx[abs]
1891 1892 o = fctx.filelog().renamed(fctx.filenode())
1892 1893 rel = m.rel(abs)
1893 1894 if o:
1894 1895 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1895 1896 else:
1896 1897 ui.write(_("%s not renamed\n") % rel)
1897 1898
1898 1899 @command('debugrevlog', cmdutil.debugrevlogopts +
1899 1900 [('d', 'dump', False, _('dump index data'))],
1900 1901 _('-c|-m|FILE'),
1901 1902 optionalrepo=True)
1902 1903 def debugrevlog(ui, repo, file_=None, **opts):
1903 1904 """show data and statistics about a revlog"""
1904 1905 opts = pycompat.byteskwargs(opts)
1905 1906 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1906 1907
1907 1908 if opts.get("dump"):
1908 1909 numrevs = len(r)
1909 1910 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
1910 1911 " rawsize totalsize compression heads chainlen\n"))
1911 1912 ts = 0
1912 1913 heads = set()
1913 1914
1914 1915 for rev in xrange(numrevs):
1915 1916 dbase = r.deltaparent(rev)
1916 1917 if dbase == -1:
1917 1918 dbase = rev
1918 1919 cbase = r.chainbase(rev)
1919 1920 clen = r.chainlen(rev)
1920 1921 p1, p2 = r.parentrevs(rev)
1921 1922 rs = r.rawsize(rev)
1922 1923 ts = ts + rs
1923 1924 heads -= set(r.parentrevs(rev))
1924 1925 heads.add(rev)
1925 1926 try:
1926 1927 compression = ts / r.end(rev)
1927 1928 except ZeroDivisionError:
1928 1929 compression = 0
1929 1930 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
1930 1931 "%11d %5d %8d\n" %
1931 1932 (rev, p1, p2, r.start(rev), r.end(rev),
1932 1933 r.start(dbase), r.start(cbase),
1933 1934 r.start(p1), r.start(p2),
1934 1935 rs, ts, compression, len(heads), clen))
1935 1936 return 0
1936 1937
1937 1938 v = r.version
1938 1939 format = v & 0xFFFF
1939 1940 flags = []
1940 1941 gdelta = False
1941 1942 if v & revlog.FLAG_INLINE_DATA:
1942 1943 flags.append('inline')
1943 1944 if v & revlog.FLAG_GENERALDELTA:
1944 1945 gdelta = True
1945 1946 flags.append('generaldelta')
1946 1947 if not flags:
1947 1948 flags = ['(none)']
1948 1949
1949 1950 nummerges = 0
1950 1951 numfull = 0
1951 1952 numprev = 0
1952 1953 nump1 = 0
1953 1954 nump2 = 0
1954 1955 numother = 0
1955 1956 nump1prev = 0
1956 1957 nump2prev = 0
1957 1958 chainlengths = []
1958 1959 chainbases = []
1959 1960 chainspans = []
1960 1961
1961 1962 datasize = [None, 0, 0]
1962 1963 fullsize = [None, 0, 0]
1963 1964 deltasize = [None, 0, 0]
1964 1965 chunktypecounts = {}
1965 1966 chunktypesizes = {}
1966 1967
1967 1968 def addsize(size, l):
1968 1969 if l[0] is None or size < l[0]:
1969 1970 l[0] = size
1970 1971 if size > l[1]:
1971 1972 l[1] = size
1972 1973 l[2] += size
1973 1974
1974 1975 numrevs = len(r)
1975 1976 for rev in xrange(numrevs):
1976 1977 p1, p2 = r.parentrevs(rev)
1977 1978 delta = r.deltaparent(rev)
1978 1979 if format > 0:
1979 1980 addsize(r.rawsize(rev), datasize)
1980 1981 if p2 != nullrev:
1981 1982 nummerges += 1
1982 1983 size = r.length(rev)
1983 1984 if delta == nullrev:
1984 1985 chainlengths.append(0)
1985 1986 chainbases.append(r.start(rev))
1986 1987 chainspans.append(size)
1987 1988 numfull += 1
1988 1989 addsize(size, fullsize)
1989 1990 else:
1990 1991 chainlengths.append(chainlengths[delta] + 1)
1991 1992 baseaddr = chainbases[delta]
1992 1993 revaddr = r.start(rev)
1993 1994 chainbases.append(baseaddr)
1994 1995 chainspans.append((revaddr - baseaddr) + size)
1995 1996 addsize(size, deltasize)
1996 1997 if delta == rev - 1:
1997 1998 numprev += 1
1998 1999 if delta == p1:
1999 2000 nump1prev += 1
2000 2001 elif delta == p2:
2001 2002 nump2prev += 1
2002 2003 elif delta == p1:
2003 2004 nump1 += 1
2004 2005 elif delta == p2:
2005 2006 nump2 += 1
2006 2007 elif delta != nullrev:
2007 2008 numother += 1
2008 2009
2009 2010 # Obtain data on the raw chunks in the revlog.
2010 2011 segment = r._getsegmentforrevs(rev, rev)[1]
2011 2012 if segment:
2012 2013 chunktype = bytes(segment[0:1])
2013 2014 else:
2014 2015 chunktype = 'empty'
2015 2016
2016 2017 if chunktype not in chunktypecounts:
2017 2018 chunktypecounts[chunktype] = 0
2018 2019 chunktypesizes[chunktype] = 0
2019 2020
2020 2021 chunktypecounts[chunktype] += 1
2021 2022 chunktypesizes[chunktype] += size
2022 2023
2023 2024 # Adjust size min value for empty cases
2024 2025 for size in (datasize, fullsize, deltasize):
2025 2026 if size[0] is None:
2026 2027 size[0] = 0
2027 2028
2028 2029 numdeltas = numrevs - numfull
2029 2030 numoprev = numprev - nump1prev - nump2prev
2030 2031 totalrawsize = datasize[2]
2031 2032 datasize[2] /= numrevs
2032 2033 fulltotal = fullsize[2]
2033 2034 fullsize[2] /= numfull
2034 2035 deltatotal = deltasize[2]
2035 2036 if numrevs - numfull > 0:
2036 2037 deltasize[2] /= numrevs - numfull
2037 2038 totalsize = fulltotal + deltatotal
2038 2039 avgchainlen = sum(chainlengths) / numrevs
2039 2040 maxchainlen = max(chainlengths)
2040 2041 maxchainspan = max(chainspans)
2041 2042 compratio = 1
2042 2043 if totalsize:
2043 2044 compratio = totalrawsize / totalsize
2044 2045
2045 2046 basedfmtstr = '%%%dd\n'
2046 2047 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2047 2048
2048 2049 def dfmtstr(max):
2049 2050 return basedfmtstr % len(str(max))
2050 2051 def pcfmtstr(max, padding=0):
2051 2052 return basepcfmtstr % (len(str(max)), ' ' * padding)
2052 2053
2053 2054 def pcfmt(value, total):
2054 2055 if total:
2055 2056 return (value, 100 * float(value) / total)
2056 2057 else:
2057 2058 return value, 100.0
2058 2059
2059 2060 ui.write(('format : %d\n') % format)
2060 2061 ui.write(('flags : %s\n') % ', '.join(flags))
2061 2062
2062 2063 ui.write('\n')
2063 2064 fmt = pcfmtstr(totalsize)
2064 2065 fmt2 = dfmtstr(totalsize)
2065 2066 ui.write(('revisions : ') + fmt2 % numrevs)
2066 2067 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2067 2068 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2068 2069 ui.write(('revisions : ') + fmt2 % numrevs)
2069 2070 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2070 2071 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2071 2072 ui.write(('revision size : ') + fmt2 % totalsize)
2072 2073 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2073 2074 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2074 2075
2075 2076 def fmtchunktype(chunktype):
2076 2077 if chunktype == 'empty':
2077 2078 return ' %s : ' % chunktype
2078 2079 elif chunktype in pycompat.bytestr(string.ascii_letters):
2079 2080 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2080 2081 else:
2081 2082 return ' 0x%s : ' % hex(chunktype)
2082 2083
2083 2084 ui.write('\n')
2084 2085 ui.write(('chunks : ') + fmt2 % numrevs)
2085 2086 for chunktype in sorted(chunktypecounts):
2086 2087 ui.write(fmtchunktype(chunktype))
2087 2088 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2088 2089 ui.write(('chunks size : ') + fmt2 % totalsize)
2089 2090 for chunktype in sorted(chunktypecounts):
2090 2091 ui.write(fmtchunktype(chunktype))
2091 2092 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2092 2093
2093 2094 ui.write('\n')
2094 2095 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
2095 2096 ui.write(('avg chain length : ') + fmt % avgchainlen)
2096 2097 ui.write(('max chain length : ') + fmt % maxchainlen)
2097 2098 ui.write(('max chain reach : ') + fmt % maxchainspan)
2098 2099 ui.write(('compression ratio : ') + fmt % compratio)
2099 2100
2100 2101 if format > 0:
2101 2102 ui.write('\n')
2102 2103 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2103 2104 % tuple(datasize))
2104 2105 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2105 2106 % tuple(fullsize))
2106 2107 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2107 2108 % tuple(deltasize))
2108 2109
2109 2110 if numdeltas > 0:
2110 2111 ui.write('\n')
2111 2112 fmt = pcfmtstr(numdeltas)
2112 2113 fmt2 = pcfmtstr(numdeltas, 4)
2113 2114 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2114 2115 if numprev > 0:
2115 2116 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2116 2117 numprev))
2117 2118 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2118 2119 numprev))
2119 2120 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2120 2121 numprev))
2121 2122 if gdelta:
2122 2123 ui.write(('deltas against p1 : ')
2123 2124 + fmt % pcfmt(nump1, numdeltas))
2124 2125 ui.write(('deltas against p2 : ')
2125 2126 + fmt % pcfmt(nump2, numdeltas))
2126 2127 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2127 2128 numdeltas))
2128 2129
2129 2130 @command('debugrevspec',
2130 2131 [('', 'optimize', None,
2131 2132 _('print parsed tree after optimizing (DEPRECATED)')),
2132 2133 ('', 'show-revs', True, _('print list of result revisions (default)')),
2133 2134 ('s', 'show-set', None, _('print internal representation of result set')),
2134 2135 ('p', 'show-stage', [],
2135 2136 _('print parsed tree at the given stage'), _('NAME')),
2136 2137 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2137 2138 ('', 'verify-optimized', False, _('verify optimized result')),
2138 2139 ],
2139 2140 ('REVSPEC'))
2140 2141 def debugrevspec(ui, repo, expr, **opts):
2141 2142 """parse and apply a revision specification
2142 2143
2143 2144 Use -p/--show-stage option to print the parsed tree at the given stages.
2144 2145 Use -p all to print tree at every stage.
2145 2146
2146 2147 Use --no-show-revs option with -s or -p to print only the set
2147 2148 representation or the parsed tree respectively.
2148 2149
2149 2150 Use --verify-optimized to compare the optimized result with the unoptimized
2150 2151 one. Returns 1 if the optimized result differs.
2151 2152 """
2152 2153 opts = pycompat.byteskwargs(opts)
2153 2154 aliases = ui.configitems('revsetalias')
2154 2155 stages = [
2155 2156 ('parsed', lambda tree: tree),
2156 2157 ('expanded', lambda tree: revsetlang.expandaliases(tree, aliases,
2157 2158 ui.warn)),
2158 2159 ('concatenated', revsetlang.foldconcat),
2159 2160 ('analyzed', revsetlang.analyze),
2160 2161 ('optimized', revsetlang.optimize),
2161 2162 ]
2162 2163 if opts['no_optimized']:
2163 2164 stages = stages[:-1]
2164 2165 if opts['verify_optimized'] and opts['no_optimized']:
2165 2166 raise error.Abort(_('cannot use --verify-optimized with '
2166 2167 '--no-optimized'))
2167 2168 stagenames = set(n for n, f in stages)
2168 2169
2169 2170 showalways = set()
2170 2171 showchanged = set()
2171 2172 if ui.verbose and not opts['show_stage']:
2172 2173 # show parsed tree by --verbose (deprecated)
2173 2174 showalways.add('parsed')
2174 2175 showchanged.update(['expanded', 'concatenated'])
2175 2176 if opts['optimize']:
2176 2177 showalways.add('optimized')
2177 2178 if opts['show_stage'] and opts['optimize']:
2178 2179 raise error.Abort(_('cannot use --optimize with --show-stage'))
2179 2180 if opts['show_stage'] == ['all']:
2180 2181 showalways.update(stagenames)
2181 2182 else:
2182 2183 for n in opts['show_stage']:
2183 2184 if n not in stagenames:
2184 2185 raise error.Abort(_('invalid stage name: %s') % n)
2185 2186 showalways.update(opts['show_stage'])
2186 2187
2187 2188 treebystage = {}
2188 2189 printedtree = None
2189 2190 tree = revsetlang.parse(expr, lookup=repo.__contains__)
2190 2191 for n, f in stages:
2191 2192 treebystage[n] = tree = f(tree)
2192 2193 if n in showalways or (n in showchanged and tree != printedtree):
2193 2194 if opts['show_stage'] or n != 'parsed':
2194 2195 ui.write(("* %s:\n") % n)
2195 2196 ui.write(revsetlang.prettyformat(tree), "\n")
2196 2197 printedtree = tree
2197 2198
2198 2199 if opts['verify_optimized']:
2199 2200 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2200 2201 brevs = revset.makematcher(treebystage['optimized'])(repo)
2201 2202 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2202 2203 ui.write(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
2203 2204 ui.write(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
2204 2205 arevs = list(arevs)
2205 2206 brevs = list(brevs)
2206 2207 if arevs == brevs:
2207 2208 return 0
2208 2209 ui.write(('--- analyzed\n'), label='diff.file_a')
2209 2210 ui.write(('+++ optimized\n'), label='diff.file_b')
2210 2211 sm = difflib.SequenceMatcher(None, arevs, brevs)
2211 2212 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2212 2213 if tag in ('delete', 'replace'):
2213 2214 for c in arevs[alo:ahi]:
2214 2215 ui.write('-%s\n' % c, label='diff.deleted')
2215 2216 if tag in ('insert', 'replace'):
2216 2217 for c in brevs[blo:bhi]:
2217 2218 ui.write('+%s\n' % c, label='diff.inserted')
2218 2219 if tag == 'equal':
2219 2220 for c in arevs[alo:ahi]:
2220 2221 ui.write(' %s\n' % c)
2221 2222 return 1
2222 2223
2223 2224 func = revset.makematcher(tree)
2224 2225 revs = func(repo)
2225 2226 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2226 2227 ui.write(("* set:\n"), smartset.prettyformat(revs), "\n")
2227 2228 if not opts['show_revs']:
2228 2229 return
2229 2230 for c in revs:
2230 2231 ui.write("%d\n" % c)
2231 2232
2232 2233 @command('debugsetparents', [], _('REV1 [REV2]'))
2233 2234 def debugsetparents(ui, repo, rev1, rev2=None):
2234 2235 """manually set the parents of the current working directory
2235 2236
2236 2237 This is useful for writing repository conversion tools, but should
2237 2238 be used with care. For example, neither the working directory nor the
2238 2239 dirstate is updated, so file status may be incorrect after running this
2239 2240 command.
2240 2241
2241 2242 Returns 0 on success.
2242 2243 """
2243 2244
2244 2245 r1 = scmutil.revsingle(repo, rev1).node()
2245 2246 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2246 2247
2247 2248 with repo.wlock():
2248 2249 repo.setparents(r1, r2)
2249 2250
2250 2251 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
2251 2252 def debugssl(ui, repo, source=None, **opts):
2252 2253 '''test a secure connection to a server
2253 2254
2254 2255 This builds the certificate chain for the server on Windows, installing the
2255 2256 missing intermediates and trusted root via Windows Update if necessary. It
2256 2257 does nothing on other platforms.
2257 2258
2258 2259 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
2259 2260 that server is used. See :hg:`help urls` for more information.
2260 2261
2261 2262 If the update succeeds, retry the original operation. Otherwise, the cause
2262 2263 of the SSL error is likely another issue.
2263 2264 '''
2264 2265 if not pycompat.iswindows:
2265 2266 raise error.Abort(_('certificate chain building is only possible on '
2266 2267 'Windows'))
2267 2268
2268 2269 if not source:
2269 2270 if not repo:
2270 2271 raise error.Abort(_("there is no Mercurial repository here, and no "
2271 2272 "server specified"))
2272 2273 source = "default"
2273 2274
2274 2275 source, branches = hg.parseurl(ui.expandpath(source))
2275 2276 url = util.url(source)
2276 2277 addr = None
2277 2278
2278 2279 defaultport = {'https': 443, 'ssh': 22}
2279 2280 if url.scheme in defaultport:
2280 2281 try:
2281 2282 addr = (url.host, int(url.port or defaultport[url.scheme]))
2282 2283 except ValueError:
2283 2284 raise error.Abort(_("malformed port number in URL"))
2284 2285 else:
2285 2286 raise error.Abort(_("only https and ssh connections are supported"))
2286 2287
2287 2288 from . import win32
2288 2289
2289 2290 s = ssl.wrap_socket(socket.socket(), ssl_version=ssl.PROTOCOL_TLS,
2290 2291 cert_reqs=ssl.CERT_NONE, ca_certs=None)
2291 2292
2292 2293 try:
2293 2294 s.connect(addr)
2294 2295 cert = s.getpeercert(True)
2295 2296
2296 2297 ui.status(_('checking the certificate chain for %s\n') % url.host)
2297 2298
2298 2299 complete = win32.checkcertificatechain(cert, build=False)
2299 2300
2300 2301 if not complete:
2301 2302 ui.status(_('certificate chain is incomplete, updating... '))
2302 2303
2303 2304 if not win32.checkcertificatechain(cert):
2304 2305 ui.status(_('failed.\n'))
2305 2306 else:
2306 2307 ui.status(_('done.\n'))
2307 2308 else:
2308 2309 ui.status(_('full certificate chain is available\n'))
2309 2310 finally:
2310 2311 s.close()
2311 2312
2312 2313 @command('debugsub',
2313 2314 [('r', 'rev', '',
2314 2315 _('revision to check'), _('REV'))],
2315 2316 _('[-r REV] [REV]'))
2316 2317 def debugsub(ui, repo, rev=None):
2317 2318 ctx = scmutil.revsingle(repo, rev, None)
2318 2319 for k, v in sorted(ctx.substate.items()):
2319 2320 ui.write(('path %s\n') % k)
2320 2321 ui.write((' source %s\n') % v[0])
2321 2322 ui.write((' revision %s\n') % v[1])
2322 2323
2323 2324 @command('debugsuccessorssets',
2324 2325 [('', 'closest', False, _('return closest successors sets only'))],
2325 2326 _('[REV]'))
2326 2327 def debugsuccessorssets(ui, repo, *revs, **opts):
2327 2328 """show set of successors for revision
2328 2329
2329 2330 A successors set of changeset A is a consistent group of revisions that
2330 2331 succeed A. It contains non-obsolete changesets only unless closests
2331 2332 successors set is set.
2332 2333
2333 2334 In most cases a changeset A has a single successors set containing a single
2334 2335 successor (changeset A replaced by A').
2335 2336
2336 2337 A changeset that is made obsolete with no successors are called "pruned".
2337 2338 Such changesets have no successors sets at all.
2338 2339
2339 2340 A changeset that has been "split" will have a successors set containing
2340 2341 more than one successor.
2341 2342
2342 2343 A changeset that has been rewritten in multiple different ways is called
2343 2344 "divergent". Such changesets have multiple successor sets (each of which
2344 2345 may also be split, i.e. have multiple successors).
2345 2346
2346 2347 Results are displayed as follows::
2347 2348
2348 2349 <rev1>
2349 2350 <successors-1A>
2350 2351 <rev2>
2351 2352 <successors-2A>
2352 2353 <successors-2B1> <successors-2B2> <successors-2B3>
2353 2354
2354 2355 Here rev2 has two possible (i.e. divergent) successors sets. The first
2355 2356 holds one element, whereas the second holds three (i.e. the changeset has
2356 2357 been split).
2357 2358 """
2358 2359 # passed to successorssets caching computation from one call to another
2359 2360 cache = {}
2360 2361 ctx2str = bytes
2361 2362 node2str = short
2362 2363 for rev in scmutil.revrange(repo, revs):
2363 2364 ctx = repo[rev]
2364 2365 ui.write('%s\n'% ctx2str(ctx))
2365 2366 for succsset in obsutil.successorssets(repo, ctx.node(),
2366 2367 closest=opts[r'closest'],
2367 2368 cache=cache):
2368 2369 if succsset:
2369 2370 ui.write(' ')
2370 2371 ui.write(node2str(succsset[0]))
2371 2372 for node in succsset[1:]:
2372 2373 ui.write(' ')
2373 2374 ui.write(node2str(node))
2374 2375 ui.write('\n')
2375 2376
2376 2377 @command('debugtemplate',
2377 2378 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2378 2379 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2379 2380 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2380 2381 optionalrepo=True)
2381 2382 def debugtemplate(ui, repo, tmpl, **opts):
2382 2383 """parse and apply a template
2383 2384
2384 2385 If -r/--rev is given, the template is processed as a log template and
2385 2386 applied to the given changesets. Otherwise, it is processed as a generic
2386 2387 template.
2387 2388
2388 2389 Use --verbose to print the parsed tree.
2389 2390 """
2390 2391 revs = None
2391 2392 if opts[r'rev']:
2392 2393 if repo is None:
2393 2394 raise error.RepoError(_('there is no Mercurial repository here '
2394 2395 '(.hg not found)'))
2395 2396 revs = scmutil.revrange(repo, opts[r'rev'])
2396 2397
2397 2398 props = {}
2398 2399 for d in opts[r'define']:
2399 2400 try:
2400 2401 k, v = (e.strip() for e in d.split('=', 1))
2401 2402 if not k or k == 'ui':
2402 2403 raise ValueError
2403 2404 props[k] = v
2404 2405 except ValueError:
2405 2406 raise error.Abort(_('malformed keyword definition: %s') % d)
2406 2407
2407 2408 if ui.verbose:
2408 2409 aliases = ui.configitems('templatealias')
2409 2410 tree = templater.parse(tmpl)
2410 2411 ui.note(templater.prettyformat(tree), '\n')
2411 2412 newtree = templater.expandaliases(tree, aliases)
2412 2413 if newtree != tree:
2413 2414 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2414 2415
2415 2416 if revs is None:
2416 2417 tres = formatter.templateresources(ui, repo)
2417 2418 t = formatter.maketemplater(ui, tmpl, resources=tres)
2418 2419 ui.write(t.render(props))
2419 2420 else:
2420 2421 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
2421 2422 for r in revs:
2422 2423 displayer.show(repo[r], **pycompat.strkwargs(props))
2423 2424 displayer.close()
2424 2425
2425 2426 @command('debugupdatecaches', [])
2426 2427 def debugupdatecaches(ui, repo, *pats, **opts):
2427 2428 """warm all known caches in the repository"""
2428 2429 with repo.wlock(), repo.lock():
2429 2430 repo.updatecaches()
2430 2431
2431 2432 @command('debugupgraderepo', [
2432 2433 ('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
2433 2434 ('', 'run', False, _('performs an upgrade')),
2434 2435 ])
2435 2436 def debugupgraderepo(ui, repo, run=False, optimize=None):
2436 2437 """upgrade a repository to use different features
2437 2438
2438 2439 If no arguments are specified, the repository is evaluated for upgrade
2439 2440 and a list of problems and potential optimizations is printed.
2440 2441
2441 2442 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
2442 2443 can be influenced via additional arguments. More details will be provided
2443 2444 by the command output when run without ``--run``.
2444 2445
2445 2446 During the upgrade, the repository will be locked and no writes will be
2446 2447 allowed.
2447 2448
2448 2449 At the end of the upgrade, the repository may not be readable while new
2449 2450 repository data is swapped in. This window will be as long as it takes to
2450 2451 rename some directories inside the ``.hg`` directory. On most machines, this
2451 2452 should complete almost instantaneously and the chances of a consumer being
2452 2453 unable to access the repository should be low.
2453 2454 """
2454 2455 return upgrade.upgraderepo(ui, repo, run=run, optimize=optimize)
2455 2456
2456 2457 @command('debugwalk', cmdutil.walkopts, _('[OPTION]... [FILE]...'),
2457 2458 inferrepo=True)
2458 2459 def debugwalk(ui, repo, *pats, **opts):
2459 2460 """show how files match on given patterns"""
2460 2461 opts = pycompat.byteskwargs(opts)
2461 2462 m = scmutil.match(repo[None], pats, opts)
2462 2463 ui.write(('matcher: %r\n' % m))
2463 2464 items = list(repo[None].walk(m))
2464 2465 if not items:
2465 2466 return
2466 2467 f = lambda fn: fn
2467 2468 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2468 2469 f = lambda fn: util.normpath(fn)
2469 2470 fmt = 'f %%-%ds %%-%ds %%s' % (
2470 2471 max([len(abs) for abs in items]),
2471 2472 max([len(m.rel(abs)) for abs in items]))
2472 2473 for abs in items:
2473 2474 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2474 2475 ui.write("%s\n" % line.rstrip())
2475 2476
2476 2477 @command('debugwireargs',
2477 2478 [('', 'three', '', 'three'),
2478 2479 ('', 'four', '', 'four'),
2479 2480 ('', 'five', '', 'five'),
2480 2481 ] + cmdutil.remoteopts,
2481 2482 _('REPO [OPTIONS]... [ONE [TWO]]'),
2482 2483 norepo=True)
2483 2484 def debugwireargs(ui, repopath, *vals, **opts):
2484 2485 opts = pycompat.byteskwargs(opts)
2485 2486 repo = hg.peer(ui, opts, repopath)
2486 2487 for opt in cmdutil.remoteopts:
2487 2488 del opts[opt[1]]
2488 2489 args = {}
2489 2490 for k, v in opts.iteritems():
2490 2491 if v:
2491 2492 args[k] = v
2492 2493 args = pycompat.strkwargs(args)
2493 2494 # run twice to check that we don't mess up the stream for the next command
2494 2495 res1 = repo.debugwireargs(*vals, **args)
2495 2496 res2 = repo.debugwireargs(*vals, **args)
2496 2497 ui.write("%s\n" % res1)
2497 2498 if res1 != res2:
2498 2499 ui.warn("%s\n" % res2)
General Comments 0
You need to be logged in to leave comments. Login now