##// END OF EJS Templates
dispatch: make loading extra information from extension extensible...
FUJIWARA Katsunori -
r28391:73905484 default
parent child Browse files
Show More
@@ -1,7149 +1,7158
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 operator
13 13 import os
14 14 import random
15 15 import re
16 16 import shlex
17 17 import socket
18 18 import sys
19 19 import tempfile
20 20 import time
21 21
22 22 from .i18n import _
23 23 from .node import (
24 24 bin,
25 25 hex,
26 26 nullhex,
27 27 nullid,
28 28 nullrev,
29 29 short,
30 30 )
31 31 from . import (
32 32 archival,
33 33 bookmarks,
34 34 bundle2,
35 35 changegroup,
36 36 cmdutil,
37 37 commandserver,
38 38 context,
39 39 copies,
40 40 dagparser,
41 41 dagutil,
42 42 destutil,
43 43 discovery,
44 44 encoding,
45 45 error,
46 46 exchange,
47 47 extensions,
48 48 fileset,
49 49 graphmod,
50 50 hbisect,
51 51 help,
52 52 hg,
53 53 hgweb,
54 54 localrepo,
55 55 lock as lockmod,
56 56 merge as mergemod,
57 57 minirst,
58 58 obsolete,
59 59 patch,
60 60 phases,
61 61 pvec,
62 62 repair,
63 63 revlog,
64 64 revset,
65 65 scmutil,
66 66 setdiscovery,
67 67 simplemerge,
68 68 sshserver,
69 69 streamclone,
70 70 templatekw,
71 71 treediscovery,
72 72 ui as uimod,
73 73 util,
74 74 )
75 75
76 76 release = lockmod.release
77 77
78 78 table = {}
79 79
80 80 command = cmdutil.command(table)
81 81
82 82 # label constants
83 83 # until 3.5, bookmarks.current was the advertised name, not
84 84 # bookmarks.active, so we must use both to avoid breaking old
85 85 # custom styles
86 86 activebookmarklabel = 'bookmarks.active bookmarks.current'
87 87
88 88 # common command options
89 89
90 90 globalopts = [
91 91 ('R', 'repository', '',
92 92 _('repository root directory or name of overlay bundle file'),
93 93 _('REPO')),
94 94 ('', 'cwd', '',
95 95 _('change working directory'), _('DIR')),
96 96 ('y', 'noninteractive', None,
97 97 _('do not prompt, automatically pick the first choice for all prompts')),
98 98 ('q', 'quiet', None, _('suppress output')),
99 99 ('v', 'verbose', None, _('enable additional output')),
100 100 ('', 'config', [],
101 101 _('set/override config option (use \'section.name=value\')'),
102 102 _('CONFIG')),
103 103 ('', 'debug', None, _('enable debugging output')),
104 104 ('', 'debugger', None, _('start debugger')),
105 105 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
106 106 _('ENCODE')),
107 107 ('', 'encodingmode', encoding.encodingmode,
108 108 _('set the charset encoding mode'), _('MODE')),
109 109 ('', 'traceback', None, _('always print a traceback on exception')),
110 110 ('', 'time', None, _('time how long the command takes')),
111 111 ('', 'profile', None, _('print command execution profile')),
112 112 ('', 'version', None, _('output version information and exit')),
113 113 ('h', 'help', None, _('display help and exit')),
114 114 ('', 'hidden', False, _('consider hidden changesets')),
115 115 ]
116 116
117 117 dryrunopts = [('n', 'dry-run', None,
118 118 _('do not perform actions, just print output'))]
119 119
120 120 remoteopts = [
121 121 ('e', 'ssh', '',
122 122 _('specify ssh command to use'), _('CMD')),
123 123 ('', 'remotecmd', '',
124 124 _('specify hg command to run on the remote side'), _('CMD')),
125 125 ('', 'insecure', None,
126 126 _('do not verify server certificate (ignoring web.cacerts config)')),
127 127 ]
128 128
129 129 walkopts = [
130 130 ('I', 'include', [],
131 131 _('include names matching the given patterns'), _('PATTERN')),
132 132 ('X', 'exclude', [],
133 133 _('exclude names matching the given patterns'), _('PATTERN')),
134 134 ]
135 135
136 136 commitopts = [
137 137 ('m', 'message', '',
138 138 _('use text as commit message'), _('TEXT')),
139 139 ('l', 'logfile', '',
140 140 _('read commit message from file'), _('FILE')),
141 141 ]
142 142
143 143 commitopts2 = [
144 144 ('d', 'date', '',
145 145 _('record the specified date as commit date'), _('DATE')),
146 146 ('u', 'user', '',
147 147 _('record the specified user as committer'), _('USER')),
148 148 ]
149 149
150 150 # hidden for now
151 151 formatteropts = [
152 152 ('T', 'template', '',
153 153 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
154 154 ]
155 155
156 156 templateopts = [
157 157 ('', 'style', '',
158 158 _('display using template map file (DEPRECATED)'), _('STYLE')),
159 159 ('T', 'template', '',
160 160 _('display with template'), _('TEMPLATE')),
161 161 ]
162 162
163 163 logopts = [
164 164 ('p', 'patch', None, _('show patch')),
165 165 ('g', 'git', None, _('use git extended diff format')),
166 166 ('l', 'limit', '',
167 167 _('limit number of changes displayed'), _('NUM')),
168 168 ('M', 'no-merges', None, _('do not show merges')),
169 169 ('', 'stat', None, _('output diffstat-style summary of changes')),
170 170 ('G', 'graph', None, _("show the revision DAG")),
171 171 ] + templateopts
172 172
173 173 diffopts = [
174 174 ('a', 'text', None, _('treat all files as text')),
175 175 ('g', 'git', None, _('use git extended diff format')),
176 176 ('', 'nodates', None, _('omit dates from diff headers'))
177 177 ]
178 178
179 179 diffwsopts = [
180 180 ('w', 'ignore-all-space', None,
181 181 _('ignore white space when comparing lines')),
182 182 ('b', 'ignore-space-change', None,
183 183 _('ignore changes in the amount of white space')),
184 184 ('B', 'ignore-blank-lines', None,
185 185 _('ignore changes whose lines are all blank')),
186 186 ]
187 187
188 188 diffopts2 = [
189 189 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
190 190 ('p', 'show-function', None, _('show which function each change is in')),
191 191 ('', 'reverse', None, _('produce a diff that undoes the changes')),
192 192 ] + diffwsopts + [
193 193 ('U', 'unified', '',
194 194 _('number of lines of context to show'), _('NUM')),
195 195 ('', 'stat', None, _('output diffstat-style summary of changes')),
196 196 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
197 197 ]
198 198
199 199 mergetoolopts = [
200 200 ('t', 'tool', '', _('specify merge tool')),
201 201 ]
202 202
203 203 similarityopts = [
204 204 ('s', 'similarity', '',
205 205 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
206 206 ]
207 207
208 208 subrepoopts = [
209 209 ('S', 'subrepos', None,
210 210 _('recurse into subrepositories'))
211 211 ]
212 212
213 213 debugrevlogopts = [
214 214 ('c', 'changelog', False, _('open changelog')),
215 215 ('m', 'manifest', False, _('open manifest')),
216 216 ('', 'dir', False, _('open directory manifest')),
217 217 ]
218 218
219 219 # Commands start here, listed alphabetically
220 220
221 221 @command('^add',
222 222 walkopts + subrepoopts + dryrunopts,
223 223 _('[OPTION]... [FILE]...'),
224 224 inferrepo=True)
225 225 def add(ui, repo, *pats, **opts):
226 226 """add the specified files on the next commit
227 227
228 228 Schedule files to be version controlled and added to the
229 229 repository.
230 230
231 231 The files will be added to the repository at the next commit. To
232 232 undo an add before that, see :hg:`forget`.
233 233
234 234 If no names are given, add all files to the repository (except
235 235 files matching ``.hgignore``).
236 236
237 237 .. container:: verbose
238 238
239 239 Examples:
240 240
241 241 - New (unknown) files are added
242 242 automatically by :hg:`add`::
243 243
244 244 $ ls
245 245 foo.c
246 246 $ hg status
247 247 ? foo.c
248 248 $ hg add
249 249 adding foo.c
250 250 $ hg status
251 251 A foo.c
252 252
253 253 - Specific files to be added can be specified::
254 254
255 255 $ ls
256 256 bar.c foo.c
257 257 $ hg status
258 258 ? bar.c
259 259 ? foo.c
260 260 $ hg add bar.c
261 261 $ hg status
262 262 A bar.c
263 263 ? foo.c
264 264
265 265 Returns 0 if all files are successfully added.
266 266 """
267 267
268 268 m = scmutil.match(repo[None], pats, opts)
269 269 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
270 270 return rejected and 1 or 0
271 271
272 272 @command('addremove',
273 273 similarityopts + subrepoopts + walkopts + dryrunopts,
274 274 _('[OPTION]... [FILE]...'),
275 275 inferrepo=True)
276 276 def addremove(ui, repo, *pats, **opts):
277 277 """add all new files, delete all missing files
278 278
279 279 Add all new files and remove all missing files from the
280 280 repository.
281 281
282 282 Unless names are given, new files are ignored if they match any of
283 283 the patterns in ``.hgignore``. As with add, these changes take
284 284 effect at the next commit.
285 285
286 286 Use the -s/--similarity option to detect renamed files. This
287 287 option takes a percentage between 0 (disabled) and 100 (files must
288 288 be identical) as its parameter. With a parameter greater than 0,
289 289 this compares every removed file with every added file and records
290 290 those similar enough as renames. Detecting renamed files this way
291 291 can be expensive. After using this option, :hg:`status -C` can be
292 292 used to check which files were identified as moved or renamed. If
293 293 not specified, -s/--similarity defaults to 100 and only renames of
294 294 identical files are detected.
295 295
296 296 .. container:: verbose
297 297
298 298 Examples:
299 299
300 300 - A number of files (bar.c and foo.c) are new,
301 301 while foobar.c has been removed (without using :hg:`remove`)
302 302 from the repository::
303 303
304 304 $ ls
305 305 bar.c foo.c
306 306 $ hg status
307 307 ! foobar.c
308 308 ? bar.c
309 309 ? foo.c
310 310 $ hg addremove
311 311 adding bar.c
312 312 adding foo.c
313 313 removing foobar.c
314 314 $ hg status
315 315 A bar.c
316 316 A foo.c
317 317 R foobar.c
318 318
319 319 - A file foobar.c was moved to foo.c without using :hg:`rename`.
320 320 Afterwards, it was edited slightly::
321 321
322 322 $ ls
323 323 foo.c
324 324 $ hg status
325 325 ! foobar.c
326 326 ? foo.c
327 327 $ hg addremove --similarity 90
328 328 removing foobar.c
329 329 adding foo.c
330 330 recording removal of foobar.c as rename to foo.c (94% similar)
331 331 $ hg status -C
332 332 A foo.c
333 333 foobar.c
334 334 R foobar.c
335 335
336 336 Returns 0 if all files are successfully added.
337 337 """
338 338 try:
339 339 sim = float(opts.get('similarity') or 100)
340 340 except ValueError:
341 341 raise error.Abort(_('similarity must be a number'))
342 342 if sim < 0 or sim > 100:
343 343 raise error.Abort(_('similarity must be between 0 and 100'))
344 344 matcher = scmutil.match(repo[None], pats, opts)
345 345 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
346 346
347 347 @command('^annotate|blame',
348 348 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
349 349 ('', 'follow', None,
350 350 _('follow copies/renames and list the filename (DEPRECATED)')),
351 351 ('', 'no-follow', None, _("don't follow copies and renames")),
352 352 ('a', 'text', None, _('treat all files as text')),
353 353 ('u', 'user', None, _('list the author (long with -v)')),
354 354 ('f', 'file', None, _('list the filename')),
355 355 ('d', 'date', None, _('list the date (short with -q)')),
356 356 ('n', 'number', None, _('list the revision number (default)')),
357 357 ('c', 'changeset', None, _('list the changeset')),
358 358 ('l', 'line-number', None, _('show line number at the first appearance'))
359 359 ] + diffwsopts + walkopts + formatteropts,
360 360 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
361 361 inferrepo=True)
362 362 def annotate(ui, repo, *pats, **opts):
363 363 """show changeset information by line for each file
364 364
365 365 List changes in files, showing the revision id responsible for
366 366 each line.
367 367
368 368 This command is useful for discovering when a change was made and
369 369 by whom.
370 370
371 371 If you include --file, --user, or --date, the revision number is
372 372 suppressed unless you also include --number.
373 373
374 374 Without the -a/--text option, annotate will avoid processing files
375 375 it detects as binary. With -a, annotate will annotate the file
376 376 anyway, although the results will probably be neither useful
377 377 nor desirable.
378 378
379 379 Returns 0 on success.
380 380 """
381 381 if not pats:
382 382 raise error.Abort(_('at least one filename or pattern is required'))
383 383
384 384 if opts.get('follow'):
385 385 # --follow is deprecated and now just an alias for -f/--file
386 386 # to mimic the behavior of Mercurial before version 1.5
387 387 opts['file'] = True
388 388
389 389 ctx = scmutil.revsingle(repo, opts.get('rev'))
390 390
391 391 fm = ui.formatter('annotate', opts)
392 392 if ui.quiet:
393 393 datefunc = util.shortdate
394 394 else:
395 395 datefunc = util.datestr
396 396 if ctx.rev() is None:
397 397 def hexfn(node):
398 398 if node is None:
399 399 return None
400 400 else:
401 401 return fm.hexfunc(node)
402 402 if opts.get('changeset'):
403 403 # omit "+" suffix which is appended to node hex
404 404 def formatrev(rev):
405 405 if rev is None:
406 406 return '%d' % ctx.p1().rev()
407 407 else:
408 408 return '%d' % rev
409 409 else:
410 410 def formatrev(rev):
411 411 if rev is None:
412 412 return '%d+' % ctx.p1().rev()
413 413 else:
414 414 return '%d ' % rev
415 415 def formathex(hex):
416 416 if hex is None:
417 417 return '%s+' % fm.hexfunc(ctx.p1().node())
418 418 else:
419 419 return '%s ' % hex
420 420 else:
421 421 hexfn = fm.hexfunc
422 422 formatrev = formathex = str
423 423
424 424 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
425 425 ('number', ' ', lambda x: x[0].rev(), formatrev),
426 426 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
427 427 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
428 428 ('file', ' ', lambda x: x[0].path(), str),
429 429 ('line_number', ':', lambda x: x[1], str),
430 430 ]
431 431 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
432 432
433 433 if (not opts.get('user') and not opts.get('changeset')
434 434 and not opts.get('date') and not opts.get('file')):
435 435 opts['number'] = True
436 436
437 437 linenumber = opts.get('line_number') is not None
438 438 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
439 439 raise error.Abort(_('at least one of -n/-c is required for -l'))
440 440
441 441 if fm:
442 442 def makefunc(get, fmt):
443 443 return get
444 444 else:
445 445 def makefunc(get, fmt):
446 446 return lambda x: fmt(get(x))
447 447 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
448 448 if opts.get(op)]
449 449 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
450 450 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
451 451 if opts.get(op))
452 452
453 453 def bad(x, y):
454 454 raise error.Abort("%s: %s" % (x, y))
455 455
456 456 m = scmutil.match(ctx, pats, opts, badfn=bad)
457 457
458 458 follow = not opts.get('no_follow')
459 459 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
460 460 whitespace=True)
461 461 for abs in ctx.walk(m):
462 462 fctx = ctx[abs]
463 463 if not opts.get('text') and util.binary(fctx.data()):
464 464 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
465 465 continue
466 466
467 467 lines = fctx.annotate(follow=follow, linenumber=linenumber,
468 468 diffopts=diffopts)
469 469 formats = []
470 470 pieces = []
471 471
472 472 for f, sep in funcmap:
473 473 l = [f(n) for n, dummy in lines]
474 474 if l:
475 475 if fm:
476 476 formats.append(['%s' for x in l])
477 477 else:
478 478 sizes = [encoding.colwidth(x) for x in l]
479 479 ml = max(sizes)
480 480 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
481 481 pieces.append(l)
482 482
483 483 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
484 484 fm.startitem()
485 485 fm.write(fields, "".join(f), *p)
486 486 fm.write('line', ": %s", l[1])
487 487
488 488 if lines and not lines[-1][1].endswith('\n'):
489 489 fm.plain('\n')
490 490
491 491 fm.end()
492 492
493 493 @command('archive',
494 494 [('', 'no-decode', None, _('do not pass files through decoders')),
495 495 ('p', 'prefix', '', _('directory prefix for files in archive'),
496 496 _('PREFIX')),
497 497 ('r', 'rev', '', _('revision to distribute'), _('REV')),
498 498 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
499 499 ] + subrepoopts + walkopts,
500 500 _('[OPTION]... DEST'))
501 501 def archive(ui, repo, dest, **opts):
502 502 '''create an unversioned archive of a repository revision
503 503
504 504 By default, the revision used is the parent of the working
505 505 directory; use -r/--rev to specify a different revision.
506 506
507 507 The archive type is automatically detected based on file
508 508 extension (to override, use -t/--type).
509 509
510 510 .. container:: verbose
511 511
512 512 Examples:
513 513
514 514 - create a zip file containing the 1.0 release::
515 515
516 516 hg archive -r 1.0 project-1.0.zip
517 517
518 518 - create a tarball excluding .hg files::
519 519
520 520 hg archive project.tar.gz -X ".hg*"
521 521
522 522 Valid types are:
523 523
524 524 :``files``: a directory full of files (default)
525 525 :``tar``: tar archive, uncompressed
526 526 :``tbz2``: tar archive, compressed using bzip2
527 527 :``tgz``: tar archive, compressed using gzip
528 528 :``uzip``: zip archive, uncompressed
529 529 :``zip``: zip archive, compressed using deflate
530 530
531 531 The exact name of the destination archive or directory is given
532 532 using a format string; see :hg:`help export` for details.
533 533
534 534 Each member added to an archive file has a directory prefix
535 535 prepended. Use -p/--prefix to specify a format string for the
536 536 prefix. The default is the basename of the archive, with suffixes
537 537 removed.
538 538
539 539 Returns 0 on success.
540 540 '''
541 541
542 542 ctx = scmutil.revsingle(repo, opts.get('rev'))
543 543 if not ctx:
544 544 raise error.Abort(_('no working directory: please specify a revision'))
545 545 node = ctx.node()
546 546 dest = cmdutil.makefilename(repo, dest, node)
547 547 if os.path.realpath(dest) == repo.root:
548 548 raise error.Abort(_('repository root cannot be destination'))
549 549
550 550 kind = opts.get('type') or archival.guesskind(dest) or 'files'
551 551 prefix = opts.get('prefix')
552 552
553 553 if dest == '-':
554 554 if kind == 'files':
555 555 raise error.Abort(_('cannot archive plain files to stdout'))
556 556 dest = cmdutil.makefileobj(repo, dest)
557 557 if not prefix:
558 558 prefix = os.path.basename(repo.root) + '-%h'
559 559
560 560 prefix = cmdutil.makefilename(repo, prefix, node)
561 561 matchfn = scmutil.match(ctx, [], opts)
562 562 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
563 563 matchfn, prefix, subrepos=opts.get('subrepos'))
564 564
565 565 @command('backout',
566 566 [('', 'merge', None, _('merge with old dirstate parent after backout')),
567 567 ('', 'commit', None,
568 568 _('commit if no conflicts were encountered (DEPRECATED)')),
569 569 ('', 'no-commit', None, _('do not commit')),
570 570 ('', 'parent', '',
571 571 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
572 572 ('r', 'rev', '', _('revision to backout'), _('REV')),
573 573 ('e', 'edit', False, _('invoke editor on commit messages')),
574 574 ] + mergetoolopts + walkopts + commitopts + commitopts2,
575 575 _('[OPTION]... [-r] REV'))
576 576 def backout(ui, repo, node=None, rev=None, **opts):
577 577 '''reverse effect of earlier changeset
578 578
579 579 Prepare a new changeset with the effect of REV undone in the
580 580 current working directory. If no conflicts were encountered,
581 581 it will be committed immediately.
582 582
583 583 If REV is the parent of the working directory, then this new changeset
584 584 is committed automatically (unless --no-commit is specified).
585 585
586 586 .. note::
587 587
588 588 :hg:`backout` cannot be used to fix either an unwanted or
589 589 incorrect merge.
590 590
591 591 .. container:: verbose
592 592
593 593 Examples:
594 594
595 595 - Reverse the effect of the parent of the working directory.
596 596 This backout will be committed immediately::
597 597
598 598 hg backout -r .
599 599
600 600 - Reverse the effect of previous bad revision 23::
601 601
602 602 hg backout -r 23
603 603
604 604 - Reverse the effect of previous bad revision 23 and
605 605 leave changes uncommitted::
606 606
607 607 hg backout -r 23 --no-commit
608 608 hg commit -m "Backout revision 23"
609 609
610 610 By default, the pending changeset will have one parent,
611 611 maintaining a linear history. With --merge, the pending
612 612 changeset will instead have two parents: the old parent of the
613 613 working directory and a new child of REV that simply undoes REV.
614 614
615 615 Before version 1.7, the behavior without --merge was equivalent
616 616 to specifying --merge followed by :hg:`update --clean .` to
617 617 cancel the merge and leave the child of REV as a head to be
618 618 merged separately.
619 619
620 620 See :hg:`help dates` for a list of formats valid for -d/--date.
621 621
622 622 See :hg:`help revert` for a way to restore files to the state
623 623 of another revision.
624 624
625 625 Returns 0 on success, 1 if nothing to backout or there are unresolved
626 626 files.
627 627 '''
628 628 wlock = lock = None
629 629 try:
630 630 wlock = repo.wlock()
631 631 lock = repo.lock()
632 632 return _dobackout(ui, repo, node, rev, **opts)
633 633 finally:
634 634 release(lock, wlock)
635 635
636 636 def _dobackout(ui, repo, node=None, rev=None, **opts):
637 637 if opts.get('commit') and opts.get('no_commit'):
638 638 raise error.Abort(_("cannot use --commit with --no-commit"))
639 639 if opts.get('merge') and opts.get('no_commit'):
640 640 raise error.Abort(_("cannot use --merge with --no-commit"))
641 641
642 642 if rev and node:
643 643 raise error.Abort(_("please specify just one revision"))
644 644
645 645 if not rev:
646 646 rev = node
647 647
648 648 if not rev:
649 649 raise error.Abort(_("please specify a revision to backout"))
650 650
651 651 date = opts.get('date')
652 652 if date:
653 653 opts['date'] = util.parsedate(date)
654 654
655 655 cmdutil.checkunfinished(repo)
656 656 cmdutil.bailifchanged(repo)
657 657 node = scmutil.revsingle(repo, rev).node()
658 658
659 659 op1, op2 = repo.dirstate.parents()
660 660 if not repo.changelog.isancestor(node, op1):
661 661 raise error.Abort(_('cannot backout change that is not an ancestor'))
662 662
663 663 p1, p2 = repo.changelog.parents(node)
664 664 if p1 == nullid:
665 665 raise error.Abort(_('cannot backout a change with no parents'))
666 666 if p2 != nullid:
667 667 if not opts.get('parent'):
668 668 raise error.Abort(_('cannot backout a merge changeset'))
669 669 p = repo.lookup(opts['parent'])
670 670 if p not in (p1, p2):
671 671 raise error.Abort(_('%s is not a parent of %s') %
672 672 (short(p), short(node)))
673 673 parent = p
674 674 else:
675 675 if opts.get('parent'):
676 676 raise error.Abort(_('cannot use --parent on non-merge changeset'))
677 677 parent = p1
678 678
679 679 # the backout should appear on the same branch
680 680 branch = repo.dirstate.branch()
681 681 bheads = repo.branchheads(branch)
682 682 rctx = scmutil.revsingle(repo, hex(parent))
683 683 if not opts.get('merge') and op1 != node:
684 684 dsguard = cmdutil.dirstateguard(repo, 'backout')
685 685 try:
686 686 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 687 'backout')
688 688 stats = mergemod.update(repo, parent, True, True, node, False)
689 689 repo.setparents(op1, op2)
690 690 dsguard.close()
691 691 hg._showstats(repo, stats)
692 692 if stats[3]:
693 693 repo.ui.status(_("use 'hg resolve' to retry unresolved "
694 694 "file merges\n"))
695 695 return 1
696 696 finally:
697 697 ui.setconfig('ui', 'forcemerge', '', '')
698 698 lockmod.release(dsguard)
699 699 else:
700 700 hg.clean(repo, node, show_stats=False)
701 701 repo.dirstate.setbranch(branch)
702 702 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
703 703
704 704 if opts.get('no_commit'):
705 705 msg = _("changeset %s backed out, "
706 706 "don't forget to commit.\n")
707 707 ui.status(msg % short(node))
708 708 return 0
709 709
710 710 def commitfunc(ui, repo, message, match, opts):
711 711 editform = 'backout'
712 712 e = cmdutil.getcommiteditor(editform=editform, **opts)
713 713 if not message:
714 714 # we don't translate commit messages
715 715 message = "Backed out changeset %s" % short(node)
716 716 e = cmdutil.getcommiteditor(edit=True, editform=editform)
717 717 return repo.commit(message, opts.get('user'), opts.get('date'),
718 718 match, editor=e)
719 719 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
720 720 if not newnode:
721 721 ui.status(_("nothing changed\n"))
722 722 return 1
723 723 cmdutil.commitstatus(repo, newnode, branch, bheads)
724 724
725 725 def nice(node):
726 726 return '%d:%s' % (repo.changelog.rev(node), short(node))
727 727 ui.status(_('changeset %s backs out changeset %s\n') %
728 728 (nice(repo.changelog.tip()), nice(node)))
729 729 if opts.get('merge') and op1 != node:
730 730 hg.clean(repo, op1, show_stats=False)
731 731 ui.status(_('merging with changeset %s\n')
732 732 % nice(repo.changelog.tip()))
733 733 try:
734 734 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
735 735 'backout')
736 736 return hg.merge(repo, hex(repo.changelog.tip()))
737 737 finally:
738 738 ui.setconfig('ui', 'forcemerge', '', '')
739 739 return 0
740 740
741 741 @command('bisect',
742 742 [('r', 'reset', False, _('reset bisect state')),
743 743 ('g', 'good', False, _('mark changeset good')),
744 744 ('b', 'bad', False, _('mark changeset bad')),
745 745 ('s', 'skip', False, _('skip testing changeset')),
746 746 ('e', 'extend', False, _('extend the bisect range')),
747 747 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
748 748 ('U', 'noupdate', False, _('do not update to target'))],
749 749 _("[-gbsr] [-U] [-c CMD] [REV]"))
750 750 def bisect(ui, repo, rev=None, extra=None, command=None,
751 751 reset=None, good=None, bad=None, skip=None, extend=None,
752 752 noupdate=None):
753 753 """subdivision search of changesets
754 754
755 755 This command helps to find changesets which introduce problems. To
756 756 use, mark the earliest changeset you know exhibits the problem as
757 757 bad, then mark the latest changeset which is free from the problem
758 758 as good. Bisect will update your working directory to a revision
759 759 for testing (unless the -U/--noupdate option is specified). Once
760 760 you have performed tests, mark the working directory as good or
761 761 bad, and bisect will either update to another candidate changeset
762 762 or announce that it has found the bad revision.
763 763
764 764 As a shortcut, you can also use the revision argument to mark a
765 765 revision as good or bad without checking it out first.
766 766
767 767 If you supply a command, it will be used for automatic bisection.
768 768 The environment variable HG_NODE will contain the ID of the
769 769 changeset being tested. The exit status of the command will be
770 770 used to mark revisions as good or bad: status 0 means good, 125
771 771 means to skip the revision, 127 (command not found) will abort the
772 772 bisection, and any other non-zero exit status means the revision
773 773 is bad.
774 774
775 775 .. container:: verbose
776 776
777 777 Some examples:
778 778
779 779 - start a bisection with known bad revision 34, and good revision 12::
780 780
781 781 hg bisect --bad 34
782 782 hg bisect --good 12
783 783
784 784 - advance the current bisection by marking current revision as good or
785 785 bad::
786 786
787 787 hg bisect --good
788 788 hg bisect --bad
789 789
790 790 - mark the current revision, or a known revision, to be skipped (e.g. if
791 791 that revision is not usable because of another issue)::
792 792
793 793 hg bisect --skip
794 794 hg bisect --skip 23
795 795
796 796 - skip all revisions that do not touch directories ``foo`` or ``bar``::
797 797
798 798 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
799 799
800 800 - forget the current bisection::
801 801
802 802 hg bisect --reset
803 803
804 804 - use 'make && make tests' to automatically find the first broken
805 805 revision::
806 806
807 807 hg bisect --reset
808 808 hg bisect --bad 34
809 809 hg bisect --good 12
810 810 hg bisect --command "make && make tests"
811 811
812 812 - see all changesets whose states are already known in the current
813 813 bisection::
814 814
815 815 hg log -r "bisect(pruned)"
816 816
817 817 - see the changeset currently being bisected (especially useful
818 818 if running with -U/--noupdate)::
819 819
820 820 hg log -r "bisect(current)"
821 821
822 822 - see all changesets that took part in the current bisection::
823 823
824 824 hg log -r "bisect(range)"
825 825
826 826 - you can even get a nice graph::
827 827
828 828 hg log --graph -r "bisect(range)"
829 829
830 830 See :hg:`help revsets` for more about the `bisect()` keyword.
831 831
832 832 Returns 0 on success.
833 833 """
834 834 def extendbisectrange(nodes, good):
835 835 # bisect is incomplete when it ends on a merge node and
836 836 # one of the parent was not checked.
837 837 parents = repo[nodes[0]].parents()
838 838 if len(parents) > 1:
839 839 if good:
840 840 side = state['bad']
841 841 else:
842 842 side = state['good']
843 843 num = len(set(i.node() for i in parents) & set(side))
844 844 if num == 1:
845 845 return parents[0].ancestor(parents[1])
846 846 return None
847 847
848 848 def print_result(nodes, good):
849 849 displayer = cmdutil.show_changeset(ui, repo, {})
850 850 if len(nodes) == 1:
851 851 # narrowed it down to a single revision
852 852 if good:
853 853 ui.write(_("The first good revision is:\n"))
854 854 else:
855 855 ui.write(_("The first bad revision is:\n"))
856 856 displayer.show(repo[nodes[0]])
857 857 extendnode = extendbisectrange(nodes, good)
858 858 if extendnode is not None:
859 859 ui.write(_('Not all ancestors of this changeset have been'
860 860 ' checked.\nUse bisect --extend to continue the '
861 861 'bisection from\nthe common ancestor, %s.\n')
862 862 % extendnode)
863 863 else:
864 864 # multiple possible revisions
865 865 if good:
866 866 ui.write(_("Due to skipped revisions, the first "
867 867 "good revision could be any of:\n"))
868 868 else:
869 869 ui.write(_("Due to skipped revisions, the first "
870 870 "bad revision could be any of:\n"))
871 871 for n in nodes:
872 872 displayer.show(repo[n])
873 873 displayer.close()
874 874
875 875 def check_state(state, interactive=True):
876 876 if not state['good'] or not state['bad']:
877 877 if (good or bad or skip or reset) and interactive:
878 878 return
879 879 if not state['good']:
880 880 raise error.Abort(_('cannot bisect (no known good revisions)'))
881 881 else:
882 882 raise error.Abort(_('cannot bisect (no known bad revisions)'))
883 883 return True
884 884
885 885 # backward compatibility
886 886 if rev in "good bad reset init".split():
887 887 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
888 888 cmd, rev, extra = rev, extra, None
889 889 if cmd == "good":
890 890 good = True
891 891 elif cmd == "bad":
892 892 bad = True
893 893 else:
894 894 reset = True
895 895 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
896 896 raise error.Abort(_('incompatible arguments'))
897 897
898 898 cmdutil.checkunfinished(repo)
899 899
900 900 if reset:
901 901 p = repo.join("bisect.state")
902 902 if os.path.exists(p):
903 903 os.unlink(p)
904 904 return
905 905
906 906 state = hbisect.load_state(repo)
907 907
908 908 if command:
909 909 changesets = 1
910 910 if noupdate:
911 911 try:
912 912 node = state['current'][0]
913 913 except LookupError:
914 914 raise error.Abort(_('current bisect revision is unknown - '
915 915 'start a new bisect to fix'))
916 916 else:
917 917 node, p2 = repo.dirstate.parents()
918 918 if p2 != nullid:
919 919 raise error.Abort(_('current bisect revision is a merge'))
920 920 try:
921 921 while changesets:
922 922 # update state
923 923 state['current'] = [node]
924 924 hbisect.save_state(repo, state)
925 925 status = ui.system(command, environ={'HG_NODE': hex(node)})
926 926 if status == 125:
927 927 transition = "skip"
928 928 elif status == 0:
929 929 transition = "good"
930 930 # status < 0 means process was killed
931 931 elif status == 127:
932 932 raise error.Abort(_("failed to execute %s") % command)
933 933 elif status < 0:
934 934 raise error.Abort(_("%s killed") % command)
935 935 else:
936 936 transition = "bad"
937 937 ctx = scmutil.revsingle(repo, rev, node)
938 938 rev = None # clear for future iterations
939 939 state[transition].append(ctx.node())
940 940 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
941 941 check_state(state, interactive=False)
942 942 # bisect
943 943 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
944 944 # update to next check
945 945 node = nodes[0]
946 946 if not noupdate:
947 947 cmdutil.bailifchanged(repo)
948 948 hg.clean(repo, node, show_stats=False)
949 949 finally:
950 950 state['current'] = [node]
951 951 hbisect.save_state(repo, state)
952 952 print_result(nodes, bgood)
953 953 return
954 954
955 955 # update state
956 956
957 957 if rev:
958 958 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
959 959 else:
960 960 nodes = [repo.lookup('.')]
961 961
962 962 if good or bad or skip:
963 963 if good:
964 964 state['good'] += nodes
965 965 elif bad:
966 966 state['bad'] += nodes
967 967 elif skip:
968 968 state['skip'] += nodes
969 969 hbisect.save_state(repo, state)
970 970
971 971 if not check_state(state):
972 972 return
973 973
974 974 # actually bisect
975 975 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
976 976 if extend:
977 977 if not changesets:
978 978 extendnode = extendbisectrange(nodes, good)
979 979 if extendnode is not None:
980 980 ui.write(_("Extending search to changeset %d:%s\n")
981 981 % (extendnode.rev(), extendnode))
982 982 state['current'] = [extendnode.node()]
983 983 hbisect.save_state(repo, state)
984 984 if noupdate:
985 985 return
986 986 cmdutil.bailifchanged(repo)
987 987 return hg.clean(repo, extendnode.node())
988 988 raise error.Abort(_("nothing to extend"))
989 989
990 990 if changesets == 0:
991 991 print_result(nodes, good)
992 992 else:
993 993 assert len(nodes) == 1 # only a single node can be tested next
994 994 node = nodes[0]
995 995 # compute the approximate number of remaining tests
996 996 tests, size = 0, 2
997 997 while size <= changesets:
998 998 tests, size = tests + 1, size * 2
999 999 rev = repo.changelog.rev(node)
1000 1000 ui.write(_("Testing changeset %d:%s "
1001 1001 "(%d changesets remaining, ~%d tests)\n")
1002 1002 % (rev, short(node), changesets, tests))
1003 1003 state['current'] = [node]
1004 1004 hbisect.save_state(repo, state)
1005 1005 if not noupdate:
1006 1006 cmdutil.bailifchanged(repo)
1007 1007 return hg.clean(repo, node)
1008 1008
1009 1009 @command('bookmarks|bookmark',
1010 1010 [('f', 'force', False, _('force')),
1011 1011 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1012 1012 ('d', 'delete', False, _('delete a given bookmark')),
1013 1013 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1014 1014 ('i', 'inactive', False, _('mark a bookmark inactive')),
1015 1015 ] + formatteropts,
1016 1016 _('hg bookmarks [OPTIONS]... [NAME]...'))
1017 1017 def bookmark(ui, repo, *names, **opts):
1018 1018 '''create a new bookmark or list existing bookmarks
1019 1019
1020 1020 Bookmarks are labels on changesets to help track lines of development.
1021 1021 Bookmarks are unversioned and can be moved, renamed and deleted.
1022 1022 Deleting or moving a bookmark has no effect on the associated changesets.
1023 1023
1024 1024 Creating or updating to a bookmark causes it to be marked as 'active'.
1025 1025 The active bookmark is indicated with a '*'.
1026 1026 When a commit is made, the active bookmark will advance to the new commit.
1027 1027 A plain :hg:`update` will also advance an active bookmark, if possible.
1028 1028 Updating away from a bookmark will cause it to be deactivated.
1029 1029
1030 1030 Bookmarks can be pushed and pulled between repositories (see
1031 1031 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1032 1032 diverged, a new 'divergent bookmark' of the form 'name@path' will
1033 1033 be created. Using :hg:`merge` will resolve the divergence.
1034 1034
1035 1035 A bookmark named '@' has the special property that :hg:`clone` will
1036 1036 check it out by default if it exists.
1037 1037
1038 1038 .. container:: verbose
1039 1039
1040 1040 Examples:
1041 1041
1042 1042 - create an active bookmark for a new line of development::
1043 1043
1044 1044 hg book new-feature
1045 1045
1046 1046 - create an inactive bookmark as a place marker::
1047 1047
1048 1048 hg book -i reviewed
1049 1049
1050 1050 - create an inactive bookmark on another changeset::
1051 1051
1052 1052 hg book -r .^ tested
1053 1053
1054 1054 - rename bookmark turkey to dinner::
1055 1055
1056 1056 hg book -m turkey dinner
1057 1057
1058 1058 - move the '@' bookmark from another branch::
1059 1059
1060 1060 hg book -f @
1061 1061 '''
1062 1062 force = opts.get('force')
1063 1063 rev = opts.get('rev')
1064 1064 delete = opts.get('delete')
1065 1065 rename = opts.get('rename')
1066 1066 inactive = opts.get('inactive')
1067 1067
1068 1068 def checkformat(mark):
1069 1069 mark = mark.strip()
1070 1070 if not mark:
1071 1071 raise error.Abort(_("bookmark names cannot consist entirely of "
1072 1072 "whitespace"))
1073 1073 scmutil.checknewlabel(repo, mark, 'bookmark')
1074 1074 return mark
1075 1075
1076 1076 def checkconflict(repo, mark, cur, force=False, target=None):
1077 1077 if mark in marks and not force:
1078 1078 if target:
1079 1079 if marks[mark] == target and target == cur:
1080 1080 # re-activating a bookmark
1081 1081 return
1082 1082 anc = repo.changelog.ancestors([repo[target].rev()])
1083 1083 bmctx = repo[marks[mark]]
1084 1084 divs = [repo[b].node() for b in marks
1085 1085 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1086 1086
1087 1087 # allow resolving a single divergent bookmark even if moving
1088 1088 # the bookmark across branches when a revision is specified
1089 1089 # that contains a divergent bookmark
1090 1090 if bmctx.rev() not in anc and target in divs:
1091 1091 bookmarks.deletedivergent(repo, [target], mark)
1092 1092 return
1093 1093
1094 1094 deletefrom = [b for b in divs
1095 1095 if repo[b].rev() in anc or b == target]
1096 1096 bookmarks.deletedivergent(repo, deletefrom, mark)
1097 1097 if bookmarks.validdest(repo, bmctx, repo[target]):
1098 1098 ui.status(_("moving bookmark '%s' forward from %s\n") %
1099 1099 (mark, short(bmctx.node())))
1100 1100 return
1101 1101 raise error.Abort(_("bookmark '%s' already exists "
1102 1102 "(use -f to force)") % mark)
1103 1103 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1104 1104 and not force):
1105 1105 raise error.Abort(
1106 1106 _("a bookmark cannot have the name of an existing branch"))
1107 1107
1108 1108 if delete and rename:
1109 1109 raise error.Abort(_("--delete and --rename are incompatible"))
1110 1110 if delete and rev:
1111 1111 raise error.Abort(_("--rev is incompatible with --delete"))
1112 1112 if rename and rev:
1113 1113 raise error.Abort(_("--rev is incompatible with --rename"))
1114 1114 if not names and (delete or rev):
1115 1115 raise error.Abort(_("bookmark name required"))
1116 1116
1117 1117 if delete or rename or names or inactive:
1118 1118 wlock = lock = tr = None
1119 1119 try:
1120 1120 wlock = repo.wlock()
1121 1121 lock = repo.lock()
1122 1122 cur = repo.changectx('.').node()
1123 1123 marks = repo._bookmarks
1124 1124 if delete:
1125 1125 tr = repo.transaction('bookmark')
1126 1126 for mark in names:
1127 1127 if mark not in marks:
1128 1128 raise error.Abort(_("bookmark '%s' does not exist") %
1129 1129 mark)
1130 1130 if mark == repo._activebookmark:
1131 1131 bookmarks.deactivate(repo)
1132 1132 del marks[mark]
1133 1133
1134 1134 elif rename:
1135 1135 tr = repo.transaction('bookmark')
1136 1136 if not names:
1137 1137 raise error.Abort(_("new bookmark name required"))
1138 1138 elif len(names) > 1:
1139 1139 raise error.Abort(_("only one new bookmark name allowed"))
1140 1140 mark = checkformat(names[0])
1141 1141 if rename not in marks:
1142 1142 raise error.Abort(_("bookmark '%s' does not exist")
1143 1143 % rename)
1144 1144 checkconflict(repo, mark, cur, force)
1145 1145 marks[mark] = marks[rename]
1146 1146 if repo._activebookmark == rename and not inactive:
1147 1147 bookmarks.activate(repo, mark)
1148 1148 del marks[rename]
1149 1149 elif names:
1150 1150 tr = repo.transaction('bookmark')
1151 1151 newact = None
1152 1152 for mark in names:
1153 1153 mark = checkformat(mark)
1154 1154 if newact is None:
1155 1155 newact = mark
1156 1156 if inactive and mark == repo._activebookmark:
1157 1157 bookmarks.deactivate(repo)
1158 1158 return
1159 1159 tgt = cur
1160 1160 if rev:
1161 1161 tgt = scmutil.revsingle(repo, rev).node()
1162 1162 checkconflict(repo, mark, cur, force, tgt)
1163 1163 marks[mark] = tgt
1164 1164 if not inactive and cur == marks[newact] and not rev:
1165 1165 bookmarks.activate(repo, newact)
1166 1166 elif cur != tgt and newact == repo._activebookmark:
1167 1167 bookmarks.deactivate(repo)
1168 1168 elif inactive:
1169 1169 if len(marks) == 0:
1170 1170 ui.status(_("no bookmarks set\n"))
1171 1171 elif not repo._activebookmark:
1172 1172 ui.status(_("no active bookmark\n"))
1173 1173 else:
1174 1174 bookmarks.deactivate(repo)
1175 1175 if tr is not None:
1176 1176 marks.recordchange(tr)
1177 1177 tr.close()
1178 1178 finally:
1179 1179 lockmod.release(tr, lock, wlock)
1180 1180 else: # show bookmarks
1181 1181 fm = ui.formatter('bookmarks', opts)
1182 1182 hexfn = fm.hexfunc
1183 1183 marks = repo._bookmarks
1184 1184 if len(marks) == 0 and not fm:
1185 1185 ui.status(_("no bookmarks set\n"))
1186 1186 for bmark, n in sorted(marks.iteritems()):
1187 1187 active = repo._activebookmark
1188 1188 if bmark == active:
1189 1189 prefix, label = '*', activebookmarklabel
1190 1190 else:
1191 1191 prefix, label = ' ', ''
1192 1192
1193 1193 fm.startitem()
1194 1194 if not ui.quiet:
1195 1195 fm.plain(' %s ' % prefix, label=label)
1196 1196 fm.write('bookmark', '%s', bmark, label=label)
1197 1197 pad = " " * (25 - encoding.colwidth(bmark))
1198 1198 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1199 1199 repo.changelog.rev(n), hexfn(n), label=label)
1200 1200 fm.data(active=(bmark == active))
1201 1201 fm.plain('\n')
1202 1202 fm.end()
1203 1203
1204 1204 @command('branch',
1205 1205 [('f', 'force', None,
1206 1206 _('set branch name even if it shadows an existing branch')),
1207 1207 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1208 1208 _('[-fC] [NAME]'))
1209 1209 def branch(ui, repo, label=None, **opts):
1210 1210 """set or show the current branch name
1211 1211
1212 1212 .. note::
1213 1213
1214 1214 Branch names are permanent and global. Use :hg:`bookmark` to create a
1215 1215 light-weight bookmark instead. See :hg:`help glossary` for more
1216 1216 information about named branches and bookmarks.
1217 1217
1218 1218 With no argument, show the current branch name. With one argument,
1219 1219 set the working directory branch name (the branch will not exist
1220 1220 in the repository until the next commit). Standard practice
1221 1221 recommends that primary development take place on the 'default'
1222 1222 branch.
1223 1223
1224 1224 Unless -f/--force is specified, branch will not let you set a
1225 1225 branch name that already exists.
1226 1226
1227 1227 Use -C/--clean to reset the working directory branch to that of
1228 1228 the parent of the working directory, negating a previous branch
1229 1229 change.
1230 1230
1231 1231 Use the command :hg:`update` to switch to an existing branch. Use
1232 1232 :hg:`commit --close-branch` to mark this branch head as closed.
1233 1233 When all heads of a branch are closed, the branch will be
1234 1234 considered closed.
1235 1235
1236 1236 Returns 0 on success.
1237 1237 """
1238 1238 if label:
1239 1239 label = label.strip()
1240 1240
1241 1241 if not opts.get('clean') and not label:
1242 1242 ui.write("%s\n" % repo.dirstate.branch())
1243 1243 return
1244 1244
1245 1245 with repo.wlock():
1246 1246 if opts.get('clean'):
1247 1247 label = repo[None].p1().branch()
1248 1248 repo.dirstate.setbranch(label)
1249 1249 ui.status(_('reset working directory to branch %s\n') % label)
1250 1250 elif label:
1251 1251 if not opts.get('force') and label in repo.branchmap():
1252 1252 if label not in [p.branch() for p in repo[None].parents()]:
1253 1253 raise error.Abort(_('a branch of the same name already'
1254 1254 ' exists'),
1255 1255 # i18n: "it" refers to an existing branch
1256 1256 hint=_("use 'hg update' to switch to it"))
1257 1257 scmutil.checknewlabel(repo, label, 'branch')
1258 1258 repo.dirstate.setbranch(label)
1259 1259 ui.status(_('marked working directory as branch %s\n') % label)
1260 1260
1261 1261 # find any open named branches aside from default
1262 1262 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1263 1263 if n != "default" and not c]
1264 1264 if not others:
1265 1265 ui.status(_('(branches are permanent and global, '
1266 1266 'did you want a bookmark?)\n'))
1267 1267
1268 1268 @command('branches',
1269 1269 [('a', 'active', False,
1270 1270 _('show only branches that have unmerged heads (DEPRECATED)')),
1271 1271 ('c', 'closed', False, _('show normal and closed branches')),
1272 1272 ] + formatteropts,
1273 1273 _('[-c]'))
1274 1274 def branches(ui, repo, active=False, closed=False, **opts):
1275 1275 """list repository named branches
1276 1276
1277 1277 List the repository's named branches, indicating which ones are
1278 1278 inactive. If -c/--closed is specified, also list branches which have
1279 1279 been marked closed (see :hg:`commit --close-branch`).
1280 1280
1281 1281 Use the command :hg:`update` to switch to an existing branch.
1282 1282
1283 1283 Returns 0.
1284 1284 """
1285 1285
1286 1286 fm = ui.formatter('branches', opts)
1287 1287 hexfunc = fm.hexfunc
1288 1288
1289 1289 allheads = set(repo.heads())
1290 1290 branches = []
1291 1291 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1292 1292 isactive = not isclosed and bool(set(heads) & allheads)
1293 1293 branches.append((tag, repo[tip], isactive, not isclosed))
1294 1294 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1295 1295 reverse=True)
1296 1296
1297 1297 for tag, ctx, isactive, isopen in branches:
1298 1298 if active and not isactive:
1299 1299 continue
1300 1300 if isactive:
1301 1301 label = 'branches.active'
1302 1302 notice = ''
1303 1303 elif not isopen:
1304 1304 if not closed:
1305 1305 continue
1306 1306 label = 'branches.closed'
1307 1307 notice = _(' (closed)')
1308 1308 else:
1309 1309 label = 'branches.inactive'
1310 1310 notice = _(' (inactive)')
1311 1311 current = (tag == repo.dirstate.branch())
1312 1312 if current:
1313 1313 label = 'branches.current'
1314 1314
1315 1315 fm.startitem()
1316 1316 fm.write('branch', '%s', tag, label=label)
1317 1317 rev = ctx.rev()
1318 1318 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1319 1319 fmt = ' ' * padsize + ' %d:%s'
1320 1320 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1321 1321 label='log.changeset changeset.%s' % ctx.phasestr())
1322 1322 fm.data(active=isactive, closed=not isopen, current=current)
1323 1323 if not ui.quiet:
1324 1324 fm.plain(notice)
1325 1325 fm.plain('\n')
1326 1326 fm.end()
1327 1327
1328 1328 @command('bundle',
1329 1329 [('f', 'force', None, _('run even when the destination is unrelated')),
1330 1330 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1331 1331 _('REV')),
1332 1332 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1333 1333 _('BRANCH')),
1334 1334 ('', 'base', [],
1335 1335 _('a base changeset assumed to be available at the destination'),
1336 1336 _('REV')),
1337 1337 ('a', 'all', None, _('bundle all changesets in the repository')),
1338 1338 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1339 1339 ] + remoteopts,
1340 1340 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1341 1341 def bundle(ui, repo, fname, dest=None, **opts):
1342 1342 """create a changegroup file
1343 1343
1344 1344 Generate a changegroup file collecting changesets to be added
1345 1345 to a repository.
1346 1346
1347 1347 To create a bundle containing all changesets, use -a/--all
1348 1348 (or --base null). Otherwise, hg assumes the destination will have
1349 1349 all the nodes you specify with --base parameters. Otherwise, hg
1350 1350 will assume the repository has all the nodes in destination, or
1351 1351 default-push/default if no destination is specified.
1352 1352
1353 1353 You can change bundle format with the -t/--type option. You can
1354 1354 specify a compression, a bundle version or both using a dash
1355 1355 (comp-version). The available compression methods are: none, bzip2,
1356 1356 and gzip (by default, bundles are compressed using bzip2). The
1357 1357 available formats are: v1, v2 (default to most suitable).
1358 1358
1359 1359 The bundle file can then be transferred using conventional means
1360 1360 and applied to another repository with the unbundle or pull
1361 1361 command. This is useful when direct push and pull are not
1362 1362 available or when exporting an entire repository is undesirable.
1363 1363
1364 1364 Applying bundles preserves all changeset contents including
1365 1365 permissions, copy/rename information, and revision history.
1366 1366
1367 1367 Returns 0 on success, 1 if no changes found.
1368 1368 """
1369 1369 revs = None
1370 1370 if 'rev' in opts:
1371 1371 revstrings = opts['rev']
1372 1372 revs = scmutil.revrange(repo, revstrings)
1373 1373 if revstrings and not revs:
1374 1374 raise error.Abort(_('no commits to bundle'))
1375 1375
1376 1376 bundletype = opts.get('type', 'bzip2').lower()
1377 1377 try:
1378 1378 bcompression, cgversion, params = exchange.parsebundlespec(
1379 1379 repo, bundletype, strict=False)
1380 1380 except error.UnsupportedBundleSpecification as e:
1381 1381 raise error.Abort(str(e),
1382 1382 hint=_('see "hg help bundle" for supported '
1383 1383 'values for --type'))
1384 1384
1385 1385 # Packed bundles are a pseudo bundle format for now.
1386 1386 if cgversion == 's1':
1387 1387 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1388 1388 hint=_('use "hg debugcreatestreamclonebundle"'))
1389 1389
1390 1390 if opts.get('all'):
1391 1391 if dest:
1392 1392 raise error.Abort(_("--all is incompatible with specifying "
1393 1393 "a destination"))
1394 1394 if opts.get('base'):
1395 1395 ui.warn(_("ignoring --base because --all was specified\n"))
1396 1396 base = ['null']
1397 1397 else:
1398 1398 base = scmutil.revrange(repo, opts.get('base'))
1399 1399 # TODO: get desired bundlecaps from command line.
1400 1400 bundlecaps = None
1401 1401 if base:
1402 1402 if dest:
1403 1403 raise error.Abort(_("--base is incompatible with specifying "
1404 1404 "a destination"))
1405 1405 common = [repo.lookup(rev) for rev in base]
1406 1406 heads = revs and map(repo.lookup, revs) or revs
1407 1407 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1408 1408 common=common, bundlecaps=bundlecaps,
1409 1409 version=cgversion)
1410 1410 outgoing = None
1411 1411 else:
1412 1412 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1413 1413 dest, branches = hg.parseurl(dest, opts.get('branch'))
1414 1414 other = hg.peer(repo, opts, dest)
1415 1415 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1416 1416 heads = revs and map(repo.lookup, revs) or revs
1417 1417 outgoing = discovery.findcommonoutgoing(repo, other,
1418 1418 onlyheads=heads,
1419 1419 force=opts.get('force'),
1420 1420 portable=True)
1421 1421 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1422 1422 bundlecaps, version=cgversion)
1423 1423 if not cg:
1424 1424 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1425 1425 return 1
1426 1426
1427 1427 if cgversion == '01': #bundle1
1428 1428 if bcompression is None:
1429 1429 bcompression = 'UN'
1430 1430 bversion = 'HG10' + bcompression
1431 1431 bcompression = None
1432 1432 else:
1433 1433 assert cgversion == '02'
1434 1434 bversion = 'HG20'
1435 1435
1436 1436
1437 1437 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1438 1438
1439 1439 @command('cat',
1440 1440 [('o', 'output', '',
1441 1441 _('print output to file with formatted name'), _('FORMAT')),
1442 1442 ('r', 'rev', '', _('print the given revision'), _('REV')),
1443 1443 ('', 'decode', None, _('apply any matching decode filter')),
1444 1444 ] + walkopts,
1445 1445 _('[OPTION]... FILE...'),
1446 1446 inferrepo=True)
1447 1447 def cat(ui, repo, file1, *pats, **opts):
1448 1448 """output the current or given revision of files
1449 1449
1450 1450 Print the specified files as they were at the given revision. If
1451 1451 no revision is given, the parent of the working directory is used.
1452 1452
1453 1453 Output may be to a file, in which case the name of the file is
1454 1454 given using a format string. The formatting rules as follows:
1455 1455
1456 1456 :``%%``: literal "%" character
1457 1457 :``%s``: basename of file being printed
1458 1458 :``%d``: dirname of file being printed, or '.' if in repository root
1459 1459 :``%p``: root-relative path name of file being printed
1460 1460 :``%H``: changeset hash (40 hexadecimal digits)
1461 1461 :``%R``: changeset revision number
1462 1462 :``%h``: short-form changeset hash (12 hexadecimal digits)
1463 1463 :``%r``: zero-padded changeset revision number
1464 1464 :``%b``: basename of the exporting repository
1465 1465
1466 1466 Returns 0 on success.
1467 1467 """
1468 1468 ctx = scmutil.revsingle(repo, opts.get('rev'))
1469 1469 m = scmutil.match(ctx, (file1,) + pats, opts)
1470 1470
1471 1471 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1472 1472
1473 1473 @command('^clone',
1474 1474 [('U', 'noupdate', None, _('the clone will include an empty working '
1475 1475 'directory (only a repository)')),
1476 1476 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1477 1477 _('REV')),
1478 1478 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1479 1479 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1480 1480 ('', 'pull', None, _('use pull protocol to copy metadata')),
1481 1481 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1482 1482 ] + remoteopts,
1483 1483 _('[OPTION]... SOURCE [DEST]'),
1484 1484 norepo=True)
1485 1485 def clone(ui, source, dest=None, **opts):
1486 1486 """make a copy of an existing repository
1487 1487
1488 1488 Create a copy of an existing repository in a new directory.
1489 1489
1490 1490 If no destination directory name is specified, it defaults to the
1491 1491 basename of the source.
1492 1492
1493 1493 The location of the source is added to the new repository's
1494 1494 ``.hg/hgrc`` file, as the default to be used for future pulls.
1495 1495
1496 1496 Only local paths and ``ssh://`` URLs are supported as
1497 1497 destinations. For ``ssh://`` destinations, no working directory or
1498 1498 ``.hg/hgrc`` will be created on the remote side.
1499 1499
1500 1500 If the source repository has a bookmark called '@' set, that
1501 1501 revision will be checked out in the new repository by default.
1502 1502
1503 1503 To check out a particular version, use -u/--update, or
1504 1504 -U/--noupdate to create a clone with no working directory.
1505 1505
1506 1506 To pull only a subset of changesets, specify one or more revisions
1507 1507 identifiers with -r/--rev or branches with -b/--branch. The
1508 1508 resulting clone will contain only the specified changesets and
1509 1509 their ancestors. These options (or 'clone src#rev dest') imply
1510 1510 --pull, even for local source repositories.
1511 1511
1512 1512 .. note::
1513 1513
1514 1514 Specifying a tag will include the tagged changeset but not the
1515 1515 changeset containing the tag.
1516 1516
1517 1517 .. container:: verbose
1518 1518
1519 1519 For efficiency, hardlinks are used for cloning whenever the
1520 1520 source and destination are on the same filesystem (note this
1521 1521 applies only to the repository data, not to the working
1522 1522 directory). Some filesystems, such as AFS, implement hardlinking
1523 1523 incorrectly, but do not report errors. In these cases, use the
1524 1524 --pull option to avoid hardlinking.
1525 1525
1526 1526 In some cases, you can clone repositories and the working
1527 1527 directory using full hardlinks with ::
1528 1528
1529 1529 $ cp -al REPO REPOCLONE
1530 1530
1531 1531 This is the fastest way to clone, but it is not always safe. The
1532 1532 operation is not atomic (making sure REPO is not modified during
1533 1533 the operation is up to you) and you have to make sure your
1534 1534 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1535 1535 so). Also, this is not compatible with certain extensions that
1536 1536 place their metadata under the .hg directory, such as mq.
1537 1537
1538 1538 Mercurial will update the working directory to the first applicable
1539 1539 revision from this list:
1540 1540
1541 1541 a) null if -U or the source repository has no changesets
1542 1542 b) if -u . and the source repository is local, the first parent of
1543 1543 the source repository's working directory
1544 1544 c) the changeset specified with -u (if a branch name, this means the
1545 1545 latest head of that branch)
1546 1546 d) the changeset specified with -r
1547 1547 e) the tipmost head specified with -b
1548 1548 f) the tipmost head specified with the url#branch source syntax
1549 1549 g) the revision marked with the '@' bookmark, if present
1550 1550 h) the tipmost head of the default branch
1551 1551 i) tip
1552 1552
1553 1553 When cloning from servers that support it, Mercurial may fetch
1554 1554 pre-generated data from a server-advertised URL. When this is done,
1555 1555 hooks operating on incoming changesets and changegroups may fire twice,
1556 1556 once for the bundle fetched from the URL and another for any additional
1557 1557 data not fetched from this URL. In addition, if an error occurs, the
1558 1558 repository may be rolled back to a partial clone. This behavior may
1559 1559 change in future releases. See :hg:`help -e clonebundles` for more.
1560 1560
1561 1561 Examples:
1562 1562
1563 1563 - clone a remote repository to a new directory named hg/::
1564 1564
1565 1565 hg clone http://selenic.com/hg
1566 1566
1567 1567 - create a lightweight local clone::
1568 1568
1569 1569 hg clone project/ project-feature/
1570 1570
1571 1571 - clone from an absolute path on an ssh server (note double-slash)::
1572 1572
1573 1573 hg clone ssh://user@server//home/projects/alpha/
1574 1574
1575 1575 - do a high-speed clone over a LAN while checking out a
1576 1576 specified version::
1577 1577
1578 1578 hg clone --uncompressed http://server/repo -u 1.5
1579 1579
1580 1580 - create a repository without changesets after a particular revision::
1581 1581
1582 1582 hg clone -r 04e544 experimental/ good/
1583 1583
1584 1584 - clone (and track) a particular named branch::
1585 1585
1586 1586 hg clone http://selenic.com/hg#stable
1587 1587
1588 1588 See :hg:`help urls` for details on specifying URLs.
1589 1589
1590 1590 Returns 0 on success.
1591 1591 """
1592 1592 if opts.get('noupdate') and opts.get('updaterev'):
1593 1593 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1594 1594
1595 1595 r = hg.clone(ui, opts, source, dest,
1596 1596 pull=opts.get('pull'),
1597 1597 stream=opts.get('uncompressed'),
1598 1598 rev=opts.get('rev'),
1599 1599 update=opts.get('updaterev') or not opts.get('noupdate'),
1600 1600 branch=opts.get('branch'),
1601 1601 shareopts=opts.get('shareopts'))
1602 1602
1603 1603 return r is None
1604 1604
1605 1605 @command('^commit|ci',
1606 1606 [('A', 'addremove', None,
1607 1607 _('mark new/missing files as added/removed before committing')),
1608 1608 ('', 'close-branch', None,
1609 1609 _('mark a branch head as closed')),
1610 1610 ('', 'amend', None, _('amend the parent of the working directory')),
1611 1611 ('s', 'secret', None, _('use the secret phase for committing')),
1612 1612 ('e', 'edit', None, _('invoke editor on commit messages')),
1613 1613 ('i', 'interactive', None, _('use interactive mode')),
1614 1614 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1615 1615 _('[OPTION]... [FILE]...'),
1616 1616 inferrepo=True)
1617 1617 def commit(ui, repo, *pats, **opts):
1618 1618 """commit the specified files or all outstanding changes
1619 1619
1620 1620 Commit changes to the given files into the repository. Unlike a
1621 1621 centralized SCM, this operation is a local operation. See
1622 1622 :hg:`push` for a way to actively distribute your changes.
1623 1623
1624 1624 If a list of files is omitted, all changes reported by :hg:`status`
1625 1625 will be committed.
1626 1626
1627 1627 If you are committing the result of a merge, do not provide any
1628 1628 filenames or -I/-X filters.
1629 1629
1630 1630 If no commit message is specified, Mercurial starts your
1631 1631 configured editor where you can enter a message. In case your
1632 1632 commit fails, you will find a backup of your message in
1633 1633 ``.hg/last-message.txt``.
1634 1634
1635 1635 The --close-branch flag can be used to mark the current branch
1636 1636 head closed. When all heads of a branch are closed, the branch
1637 1637 will be considered closed and no longer listed.
1638 1638
1639 1639 The --amend flag can be used to amend the parent of the
1640 1640 working directory with a new commit that contains the changes
1641 1641 in the parent in addition to those currently reported by :hg:`status`,
1642 1642 if there are any. The old commit is stored in a backup bundle in
1643 1643 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1644 1644 on how to restore it).
1645 1645
1646 1646 Message, user and date are taken from the amended commit unless
1647 1647 specified. When a message isn't specified on the command line,
1648 1648 the editor will open with the message of the amended commit.
1649 1649
1650 1650 It is not possible to amend public changesets (see :hg:`help phases`)
1651 1651 or changesets that have children.
1652 1652
1653 1653 See :hg:`help dates` for a list of formats valid for -d/--date.
1654 1654
1655 1655 Returns 0 on success, 1 if nothing changed.
1656 1656
1657 1657 .. container:: verbose
1658 1658
1659 1659 Examples:
1660 1660
1661 1661 - commit all files ending in .py::
1662 1662
1663 1663 hg commit --include "set:**.py"
1664 1664
1665 1665 - commit all non-binary files::
1666 1666
1667 1667 hg commit --exclude "set:binary()"
1668 1668
1669 1669 - amend the current commit and set the date to now::
1670 1670
1671 1671 hg commit --amend --date now
1672 1672 """
1673 1673 wlock = lock = None
1674 1674 try:
1675 1675 wlock = repo.wlock()
1676 1676 lock = repo.lock()
1677 1677 return _docommit(ui, repo, *pats, **opts)
1678 1678 finally:
1679 1679 release(lock, wlock)
1680 1680
1681 1681 def _docommit(ui, repo, *pats, **opts):
1682 1682 if opts.get('interactive'):
1683 1683 opts.pop('interactive')
1684 1684 cmdutil.dorecord(ui, repo, commit, None, False,
1685 1685 cmdutil.recordfilter, *pats, **opts)
1686 1686 return
1687 1687
1688 1688 if opts.get('subrepos'):
1689 1689 if opts.get('amend'):
1690 1690 raise error.Abort(_('cannot amend with --subrepos'))
1691 1691 # Let --subrepos on the command line override config setting.
1692 1692 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1693 1693
1694 1694 cmdutil.checkunfinished(repo, commit=True)
1695 1695
1696 1696 branch = repo[None].branch()
1697 1697 bheads = repo.branchheads(branch)
1698 1698
1699 1699 extra = {}
1700 1700 if opts.get('close_branch'):
1701 1701 extra['close'] = 1
1702 1702
1703 1703 if not bheads:
1704 1704 raise error.Abort(_('can only close branch heads'))
1705 1705 elif opts.get('amend'):
1706 1706 if repo[None].parents()[0].p1().branch() != branch and \
1707 1707 repo[None].parents()[0].p2().branch() != branch:
1708 1708 raise error.Abort(_('can only close branch heads'))
1709 1709
1710 1710 if opts.get('amend'):
1711 1711 if ui.configbool('ui', 'commitsubrepos'):
1712 1712 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1713 1713
1714 1714 old = repo['.']
1715 1715 if not old.mutable():
1716 1716 raise error.Abort(_('cannot amend public changesets'))
1717 1717 if len(repo[None].parents()) > 1:
1718 1718 raise error.Abort(_('cannot amend while merging'))
1719 1719 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1720 1720 if not allowunstable and old.children():
1721 1721 raise error.Abort(_('cannot amend changeset with children'))
1722 1722
1723 1723 # Currently histedit gets confused if an amend happens while histedit
1724 1724 # is in progress. Since we have a checkunfinished command, we are
1725 1725 # temporarily honoring it.
1726 1726 #
1727 1727 # Note: eventually this guard will be removed. Please do not expect
1728 1728 # this behavior to remain.
1729 1729 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1730 1730 cmdutil.checkunfinished(repo)
1731 1731
1732 1732 # commitfunc is used only for temporary amend commit by cmdutil.amend
1733 1733 def commitfunc(ui, repo, message, match, opts):
1734 1734 return repo.commit(message,
1735 1735 opts.get('user') or old.user(),
1736 1736 opts.get('date') or old.date(),
1737 1737 match,
1738 1738 extra=extra)
1739 1739
1740 1740 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1741 1741 if node == old.node():
1742 1742 ui.status(_("nothing changed\n"))
1743 1743 return 1
1744 1744 else:
1745 1745 def commitfunc(ui, repo, message, match, opts):
1746 1746 backup = ui.backupconfig('phases', 'new-commit')
1747 1747 baseui = repo.baseui
1748 1748 basebackup = baseui.backupconfig('phases', 'new-commit')
1749 1749 try:
1750 1750 if opts.get('secret'):
1751 1751 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1752 1752 # Propagate to subrepos
1753 1753 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1754 1754
1755 1755 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1756 1756 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1757 1757 return repo.commit(message, opts.get('user'), opts.get('date'),
1758 1758 match,
1759 1759 editor=editor,
1760 1760 extra=extra)
1761 1761 finally:
1762 1762 ui.restoreconfig(backup)
1763 1763 repo.baseui.restoreconfig(basebackup)
1764 1764
1765 1765
1766 1766 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1767 1767
1768 1768 if not node:
1769 1769 stat = cmdutil.postcommitstatus(repo, pats, opts)
1770 1770 if stat[3]:
1771 1771 ui.status(_("nothing changed (%d missing files, see "
1772 1772 "'hg status')\n") % len(stat[3]))
1773 1773 else:
1774 1774 ui.status(_("nothing changed\n"))
1775 1775 return 1
1776 1776
1777 1777 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1778 1778
1779 1779 @command('config|showconfig|debugconfig',
1780 1780 [('u', 'untrusted', None, _('show untrusted configuration options')),
1781 1781 ('e', 'edit', None, _('edit user config')),
1782 1782 ('l', 'local', None, _('edit repository config')),
1783 1783 ('g', 'global', None, _('edit global config'))],
1784 1784 _('[-u] [NAME]...'),
1785 1785 optionalrepo=True)
1786 1786 def config(ui, repo, *values, **opts):
1787 1787 """show combined config settings from all hgrc files
1788 1788
1789 1789 With no arguments, print names and values of all config items.
1790 1790
1791 1791 With one argument of the form section.name, print just the value
1792 1792 of that config item.
1793 1793
1794 1794 With multiple arguments, print names and values of all config
1795 1795 items with matching section names.
1796 1796
1797 1797 With --edit, start an editor on the user-level config file. With
1798 1798 --global, edit the system-wide config file. With --local, edit the
1799 1799 repository-level config file.
1800 1800
1801 1801 With --debug, the source (filename and line number) is printed
1802 1802 for each config item.
1803 1803
1804 1804 See :hg:`help config` for more information about config files.
1805 1805
1806 1806 Returns 0 on success, 1 if NAME does not exist.
1807 1807
1808 1808 """
1809 1809
1810 1810 if opts.get('edit') or opts.get('local') or opts.get('global'):
1811 1811 if opts.get('local') and opts.get('global'):
1812 1812 raise error.Abort(_("can't use --local and --global together"))
1813 1813
1814 1814 if opts.get('local'):
1815 1815 if not repo:
1816 1816 raise error.Abort(_("can't use --local outside a repository"))
1817 1817 paths = [repo.join('hgrc')]
1818 1818 elif opts.get('global'):
1819 1819 paths = scmutil.systemrcpath()
1820 1820 else:
1821 1821 paths = scmutil.userrcpath()
1822 1822
1823 1823 for f in paths:
1824 1824 if os.path.exists(f):
1825 1825 break
1826 1826 else:
1827 1827 if opts.get('global'):
1828 1828 samplehgrc = uimod.samplehgrcs['global']
1829 1829 elif opts.get('local'):
1830 1830 samplehgrc = uimod.samplehgrcs['local']
1831 1831 else:
1832 1832 samplehgrc = uimod.samplehgrcs['user']
1833 1833
1834 1834 f = paths[0]
1835 1835 fp = open(f, "w")
1836 1836 fp.write(samplehgrc)
1837 1837 fp.close()
1838 1838
1839 1839 editor = ui.geteditor()
1840 1840 ui.system("%s \"%s\"" % (editor, f),
1841 1841 onerr=error.Abort, errprefix=_("edit failed"))
1842 1842 return
1843 1843
1844 1844 for f in scmutil.rcpath():
1845 1845 ui.debug('read config from: %s\n' % f)
1846 1846 untrusted = bool(opts.get('untrusted'))
1847 1847 if values:
1848 1848 sections = [v for v in values if '.' not in v]
1849 1849 items = [v for v in values if '.' in v]
1850 1850 if len(items) > 1 or items and sections:
1851 1851 raise error.Abort(_('only one config item permitted'))
1852 1852 matched = False
1853 1853 for section, name, value in ui.walkconfig(untrusted=untrusted):
1854 1854 value = str(value).replace('\n', '\\n')
1855 1855 sectname = section + '.' + name
1856 1856 if values:
1857 1857 for v in values:
1858 1858 if v == section:
1859 1859 ui.debug('%s: ' %
1860 1860 ui.configsource(section, name, untrusted))
1861 1861 ui.write('%s=%s\n' % (sectname, value))
1862 1862 matched = True
1863 1863 elif v == sectname:
1864 1864 ui.debug('%s: ' %
1865 1865 ui.configsource(section, name, untrusted))
1866 1866 ui.write(value, '\n')
1867 1867 matched = True
1868 1868 else:
1869 1869 ui.debug('%s: ' %
1870 1870 ui.configsource(section, name, untrusted))
1871 1871 ui.write('%s=%s\n' % (sectname, value))
1872 1872 matched = True
1873 1873 if matched:
1874 1874 return 0
1875 1875 return 1
1876 1876
1877 1877 @command('copy|cp',
1878 1878 [('A', 'after', None, _('record a copy that has already occurred')),
1879 1879 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1880 1880 ] + walkopts + dryrunopts,
1881 1881 _('[OPTION]... [SOURCE]... DEST'))
1882 1882 def copy(ui, repo, *pats, **opts):
1883 1883 """mark files as copied for the next commit
1884 1884
1885 1885 Mark dest as having copies of source files. If dest is a
1886 1886 directory, copies are put in that directory. If dest is a file,
1887 1887 the source must be a single file.
1888 1888
1889 1889 By default, this command copies the contents of files as they
1890 1890 exist in the working directory. If invoked with -A/--after, the
1891 1891 operation is recorded, but no copying is performed.
1892 1892
1893 1893 This command takes effect with the next commit. To undo a copy
1894 1894 before that, see :hg:`revert`.
1895 1895
1896 1896 Returns 0 on success, 1 if errors are encountered.
1897 1897 """
1898 1898 with repo.wlock(False):
1899 1899 return cmdutil.copy(ui, repo, pats, opts)
1900 1900
1901 1901 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1902 1902 def debugancestor(ui, repo, *args):
1903 1903 """find the ancestor revision of two revisions in a given index"""
1904 1904 if len(args) == 3:
1905 1905 index, rev1, rev2 = args
1906 1906 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1907 1907 lookup = r.lookup
1908 1908 elif len(args) == 2:
1909 1909 if not repo:
1910 1910 raise error.Abort(_("there is no Mercurial repository here "
1911 1911 "(.hg not found)"))
1912 1912 rev1, rev2 = args
1913 1913 r = repo.changelog
1914 1914 lookup = repo.lookup
1915 1915 else:
1916 1916 raise error.Abort(_('either two or three arguments required'))
1917 1917 a = r.ancestor(lookup(rev1), lookup(rev2))
1918 1918 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1919 1919
1920 1920 @command('debugbuilddag',
1921 1921 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1922 1922 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1923 1923 ('n', 'new-file', None, _('add new file at each rev'))],
1924 1924 _('[OPTION]... [TEXT]'))
1925 1925 def debugbuilddag(ui, repo, text=None,
1926 1926 mergeable_file=False,
1927 1927 overwritten_file=False,
1928 1928 new_file=False):
1929 1929 """builds a repo with a given DAG from scratch in the current empty repo
1930 1930
1931 1931 The description of the DAG is read from stdin if not given on the
1932 1932 command line.
1933 1933
1934 1934 Elements:
1935 1935
1936 1936 - "+n" is a linear run of n nodes based on the current default parent
1937 1937 - "." is a single node based on the current default parent
1938 1938 - "$" resets the default parent to null (implied at the start);
1939 1939 otherwise the default parent is always the last node created
1940 1940 - "<p" sets the default parent to the backref p
1941 1941 - "*p" is a fork at parent p, which is a backref
1942 1942 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1943 1943 - "/p2" is a merge of the preceding node and p2
1944 1944 - ":tag" defines a local tag for the preceding node
1945 1945 - "@branch" sets the named branch for subsequent nodes
1946 1946 - "#...\\n" is a comment up to the end of the line
1947 1947
1948 1948 Whitespace between the above elements is ignored.
1949 1949
1950 1950 A backref is either
1951 1951
1952 1952 - a number n, which references the node curr-n, where curr is the current
1953 1953 node, or
1954 1954 - the name of a local tag you placed earlier using ":tag", or
1955 1955 - empty to denote the default parent.
1956 1956
1957 1957 All string valued-elements are either strictly alphanumeric, or must
1958 1958 be enclosed in double quotes ("..."), with "\\" as escape character.
1959 1959 """
1960 1960
1961 1961 if text is None:
1962 1962 ui.status(_("reading DAG from stdin\n"))
1963 1963 text = ui.fin.read()
1964 1964
1965 1965 cl = repo.changelog
1966 1966 if len(cl) > 0:
1967 1967 raise error.Abort(_('repository is not empty'))
1968 1968
1969 1969 # determine number of revs in DAG
1970 1970 total = 0
1971 1971 for type, data in dagparser.parsedag(text):
1972 1972 if type == 'n':
1973 1973 total += 1
1974 1974
1975 1975 if mergeable_file:
1976 1976 linesperrev = 2
1977 1977 # make a file with k lines per rev
1978 1978 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1979 1979 initialmergedlines.append("")
1980 1980
1981 1981 tags = []
1982 1982
1983 1983 lock = tr = None
1984 1984 try:
1985 1985 lock = repo.lock()
1986 1986 tr = repo.transaction("builddag")
1987 1987
1988 1988 at = -1
1989 1989 atbranch = 'default'
1990 1990 nodeids = []
1991 1991 id = 0
1992 1992 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1993 1993 for type, data in dagparser.parsedag(text):
1994 1994 if type == 'n':
1995 1995 ui.note(('node %s\n' % str(data)))
1996 1996 id, ps = data
1997 1997
1998 1998 files = []
1999 1999 fctxs = {}
2000 2000
2001 2001 p2 = None
2002 2002 if mergeable_file:
2003 2003 fn = "mf"
2004 2004 p1 = repo[ps[0]]
2005 2005 if len(ps) > 1:
2006 2006 p2 = repo[ps[1]]
2007 2007 pa = p1.ancestor(p2)
2008 2008 base, local, other = [x[fn].data() for x in (pa, p1,
2009 2009 p2)]
2010 2010 m3 = simplemerge.Merge3Text(base, local, other)
2011 2011 ml = [l.strip() for l in m3.merge_lines()]
2012 2012 ml.append("")
2013 2013 elif at > 0:
2014 2014 ml = p1[fn].data().split("\n")
2015 2015 else:
2016 2016 ml = initialmergedlines
2017 2017 ml[id * linesperrev] += " r%i" % id
2018 2018 mergedtext = "\n".join(ml)
2019 2019 files.append(fn)
2020 2020 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2021 2021
2022 2022 if overwritten_file:
2023 2023 fn = "of"
2024 2024 files.append(fn)
2025 2025 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2026 2026
2027 2027 if new_file:
2028 2028 fn = "nf%i" % id
2029 2029 files.append(fn)
2030 2030 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2031 2031 if len(ps) > 1:
2032 2032 if not p2:
2033 2033 p2 = repo[ps[1]]
2034 2034 for fn in p2:
2035 2035 if fn.startswith("nf"):
2036 2036 files.append(fn)
2037 2037 fctxs[fn] = p2[fn]
2038 2038
2039 2039 def fctxfn(repo, cx, path):
2040 2040 return fctxs.get(path)
2041 2041
2042 2042 if len(ps) == 0 or ps[0] < 0:
2043 2043 pars = [None, None]
2044 2044 elif len(ps) == 1:
2045 2045 pars = [nodeids[ps[0]], None]
2046 2046 else:
2047 2047 pars = [nodeids[p] for p in ps]
2048 2048 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2049 2049 date=(id, 0),
2050 2050 user="debugbuilddag",
2051 2051 extra={'branch': atbranch})
2052 2052 nodeid = repo.commitctx(cx)
2053 2053 nodeids.append(nodeid)
2054 2054 at = id
2055 2055 elif type == 'l':
2056 2056 id, name = data
2057 2057 ui.note(('tag %s\n' % name))
2058 2058 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2059 2059 elif type == 'a':
2060 2060 ui.note(('branch %s\n' % data))
2061 2061 atbranch = data
2062 2062 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2063 2063 tr.close()
2064 2064
2065 2065 if tags:
2066 2066 repo.vfs.write("localtags", "".join(tags))
2067 2067 finally:
2068 2068 ui.progress(_('building'), None)
2069 2069 release(tr, lock)
2070 2070
2071 2071 @command('debugbundle',
2072 2072 [('a', 'all', None, _('show all details')),
2073 2073 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2074 2074 _('FILE'),
2075 2075 norepo=True)
2076 2076 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2077 2077 """lists the contents of a bundle"""
2078 2078 with hg.openpath(ui, bundlepath) as f:
2079 2079 if spec:
2080 2080 spec = exchange.getbundlespec(ui, f)
2081 2081 ui.write('%s\n' % spec)
2082 2082 return
2083 2083
2084 2084 gen = exchange.readbundle(ui, f, bundlepath)
2085 2085 if isinstance(gen, bundle2.unbundle20):
2086 2086 return _debugbundle2(ui, gen, all=all, **opts)
2087 2087 if all:
2088 2088 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2089 2089
2090 2090 def showchunks(named):
2091 2091 ui.write("\n%s\n" % named)
2092 2092 chain = None
2093 2093 while True:
2094 2094 chunkdata = gen.deltachunk(chain)
2095 2095 if not chunkdata:
2096 2096 break
2097 2097 node = chunkdata['node']
2098 2098 p1 = chunkdata['p1']
2099 2099 p2 = chunkdata['p2']
2100 2100 cs = chunkdata['cs']
2101 2101 deltabase = chunkdata['deltabase']
2102 2102 delta = chunkdata['delta']
2103 2103 ui.write("%s %s %s %s %s %s\n" %
2104 2104 (hex(node), hex(p1), hex(p2),
2105 2105 hex(cs), hex(deltabase), len(delta)))
2106 2106 chain = node
2107 2107
2108 2108 chunkdata = gen.changelogheader()
2109 2109 showchunks("changelog")
2110 2110 chunkdata = gen.manifestheader()
2111 2111 showchunks("manifest")
2112 2112 while True:
2113 2113 chunkdata = gen.filelogheader()
2114 2114 if not chunkdata:
2115 2115 break
2116 2116 fname = chunkdata['filename']
2117 2117 showchunks(fname)
2118 2118 else:
2119 2119 if isinstance(gen, bundle2.unbundle20):
2120 2120 raise error.Abort(_('use debugbundle2 for this file'))
2121 2121 chunkdata = gen.changelogheader()
2122 2122 chain = None
2123 2123 while True:
2124 2124 chunkdata = gen.deltachunk(chain)
2125 2125 if not chunkdata:
2126 2126 break
2127 2127 node = chunkdata['node']
2128 2128 ui.write("%s\n" % hex(node))
2129 2129 chain = node
2130 2130
2131 2131 def _debugbundle2(ui, gen, **opts):
2132 2132 """lists the contents of a bundle2"""
2133 2133 if not isinstance(gen, bundle2.unbundle20):
2134 2134 raise error.Abort(_('not a bundle2 file'))
2135 2135 ui.write(('Stream params: %s\n' % repr(gen.params)))
2136 2136 for part in gen.iterparts():
2137 2137 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2138 2138 if part.type == 'changegroup':
2139 2139 version = part.params.get('version', '01')
2140 2140 cg = changegroup.getunbundler(version, part, 'UN')
2141 2141 chunkdata = cg.changelogheader()
2142 2142 chain = None
2143 2143 while True:
2144 2144 chunkdata = cg.deltachunk(chain)
2145 2145 if not chunkdata:
2146 2146 break
2147 2147 node = chunkdata['node']
2148 2148 ui.write(" %s\n" % hex(node))
2149 2149 chain = node
2150 2150
2151 2151 @command('debugcreatestreamclonebundle', [], 'FILE')
2152 2152 def debugcreatestreamclonebundle(ui, repo, fname):
2153 2153 """create a stream clone bundle file
2154 2154
2155 2155 Stream bundles are special bundles that are essentially archives of
2156 2156 revlog files. They are commonly used for cloning very quickly.
2157 2157 """
2158 2158 requirements, gen = streamclone.generatebundlev1(repo)
2159 2159 changegroup.writechunks(ui, gen, fname)
2160 2160
2161 2161 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2162 2162
2163 2163 @command('debugapplystreamclonebundle', [], 'FILE')
2164 2164 def debugapplystreamclonebundle(ui, repo, fname):
2165 2165 """apply a stream clone bundle file"""
2166 2166 f = hg.openpath(ui, fname)
2167 2167 gen = exchange.readbundle(ui, f, fname)
2168 2168 gen.apply(repo)
2169 2169
2170 2170 @command('debugcheckstate', [], '')
2171 2171 def debugcheckstate(ui, repo):
2172 2172 """validate the correctness of the current dirstate"""
2173 2173 parent1, parent2 = repo.dirstate.parents()
2174 2174 m1 = repo[parent1].manifest()
2175 2175 m2 = repo[parent2].manifest()
2176 2176 errors = 0
2177 2177 for f in repo.dirstate:
2178 2178 state = repo.dirstate[f]
2179 2179 if state in "nr" and f not in m1:
2180 2180 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2181 2181 errors += 1
2182 2182 if state in "a" and f in m1:
2183 2183 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2184 2184 errors += 1
2185 2185 if state in "m" and f not in m1 and f not in m2:
2186 2186 ui.warn(_("%s in state %s, but not in either manifest\n") %
2187 2187 (f, state))
2188 2188 errors += 1
2189 2189 for f in m1:
2190 2190 state = repo.dirstate[f]
2191 2191 if state not in "nrm":
2192 2192 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2193 2193 errors += 1
2194 2194 if errors:
2195 2195 error = _(".hg/dirstate inconsistent with current parent's manifest")
2196 2196 raise error.Abort(error)
2197 2197
2198 2198 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2199 2199 def debugcommands(ui, cmd='', *args):
2200 2200 """list all available commands and options"""
2201 2201 for cmd, vals in sorted(table.iteritems()):
2202 2202 cmd = cmd.split('|')[0].strip('^')
2203 2203 opts = ', '.join([i[1] for i in vals[1]])
2204 2204 ui.write('%s: %s\n' % (cmd, opts))
2205 2205
2206 2206 @command('debugcomplete',
2207 2207 [('o', 'options', None, _('show the command options'))],
2208 2208 _('[-o] CMD'),
2209 2209 norepo=True)
2210 2210 def debugcomplete(ui, cmd='', **opts):
2211 2211 """returns the completion list associated with the given command"""
2212 2212
2213 2213 if opts.get('options'):
2214 2214 options = []
2215 2215 otables = [globalopts]
2216 2216 if cmd:
2217 2217 aliases, entry = cmdutil.findcmd(cmd, table, False)
2218 2218 otables.append(entry[1])
2219 2219 for t in otables:
2220 2220 for o in t:
2221 2221 if "(DEPRECATED)" in o[3]:
2222 2222 continue
2223 2223 if o[0]:
2224 2224 options.append('-%s' % o[0])
2225 2225 options.append('--%s' % o[1])
2226 2226 ui.write("%s\n" % "\n".join(options))
2227 2227 return
2228 2228
2229 2229 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2230 2230 if ui.verbose:
2231 2231 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2232 2232 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2233 2233
2234 2234 @command('debugdag',
2235 2235 [('t', 'tags', None, _('use tags as labels')),
2236 2236 ('b', 'branches', None, _('annotate with branch names')),
2237 2237 ('', 'dots', None, _('use dots for runs')),
2238 2238 ('s', 'spaces', None, _('separate elements by spaces'))],
2239 2239 _('[OPTION]... [FILE [REV]...]'),
2240 2240 optionalrepo=True)
2241 2241 def debugdag(ui, repo, file_=None, *revs, **opts):
2242 2242 """format the changelog or an index DAG as a concise textual description
2243 2243
2244 2244 If you pass a revlog index, the revlog's DAG is emitted. If you list
2245 2245 revision numbers, they get labeled in the output as rN.
2246 2246
2247 2247 Otherwise, the changelog DAG of the current repo is emitted.
2248 2248 """
2249 2249 spaces = opts.get('spaces')
2250 2250 dots = opts.get('dots')
2251 2251 if file_:
2252 2252 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2253 2253 revs = set((int(r) for r in revs))
2254 2254 def events():
2255 2255 for r in rlog:
2256 2256 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2257 2257 if p != -1))
2258 2258 if r in revs:
2259 2259 yield 'l', (r, "r%i" % r)
2260 2260 elif repo:
2261 2261 cl = repo.changelog
2262 2262 tags = opts.get('tags')
2263 2263 branches = opts.get('branches')
2264 2264 if tags:
2265 2265 labels = {}
2266 2266 for l, n in repo.tags().items():
2267 2267 labels.setdefault(cl.rev(n), []).append(l)
2268 2268 def events():
2269 2269 b = "default"
2270 2270 for r in cl:
2271 2271 if branches:
2272 2272 newb = cl.read(cl.node(r))[5]['branch']
2273 2273 if newb != b:
2274 2274 yield 'a', newb
2275 2275 b = newb
2276 2276 yield 'n', (r, list(p for p in cl.parentrevs(r)
2277 2277 if p != -1))
2278 2278 if tags:
2279 2279 ls = labels.get(r)
2280 2280 if ls:
2281 2281 for l in ls:
2282 2282 yield 'l', (r, l)
2283 2283 else:
2284 2284 raise error.Abort(_('need repo for changelog dag'))
2285 2285
2286 2286 for line in dagparser.dagtextlines(events(),
2287 2287 addspaces=spaces,
2288 2288 wraplabels=True,
2289 2289 wrapannotations=True,
2290 2290 wrapnonlinear=dots,
2291 2291 usedots=dots,
2292 2292 maxlinewidth=70):
2293 2293 ui.write(line)
2294 2294 ui.write("\n")
2295 2295
2296 2296 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2297 2297 def debugdata(ui, repo, file_, rev=None, **opts):
2298 2298 """dump the contents of a data file revision"""
2299 2299 if opts.get('changelog') or opts.get('manifest'):
2300 2300 file_, rev = None, file_
2301 2301 elif rev is None:
2302 2302 raise error.CommandError('debugdata', _('invalid arguments'))
2303 2303 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2304 2304 try:
2305 2305 ui.write(r.revision(r.lookup(rev)))
2306 2306 except KeyError:
2307 2307 raise error.Abort(_('invalid revision identifier %s') % rev)
2308 2308
2309 2309 @command('debugdate',
2310 2310 [('e', 'extended', None, _('try extended date formats'))],
2311 2311 _('[-e] DATE [RANGE]'),
2312 2312 norepo=True, optionalrepo=True)
2313 2313 def debugdate(ui, date, range=None, **opts):
2314 2314 """parse and display a date"""
2315 2315 if opts["extended"]:
2316 2316 d = util.parsedate(date, util.extendeddateformats)
2317 2317 else:
2318 2318 d = util.parsedate(date)
2319 2319 ui.write(("internal: %s %s\n") % d)
2320 2320 ui.write(("standard: %s\n") % util.datestr(d))
2321 2321 if range:
2322 2322 m = util.matchdate(range)
2323 2323 ui.write(("match: %s\n") % m(d[0]))
2324 2324
2325 2325 @command('debugdiscovery',
2326 2326 [('', 'old', None, _('use old-style discovery')),
2327 2327 ('', 'nonheads', None,
2328 2328 _('use old-style discovery with non-heads included')),
2329 2329 ] + remoteopts,
2330 2330 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2331 2331 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2332 2332 """runs the changeset discovery protocol in isolation"""
2333 2333 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2334 2334 opts.get('branch'))
2335 2335 remote = hg.peer(repo, opts, remoteurl)
2336 2336 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2337 2337
2338 2338 # make sure tests are repeatable
2339 2339 random.seed(12323)
2340 2340
2341 2341 def doit(localheads, remoteheads, remote=remote):
2342 2342 if opts.get('old'):
2343 2343 if localheads:
2344 2344 raise error.Abort('cannot use localheads with old style '
2345 2345 'discovery')
2346 2346 if not util.safehasattr(remote, 'branches'):
2347 2347 # enable in-client legacy support
2348 2348 remote = localrepo.locallegacypeer(remote.local())
2349 2349 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2350 2350 force=True)
2351 2351 common = set(common)
2352 2352 if not opts.get('nonheads'):
2353 2353 ui.write(("unpruned common: %s\n") %
2354 2354 " ".join(sorted(short(n) for n in common)))
2355 2355 dag = dagutil.revlogdag(repo.changelog)
2356 2356 all = dag.ancestorset(dag.internalizeall(common))
2357 2357 common = dag.externalizeall(dag.headsetofconnecteds(all))
2358 2358 else:
2359 2359 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2360 2360 common = set(common)
2361 2361 rheads = set(hds)
2362 2362 lheads = set(repo.heads())
2363 2363 ui.write(("common heads: %s\n") %
2364 2364 " ".join(sorted(short(n) for n in common)))
2365 2365 if lheads <= common:
2366 2366 ui.write(("local is subset\n"))
2367 2367 elif rheads <= common:
2368 2368 ui.write(("remote is subset\n"))
2369 2369
2370 2370 serverlogs = opts.get('serverlog')
2371 2371 if serverlogs:
2372 2372 for filename in serverlogs:
2373 2373 with open(filename, 'r') as logfile:
2374 2374 line = logfile.readline()
2375 2375 while line:
2376 2376 parts = line.strip().split(';')
2377 2377 op = parts[1]
2378 2378 if op == 'cg':
2379 2379 pass
2380 2380 elif op == 'cgss':
2381 2381 doit(parts[2].split(' '), parts[3].split(' '))
2382 2382 elif op == 'unb':
2383 2383 doit(parts[3].split(' '), parts[2].split(' '))
2384 2384 line = logfile.readline()
2385 2385 else:
2386 2386 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2387 2387 opts.get('remote_head'))
2388 2388 localrevs = opts.get('local_head')
2389 2389 doit(localrevs, remoterevs)
2390 2390
2391 2391 @command('debugextensions', formatteropts, [], norepo=True)
2392 2392 def debugextensions(ui, **opts):
2393 2393 '''show information about active extensions'''
2394 2394 exts = extensions.extensions(ui)
2395 2395 fm = ui.formatter('debugextensions', opts)
2396 2396 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2397 2397 extsource = extmod.__file__
2398 2398 exttestedwith = getattr(extmod, 'testedwith', None)
2399 2399 if exttestedwith is not None:
2400 2400 exttestedwith = exttestedwith.split()
2401 2401 extbuglink = getattr(extmod, 'buglink', None)
2402 2402
2403 2403 fm.startitem()
2404 2404
2405 2405 if ui.quiet or ui.verbose:
2406 2406 fm.write('name', '%s\n', extname)
2407 2407 else:
2408 2408 fm.write('name', '%s', extname)
2409 2409 if not exttestedwith:
2410 2410 fm.plain(_(' (untested!)\n'))
2411 2411 else:
2412 2412 if exttestedwith == ['internal'] or \
2413 2413 util.version() in exttestedwith:
2414 2414 fm.plain('\n')
2415 2415 else:
2416 2416 lasttestedversion = exttestedwith[-1]
2417 2417 fm.plain(' (%s!)\n' % lasttestedversion)
2418 2418
2419 2419 fm.condwrite(ui.verbose and extsource, 'source',
2420 2420 _(' location: %s\n'), extsource or "")
2421 2421
2422 2422 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2423 2423 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2424 2424
2425 2425 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2426 2426 _(' bug reporting: %s\n'), extbuglink or "")
2427 2427
2428 2428 fm.end()
2429 2429
2430 2430 @command('debugfileset',
2431 2431 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2432 2432 _('[-r REV] FILESPEC'))
2433 2433 def debugfileset(ui, repo, expr, **opts):
2434 2434 '''parse and apply a fileset specification'''
2435 2435 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2436 2436 if ui.verbose:
2437 2437 tree = fileset.parse(expr)
2438 2438 ui.note(fileset.prettyformat(tree), "\n")
2439 2439
2440 2440 for f in ctx.getfileset(expr):
2441 2441 ui.write("%s\n" % f)
2442 2442
2443 2443 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2444 2444 def debugfsinfo(ui, path="."):
2445 2445 """show information detected about current filesystem"""
2446 2446 util.writefile('.debugfsinfo', '')
2447 2447 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2448 2448 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2449 2449 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2450 2450 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2451 2451 and 'yes' or 'no'))
2452 2452 os.unlink('.debugfsinfo')
2453 2453
2454 2454 @command('debuggetbundle',
2455 2455 [('H', 'head', [], _('id of head node'), _('ID')),
2456 2456 ('C', 'common', [], _('id of common node'), _('ID')),
2457 2457 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2458 2458 _('REPO FILE [-H|-C ID]...'),
2459 2459 norepo=True)
2460 2460 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2461 2461 """retrieves a bundle from a repo
2462 2462
2463 2463 Every ID must be a full-length hex node id string. Saves the bundle to the
2464 2464 given file.
2465 2465 """
2466 2466 repo = hg.peer(ui, opts, repopath)
2467 2467 if not repo.capable('getbundle'):
2468 2468 raise error.Abort("getbundle() not supported by target repository")
2469 2469 args = {}
2470 2470 if common:
2471 2471 args['common'] = [bin(s) for s in common]
2472 2472 if head:
2473 2473 args['heads'] = [bin(s) for s in head]
2474 2474 # TODO: get desired bundlecaps from command line.
2475 2475 args['bundlecaps'] = None
2476 2476 bundle = repo.getbundle('debug', **args)
2477 2477
2478 2478 bundletype = opts.get('type', 'bzip2').lower()
2479 2479 btypes = {'none': 'HG10UN',
2480 2480 'bzip2': 'HG10BZ',
2481 2481 'gzip': 'HG10GZ',
2482 2482 'bundle2': 'HG20'}
2483 2483 bundletype = btypes.get(bundletype)
2484 2484 if bundletype not in changegroup.bundletypes:
2485 2485 raise error.Abort(_('unknown bundle type specified with --type'))
2486 2486 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2487 2487
2488 2488 @command('debugignore', [], '[FILE]')
2489 2489 def debugignore(ui, repo, *files, **opts):
2490 2490 """display the combined ignore pattern and information about ignored files
2491 2491
2492 2492 With no argument display the combined ignore pattern.
2493 2493
2494 2494 Given space separated file names, shows if the given file is ignored and
2495 2495 if so, show the ignore rule (file and line number) that matched it.
2496 2496 """
2497 2497 ignore = repo.dirstate._ignore
2498 2498 if not files:
2499 2499 # Show all the patterns
2500 2500 includepat = getattr(ignore, 'includepat', None)
2501 2501 if includepat is not None:
2502 2502 ui.write("%s\n" % includepat)
2503 2503 else:
2504 2504 raise error.Abort(_("no ignore patterns found"))
2505 2505 else:
2506 2506 for f in files:
2507 2507 nf = util.normpath(f)
2508 2508 ignored = None
2509 2509 ignoredata = None
2510 2510 if nf != '.':
2511 2511 if ignore(nf):
2512 2512 ignored = nf
2513 2513 ignoredata = repo.dirstate._ignorefileandline(nf)
2514 2514 else:
2515 2515 for p in util.finddirs(nf):
2516 2516 if ignore(p):
2517 2517 ignored = p
2518 2518 ignoredata = repo.dirstate._ignorefileandline(p)
2519 2519 break
2520 2520 if ignored:
2521 2521 if ignored == nf:
2522 2522 ui.write("%s is ignored\n" % f)
2523 2523 else:
2524 2524 ui.write("%s is ignored because of containing folder %s\n"
2525 2525 % (f, ignored))
2526 2526 ignorefile, lineno, line = ignoredata
2527 2527 ui.write("(ignore rule in %s, line %d: '%s')\n"
2528 2528 % (ignorefile, lineno, line))
2529 2529 else:
2530 2530 ui.write("%s is not ignored\n" % f)
2531 2531
2532 2532 @command('debugindex', debugrevlogopts +
2533 2533 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2534 2534 _('[-f FORMAT] -c|-m|FILE'),
2535 2535 optionalrepo=True)
2536 2536 def debugindex(ui, repo, file_=None, **opts):
2537 2537 """dump the contents of an index file"""
2538 2538 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2539 2539 format = opts.get('format', 0)
2540 2540 if format not in (0, 1):
2541 2541 raise error.Abort(_("unknown format %d") % format)
2542 2542
2543 2543 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2544 2544 if generaldelta:
2545 2545 basehdr = ' delta'
2546 2546 else:
2547 2547 basehdr = ' base'
2548 2548
2549 2549 if ui.debugflag:
2550 2550 shortfn = hex
2551 2551 else:
2552 2552 shortfn = short
2553 2553
2554 2554 # There might not be anything in r, so have a sane default
2555 2555 idlen = 12
2556 2556 for i in r:
2557 2557 idlen = len(shortfn(r.node(i)))
2558 2558 break
2559 2559
2560 2560 if format == 0:
2561 2561 ui.write(" rev offset length " + basehdr + " linkrev"
2562 2562 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2563 2563 elif format == 1:
2564 2564 ui.write(" rev flag offset length"
2565 2565 " size " + basehdr + " link p1 p2"
2566 2566 " %s\n" % "nodeid".rjust(idlen))
2567 2567
2568 2568 for i in r:
2569 2569 node = r.node(i)
2570 2570 if generaldelta:
2571 2571 base = r.deltaparent(i)
2572 2572 else:
2573 2573 base = r.chainbase(i)
2574 2574 if format == 0:
2575 2575 try:
2576 2576 pp = r.parents(node)
2577 2577 except Exception:
2578 2578 pp = [nullid, nullid]
2579 2579 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2580 2580 i, r.start(i), r.length(i), base, r.linkrev(i),
2581 2581 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2582 2582 elif format == 1:
2583 2583 pr = r.parentrevs(i)
2584 2584 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2585 2585 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2586 2586 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2587 2587
2588 2588 @command('debugindexdot', debugrevlogopts,
2589 2589 _('-c|-m|FILE'), optionalrepo=True)
2590 2590 def debugindexdot(ui, repo, file_=None, **opts):
2591 2591 """dump an index DAG as a graphviz dot file"""
2592 2592 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2593 2593 ui.write(("digraph G {\n"))
2594 2594 for i in r:
2595 2595 node = r.node(i)
2596 2596 pp = r.parents(node)
2597 2597 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2598 2598 if pp[1] != nullid:
2599 2599 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2600 2600 ui.write("}\n")
2601 2601
2602 2602 @command('debugdeltachain',
2603 2603 debugrevlogopts + formatteropts,
2604 2604 _('-c|-m|FILE'),
2605 2605 optionalrepo=True)
2606 2606 def debugdeltachain(ui, repo, file_=None, **opts):
2607 2607 """dump information about delta chains in a revlog
2608 2608
2609 2609 Output can be templatized. Available template keywords are:
2610 2610
2611 2611 rev revision number
2612 2612 chainid delta chain identifier (numbered by unique base)
2613 2613 chainlen delta chain length to this revision
2614 2614 prevrev previous revision in delta chain
2615 2615 deltatype role of delta / how it was computed
2616 2616 compsize compressed size of revision
2617 2617 uncompsize uncompressed size of revision
2618 2618 chainsize total size of compressed revisions in chain
2619 2619 chainratio total chain size divided by uncompressed revision size
2620 2620 (new delta chains typically start at ratio 2.00)
2621 2621 lindist linear distance from base revision in delta chain to end
2622 2622 of this revision
2623 2623 extradist total size of revisions not part of this delta chain from
2624 2624 base of delta chain to end of this revision; a measurement
2625 2625 of how much extra data we need to read/seek across to read
2626 2626 the delta chain for this revision
2627 2627 extraratio extradist divided by chainsize; another representation of
2628 2628 how much unrelated data is needed to load this delta chain
2629 2629 """
2630 2630 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2631 2631 index = r.index
2632 2632 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2633 2633
2634 2634 def revinfo(rev):
2635 2635 e = index[rev]
2636 2636 compsize = e[1]
2637 2637 uncompsize = e[2]
2638 2638 chainsize = 0
2639 2639
2640 2640 if generaldelta:
2641 2641 if e[3] == e[5]:
2642 2642 deltatype = 'p1'
2643 2643 elif e[3] == e[6]:
2644 2644 deltatype = 'p2'
2645 2645 elif e[3] == rev - 1:
2646 2646 deltatype = 'prev'
2647 2647 elif e[3] == rev:
2648 2648 deltatype = 'base'
2649 2649 else:
2650 2650 deltatype = 'other'
2651 2651 else:
2652 2652 if e[3] == rev:
2653 2653 deltatype = 'base'
2654 2654 else:
2655 2655 deltatype = 'prev'
2656 2656
2657 2657 chain = r._deltachain(rev)[0]
2658 2658 for iterrev in chain:
2659 2659 e = index[iterrev]
2660 2660 chainsize += e[1]
2661 2661
2662 2662 return compsize, uncompsize, deltatype, chain, chainsize
2663 2663
2664 2664 fm = ui.formatter('debugdeltachain', opts)
2665 2665
2666 2666 fm.plain(' rev chain# chainlen prev delta '
2667 2667 'size rawsize chainsize ratio lindist extradist '
2668 2668 'extraratio\n')
2669 2669
2670 2670 chainbases = {}
2671 2671 for rev in r:
2672 2672 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2673 2673 chainbase = chain[0]
2674 2674 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2675 2675 basestart = r.start(chainbase)
2676 2676 revstart = r.start(rev)
2677 2677 lineardist = revstart + comp - basestart
2678 2678 extradist = lineardist - chainsize
2679 2679 try:
2680 2680 prevrev = chain[-2]
2681 2681 except IndexError:
2682 2682 prevrev = -1
2683 2683
2684 2684 chainratio = float(chainsize) / float(uncomp)
2685 2685 extraratio = float(extradist) / float(chainsize)
2686 2686
2687 2687 fm.startitem()
2688 2688 fm.write('rev chainid chainlen prevrev deltatype compsize '
2689 2689 'uncompsize chainsize chainratio lindist extradist '
2690 2690 'extraratio',
2691 2691 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2692 2692 rev, chainid, len(chain), prevrev, deltatype, comp,
2693 2693 uncomp, chainsize, chainratio, lineardist, extradist,
2694 2694 extraratio,
2695 2695 rev=rev, chainid=chainid, chainlen=len(chain),
2696 2696 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2697 2697 uncompsize=uncomp, chainsize=chainsize,
2698 2698 chainratio=chainratio, lindist=lineardist,
2699 2699 extradist=extradist, extraratio=extraratio)
2700 2700
2701 2701 fm.end()
2702 2702
2703 2703 @command('debuginstall', [], '', norepo=True)
2704 2704 def debuginstall(ui):
2705 2705 '''test Mercurial installation
2706 2706
2707 2707 Returns 0 on success.
2708 2708 '''
2709 2709
2710 2710 def writetemp(contents):
2711 2711 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2712 2712 f = os.fdopen(fd, "wb")
2713 2713 f.write(contents)
2714 2714 f.close()
2715 2715 return name
2716 2716
2717 2717 problems = 0
2718 2718
2719 2719 # encoding
2720 2720 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2721 2721 try:
2722 2722 encoding.fromlocal("test")
2723 2723 except error.Abort as inst:
2724 2724 ui.write(" %s\n" % inst)
2725 2725 ui.write(_(" (check that your locale is properly set)\n"))
2726 2726 problems += 1
2727 2727
2728 2728 # Python
2729 2729 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2730 2730 ui.status(_("checking Python version (%s)\n")
2731 2731 % ("%s.%s.%s" % sys.version_info[:3]))
2732 2732 ui.status(_("checking Python lib (%s)...\n")
2733 2733 % os.path.dirname(os.__file__))
2734 2734
2735 2735 # compiled modules
2736 2736 ui.status(_("checking installed modules (%s)...\n")
2737 2737 % os.path.dirname(__file__))
2738 2738 try:
2739 2739 from . import (
2740 2740 base85,
2741 2741 bdiff,
2742 2742 mpatch,
2743 2743 osutil,
2744 2744 )
2745 2745 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2746 2746 except Exception as inst:
2747 2747 ui.write(" %s\n" % inst)
2748 2748 ui.write(_(" One or more extensions could not be found"))
2749 2749 ui.write(_(" (check that you compiled the extensions)\n"))
2750 2750 problems += 1
2751 2751
2752 2752 # templates
2753 2753 from . import templater
2754 2754 p = templater.templatepaths()
2755 2755 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2756 2756 if p:
2757 2757 m = templater.templatepath("map-cmdline.default")
2758 2758 if m:
2759 2759 # template found, check if it is working
2760 2760 try:
2761 2761 templater.templater(m)
2762 2762 except Exception as inst:
2763 2763 ui.write(" %s\n" % inst)
2764 2764 p = None
2765 2765 else:
2766 2766 ui.write(_(" template 'default' not found\n"))
2767 2767 p = None
2768 2768 else:
2769 2769 ui.write(_(" no template directories found\n"))
2770 2770 if not p:
2771 2771 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2772 2772 problems += 1
2773 2773
2774 2774 # editor
2775 2775 ui.status(_("checking commit editor...\n"))
2776 2776 editor = ui.geteditor()
2777 2777 editor = util.expandpath(editor)
2778 2778 cmdpath = util.findexe(shlex.split(editor)[0])
2779 2779 if not cmdpath:
2780 2780 if editor == 'vi':
2781 2781 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2782 2782 ui.write(_(" (specify a commit editor in your configuration"
2783 2783 " file)\n"))
2784 2784 else:
2785 2785 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2786 2786 ui.write(_(" (specify a commit editor in your configuration"
2787 2787 " file)\n"))
2788 2788 problems += 1
2789 2789
2790 2790 # check username
2791 2791 ui.status(_("checking username...\n"))
2792 2792 try:
2793 2793 ui.username()
2794 2794 except error.Abort as e:
2795 2795 ui.write(" %s\n" % e)
2796 2796 ui.write(_(" (specify a username in your configuration file)\n"))
2797 2797 problems += 1
2798 2798
2799 2799 if not problems:
2800 2800 ui.status(_("no problems detected\n"))
2801 2801 else:
2802 2802 ui.write(_("%s problems detected,"
2803 2803 " please check your install!\n") % problems)
2804 2804
2805 2805 return problems
2806 2806
2807 2807 @command('debugknown', [], _('REPO ID...'), norepo=True)
2808 2808 def debugknown(ui, repopath, *ids, **opts):
2809 2809 """test whether node ids are known to a repo
2810 2810
2811 2811 Every ID must be a full-length hex node id string. Returns a list of 0s
2812 2812 and 1s indicating unknown/known.
2813 2813 """
2814 2814 repo = hg.peer(ui, opts, repopath)
2815 2815 if not repo.capable('known'):
2816 2816 raise error.Abort("known() not supported by target repository")
2817 2817 flags = repo.known([bin(s) for s in ids])
2818 2818 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2819 2819
2820 2820 @command('debuglabelcomplete', [], _('LABEL...'))
2821 2821 def debuglabelcomplete(ui, repo, *args):
2822 2822 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2823 2823 debugnamecomplete(ui, repo, *args)
2824 2824
2825 2825 @command('debugmergestate', [], '')
2826 2826 def debugmergestate(ui, repo, *args):
2827 2827 """print merge state
2828 2828
2829 2829 Use --verbose to print out information about whether v1 or v2 merge state
2830 2830 was chosen."""
2831 2831 def _hashornull(h):
2832 2832 if h == nullhex:
2833 2833 return 'null'
2834 2834 else:
2835 2835 return h
2836 2836
2837 2837 def printrecords(version):
2838 2838 ui.write(('* version %s records\n') % version)
2839 2839 if version == 1:
2840 2840 records = v1records
2841 2841 else:
2842 2842 records = v2records
2843 2843
2844 2844 for rtype, record in records:
2845 2845 # pretty print some record types
2846 2846 if rtype == 'L':
2847 2847 ui.write(('local: %s\n') % record)
2848 2848 elif rtype == 'O':
2849 2849 ui.write(('other: %s\n') % record)
2850 2850 elif rtype == 'm':
2851 2851 driver, mdstate = record.split('\0', 1)
2852 2852 ui.write(('merge driver: %s (state "%s")\n')
2853 2853 % (driver, mdstate))
2854 2854 elif rtype in 'FDC':
2855 2855 r = record.split('\0')
2856 2856 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2857 2857 if version == 1:
2858 2858 onode = 'not stored in v1 format'
2859 2859 flags = r[7]
2860 2860 else:
2861 2861 onode, flags = r[7:9]
2862 2862 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2863 2863 % (f, rtype, state, _hashornull(hash)))
2864 2864 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2865 2865 ui.write((' ancestor path: %s (node %s)\n')
2866 2866 % (afile, _hashornull(anode)))
2867 2867 ui.write((' other path: %s (node %s)\n')
2868 2868 % (ofile, _hashornull(onode)))
2869 2869 elif rtype == 'f':
2870 2870 filename, rawextras = record.split('\0', 1)
2871 2871 extras = rawextras.split('\0')
2872 2872 i = 0
2873 2873 extrastrings = []
2874 2874 while i < len(extras):
2875 2875 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2876 2876 i += 2
2877 2877
2878 2878 ui.write(('file extras: %s (%s)\n')
2879 2879 % (filename, ', '.join(extrastrings)))
2880 2880 else:
2881 2881 ui.write(('unrecognized entry: %s\t%s\n')
2882 2882 % (rtype, record.replace('\0', '\t')))
2883 2883
2884 2884 # Avoid mergestate.read() since it may raise an exception for unsupported
2885 2885 # merge state records. We shouldn't be doing this, but this is OK since this
2886 2886 # command is pretty low-level.
2887 2887 ms = mergemod.mergestate(repo)
2888 2888
2889 2889 # sort so that reasonable information is on top
2890 2890 v1records = ms._readrecordsv1()
2891 2891 v2records = ms._readrecordsv2()
2892 2892 order = 'LOm'
2893 2893 def key(r):
2894 2894 idx = order.find(r[0])
2895 2895 if idx == -1:
2896 2896 return (1, r[1])
2897 2897 else:
2898 2898 return (0, idx)
2899 2899 v1records.sort(key=key)
2900 2900 v2records.sort(key=key)
2901 2901
2902 2902 if not v1records and not v2records:
2903 2903 ui.write(('no merge state found\n'))
2904 2904 elif not v2records:
2905 2905 ui.note(('no version 2 merge state\n'))
2906 2906 printrecords(1)
2907 2907 elif ms._v1v2match(v1records, v2records):
2908 2908 ui.note(('v1 and v2 states match: using v2\n'))
2909 2909 printrecords(2)
2910 2910 else:
2911 2911 ui.note(('v1 and v2 states mismatch: using v1\n'))
2912 2912 printrecords(1)
2913 2913 if ui.verbose:
2914 2914 printrecords(2)
2915 2915
2916 2916 @command('debugnamecomplete', [], _('NAME...'))
2917 2917 def debugnamecomplete(ui, repo, *args):
2918 2918 '''complete "names" - tags, open branch names, bookmark names'''
2919 2919
2920 2920 names = set()
2921 2921 # since we previously only listed open branches, we will handle that
2922 2922 # specially (after this for loop)
2923 2923 for name, ns in repo.names.iteritems():
2924 2924 if name != 'branches':
2925 2925 names.update(ns.listnames(repo))
2926 2926 names.update(tag for (tag, heads, tip, closed)
2927 2927 in repo.branchmap().iterbranches() if not closed)
2928 2928 completions = set()
2929 2929 if not args:
2930 2930 args = ['']
2931 2931 for a in args:
2932 2932 completions.update(n for n in names if n.startswith(a))
2933 2933 ui.write('\n'.join(sorted(completions)))
2934 2934 ui.write('\n')
2935 2935
2936 2936 @command('debuglocks',
2937 2937 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2938 2938 ('W', 'force-wlock', None,
2939 2939 _('free the working state lock (DANGEROUS)'))],
2940 2940 _('[OPTION]...'))
2941 2941 def debuglocks(ui, repo, **opts):
2942 2942 """show or modify state of locks
2943 2943
2944 2944 By default, this command will show which locks are held. This
2945 2945 includes the user and process holding the lock, the amount of time
2946 2946 the lock has been held, and the machine name where the process is
2947 2947 running if it's not local.
2948 2948
2949 2949 Locks protect the integrity of Mercurial's data, so should be
2950 2950 treated with care. System crashes or other interruptions may cause
2951 2951 locks to not be properly released, though Mercurial will usually
2952 2952 detect and remove such stale locks automatically.
2953 2953
2954 2954 However, detecting stale locks may not always be possible (for
2955 2955 instance, on a shared filesystem). Removing locks may also be
2956 2956 blocked by filesystem permissions.
2957 2957
2958 2958 Returns 0 if no locks are held.
2959 2959
2960 2960 """
2961 2961
2962 2962 if opts.get('force_lock'):
2963 2963 repo.svfs.unlink('lock')
2964 2964 if opts.get('force_wlock'):
2965 2965 repo.vfs.unlink('wlock')
2966 2966 if opts.get('force_lock') or opts.get('force_lock'):
2967 2967 return 0
2968 2968
2969 2969 now = time.time()
2970 2970 held = 0
2971 2971
2972 2972 def report(vfs, name, method):
2973 2973 # this causes stale locks to get reaped for more accurate reporting
2974 2974 try:
2975 2975 l = method(False)
2976 2976 except error.LockHeld:
2977 2977 l = None
2978 2978
2979 2979 if l:
2980 2980 l.release()
2981 2981 else:
2982 2982 try:
2983 2983 stat = vfs.lstat(name)
2984 2984 age = now - stat.st_mtime
2985 2985 user = util.username(stat.st_uid)
2986 2986 locker = vfs.readlock(name)
2987 2987 if ":" in locker:
2988 2988 host, pid = locker.split(':')
2989 2989 if host == socket.gethostname():
2990 2990 locker = 'user %s, process %s' % (user, pid)
2991 2991 else:
2992 2992 locker = 'user %s, process %s, host %s' \
2993 2993 % (user, pid, host)
2994 2994 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2995 2995 return 1
2996 2996 except OSError as e:
2997 2997 if e.errno != errno.ENOENT:
2998 2998 raise
2999 2999
3000 3000 ui.write("%-6s free\n" % (name + ":"))
3001 3001 return 0
3002 3002
3003 3003 held += report(repo.svfs, "lock", repo.lock)
3004 3004 held += report(repo.vfs, "wlock", repo.wlock)
3005 3005
3006 3006 return held
3007 3007
3008 3008 @command('debugobsolete',
3009 3009 [('', 'flags', 0, _('markers flag')),
3010 3010 ('', 'record-parents', False,
3011 3011 _('record parent information for the precursor')),
3012 3012 ('r', 'rev', [], _('display markers relevant to REV')),
3013 3013 ] + commitopts2,
3014 3014 _('[OBSOLETED [REPLACEMENT ...]]'))
3015 3015 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3016 3016 """create arbitrary obsolete marker
3017 3017
3018 3018 With no arguments, displays the list of obsolescence markers."""
3019 3019
3020 3020 def parsenodeid(s):
3021 3021 try:
3022 3022 # We do not use revsingle/revrange functions here to accept
3023 3023 # arbitrary node identifiers, possibly not present in the
3024 3024 # local repository.
3025 3025 n = bin(s)
3026 3026 if len(n) != len(nullid):
3027 3027 raise TypeError()
3028 3028 return n
3029 3029 except TypeError:
3030 3030 raise error.Abort('changeset references must be full hexadecimal '
3031 3031 'node identifiers')
3032 3032
3033 3033 if precursor is not None:
3034 3034 if opts['rev']:
3035 3035 raise error.Abort('cannot select revision when creating marker')
3036 3036 metadata = {}
3037 3037 metadata['user'] = opts['user'] or ui.username()
3038 3038 succs = tuple(parsenodeid(succ) for succ in successors)
3039 3039 l = repo.lock()
3040 3040 try:
3041 3041 tr = repo.transaction('debugobsolete')
3042 3042 try:
3043 3043 date = opts.get('date')
3044 3044 if date:
3045 3045 date = util.parsedate(date)
3046 3046 else:
3047 3047 date = None
3048 3048 prec = parsenodeid(precursor)
3049 3049 parents = None
3050 3050 if opts['record_parents']:
3051 3051 if prec not in repo.unfiltered():
3052 3052 raise error.Abort('cannot used --record-parents on '
3053 3053 'unknown changesets')
3054 3054 parents = repo.unfiltered()[prec].parents()
3055 3055 parents = tuple(p.node() for p in parents)
3056 3056 repo.obsstore.create(tr, prec, succs, opts['flags'],
3057 3057 parents=parents, date=date,
3058 3058 metadata=metadata)
3059 3059 tr.close()
3060 3060 except ValueError as exc:
3061 3061 raise error.Abort(_('bad obsmarker input: %s') % exc)
3062 3062 finally:
3063 3063 tr.release()
3064 3064 finally:
3065 3065 l.release()
3066 3066 else:
3067 3067 if opts['rev']:
3068 3068 revs = scmutil.revrange(repo, opts['rev'])
3069 3069 nodes = [repo[r].node() for r in revs]
3070 3070 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3071 3071 markers.sort(key=lambda x: x._data)
3072 3072 else:
3073 3073 markers = obsolete.getmarkers(repo)
3074 3074
3075 3075 for m in markers:
3076 3076 cmdutil.showmarker(ui, m)
3077 3077
3078 3078 @command('debugpathcomplete',
3079 3079 [('f', 'full', None, _('complete an entire path')),
3080 3080 ('n', 'normal', None, _('show only normal files')),
3081 3081 ('a', 'added', None, _('show only added files')),
3082 3082 ('r', 'removed', None, _('show only removed files'))],
3083 3083 _('FILESPEC...'))
3084 3084 def debugpathcomplete(ui, repo, *specs, **opts):
3085 3085 '''complete part or all of a tracked path
3086 3086
3087 3087 This command supports shells that offer path name completion. It
3088 3088 currently completes only files already known to the dirstate.
3089 3089
3090 3090 Completion extends only to the next path segment unless
3091 3091 --full is specified, in which case entire paths are used.'''
3092 3092
3093 3093 def complete(path, acceptable):
3094 3094 dirstate = repo.dirstate
3095 3095 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3096 3096 rootdir = repo.root + os.sep
3097 3097 if spec != repo.root and not spec.startswith(rootdir):
3098 3098 return [], []
3099 3099 if os.path.isdir(spec):
3100 3100 spec += '/'
3101 3101 spec = spec[len(rootdir):]
3102 3102 fixpaths = os.sep != '/'
3103 3103 if fixpaths:
3104 3104 spec = spec.replace(os.sep, '/')
3105 3105 speclen = len(spec)
3106 3106 fullpaths = opts['full']
3107 3107 files, dirs = set(), set()
3108 3108 adddir, addfile = dirs.add, files.add
3109 3109 for f, st in dirstate.iteritems():
3110 3110 if f.startswith(spec) and st[0] in acceptable:
3111 3111 if fixpaths:
3112 3112 f = f.replace('/', os.sep)
3113 3113 if fullpaths:
3114 3114 addfile(f)
3115 3115 continue
3116 3116 s = f.find(os.sep, speclen)
3117 3117 if s >= 0:
3118 3118 adddir(f[:s])
3119 3119 else:
3120 3120 addfile(f)
3121 3121 return files, dirs
3122 3122
3123 3123 acceptable = ''
3124 3124 if opts['normal']:
3125 3125 acceptable += 'nm'
3126 3126 if opts['added']:
3127 3127 acceptable += 'a'
3128 3128 if opts['removed']:
3129 3129 acceptable += 'r'
3130 3130 cwd = repo.getcwd()
3131 3131 if not specs:
3132 3132 specs = ['.']
3133 3133
3134 3134 files, dirs = set(), set()
3135 3135 for spec in specs:
3136 3136 f, d = complete(spec, acceptable or 'nmar')
3137 3137 files.update(f)
3138 3138 dirs.update(d)
3139 3139 files.update(dirs)
3140 3140 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3141 3141 ui.write('\n')
3142 3142
3143 3143 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3144 3144 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3145 3145 '''access the pushkey key/value protocol
3146 3146
3147 3147 With two args, list the keys in the given namespace.
3148 3148
3149 3149 With five args, set a key to new if it currently is set to old.
3150 3150 Reports success or failure.
3151 3151 '''
3152 3152
3153 3153 target = hg.peer(ui, {}, repopath)
3154 3154 if keyinfo:
3155 3155 key, old, new = keyinfo
3156 3156 r = target.pushkey(namespace, key, old, new)
3157 3157 ui.status(str(r) + '\n')
3158 3158 return not r
3159 3159 else:
3160 3160 for k, v in sorted(target.listkeys(namespace).iteritems()):
3161 3161 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3162 3162 v.encode('string-escape')))
3163 3163
3164 3164 @command('debugpvec', [], _('A B'))
3165 3165 def debugpvec(ui, repo, a, b=None):
3166 3166 ca = scmutil.revsingle(repo, a)
3167 3167 cb = scmutil.revsingle(repo, b)
3168 3168 pa = pvec.ctxpvec(ca)
3169 3169 pb = pvec.ctxpvec(cb)
3170 3170 if pa == pb:
3171 3171 rel = "="
3172 3172 elif pa > pb:
3173 3173 rel = ">"
3174 3174 elif pa < pb:
3175 3175 rel = "<"
3176 3176 elif pa | pb:
3177 3177 rel = "|"
3178 3178 ui.write(_("a: %s\n") % pa)
3179 3179 ui.write(_("b: %s\n") % pb)
3180 3180 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3181 3181 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3182 3182 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3183 3183 pa.distance(pb), rel))
3184 3184
3185 3185 @command('debugrebuilddirstate|debugrebuildstate',
3186 3186 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3187 3187 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3188 3188 'the working copy parent')),
3189 3189 ],
3190 3190 _('[-r REV]'))
3191 3191 def debugrebuilddirstate(ui, repo, rev, **opts):
3192 3192 """rebuild the dirstate as it would look like for the given revision
3193 3193
3194 3194 If no revision is specified the first current parent will be used.
3195 3195
3196 3196 The dirstate will be set to the files of the given revision.
3197 3197 The actual working directory content or existing dirstate
3198 3198 information such as adds or removes is not considered.
3199 3199
3200 3200 ``minimal`` will only rebuild the dirstate status for files that claim to be
3201 3201 tracked but are not in the parent manifest, or that exist in the parent
3202 3202 manifest but are not in the dirstate. It will not change adds, removes, or
3203 3203 modified files that are in the working copy parent.
3204 3204
3205 3205 One use of this command is to make the next :hg:`status` invocation
3206 3206 check the actual file content.
3207 3207 """
3208 3208 ctx = scmutil.revsingle(repo, rev)
3209 3209 with repo.wlock():
3210 3210 dirstate = repo.dirstate
3211 3211 changedfiles = None
3212 3212 # See command doc for what minimal does.
3213 3213 if opts.get('minimal'):
3214 3214 manifestfiles = set(ctx.manifest().keys())
3215 3215 dirstatefiles = set(dirstate)
3216 3216 manifestonly = manifestfiles - dirstatefiles
3217 3217 dsonly = dirstatefiles - manifestfiles
3218 3218 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3219 3219 changedfiles = manifestonly | dsnotadded
3220 3220
3221 3221 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3222 3222
3223 3223 @command('debugrebuildfncache', [], '')
3224 3224 def debugrebuildfncache(ui, repo):
3225 3225 """rebuild the fncache file"""
3226 3226 repair.rebuildfncache(ui, repo)
3227 3227
3228 3228 @command('debugrename',
3229 3229 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3230 3230 _('[-r REV] FILE'))
3231 3231 def debugrename(ui, repo, file1, *pats, **opts):
3232 3232 """dump rename information"""
3233 3233
3234 3234 ctx = scmutil.revsingle(repo, opts.get('rev'))
3235 3235 m = scmutil.match(ctx, (file1,) + pats, opts)
3236 3236 for abs in ctx.walk(m):
3237 3237 fctx = ctx[abs]
3238 3238 o = fctx.filelog().renamed(fctx.filenode())
3239 3239 rel = m.rel(abs)
3240 3240 if o:
3241 3241 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3242 3242 else:
3243 3243 ui.write(_("%s not renamed\n") % rel)
3244 3244
3245 3245 @command('debugrevlog', debugrevlogopts +
3246 3246 [('d', 'dump', False, _('dump index data'))],
3247 3247 _('-c|-m|FILE'),
3248 3248 optionalrepo=True)
3249 3249 def debugrevlog(ui, repo, file_=None, **opts):
3250 3250 """show data and statistics about a revlog"""
3251 3251 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3252 3252
3253 3253 if opts.get("dump"):
3254 3254 numrevs = len(r)
3255 3255 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3256 3256 " rawsize totalsize compression heads chainlen\n")
3257 3257 ts = 0
3258 3258 heads = set()
3259 3259
3260 3260 for rev in xrange(numrevs):
3261 3261 dbase = r.deltaparent(rev)
3262 3262 if dbase == -1:
3263 3263 dbase = rev
3264 3264 cbase = r.chainbase(rev)
3265 3265 clen = r.chainlen(rev)
3266 3266 p1, p2 = r.parentrevs(rev)
3267 3267 rs = r.rawsize(rev)
3268 3268 ts = ts + rs
3269 3269 heads -= set(r.parentrevs(rev))
3270 3270 heads.add(rev)
3271 3271 try:
3272 3272 compression = ts / r.end(rev)
3273 3273 except ZeroDivisionError:
3274 3274 compression = 0
3275 3275 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3276 3276 "%11d %5d %8d\n" %
3277 3277 (rev, p1, p2, r.start(rev), r.end(rev),
3278 3278 r.start(dbase), r.start(cbase),
3279 3279 r.start(p1), r.start(p2),
3280 3280 rs, ts, compression, len(heads), clen))
3281 3281 return 0
3282 3282
3283 3283 v = r.version
3284 3284 format = v & 0xFFFF
3285 3285 flags = []
3286 3286 gdelta = False
3287 3287 if v & revlog.REVLOGNGINLINEDATA:
3288 3288 flags.append('inline')
3289 3289 if v & revlog.REVLOGGENERALDELTA:
3290 3290 gdelta = True
3291 3291 flags.append('generaldelta')
3292 3292 if not flags:
3293 3293 flags = ['(none)']
3294 3294
3295 3295 nummerges = 0
3296 3296 numfull = 0
3297 3297 numprev = 0
3298 3298 nump1 = 0
3299 3299 nump2 = 0
3300 3300 numother = 0
3301 3301 nump1prev = 0
3302 3302 nump2prev = 0
3303 3303 chainlengths = []
3304 3304
3305 3305 datasize = [None, 0, 0L]
3306 3306 fullsize = [None, 0, 0L]
3307 3307 deltasize = [None, 0, 0L]
3308 3308
3309 3309 def addsize(size, l):
3310 3310 if l[0] is None or size < l[0]:
3311 3311 l[0] = size
3312 3312 if size > l[1]:
3313 3313 l[1] = size
3314 3314 l[2] += size
3315 3315
3316 3316 numrevs = len(r)
3317 3317 for rev in xrange(numrevs):
3318 3318 p1, p2 = r.parentrevs(rev)
3319 3319 delta = r.deltaparent(rev)
3320 3320 if format > 0:
3321 3321 addsize(r.rawsize(rev), datasize)
3322 3322 if p2 != nullrev:
3323 3323 nummerges += 1
3324 3324 size = r.length(rev)
3325 3325 if delta == nullrev:
3326 3326 chainlengths.append(0)
3327 3327 numfull += 1
3328 3328 addsize(size, fullsize)
3329 3329 else:
3330 3330 chainlengths.append(chainlengths[delta] + 1)
3331 3331 addsize(size, deltasize)
3332 3332 if delta == rev - 1:
3333 3333 numprev += 1
3334 3334 if delta == p1:
3335 3335 nump1prev += 1
3336 3336 elif delta == p2:
3337 3337 nump2prev += 1
3338 3338 elif delta == p1:
3339 3339 nump1 += 1
3340 3340 elif delta == p2:
3341 3341 nump2 += 1
3342 3342 elif delta != nullrev:
3343 3343 numother += 1
3344 3344
3345 3345 # Adjust size min value for empty cases
3346 3346 for size in (datasize, fullsize, deltasize):
3347 3347 if size[0] is None:
3348 3348 size[0] = 0
3349 3349
3350 3350 numdeltas = numrevs - numfull
3351 3351 numoprev = numprev - nump1prev - nump2prev
3352 3352 totalrawsize = datasize[2]
3353 3353 datasize[2] /= numrevs
3354 3354 fulltotal = fullsize[2]
3355 3355 fullsize[2] /= numfull
3356 3356 deltatotal = deltasize[2]
3357 3357 if numrevs - numfull > 0:
3358 3358 deltasize[2] /= numrevs - numfull
3359 3359 totalsize = fulltotal + deltatotal
3360 3360 avgchainlen = sum(chainlengths) / numrevs
3361 3361 maxchainlen = max(chainlengths)
3362 3362 compratio = 1
3363 3363 if totalsize:
3364 3364 compratio = totalrawsize / totalsize
3365 3365
3366 3366 basedfmtstr = '%%%dd\n'
3367 3367 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3368 3368
3369 3369 def dfmtstr(max):
3370 3370 return basedfmtstr % len(str(max))
3371 3371 def pcfmtstr(max, padding=0):
3372 3372 return basepcfmtstr % (len(str(max)), ' ' * padding)
3373 3373
3374 3374 def pcfmt(value, total):
3375 3375 if total:
3376 3376 return (value, 100 * float(value) / total)
3377 3377 else:
3378 3378 return value, 100.0
3379 3379
3380 3380 ui.write(('format : %d\n') % format)
3381 3381 ui.write(('flags : %s\n') % ', '.join(flags))
3382 3382
3383 3383 ui.write('\n')
3384 3384 fmt = pcfmtstr(totalsize)
3385 3385 fmt2 = dfmtstr(totalsize)
3386 3386 ui.write(('revisions : ') + fmt2 % numrevs)
3387 3387 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3388 3388 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3389 3389 ui.write(('revisions : ') + fmt2 % numrevs)
3390 3390 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3391 3391 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3392 3392 ui.write(('revision size : ') + fmt2 % totalsize)
3393 3393 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3394 3394 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3395 3395
3396 3396 ui.write('\n')
3397 3397 fmt = dfmtstr(max(avgchainlen, compratio))
3398 3398 ui.write(('avg chain length : ') + fmt % avgchainlen)
3399 3399 ui.write(('max chain length : ') + fmt % maxchainlen)
3400 3400 ui.write(('compression ratio : ') + fmt % compratio)
3401 3401
3402 3402 if format > 0:
3403 3403 ui.write('\n')
3404 3404 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3405 3405 % tuple(datasize))
3406 3406 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3407 3407 % tuple(fullsize))
3408 3408 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3409 3409 % tuple(deltasize))
3410 3410
3411 3411 if numdeltas > 0:
3412 3412 ui.write('\n')
3413 3413 fmt = pcfmtstr(numdeltas)
3414 3414 fmt2 = pcfmtstr(numdeltas, 4)
3415 3415 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3416 3416 if numprev > 0:
3417 3417 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3418 3418 numprev))
3419 3419 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3420 3420 numprev))
3421 3421 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3422 3422 numprev))
3423 3423 if gdelta:
3424 3424 ui.write(('deltas against p1 : ')
3425 3425 + fmt % pcfmt(nump1, numdeltas))
3426 3426 ui.write(('deltas against p2 : ')
3427 3427 + fmt % pcfmt(nump2, numdeltas))
3428 3428 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3429 3429 numdeltas))
3430 3430
3431 3431 @command('debugrevspec',
3432 3432 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3433 3433 ('REVSPEC'))
3434 3434 def debugrevspec(ui, repo, expr, **opts):
3435 3435 """parse and apply a revision specification
3436 3436
3437 3437 Use --verbose to print the parsed tree before and after aliases
3438 3438 expansion.
3439 3439 """
3440 3440 if ui.verbose:
3441 3441 tree = revset.parse(expr, lookup=repo.__contains__)
3442 3442 ui.note(revset.prettyformat(tree), "\n")
3443 3443 newtree = revset.findaliases(ui, tree)
3444 3444 if newtree != tree:
3445 3445 ui.note(revset.prettyformat(newtree), "\n")
3446 3446 tree = newtree
3447 3447 newtree = revset.foldconcat(tree)
3448 3448 if newtree != tree:
3449 3449 ui.note(revset.prettyformat(newtree), "\n")
3450 3450 if opts["optimize"]:
3451 3451 weight, optimizedtree = revset.optimize(newtree, True)
3452 3452 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3453 3453 func = revset.match(ui, expr, repo)
3454 3454 revs = func(repo)
3455 3455 if ui.verbose:
3456 3456 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3457 3457 for c in revs:
3458 3458 ui.write("%s\n" % c)
3459 3459
3460 3460 @command('debugsetparents', [], _('REV1 [REV2]'))
3461 3461 def debugsetparents(ui, repo, rev1, rev2=None):
3462 3462 """manually set the parents of the current working directory
3463 3463
3464 3464 This is useful for writing repository conversion tools, but should
3465 3465 be used with care. For example, neither the working directory nor the
3466 3466 dirstate is updated, so file status may be incorrect after running this
3467 3467 command.
3468 3468
3469 3469 Returns 0 on success.
3470 3470 """
3471 3471
3472 3472 r1 = scmutil.revsingle(repo, rev1).node()
3473 3473 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3474 3474
3475 3475 with repo.wlock():
3476 3476 repo.dirstate.beginparentchange()
3477 3477 repo.setparents(r1, r2)
3478 3478 repo.dirstate.endparentchange()
3479 3479
3480 3480 @command('debugdirstate|debugstate',
3481 3481 [('', 'nodates', None, _('do not display the saved mtime')),
3482 3482 ('', 'datesort', None, _('sort by saved mtime'))],
3483 3483 _('[OPTION]...'))
3484 3484 def debugstate(ui, repo, **opts):
3485 3485 """show the contents of the current dirstate"""
3486 3486
3487 3487 nodates = opts.get('nodates')
3488 3488 datesort = opts.get('datesort')
3489 3489
3490 3490 timestr = ""
3491 3491 if datesort:
3492 3492 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3493 3493 else:
3494 3494 keyfunc = None # sort by filename
3495 3495 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3496 3496 if ent[3] == -1:
3497 3497 timestr = 'unset '
3498 3498 elif nodates:
3499 3499 timestr = 'set '
3500 3500 else:
3501 3501 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3502 3502 time.localtime(ent[3]))
3503 3503 if ent[1] & 0o20000:
3504 3504 mode = 'lnk'
3505 3505 else:
3506 3506 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3507 3507 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3508 3508 for f in repo.dirstate.copies():
3509 3509 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3510 3510
3511 3511 @command('debugsub',
3512 3512 [('r', 'rev', '',
3513 3513 _('revision to check'), _('REV'))],
3514 3514 _('[-r REV] [REV]'))
3515 3515 def debugsub(ui, repo, rev=None):
3516 3516 ctx = scmutil.revsingle(repo, rev, None)
3517 3517 for k, v in sorted(ctx.substate.items()):
3518 3518 ui.write(('path %s\n') % k)
3519 3519 ui.write((' source %s\n') % v[0])
3520 3520 ui.write((' revision %s\n') % v[1])
3521 3521
3522 3522 @command('debugsuccessorssets',
3523 3523 [],
3524 3524 _('[REV]'))
3525 3525 def debugsuccessorssets(ui, repo, *revs):
3526 3526 """show set of successors for revision
3527 3527
3528 3528 A successors set of changeset A is a consistent group of revisions that
3529 3529 succeed A. It contains non-obsolete changesets only.
3530 3530
3531 3531 In most cases a changeset A has a single successors set containing a single
3532 3532 successor (changeset A replaced by A').
3533 3533
3534 3534 A changeset that is made obsolete with no successors are called "pruned".
3535 3535 Such changesets have no successors sets at all.
3536 3536
3537 3537 A changeset that has been "split" will have a successors set containing
3538 3538 more than one successor.
3539 3539
3540 3540 A changeset that has been rewritten in multiple different ways is called
3541 3541 "divergent". Such changesets have multiple successor sets (each of which
3542 3542 may also be split, i.e. have multiple successors).
3543 3543
3544 3544 Results are displayed as follows::
3545 3545
3546 3546 <rev1>
3547 3547 <successors-1A>
3548 3548 <rev2>
3549 3549 <successors-2A>
3550 3550 <successors-2B1> <successors-2B2> <successors-2B3>
3551 3551
3552 3552 Here rev2 has two possible (i.e. divergent) successors sets. The first
3553 3553 holds one element, whereas the second holds three (i.e. the changeset has
3554 3554 been split).
3555 3555 """
3556 3556 # passed to successorssets caching computation from one call to another
3557 3557 cache = {}
3558 3558 ctx2str = str
3559 3559 node2str = short
3560 3560 if ui.debug():
3561 3561 def ctx2str(ctx):
3562 3562 return ctx.hex()
3563 3563 node2str = hex
3564 3564 for rev in scmutil.revrange(repo, revs):
3565 3565 ctx = repo[rev]
3566 3566 ui.write('%s\n'% ctx2str(ctx))
3567 3567 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3568 3568 if succsset:
3569 3569 ui.write(' ')
3570 3570 ui.write(node2str(succsset[0]))
3571 3571 for node in succsset[1:]:
3572 3572 ui.write(' ')
3573 3573 ui.write(node2str(node))
3574 3574 ui.write('\n')
3575 3575
3576 3576 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3577 3577 def debugwalk(ui, repo, *pats, **opts):
3578 3578 """show how files match on given patterns"""
3579 3579 m = scmutil.match(repo[None], pats, opts)
3580 3580 items = list(repo.walk(m))
3581 3581 if not items:
3582 3582 return
3583 3583 f = lambda fn: fn
3584 3584 if ui.configbool('ui', 'slash') and os.sep != '/':
3585 3585 f = lambda fn: util.normpath(fn)
3586 3586 fmt = 'f %%-%ds %%-%ds %%s' % (
3587 3587 max([len(abs) for abs in items]),
3588 3588 max([len(m.rel(abs)) for abs in items]))
3589 3589 for abs in items:
3590 3590 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3591 3591 ui.write("%s\n" % line.rstrip())
3592 3592
3593 3593 @command('debugwireargs',
3594 3594 [('', 'three', '', 'three'),
3595 3595 ('', 'four', '', 'four'),
3596 3596 ('', 'five', '', 'five'),
3597 3597 ] + remoteopts,
3598 3598 _('REPO [OPTIONS]... [ONE [TWO]]'),
3599 3599 norepo=True)
3600 3600 def debugwireargs(ui, repopath, *vals, **opts):
3601 3601 repo = hg.peer(ui, opts, repopath)
3602 3602 for opt in remoteopts:
3603 3603 del opts[opt[1]]
3604 3604 args = {}
3605 3605 for k, v in opts.iteritems():
3606 3606 if v:
3607 3607 args[k] = v
3608 3608 # run twice to check that we don't mess up the stream for the next command
3609 3609 res1 = repo.debugwireargs(*vals, **args)
3610 3610 res2 = repo.debugwireargs(*vals, **args)
3611 3611 ui.write("%s\n" % res1)
3612 3612 if res1 != res2:
3613 3613 ui.warn("%s\n" % res2)
3614 3614
3615 3615 @command('^diff',
3616 3616 [('r', 'rev', [], _('revision'), _('REV')),
3617 3617 ('c', 'change', '', _('change made by revision'), _('REV'))
3618 3618 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3619 3619 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3620 3620 inferrepo=True)
3621 3621 def diff(ui, repo, *pats, **opts):
3622 3622 """diff repository (or selected files)
3623 3623
3624 3624 Show differences between revisions for the specified files.
3625 3625
3626 3626 Differences between files are shown using the unified diff format.
3627 3627
3628 3628 .. note::
3629 3629
3630 3630 :hg:`diff` may generate unexpected results for merges, as it will
3631 3631 default to comparing against the working directory's first
3632 3632 parent changeset if no revisions are specified.
3633 3633
3634 3634 When two revision arguments are given, then changes are shown
3635 3635 between those revisions. If only one revision is specified then
3636 3636 that revision is compared to the working directory, and, when no
3637 3637 revisions are specified, the working directory files are compared
3638 3638 to its first parent.
3639 3639
3640 3640 Alternatively you can specify -c/--change with a revision to see
3641 3641 the changes in that changeset relative to its first parent.
3642 3642
3643 3643 Without the -a/--text option, diff will avoid generating diffs of
3644 3644 files it detects as binary. With -a, diff will generate a diff
3645 3645 anyway, probably with undesirable results.
3646 3646
3647 3647 Use the -g/--git option to generate diffs in the git extended diff
3648 3648 format. For more information, read :hg:`help diffs`.
3649 3649
3650 3650 .. container:: verbose
3651 3651
3652 3652 Examples:
3653 3653
3654 3654 - compare a file in the current working directory to its parent::
3655 3655
3656 3656 hg diff foo.c
3657 3657
3658 3658 - compare two historical versions of a directory, with rename info::
3659 3659
3660 3660 hg diff --git -r 1.0:1.2 lib/
3661 3661
3662 3662 - get change stats relative to the last change on some date::
3663 3663
3664 3664 hg diff --stat -r "date('may 2')"
3665 3665
3666 3666 - diff all newly-added files that contain a keyword::
3667 3667
3668 3668 hg diff "set:added() and grep(GNU)"
3669 3669
3670 3670 - compare a revision and its parents::
3671 3671
3672 3672 hg diff -c 9353 # compare against first parent
3673 3673 hg diff -r 9353^:9353 # same using revset syntax
3674 3674 hg diff -r 9353^2:9353 # compare against the second parent
3675 3675
3676 3676 Returns 0 on success.
3677 3677 """
3678 3678
3679 3679 revs = opts.get('rev')
3680 3680 change = opts.get('change')
3681 3681 stat = opts.get('stat')
3682 3682 reverse = opts.get('reverse')
3683 3683
3684 3684 if revs and change:
3685 3685 msg = _('cannot specify --rev and --change at the same time')
3686 3686 raise error.Abort(msg)
3687 3687 elif change:
3688 3688 node2 = scmutil.revsingle(repo, change, None).node()
3689 3689 node1 = repo[node2].p1().node()
3690 3690 else:
3691 3691 node1, node2 = scmutil.revpair(repo, revs)
3692 3692
3693 3693 if reverse:
3694 3694 node1, node2 = node2, node1
3695 3695
3696 3696 diffopts = patch.diffallopts(ui, opts)
3697 3697 m = scmutil.match(repo[node2], pats, opts)
3698 3698 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3699 3699 listsubrepos=opts.get('subrepos'),
3700 3700 root=opts.get('root'))
3701 3701
3702 3702 @command('^export',
3703 3703 [('o', 'output', '',
3704 3704 _('print output to file with formatted name'), _('FORMAT')),
3705 3705 ('', 'switch-parent', None, _('diff against the second parent')),
3706 3706 ('r', 'rev', [], _('revisions to export'), _('REV')),
3707 3707 ] + diffopts,
3708 3708 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3709 3709 def export(ui, repo, *changesets, **opts):
3710 3710 """dump the header and diffs for one or more changesets
3711 3711
3712 3712 Print the changeset header and diffs for one or more revisions.
3713 3713 If no revision is given, the parent of the working directory is used.
3714 3714
3715 3715 The information shown in the changeset header is: author, date,
3716 3716 branch name (if non-default), changeset hash, parent(s) and commit
3717 3717 comment.
3718 3718
3719 3719 .. note::
3720 3720
3721 3721 :hg:`export` may generate unexpected diff output for merge
3722 3722 changesets, as it will compare the merge changeset against its
3723 3723 first parent only.
3724 3724
3725 3725 Output may be to a file, in which case the name of the file is
3726 3726 given using a format string. The formatting rules are as follows:
3727 3727
3728 3728 :``%%``: literal "%" character
3729 3729 :``%H``: changeset hash (40 hexadecimal digits)
3730 3730 :``%N``: number of patches being generated
3731 3731 :``%R``: changeset revision number
3732 3732 :``%b``: basename of the exporting repository
3733 3733 :``%h``: short-form changeset hash (12 hexadecimal digits)
3734 3734 :``%m``: first line of the commit message (only alphanumeric characters)
3735 3735 :``%n``: zero-padded sequence number, starting at 1
3736 3736 :``%r``: zero-padded changeset revision number
3737 3737
3738 3738 Without the -a/--text option, export will avoid generating diffs
3739 3739 of files it detects as binary. With -a, export will generate a
3740 3740 diff anyway, probably with undesirable results.
3741 3741
3742 3742 Use the -g/--git option to generate diffs in the git extended diff
3743 3743 format. See :hg:`help diffs` for more information.
3744 3744
3745 3745 With the --switch-parent option, the diff will be against the
3746 3746 second parent. It can be useful to review a merge.
3747 3747
3748 3748 .. container:: verbose
3749 3749
3750 3750 Examples:
3751 3751
3752 3752 - use export and import to transplant a bugfix to the current
3753 3753 branch::
3754 3754
3755 3755 hg export -r 9353 | hg import -
3756 3756
3757 3757 - export all the changesets between two revisions to a file with
3758 3758 rename information::
3759 3759
3760 3760 hg export --git -r 123:150 > changes.txt
3761 3761
3762 3762 - split outgoing changes into a series of patches with
3763 3763 descriptive names::
3764 3764
3765 3765 hg export -r "outgoing()" -o "%n-%m.patch"
3766 3766
3767 3767 Returns 0 on success.
3768 3768 """
3769 3769 changesets += tuple(opts.get('rev', []))
3770 3770 if not changesets:
3771 3771 changesets = ['.']
3772 3772 revs = scmutil.revrange(repo, changesets)
3773 3773 if not revs:
3774 3774 raise error.Abort(_("export requires at least one changeset"))
3775 3775 if len(revs) > 1:
3776 3776 ui.note(_('exporting patches:\n'))
3777 3777 else:
3778 3778 ui.note(_('exporting patch:\n'))
3779 3779 cmdutil.export(repo, revs, template=opts.get('output'),
3780 3780 switch_parent=opts.get('switch_parent'),
3781 3781 opts=patch.diffallopts(ui, opts))
3782 3782
3783 3783 @command('files',
3784 3784 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3785 3785 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3786 3786 ] + walkopts + formatteropts + subrepoopts,
3787 3787 _('[OPTION]... [PATTERN]...'))
3788 3788 def files(ui, repo, *pats, **opts):
3789 3789 """list tracked files
3790 3790
3791 3791 Print files under Mercurial control in the working directory or
3792 3792 specified revision whose names match the given patterns (excluding
3793 3793 removed files).
3794 3794
3795 3795 If no patterns are given to match, this command prints the names
3796 3796 of all files under Mercurial control in the working directory.
3797 3797
3798 3798 .. container:: verbose
3799 3799
3800 3800 Examples:
3801 3801
3802 3802 - list all files under the current directory::
3803 3803
3804 3804 hg files .
3805 3805
3806 3806 - shows sizes and flags for current revision::
3807 3807
3808 3808 hg files -vr .
3809 3809
3810 3810 - list all files named README::
3811 3811
3812 3812 hg files -I "**/README"
3813 3813
3814 3814 - list all binary files::
3815 3815
3816 3816 hg files "set:binary()"
3817 3817
3818 3818 - find files containing a regular expression::
3819 3819
3820 3820 hg files "set:grep('bob')"
3821 3821
3822 3822 - search tracked file contents with xargs and grep::
3823 3823
3824 3824 hg files -0 | xargs -0 grep foo
3825 3825
3826 3826 See :hg:`help patterns` and :hg:`help filesets` for more information
3827 3827 on specifying file patterns.
3828 3828
3829 3829 Returns 0 if a match is found, 1 otherwise.
3830 3830
3831 3831 """
3832 3832 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3833 3833
3834 3834 end = '\n'
3835 3835 if opts.get('print0'):
3836 3836 end = '\0'
3837 3837 fm = ui.formatter('files', opts)
3838 3838 fmt = '%s' + end
3839 3839
3840 3840 m = scmutil.match(ctx, pats, opts)
3841 3841 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3842 3842
3843 3843 fm.end()
3844 3844
3845 3845 return ret
3846 3846
3847 3847 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3848 3848 def forget(ui, repo, *pats, **opts):
3849 3849 """forget the specified files on the next commit
3850 3850
3851 3851 Mark the specified files so they will no longer be tracked
3852 3852 after the next commit.
3853 3853
3854 3854 This only removes files from the current branch, not from the
3855 3855 entire project history, and it does not delete them from the
3856 3856 working directory.
3857 3857
3858 3858 To delete the file from the working directory, see :hg:`remove`.
3859 3859
3860 3860 To undo a forget before the next commit, see :hg:`add`.
3861 3861
3862 3862 .. container:: verbose
3863 3863
3864 3864 Examples:
3865 3865
3866 3866 - forget newly-added binary files::
3867 3867
3868 3868 hg forget "set:added() and binary()"
3869 3869
3870 3870 - forget files that would be excluded by .hgignore::
3871 3871
3872 3872 hg forget "set:hgignore()"
3873 3873
3874 3874 Returns 0 on success.
3875 3875 """
3876 3876
3877 3877 if not pats:
3878 3878 raise error.Abort(_('no files specified'))
3879 3879
3880 3880 m = scmutil.match(repo[None], pats, opts)
3881 3881 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3882 3882 return rejected and 1 or 0
3883 3883
3884 3884 @command(
3885 3885 'graft',
3886 3886 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3887 3887 ('c', 'continue', False, _('resume interrupted graft')),
3888 3888 ('e', 'edit', False, _('invoke editor on commit messages')),
3889 3889 ('', 'log', None, _('append graft info to log message')),
3890 3890 ('f', 'force', False, _('force graft')),
3891 3891 ('D', 'currentdate', False,
3892 3892 _('record the current date as commit date')),
3893 3893 ('U', 'currentuser', False,
3894 3894 _('record the current user as committer'), _('DATE'))]
3895 3895 + commitopts2 + mergetoolopts + dryrunopts,
3896 3896 _('[OPTION]... [-r REV]... REV...'))
3897 3897 def graft(ui, repo, *revs, **opts):
3898 3898 '''copy changes from other branches onto the current branch
3899 3899
3900 3900 This command uses Mercurial's merge logic to copy individual
3901 3901 changes from other branches without merging branches in the
3902 3902 history graph. This is sometimes known as 'backporting' or
3903 3903 'cherry-picking'. By default, graft will copy user, date, and
3904 3904 description from the source changesets.
3905 3905
3906 3906 Changesets that are ancestors of the current revision, that have
3907 3907 already been grafted, or that are merges will be skipped.
3908 3908
3909 3909 If --log is specified, log messages will have a comment appended
3910 3910 of the form::
3911 3911
3912 3912 (grafted from CHANGESETHASH)
3913 3913
3914 3914 If --force is specified, revisions will be grafted even if they
3915 3915 are already ancestors of or have been grafted to the destination.
3916 3916 This is useful when the revisions have since been backed out.
3917 3917
3918 3918 If a graft merge results in conflicts, the graft process is
3919 3919 interrupted so that the current merge can be manually resolved.
3920 3920 Once all conflicts are addressed, the graft process can be
3921 3921 continued with the -c/--continue option.
3922 3922
3923 3923 .. note::
3924 3924
3925 3925 The -c/--continue option does not reapply earlier options, except
3926 3926 for --force.
3927 3927
3928 3928 .. container:: verbose
3929 3929
3930 3930 Examples:
3931 3931
3932 3932 - copy a single change to the stable branch and edit its description::
3933 3933
3934 3934 hg update stable
3935 3935 hg graft --edit 9393
3936 3936
3937 3937 - graft a range of changesets with one exception, updating dates::
3938 3938
3939 3939 hg graft -D "2085::2093 and not 2091"
3940 3940
3941 3941 - continue a graft after resolving conflicts::
3942 3942
3943 3943 hg graft -c
3944 3944
3945 3945 - show the source of a grafted changeset::
3946 3946
3947 3947 hg log --debug -r .
3948 3948
3949 3949 - show revisions sorted by date::
3950 3950
3951 3951 hg log -r 'sort(all(), date)'
3952 3952
3953 3953 See :hg:`help revisions` and :hg:`help revsets` for more about
3954 3954 specifying revisions.
3955 3955
3956 3956 Returns 0 on successful completion.
3957 3957 '''
3958 3958 with repo.wlock():
3959 3959 return _dograft(ui, repo, *revs, **opts)
3960 3960
3961 3961 def _dograft(ui, repo, *revs, **opts):
3962 3962 if revs and opts['rev']:
3963 3963 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3964 3964 'revision ordering!\n'))
3965 3965
3966 3966 revs = list(revs)
3967 3967 revs.extend(opts['rev'])
3968 3968
3969 3969 if not opts.get('user') and opts.get('currentuser'):
3970 3970 opts['user'] = ui.username()
3971 3971 if not opts.get('date') and opts.get('currentdate'):
3972 3972 opts['date'] = "%d %d" % util.makedate()
3973 3973
3974 3974 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3975 3975
3976 3976 cont = False
3977 3977 if opts['continue']:
3978 3978 cont = True
3979 3979 if revs:
3980 3980 raise error.Abort(_("can't specify --continue and revisions"))
3981 3981 # read in unfinished revisions
3982 3982 try:
3983 3983 nodes = repo.vfs.read('graftstate').splitlines()
3984 3984 revs = [repo[node].rev() for node in nodes]
3985 3985 except IOError as inst:
3986 3986 if inst.errno != errno.ENOENT:
3987 3987 raise
3988 3988 cmdutil.wrongtooltocontinue(repo, _('graft'))
3989 3989 else:
3990 3990 cmdutil.checkunfinished(repo)
3991 3991 cmdutil.bailifchanged(repo)
3992 3992 if not revs:
3993 3993 raise error.Abort(_('no revisions specified'))
3994 3994 revs = scmutil.revrange(repo, revs)
3995 3995
3996 3996 skipped = set()
3997 3997 # check for merges
3998 3998 for rev in repo.revs('%ld and merge()', revs):
3999 3999 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4000 4000 skipped.add(rev)
4001 4001 revs = [r for r in revs if r not in skipped]
4002 4002 if not revs:
4003 4003 return -1
4004 4004
4005 4005 # Don't check in the --continue case, in effect retaining --force across
4006 4006 # --continues. That's because without --force, any revisions we decided to
4007 4007 # skip would have been filtered out here, so they wouldn't have made their
4008 4008 # way to the graftstate. With --force, any revisions we would have otherwise
4009 4009 # skipped would not have been filtered out, and if they hadn't been applied
4010 4010 # already, they'd have been in the graftstate.
4011 4011 if not (cont or opts.get('force')):
4012 4012 # check for ancestors of dest branch
4013 4013 crev = repo['.'].rev()
4014 4014 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4015 4015 # Cannot use x.remove(y) on smart set, this has to be a list.
4016 4016 # XXX make this lazy in the future
4017 4017 revs = list(revs)
4018 4018 # don't mutate while iterating, create a copy
4019 4019 for rev in list(revs):
4020 4020 if rev in ancestors:
4021 4021 ui.warn(_('skipping ancestor revision %d:%s\n') %
4022 4022 (rev, repo[rev]))
4023 4023 # XXX remove on list is slow
4024 4024 revs.remove(rev)
4025 4025 if not revs:
4026 4026 return -1
4027 4027
4028 4028 # analyze revs for earlier grafts
4029 4029 ids = {}
4030 4030 for ctx in repo.set("%ld", revs):
4031 4031 ids[ctx.hex()] = ctx.rev()
4032 4032 n = ctx.extra().get('source')
4033 4033 if n:
4034 4034 ids[n] = ctx.rev()
4035 4035
4036 4036 # check ancestors for earlier grafts
4037 4037 ui.debug('scanning for duplicate grafts\n')
4038 4038
4039 4039 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4040 4040 ctx = repo[rev]
4041 4041 n = ctx.extra().get('source')
4042 4042 if n in ids:
4043 4043 try:
4044 4044 r = repo[n].rev()
4045 4045 except error.RepoLookupError:
4046 4046 r = None
4047 4047 if r in revs:
4048 4048 ui.warn(_('skipping revision %d:%s '
4049 4049 '(already grafted to %d:%s)\n')
4050 4050 % (r, repo[r], rev, ctx))
4051 4051 revs.remove(r)
4052 4052 elif ids[n] in revs:
4053 4053 if r is None:
4054 4054 ui.warn(_('skipping already grafted revision %d:%s '
4055 4055 '(%d:%s also has unknown origin %s)\n')
4056 4056 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4057 4057 else:
4058 4058 ui.warn(_('skipping already grafted revision %d:%s '
4059 4059 '(%d:%s also has origin %d:%s)\n')
4060 4060 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4061 4061 revs.remove(ids[n])
4062 4062 elif ctx.hex() in ids:
4063 4063 r = ids[ctx.hex()]
4064 4064 ui.warn(_('skipping already grafted revision %d:%s '
4065 4065 '(was grafted from %d:%s)\n') %
4066 4066 (r, repo[r], rev, ctx))
4067 4067 revs.remove(r)
4068 4068 if not revs:
4069 4069 return -1
4070 4070
4071 4071 for pos, ctx in enumerate(repo.set("%ld", revs)):
4072 4072 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4073 4073 ctx.description().split('\n', 1)[0])
4074 4074 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4075 4075 if names:
4076 4076 desc += ' (%s)' % ' '.join(names)
4077 4077 ui.status(_('grafting %s\n') % desc)
4078 4078 if opts.get('dry_run'):
4079 4079 continue
4080 4080
4081 4081 source = ctx.extra().get('source')
4082 4082 extra = {}
4083 4083 if source:
4084 4084 extra['source'] = source
4085 4085 extra['intermediate-source'] = ctx.hex()
4086 4086 else:
4087 4087 extra['source'] = ctx.hex()
4088 4088 user = ctx.user()
4089 4089 if opts.get('user'):
4090 4090 user = opts['user']
4091 4091 date = ctx.date()
4092 4092 if opts.get('date'):
4093 4093 date = opts['date']
4094 4094 message = ctx.description()
4095 4095 if opts.get('log'):
4096 4096 message += '\n(grafted from %s)' % ctx.hex()
4097 4097
4098 4098 # we don't merge the first commit when continuing
4099 4099 if not cont:
4100 4100 # perform the graft merge with p1(rev) as 'ancestor'
4101 4101 try:
4102 4102 # ui.forcemerge is an internal variable, do not document
4103 4103 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4104 4104 'graft')
4105 4105 stats = mergemod.graft(repo, ctx, ctx.p1(),
4106 4106 ['local', 'graft'])
4107 4107 finally:
4108 4108 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4109 4109 # report any conflicts
4110 4110 if stats and stats[3] > 0:
4111 4111 # write out state for --continue
4112 4112 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4113 4113 repo.vfs.write('graftstate', ''.join(nodelines))
4114 4114 extra = ''
4115 4115 if opts.get('user'):
4116 4116 extra += ' --user %s' % opts['user']
4117 4117 if opts.get('date'):
4118 4118 extra += ' --date %s' % opts['date']
4119 4119 if opts.get('log'):
4120 4120 extra += ' --log'
4121 4121 hint=_('use hg resolve and hg graft --continue%s') % extra
4122 4122 raise error.Abort(
4123 4123 _("unresolved conflicts, can't continue"),
4124 4124 hint=hint)
4125 4125 else:
4126 4126 cont = False
4127 4127
4128 4128 # commit
4129 4129 node = repo.commit(text=message, user=user,
4130 4130 date=date, extra=extra, editor=editor)
4131 4131 if node is None:
4132 4132 ui.warn(
4133 4133 _('note: graft of %d:%s created no changes to commit\n') %
4134 4134 (ctx.rev(), ctx))
4135 4135
4136 4136 # remove state when we complete successfully
4137 4137 if not opts.get('dry_run'):
4138 4138 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4139 4139
4140 4140 return 0
4141 4141
4142 4142 @command('grep',
4143 4143 [('0', 'print0', None, _('end fields with NUL')),
4144 4144 ('', 'all', None, _('print all revisions that match')),
4145 4145 ('a', 'text', None, _('treat all files as text')),
4146 4146 ('f', 'follow', None,
4147 4147 _('follow changeset history,'
4148 4148 ' or file history across copies and renames')),
4149 4149 ('i', 'ignore-case', None, _('ignore case when matching')),
4150 4150 ('l', 'files-with-matches', None,
4151 4151 _('print only filenames and revisions that match')),
4152 4152 ('n', 'line-number', None, _('print matching line numbers')),
4153 4153 ('r', 'rev', [],
4154 4154 _('only search files changed within revision range'), _('REV')),
4155 4155 ('u', 'user', None, _('list the author (long with -v)')),
4156 4156 ('d', 'date', None, _('list the date (short with -q)')),
4157 4157 ] + walkopts,
4158 4158 _('[OPTION]... PATTERN [FILE]...'),
4159 4159 inferrepo=True)
4160 4160 def grep(ui, repo, pattern, *pats, **opts):
4161 4161 """search for a pattern in specified files and revisions
4162 4162
4163 4163 Search revisions of files for a regular expression.
4164 4164
4165 4165 This command behaves differently than Unix grep. It only accepts
4166 4166 Python/Perl regexps. It searches repository history, not the
4167 4167 working directory. It always prints the revision number in which a
4168 4168 match appears.
4169 4169
4170 4170 By default, grep only prints output for the first revision of a
4171 4171 file in which it finds a match. To get it to print every revision
4172 4172 that contains a change in match status ("-" for a match that
4173 4173 becomes a non-match, or "+" for a non-match that becomes a match),
4174 4174 use the --all flag.
4175 4175
4176 4176 Returns 0 if a match is found, 1 otherwise.
4177 4177 """
4178 4178 reflags = re.M
4179 4179 if opts.get('ignore_case'):
4180 4180 reflags |= re.I
4181 4181 try:
4182 4182 regexp = util.re.compile(pattern, reflags)
4183 4183 except re.error as inst:
4184 4184 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4185 4185 return 1
4186 4186 sep, eol = ':', '\n'
4187 4187 if opts.get('print0'):
4188 4188 sep = eol = '\0'
4189 4189
4190 4190 getfile = util.lrucachefunc(repo.file)
4191 4191
4192 4192 def matchlines(body):
4193 4193 begin = 0
4194 4194 linenum = 0
4195 4195 while begin < len(body):
4196 4196 match = regexp.search(body, begin)
4197 4197 if not match:
4198 4198 break
4199 4199 mstart, mend = match.span()
4200 4200 linenum += body.count('\n', begin, mstart) + 1
4201 4201 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4202 4202 begin = body.find('\n', mend) + 1 or len(body) + 1
4203 4203 lend = begin - 1
4204 4204 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4205 4205
4206 4206 class linestate(object):
4207 4207 def __init__(self, line, linenum, colstart, colend):
4208 4208 self.line = line
4209 4209 self.linenum = linenum
4210 4210 self.colstart = colstart
4211 4211 self.colend = colend
4212 4212
4213 4213 def __hash__(self):
4214 4214 return hash((self.linenum, self.line))
4215 4215
4216 4216 def __eq__(self, other):
4217 4217 return self.line == other.line
4218 4218
4219 4219 def __iter__(self):
4220 4220 yield (self.line[:self.colstart], '')
4221 4221 yield (self.line[self.colstart:self.colend], 'grep.match')
4222 4222 rest = self.line[self.colend:]
4223 4223 while rest != '':
4224 4224 match = regexp.search(rest)
4225 4225 if not match:
4226 4226 yield (rest, '')
4227 4227 break
4228 4228 mstart, mend = match.span()
4229 4229 yield (rest[:mstart], '')
4230 4230 yield (rest[mstart:mend], 'grep.match')
4231 4231 rest = rest[mend:]
4232 4232
4233 4233 matches = {}
4234 4234 copies = {}
4235 4235 def grepbody(fn, rev, body):
4236 4236 matches[rev].setdefault(fn, [])
4237 4237 m = matches[rev][fn]
4238 4238 for lnum, cstart, cend, line in matchlines(body):
4239 4239 s = linestate(line, lnum, cstart, cend)
4240 4240 m.append(s)
4241 4241
4242 4242 def difflinestates(a, b):
4243 4243 sm = difflib.SequenceMatcher(None, a, b)
4244 4244 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4245 4245 if tag == 'insert':
4246 4246 for i in xrange(blo, bhi):
4247 4247 yield ('+', b[i])
4248 4248 elif tag == 'delete':
4249 4249 for i in xrange(alo, ahi):
4250 4250 yield ('-', a[i])
4251 4251 elif tag == 'replace':
4252 4252 for i in xrange(alo, ahi):
4253 4253 yield ('-', a[i])
4254 4254 for i in xrange(blo, bhi):
4255 4255 yield ('+', b[i])
4256 4256
4257 4257 def display(fn, ctx, pstates, states):
4258 4258 rev = ctx.rev()
4259 4259 if ui.quiet:
4260 4260 datefunc = util.shortdate
4261 4261 else:
4262 4262 datefunc = util.datestr
4263 4263 found = False
4264 4264 @util.cachefunc
4265 4265 def binary():
4266 4266 flog = getfile(fn)
4267 4267 return util.binary(flog.read(ctx.filenode(fn)))
4268 4268
4269 4269 if opts.get('all'):
4270 4270 iter = difflinestates(pstates, states)
4271 4271 else:
4272 4272 iter = [('', l) for l in states]
4273 4273 for change, l in iter:
4274 4274 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4275 4275
4276 4276 if opts.get('line_number'):
4277 4277 cols.append((str(l.linenum), 'grep.linenumber'))
4278 4278 if opts.get('all'):
4279 4279 cols.append((change, 'grep.change'))
4280 4280 if opts.get('user'):
4281 4281 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4282 4282 if opts.get('date'):
4283 4283 cols.append((datefunc(ctx.date()), 'grep.date'))
4284 4284 for col, label in cols[:-1]:
4285 4285 ui.write(col, label=label)
4286 4286 ui.write(sep, label='grep.sep')
4287 4287 ui.write(cols[-1][0], label=cols[-1][1])
4288 4288 if not opts.get('files_with_matches'):
4289 4289 ui.write(sep, label='grep.sep')
4290 4290 if not opts.get('text') and binary():
4291 4291 ui.write(" Binary file matches")
4292 4292 else:
4293 4293 for s, label in l:
4294 4294 ui.write(s, label=label)
4295 4295 ui.write(eol)
4296 4296 found = True
4297 4297 if opts.get('files_with_matches'):
4298 4298 break
4299 4299 return found
4300 4300
4301 4301 skip = {}
4302 4302 revfiles = {}
4303 4303 matchfn = scmutil.match(repo[None], pats, opts)
4304 4304 found = False
4305 4305 follow = opts.get('follow')
4306 4306
4307 4307 def prep(ctx, fns):
4308 4308 rev = ctx.rev()
4309 4309 pctx = ctx.p1()
4310 4310 parent = pctx.rev()
4311 4311 matches.setdefault(rev, {})
4312 4312 matches.setdefault(parent, {})
4313 4313 files = revfiles.setdefault(rev, [])
4314 4314 for fn in fns:
4315 4315 flog = getfile(fn)
4316 4316 try:
4317 4317 fnode = ctx.filenode(fn)
4318 4318 except error.LookupError:
4319 4319 continue
4320 4320
4321 4321 copied = flog.renamed(fnode)
4322 4322 copy = follow and copied and copied[0]
4323 4323 if copy:
4324 4324 copies.setdefault(rev, {})[fn] = copy
4325 4325 if fn in skip:
4326 4326 if copy:
4327 4327 skip[copy] = True
4328 4328 continue
4329 4329 files.append(fn)
4330 4330
4331 4331 if fn not in matches[rev]:
4332 4332 grepbody(fn, rev, flog.read(fnode))
4333 4333
4334 4334 pfn = copy or fn
4335 4335 if pfn not in matches[parent]:
4336 4336 try:
4337 4337 fnode = pctx.filenode(pfn)
4338 4338 grepbody(pfn, parent, flog.read(fnode))
4339 4339 except error.LookupError:
4340 4340 pass
4341 4341
4342 4342 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4343 4343 rev = ctx.rev()
4344 4344 parent = ctx.p1().rev()
4345 4345 for fn in sorted(revfiles.get(rev, [])):
4346 4346 states = matches[rev][fn]
4347 4347 copy = copies.get(rev, {}).get(fn)
4348 4348 if fn in skip:
4349 4349 if copy:
4350 4350 skip[copy] = True
4351 4351 continue
4352 4352 pstates = matches.get(parent, {}).get(copy or fn, [])
4353 4353 if pstates or states:
4354 4354 r = display(fn, ctx, pstates, states)
4355 4355 found = found or r
4356 4356 if r and not opts.get('all'):
4357 4357 skip[fn] = True
4358 4358 if copy:
4359 4359 skip[copy] = True
4360 4360 del matches[rev]
4361 4361 del revfiles[rev]
4362 4362
4363 4363 return not found
4364 4364
4365 4365 @command('heads',
4366 4366 [('r', 'rev', '',
4367 4367 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4368 4368 ('t', 'topo', False, _('show topological heads only')),
4369 4369 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4370 4370 ('c', 'closed', False, _('show normal and closed branch heads')),
4371 4371 ] + templateopts,
4372 4372 _('[-ct] [-r STARTREV] [REV]...'))
4373 4373 def heads(ui, repo, *branchrevs, **opts):
4374 4374 """show branch heads
4375 4375
4376 4376 With no arguments, show all open branch heads in the repository.
4377 4377 Branch heads are changesets that have no descendants on the
4378 4378 same branch. They are where development generally takes place and
4379 4379 are the usual targets for update and merge operations.
4380 4380
4381 4381 If one or more REVs are given, only open branch heads on the
4382 4382 branches associated with the specified changesets are shown. This
4383 4383 means that you can use :hg:`heads .` to see the heads on the
4384 4384 currently checked-out branch.
4385 4385
4386 4386 If -c/--closed is specified, also show branch heads marked closed
4387 4387 (see :hg:`commit --close-branch`).
4388 4388
4389 4389 If STARTREV is specified, only those heads that are descendants of
4390 4390 STARTREV will be displayed.
4391 4391
4392 4392 If -t/--topo is specified, named branch mechanics will be ignored and only
4393 4393 topological heads (changesets with no children) will be shown.
4394 4394
4395 4395 Returns 0 if matching heads are found, 1 if not.
4396 4396 """
4397 4397
4398 4398 start = None
4399 4399 if 'rev' in opts:
4400 4400 start = scmutil.revsingle(repo, opts['rev'], None).node()
4401 4401
4402 4402 if opts.get('topo'):
4403 4403 heads = [repo[h] for h in repo.heads(start)]
4404 4404 else:
4405 4405 heads = []
4406 4406 for branch in repo.branchmap():
4407 4407 heads += repo.branchheads(branch, start, opts.get('closed'))
4408 4408 heads = [repo[h] for h in heads]
4409 4409
4410 4410 if branchrevs:
4411 4411 branches = set(repo[br].branch() for br in branchrevs)
4412 4412 heads = [h for h in heads if h.branch() in branches]
4413 4413
4414 4414 if opts.get('active') and branchrevs:
4415 4415 dagheads = repo.heads(start)
4416 4416 heads = [h for h in heads if h.node() in dagheads]
4417 4417
4418 4418 if branchrevs:
4419 4419 haveheads = set(h.branch() for h in heads)
4420 4420 if branches - haveheads:
4421 4421 headless = ', '.join(b for b in branches - haveheads)
4422 4422 msg = _('no open branch heads found on branches %s')
4423 4423 if opts.get('rev'):
4424 4424 msg += _(' (started at %s)') % opts['rev']
4425 4425 ui.warn((msg + '\n') % headless)
4426 4426
4427 4427 if not heads:
4428 4428 return 1
4429 4429
4430 4430 heads = sorted(heads, key=lambda x: -x.rev())
4431 4431 displayer = cmdutil.show_changeset(ui, repo, opts)
4432 4432 for ctx in heads:
4433 4433 displayer.show(ctx)
4434 4434 displayer.close()
4435 4435
4436 4436 @command('help',
4437 4437 [('e', 'extension', None, _('show only help for extensions')),
4438 4438 ('c', 'command', None, _('show only help for commands')),
4439 4439 ('k', 'keyword', None, _('show topics matching keyword')),
4440 4440 ('s', 'system', [], _('show help for specific platform(s)')),
4441 4441 ],
4442 4442 _('[-ecks] [TOPIC]'),
4443 4443 norepo=True)
4444 4444 def help_(ui, name=None, **opts):
4445 4445 """show help for a given topic or a help overview
4446 4446
4447 4447 With no arguments, print a list of commands with short help messages.
4448 4448
4449 4449 Given a topic, extension, or command name, print help for that
4450 4450 topic.
4451 4451
4452 4452 Returns 0 if successful.
4453 4453 """
4454 4454
4455 4455 textwidth = min(ui.termwidth(), 80) - 2
4456 4456
4457 4457 keep = opts.get('system') or []
4458 4458 if len(keep) == 0:
4459 4459 if sys.platform.startswith('win'):
4460 4460 keep.append('windows')
4461 4461 elif sys.platform == 'OpenVMS':
4462 4462 keep.append('vms')
4463 4463 elif sys.platform == 'plan9':
4464 4464 keep.append('plan9')
4465 4465 else:
4466 4466 keep.append('unix')
4467 4467 keep.append(sys.platform.lower())
4468 4468 if ui.verbose:
4469 4469 keep.append('verbose')
4470 4470
4471 4471 section = None
4472 4472 subtopic = None
4473 4473 if name and '.' in name:
4474 4474 name, section = name.split('.', 1)
4475 4475 section = section.lower()
4476 4476 if '.' in section:
4477 4477 subtopic, section = section.split('.', 1)
4478 4478 else:
4479 4479 subtopic = section
4480 4480
4481 4481 text = help.help_(ui, name, subtopic=subtopic, **opts)
4482 4482
4483 4483 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4484 4484 section=section)
4485 4485
4486 4486 # We could have been given a weird ".foo" section without a name
4487 4487 # to look for, or we could have simply failed to found "foo.bar"
4488 4488 # because bar isn't a section of foo
4489 4489 if section and not (formatted and name):
4490 4490 raise error.Abort(_("help section not found"))
4491 4491
4492 4492 if 'verbose' in pruned:
4493 4493 keep.append('omitted')
4494 4494 else:
4495 4495 keep.append('notomitted')
4496 4496 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4497 4497 section=section)
4498 4498 ui.write(formatted)
4499 4499
4500 4500
4501 4501 @command('identify|id',
4502 4502 [('r', 'rev', '',
4503 4503 _('identify the specified revision'), _('REV')),
4504 4504 ('n', 'num', None, _('show local revision number')),
4505 4505 ('i', 'id', None, _('show global revision id')),
4506 4506 ('b', 'branch', None, _('show branch')),
4507 4507 ('t', 'tags', None, _('show tags')),
4508 4508 ('B', 'bookmarks', None, _('show bookmarks')),
4509 4509 ] + remoteopts,
4510 4510 _('[-nibtB] [-r REV] [SOURCE]'),
4511 4511 optionalrepo=True)
4512 4512 def identify(ui, repo, source=None, rev=None,
4513 4513 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4514 4514 """identify the working directory or specified revision
4515 4515
4516 4516 Print a summary identifying the repository state at REV using one or
4517 4517 two parent hash identifiers, followed by a "+" if the working
4518 4518 directory has uncommitted changes, the branch name (if not default),
4519 4519 a list of tags, and a list of bookmarks.
4520 4520
4521 4521 When REV is not given, print a summary of the current state of the
4522 4522 repository.
4523 4523
4524 4524 Specifying a path to a repository root or Mercurial bundle will
4525 4525 cause lookup to operate on that repository/bundle.
4526 4526
4527 4527 .. container:: verbose
4528 4528
4529 4529 Examples:
4530 4530
4531 4531 - generate a build identifier for the working directory::
4532 4532
4533 4533 hg id --id > build-id.dat
4534 4534
4535 4535 - find the revision corresponding to a tag::
4536 4536
4537 4537 hg id -n -r 1.3
4538 4538
4539 4539 - check the most recent revision of a remote repository::
4540 4540
4541 4541 hg id -r tip http://selenic.com/hg/
4542 4542
4543 4543 See :hg:`log` for generating more information about specific revisions,
4544 4544 including full hash identifiers.
4545 4545
4546 4546 Returns 0 if successful.
4547 4547 """
4548 4548
4549 4549 if not repo and not source:
4550 4550 raise error.Abort(_("there is no Mercurial repository here "
4551 4551 "(.hg not found)"))
4552 4552
4553 4553 if ui.debugflag:
4554 4554 hexfunc = hex
4555 4555 else:
4556 4556 hexfunc = short
4557 4557 default = not (num or id or branch or tags or bookmarks)
4558 4558 output = []
4559 4559 revs = []
4560 4560
4561 4561 if source:
4562 4562 source, branches = hg.parseurl(ui.expandpath(source))
4563 4563 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4564 4564 repo = peer.local()
4565 4565 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4566 4566
4567 4567 if not repo:
4568 4568 if num or branch or tags:
4569 4569 raise error.Abort(
4570 4570 _("can't query remote revision number, branch, or tags"))
4571 4571 if not rev and revs:
4572 4572 rev = revs[0]
4573 4573 if not rev:
4574 4574 rev = "tip"
4575 4575
4576 4576 remoterev = peer.lookup(rev)
4577 4577 if default or id:
4578 4578 output = [hexfunc(remoterev)]
4579 4579
4580 4580 def getbms():
4581 4581 bms = []
4582 4582
4583 4583 if 'bookmarks' in peer.listkeys('namespaces'):
4584 4584 hexremoterev = hex(remoterev)
4585 4585 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4586 4586 if bmr == hexremoterev]
4587 4587
4588 4588 return sorted(bms)
4589 4589
4590 4590 if bookmarks:
4591 4591 output.extend(getbms())
4592 4592 elif default and not ui.quiet:
4593 4593 # multiple bookmarks for a single parent separated by '/'
4594 4594 bm = '/'.join(getbms())
4595 4595 if bm:
4596 4596 output.append(bm)
4597 4597 else:
4598 4598 ctx = scmutil.revsingle(repo, rev, None)
4599 4599
4600 4600 if ctx.rev() is None:
4601 4601 ctx = repo[None]
4602 4602 parents = ctx.parents()
4603 4603 taglist = []
4604 4604 for p in parents:
4605 4605 taglist.extend(p.tags())
4606 4606
4607 4607 changed = ""
4608 4608 if default or id or num:
4609 4609 if (any(repo.status())
4610 4610 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4611 4611 changed = '+'
4612 4612 if default or id:
4613 4613 output = ["%s%s" %
4614 4614 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4615 4615 if num:
4616 4616 output.append("%s%s" %
4617 4617 ('+'.join([str(p.rev()) for p in parents]), changed))
4618 4618 else:
4619 4619 if default or id:
4620 4620 output = [hexfunc(ctx.node())]
4621 4621 if num:
4622 4622 output.append(str(ctx.rev()))
4623 4623 taglist = ctx.tags()
4624 4624
4625 4625 if default and not ui.quiet:
4626 4626 b = ctx.branch()
4627 4627 if b != 'default':
4628 4628 output.append("(%s)" % b)
4629 4629
4630 4630 # multiple tags for a single parent separated by '/'
4631 4631 t = '/'.join(taglist)
4632 4632 if t:
4633 4633 output.append(t)
4634 4634
4635 4635 # multiple bookmarks for a single parent separated by '/'
4636 4636 bm = '/'.join(ctx.bookmarks())
4637 4637 if bm:
4638 4638 output.append(bm)
4639 4639 else:
4640 4640 if branch:
4641 4641 output.append(ctx.branch())
4642 4642
4643 4643 if tags:
4644 4644 output.extend(taglist)
4645 4645
4646 4646 if bookmarks:
4647 4647 output.extend(ctx.bookmarks())
4648 4648
4649 4649 ui.write("%s\n" % ' '.join(output))
4650 4650
4651 4651 @command('import|patch',
4652 4652 [('p', 'strip', 1,
4653 4653 _('directory strip option for patch. This has the same '
4654 4654 'meaning as the corresponding patch option'), _('NUM')),
4655 4655 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4656 4656 ('e', 'edit', False, _('invoke editor on commit messages')),
4657 4657 ('f', 'force', None,
4658 4658 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4659 4659 ('', 'no-commit', None,
4660 4660 _("don't commit, just update the working directory")),
4661 4661 ('', 'bypass', None,
4662 4662 _("apply patch without touching the working directory")),
4663 4663 ('', 'partial', None,
4664 4664 _('commit even if some hunks fail')),
4665 4665 ('', 'exact', None,
4666 4666 _('apply patch to the nodes from which it was generated')),
4667 4667 ('', 'prefix', '',
4668 4668 _('apply patch to subdirectory'), _('DIR')),
4669 4669 ('', 'import-branch', None,
4670 4670 _('use any branch information in patch (implied by --exact)'))] +
4671 4671 commitopts + commitopts2 + similarityopts,
4672 4672 _('[OPTION]... PATCH...'))
4673 4673 def import_(ui, repo, patch1=None, *patches, **opts):
4674 4674 """import an ordered set of patches
4675 4675
4676 4676 Import a list of patches and commit them individually (unless
4677 4677 --no-commit is specified).
4678 4678
4679 4679 To read a patch from standard input, use "-" as the patch name. If
4680 4680 a URL is specified, the patch will be downloaded from there.
4681 4681
4682 4682 Import first applies changes to the working directory (unless
4683 4683 --bypass is specified), import will abort if there are outstanding
4684 4684 changes.
4685 4685
4686 4686 Use --bypass to apply and commit patches directly to the
4687 4687 repository, without affecting the working directory. Without
4688 4688 --exact, patches will be applied on top of the working directory
4689 4689 parent revision.
4690 4690
4691 4691 You can import a patch straight from a mail message. Even patches
4692 4692 as attachments work (to use the body part, it must have type
4693 4693 text/plain or text/x-patch). From and Subject headers of email
4694 4694 message are used as default committer and commit message. All
4695 4695 text/plain body parts before first diff are added to the commit
4696 4696 message.
4697 4697
4698 4698 If the imported patch was generated by :hg:`export`, user and
4699 4699 description from patch override values from message headers and
4700 4700 body. Values given on command line with -m/--message and -u/--user
4701 4701 override these.
4702 4702
4703 4703 If --exact is specified, import will set the working directory to
4704 4704 the parent of each patch before applying it, and will abort if the
4705 4705 resulting changeset has a different ID than the one recorded in
4706 4706 the patch. This may happen due to character set problems or other
4707 4707 deficiencies in the text patch format.
4708 4708
4709 4709 Use --partial to ensure a changeset will be created from the patch
4710 4710 even if some hunks fail to apply. Hunks that fail to apply will be
4711 4711 written to a <target-file>.rej file. Conflicts can then be resolved
4712 4712 by hand before :hg:`commit --amend` is run to update the created
4713 4713 changeset. This flag exists to let people import patches that
4714 4714 partially apply without losing the associated metadata (author,
4715 4715 date, description, ...).
4716 4716
4717 4717 .. note::
4718 4718
4719 4719 When no hunks apply cleanly, :hg:`import --partial` will create
4720 4720 an empty changeset, importing only the patch metadata.
4721 4721
4722 4722 With -s/--similarity, hg will attempt to discover renames and
4723 4723 copies in the patch in the same way as :hg:`addremove`.
4724 4724
4725 4725 It is possible to use external patch programs to perform the patch
4726 4726 by setting the ``ui.patch`` configuration option. For the default
4727 4727 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4728 4728 See :hg:`help config` for more information about configuration
4729 4729 files and how to use these options.
4730 4730
4731 4731 See :hg:`help dates` for a list of formats valid for -d/--date.
4732 4732
4733 4733 .. container:: verbose
4734 4734
4735 4735 Examples:
4736 4736
4737 4737 - import a traditional patch from a website and detect renames::
4738 4738
4739 4739 hg import -s 80 http://example.com/bugfix.patch
4740 4740
4741 4741 - import a changeset from an hgweb server::
4742 4742
4743 4743 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4744 4744
4745 4745 - import all the patches in an Unix-style mbox::
4746 4746
4747 4747 hg import incoming-patches.mbox
4748 4748
4749 4749 - attempt to exactly restore an exported changeset (not always
4750 4750 possible)::
4751 4751
4752 4752 hg import --exact proposed-fix.patch
4753 4753
4754 4754 - use an external tool to apply a patch which is too fuzzy for
4755 4755 the default internal tool.
4756 4756
4757 4757 hg import --config ui.patch="patch --merge" fuzzy.patch
4758 4758
4759 4759 - change the default fuzzing from 2 to a less strict 7
4760 4760
4761 4761 hg import --config ui.fuzz=7 fuzz.patch
4762 4762
4763 4763 Returns 0 on success, 1 on partial success (see --partial).
4764 4764 """
4765 4765
4766 4766 if not patch1:
4767 4767 raise error.Abort(_('need at least one patch to import'))
4768 4768
4769 4769 patches = (patch1,) + patches
4770 4770
4771 4771 date = opts.get('date')
4772 4772 if date:
4773 4773 opts['date'] = util.parsedate(date)
4774 4774
4775 4775 exact = opts.get('exact')
4776 4776 update = not opts.get('bypass')
4777 4777 if not update and opts.get('no_commit'):
4778 4778 raise error.Abort(_('cannot use --no-commit with --bypass'))
4779 4779 try:
4780 4780 sim = float(opts.get('similarity') or 0)
4781 4781 except ValueError:
4782 4782 raise error.Abort(_('similarity must be a number'))
4783 4783 if sim < 0 or sim > 100:
4784 4784 raise error.Abort(_('similarity must be between 0 and 100'))
4785 4785 if sim and not update:
4786 4786 raise error.Abort(_('cannot use --similarity with --bypass'))
4787 4787 if exact:
4788 4788 if opts.get('edit'):
4789 4789 raise error.Abort(_('cannot use --exact with --edit'))
4790 4790 if opts.get('prefix'):
4791 4791 raise error.Abort(_('cannot use --exact with --prefix'))
4792 4792
4793 4793 base = opts["base"]
4794 4794 wlock = dsguard = lock = tr = None
4795 4795 msgs = []
4796 4796 ret = 0
4797 4797
4798 4798
4799 4799 try:
4800 4800 wlock = repo.wlock()
4801 4801
4802 4802 if update:
4803 4803 cmdutil.checkunfinished(repo)
4804 4804 if (exact or not opts.get('force')):
4805 4805 cmdutil.bailifchanged(repo)
4806 4806
4807 4807 if not opts.get('no_commit'):
4808 4808 lock = repo.lock()
4809 4809 tr = repo.transaction('import')
4810 4810 else:
4811 4811 dsguard = cmdutil.dirstateguard(repo, 'import')
4812 4812 parents = repo[None].parents()
4813 4813 for patchurl in patches:
4814 4814 if patchurl == '-':
4815 4815 ui.status(_('applying patch from stdin\n'))
4816 4816 patchfile = ui.fin
4817 4817 patchurl = 'stdin' # for error message
4818 4818 else:
4819 4819 patchurl = os.path.join(base, patchurl)
4820 4820 ui.status(_('applying %s\n') % patchurl)
4821 4821 patchfile = hg.openpath(ui, patchurl)
4822 4822
4823 4823 haspatch = False
4824 4824 for hunk in patch.split(patchfile):
4825 4825 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4826 4826 parents, opts,
4827 4827 msgs, hg.clean)
4828 4828 if msg:
4829 4829 haspatch = True
4830 4830 ui.note(msg + '\n')
4831 4831 if update or exact:
4832 4832 parents = repo[None].parents()
4833 4833 else:
4834 4834 parents = [repo[node]]
4835 4835 if rej:
4836 4836 ui.write_err(_("patch applied partially\n"))
4837 4837 ui.write_err(_("(fix the .rej files and run "
4838 4838 "`hg commit --amend`)\n"))
4839 4839 ret = 1
4840 4840 break
4841 4841
4842 4842 if not haspatch:
4843 4843 raise error.Abort(_('%s: no diffs found') % patchurl)
4844 4844
4845 4845 if tr:
4846 4846 tr.close()
4847 4847 if msgs:
4848 4848 repo.savecommitmessage('\n* * *\n'.join(msgs))
4849 4849 if dsguard:
4850 4850 dsguard.close()
4851 4851 return ret
4852 4852 finally:
4853 4853 if tr:
4854 4854 tr.release()
4855 4855 release(lock, dsguard, wlock)
4856 4856
4857 4857 @command('incoming|in',
4858 4858 [('f', 'force', None,
4859 4859 _('run even if remote repository is unrelated')),
4860 4860 ('n', 'newest-first', None, _('show newest record first')),
4861 4861 ('', 'bundle', '',
4862 4862 _('file to store the bundles into'), _('FILE')),
4863 4863 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4864 4864 ('B', 'bookmarks', False, _("compare bookmarks")),
4865 4865 ('b', 'branch', [],
4866 4866 _('a specific branch you would like to pull'), _('BRANCH')),
4867 4867 ] + logopts + remoteopts + subrepoopts,
4868 4868 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4869 4869 def incoming(ui, repo, source="default", **opts):
4870 4870 """show new changesets found in source
4871 4871
4872 4872 Show new changesets found in the specified path/URL or the default
4873 4873 pull location. These are the changesets that would have been pulled
4874 4874 if a pull at the time you issued this command.
4875 4875
4876 4876 See pull for valid source format details.
4877 4877
4878 4878 .. container:: verbose
4879 4879
4880 4880 With -B/--bookmarks, the result of bookmark comparison between
4881 4881 local and remote repositories is displayed. With -v/--verbose,
4882 4882 status is also displayed for each bookmark like below::
4883 4883
4884 4884 BM1 01234567890a added
4885 4885 BM2 1234567890ab advanced
4886 4886 BM3 234567890abc diverged
4887 4887 BM4 34567890abcd changed
4888 4888
4889 4889 The action taken locally when pulling depends on the
4890 4890 status of each bookmark:
4891 4891
4892 4892 :``added``: pull will create it
4893 4893 :``advanced``: pull will update it
4894 4894 :``diverged``: pull will create a divergent bookmark
4895 4895 :``changed``: result depends on remote changesets
4896 4896
4897 4897 From the point of view of pulling behavior, bookmark
4898 4898 existing only in the remote repository are treated as ``added``,
4899 4899 even if it is in fact locally deleted.
4900 4900
4901 4901 .. container:: verbose
4902 4902
4903 4903 For remote repository, using --bundle avoids downloading the
4904 4904 changesets twice if the incoming is followed by a pull.
4905 4905
4906 4906 Examples:
4907 4907
4908 4908 - show incoming changes with patches and full description::
4909 4909
4910 4910 hg incoming -vp
4911 4911
4912 4912 - show incoming changes excluding merges, store a bundle::
4913 4913
4914 4914 hg in -vpM --bundle incoming.hg
4915 4915 hg pull incoming.hg
4916 4916
4917 4917 - briefly list changes inside a bundle::
4918 4918
4919 4919 hg in changes.hg -T "{desc|firstline}\\n"
4920 4920
4921 4921 Returns 0 if there are incoming changes, 1 otherwise.
4922 4922 """
4923 4923 if opts.get('graph'):
4924 4924 cmdutil.checkunsupportedgraphflags([], opts)
4925 4925 def display(other, chlist, displayer):
4926 4926 revdag = cmdutil.graphrevs(other, chlist, opts)
4927 4927 cmdutil.displaygraph(ui, repo, revdag, displayer,
4928 4928 graphmod.asciiedges)
4929 4929
4930 4930 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4931 4931 return 0
4932 4932
4933 4933 if opts.get('bundle') and opts.get('subrepos'):
4934 4934 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4935 4935
4936 4936 if opts.get('bookmarks'):
4937 4937 source, branches = hg.parseurl(ui.expandpath(source),
4938 4938 opts.get('branch'))
4939 4939 other = hg.peer(repo, opts, source)
4940 4940 if 'bookmarks' not in other.listkeys('namespaces'):
4941 4941 ui.warn(_("remote doesn't support bookmarks\n"))
4942 4942 return 0
4943 4943 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4944 4944 return bookmarks.incoming(ui, repo, other)
4945 4945
4946 4946 repo._subtoppath = ui.expandpath(source)
4947 4947 try:
4948 4948 return hg.incoming(ui, repo, source, opts)
4949 4949 finally:
4950 4950 del repo._subtoppath
4951 4951
4952 4952
4953 4953 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4954 4954 norepo=True)
4955 4955 def init(ui, dest=".", **opts):
4956 4956 """create a new repository in the given directory
4957 4957
4958 4958 Initialize a new repository in the given directory. If the given
4959 4959 directory does not exist, it will be created.
4960 4960
4961 4961 If no directory is given, the current directory is used.
4962 4962
4963 4963 It is possible to specify an ``ssh://`` URL as the destination.
4964 4964 See :hg:`help urls` for more information.
4965 4965
4966 4966 Returns 0 on success.
4967 4967 """
4968 4968 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4969 4969
4970 4970 @command('locate',
4971 4971 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4972 4972 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4973 4973 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4974 4974 ] + walkopts,
4975 4975 _('[OPTION]... [PATTERN]...'))
4976 4976 def locate(ui, repo, *pats, **opts):
4977 4977 """locate files matching specific patterns (DEPRECATED)
4978 4978
4979 4979 Print files under Mercurial control in the working directory whose
4980 4980 names match the given patterns.
4981 4981
4982 4982 By default, this command searches all directories in the working
4983 4983 directory. To search just the current directory and its
4984 4984 subdirectories, use "--include .".
4985 4985
4986 4986 If no patterns are given to match, this command prints the names
4987 4987 of all files under Mercurial control in the working directory.
4988 4988
4989 4989 If you want to feed the output of this command into the "xargs"
4990 4990 command, use the -0 option to both this command and "xargs". This
4991 4991 will avoid the problem of "xargs" treating single filenames that
4992 4992 contain whitespace as multiple filenames.
4993 4993
4994 4994 See :hg:`help files` for a more versatile command.
4995 4995
4996 4996 Returns 0 if a match is found, 1 otherwise.
4997 4997 """
4998 4998 if opts.get('print0'):
4999 4999 end = '\0'
5000 5000 else:
5001 5001 end = '\n'
5002 5002 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5003 5003
5004 5004 ret = 1
5005 5005 ctx = repo[rev]
5006 5006 m = scmutil.match(ctx, pats, opts, default='relglob',
5007 5007 badfn=lambda x, y: False)
5008 5008
5009 5009 for abs in ctx.matches(m):
5010 5010 if opts.get('fullpath'):
5011 5011 ui.write(repo.wjoin(abs), end)
5012 5012 else:
5013 5013 ui.write(((pats and m.rel(abs)) or abs), end)
5014 5014 ret = 0
5015 5015
5016 5016 return ret
5017 5017
5018 5018 @command('^log|history',
5019 5019 [('f', 'follow', None,
5020 5020 _('follow changeset history, or file history across copies and renames')),
5021 5021 ('', 'follow-first', None,
5022 5022 _('only follow the first parent of merge changesets (DEPRECATED)')),
5023 5023 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5024 5024 ('C', 'copies', None, _('show copied files')),
5025 5025 ('k', 'keyword', [],
5026 5026 _('do case-insensitive search for a given text'), _('TEXT')),
5027 5027 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5028 5028 ('', 'removed', None, _('include revisions where files were removed')),
5029 5029 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5030 5030 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5031 5031 ('', 'only-branch', [],
5032 5032 _('show only changesets within the given named branch (DEPRECATED)'),
5033 5033 _('BRANCH')),
5034 5034 ('b', 'branch', [],
5035 5035 _('show changesets within the given named branch'), _('BRANCH')),
5036 5036 ('P', 'prune', [],
5037 5037 _('do not display revision or any of its ancestors'), _('REV')),
5038 5038 ] + logopts + walkopts,
5039 5039 _('[OPTION]... [FILE]'),
5040 5040 inferrepo=True)
5041 5041 def log(ui, repo, *pats, **opts):
5042 5042 """show revision history of entire repository or files
5043 5043
5044 5044 Print the revision history of the specified files or the entire
5045 5045 project.
5046 5046
5047 5047 If no revision range is specified, the default is ``tip:0`` unless
5048 5048 --follow is set, in which case the working directory parent is
5049 5049 used as the starting revision.
5050 5050
5051 5051 File history is shown without following rename or copy history of
5052 5052 files. Use -f/--follow with a filename to follow history across
5053 5053 renames and copies. --follow without a filename will only show
5054 5054 ancestors or descendants of the starting revision.
5055 5055
5056 5056 By default this command prints revision number and changeset id,
5057 5057 tags, non-trivial parents, user, date and time, and a summary for
5058 5058 each commit. When the -v/--verbose switch is used, the list of
5059 5059 changed files and full commit message are shown.
5060 5060
5061 5061 With --graph the revisions are shown as an ASCII art DAG with the most
5062 5062 recent changeset at the top.
5063 5063 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5064 5064 and '+' represents a fork where the changeset from the lines below is a
5065 5065 parent of the 'o' merge on the same line.
5066 5066
5067 5067 .. note::
5068 5068
5069 5069 :hg:`log --patch` may generate unexpected diff output for merge
5070 5070 changesets, as it will only compare the merge changeset against
5071 5071 its first parent. Also, only files different from BOTH parents
5072 5072 will appear in files:.
5073 5073
5074 5074 .. note::
5075 5075
5076 5076 For performance reasons, :hg:`log FILE` may omit duplicate changes
5077 5077 made on branches and will not show removals or mode changes. To
5078 5078 see all such changes, use the --removed switch.
5079 5079
5080 5080 .. container:: verbose
5081 5081
5082 5082 Some examples:
5083 5083
5084 5084 - changesets with full descriptions and file lists::
5085 5085
5086 5086 hg log -v
5087 5087
5088 5088 - changesets ancestral to the working directory::
5089 5089
5090 5090 hg log -f
5091 5091
5092 5092 - last 10 commits on the current branch::
5093 5093
5094 5094 hg log -l 10 -b .
5095 5095
5096 5096 - changesets showing all modifications of a file, including removals::
5097 5097
5098 5098 hg log --removed file.c
5099 5099
5100 5100 - all changesets that touch a directory, with diffs, excluding merges::
5101 5101
5102 5102 hg log -Mp lib/
5103 5103
5104 5104 - all revision numbers that match a keyword::
5105 5105
5106 5106 hg log -k bug --template "{rev}\\n"
5107 5107
5108 5108 - the full hash identifier of the working directory parent::
5109 5109
5110 5110 hg log -r . --template "{node}\\n"
5111 5111
5112 5112 - list available log templates::
5113 5113
5114 5114 hg log -T list
5115 5115
5116 5116 - check if a given changeset is included in a tagged release::
5117 5117
5118 5118 hg log -r "a21ccf and ancestor(1.9)"
5119 5119
5120 5120 - find all changesets by some user in a date range::
5121 5121
5122 5122 hg log -k alice -d "may 2008 to jul 2008"
5123 5123
5124 5124 - summary of all changesets after the last tag::
5125 5125
5126 5126 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5127 5127
5128 5128 See :hg:`help dates` for a list of formats valid for -d/--date.
5129 5129
5130 5130 See :hg:`help revisions` and :hg:`help revsets` for more about
5131 5131 specifying and ordering revisions.
5132 5132
5133 5133 See :hg:`help templates` for more about pre-packaged styles and
5134 5134 specifying custom templates.
5135 5135
5136 5136 Returns 0 on success.
5137 5137
5138 5138 """
5139 5139 if opts.get('follow') and opts.get('rev'):
5140 5140 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5141 5141 del opts['follow']
5142 5142
5143 5143 if opts.get('graph'):
5144 5144 return cmdutil.graphlog(ui, repo, *pats, **opts)
5145 5145
5146 5146 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5147 5147 limit = cmdutil.loglimit(opts)
5148 5148 count = 0
5149 5149
5150 5150 getrenamed = None
5151 5151 if opts.get('copies'):
5152 5152 endrev = None
5153 5153 if opts.get('rev'):
5154 5154 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5155 5155 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5156 5156
5157 5157 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5158 5158 for rev in revs:
5159 5159 if count == limit:
5160 5160 break
5161 5161 ctx = repo[rev]
5162 5162 copies = None
5163 5163 if getrenamed is not None and rev:
5164 5164 copies = []
5165 5165 for fn in ctx.files():
5166 5166 rename = getrenamed(fn, rev)
5167 5167 if rename:
5168 5168 copies.append((fn, rename[0]))
5169 5169 if filematcher:
5170 5170 revmatchfn = filematcher(ctx.rev())
5171 5171 else:
5172 5172 revmatchfn = None
5173 5173 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5174 5174 if displayer.flush(ctx):
5175 5175 count += 1
5176 5176
5177 5177 displayer.close()
5178 5178
5179 5179 @command('manifest',
5180 5180 [('r', 'rev', '', _('revision to display'), _('REV')),
5181 5181 ('', 'all', False, _("list files from all revisions"))]
5182 5182 + formatteropts,
5183 5183 _('[-r REV]'))
5184 5184 def manifest(ui, repo, node=None, rev=None, **opts):
5185 5185 """output the current or given revision of the project manifest
5186 5186
5187 5187 Print a list of version controlled files for the given revision.
5188 5188 If no revision is given, the first parent of the working directory
5189 5189 is used, or the null revision if no revision is checked out.
5190 5190
5191 5191 With -v, print file permissions, symlink and executable bits.
5192 5192 With --debug, print file revision hashes.
5193 5193
5194 5194 If option --all is specified, the list of all files from all revisions
5195 5195 is printed. This includes deleted and renamed files.
5196 5196
5197 5197 Returns 0 on success.
5198 5198 """
5199 5199
5200 5200 fm = ui.formatter('manifest', opts)
5201 5201
5202 5202 if opts.get('all'):
5203 5203 if rev or node:
5204 5204 raise error.Abort(_("can't specify a revision with --all"))
5205 5205
5206 5206 res = []
5207 5207 prefix = "data/"
5208 5208 suffix = ".i"
5209 5209 plen = len(prefix)
5210 5210 slen = len(suffix)
5211 5211 with repo.lock():
5212 5212 for fn, b, size in repo.store.datafiles():
5213 5213 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5214 5214 res.append(fn[plen:-slen])
5215 5215 for f in res:
5216 5216 fm.startitem()
5217 5217 fm.write("path", '%s\n', f)
5218 5218 fm.end()
5219 5219 return
5220 5220
5221 5221 if rev and node:
5222 5222 raise error.Abort(_("please specify just one revision"))
5223 5223
5224 5224 if not node:
5225 5225 node = rev
5226 5226
5227 5227 char = {'l': '@', 'x': '*', '': ''}
5228 5228 mode = {'l': '644', 'x': '755', '': '644'}
5229 5229 ctx = scmutil.revsingle(repo, node)
5230 5230 mf = ctx.manifest()
5231 5231 for f in ctx:
5232 5232 fm.startitem()
5233 5233 fl = ctx[f].flags()
5234 5234 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5235 5235 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5236 5236 fm.write('path', '%s\n', f)
5237 5237 fm.end()
5238 5238
5239 5239 @command('^merge',
5240 5240 [('f', 'force', None,
5241 5241 _('force a merge including outstanding changes (DEPRECATED)')),
5242 5242 ('r', 'rev', '', _('revision to merge'), _('REV')),
5243 5243 ('P', 'preview', None,
5244 5244 _('review revisions to merge (no merge is performed)'))
5245 5245 ] + mergetoolopts,
5246 5246 _('[-P] [[-r] REV]'))
5247 5247 def merge(ui, repo, node=None, **opts):
5248 5248 """merge another revision into working directory
5249 5249
5250 5250 The current working directory is updated with all changes made in
5251 5251 the requested revision since the last common predecessor revision.
5252 5252
5253 5253 Files that changed between either parent are marked as changed for
5254 5254 the next commit and a commit must be performed before any further
5255 5255 updates to the repository are allowed. The next commit will have
5256 5256 two parents.
5257 5257
5258 5258 ``--tool`` can be used to specify the merge tool used for file
5259 5259 merges. It overrides the HGMERGE environment variable and your
5260 5260 configuration files. See :hg:`help merge-tools` for options.
5261 5261
5262 5262 If no revision is specified, the working directory's parent is a
5263 5263 head revision, and the current branch contains exactly one other
5264 5264 head, the other head is merged with by default. Otherwise, an
5265 5265 explicit revision with which to merge with must be provided.
5266 5266
5267 5267 See :hg:`help resolve` for information on handling file conflicts.
5268 5268
5269 5269 To undo an uncommitted merge, use :hg:`update --clean .` which
5270 5270 will check out a clean copy of the original merge parent, losing
5271 5271 all changes.
5272 5272
5273 5273 Returns 0 on success, 1 if there are unresolved files.
5274 5274 """
5275 5275
5276 5276 if opts.get('rev') and node:
5277 5277 raise error.Abort(_("please specify just one revision"))
5278 5278 if not node:
5279 5279 node = opts.get('rev')
5280 5280
5281 5281 if node:
5282 5282 node = scmutil.revsingle(repo, node).node()
5283 5283
5284 5284 if not node:
5285 5285 node = repo[destutil.destmerge(repo)].node()
5286 5286
5287 5287 if opts.get('preview'):
5288 5288 # find nodes that are ancestors of p2 but not of p1
5289 5289 p1 = repo.lookup('.')
5290 5290 p2 = repo.lookup(node)
5291 5291 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5292 5292
5293 5293 displayer = cmdutil.show_changeset(ui, repo, opts)
5294 5294 for node in nodes:
5295 5295 displayer.show(repo[node])
5296 5296 displayer.close()
5297 5297 return 0
5298 5298
5299 5299 try:
5300 5300 # ui.forcemerge is an internal variable, do not document
5301 5301 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5302 5302 force = opts.get('force')
5303 5303 return hg.merge(repo, node, force=force, mergeforce=force)
5304 5304 finally:
5305 5305 ui.setconfig('ui', 'forcemerge', '', 'merge')
5306 5306
5307 5307 @command('outgoing|out',
5308 5308 [('f', 'force', None, _('run even when the destination is unrelated')),
5309 5309 ('r', 'rev', [],
5310 5310 _('a changeset intended to be included in the destination'), _('REV')),
5311 5311 ('n', 'newest-first', None, _('show newest record first')),
5312 5312 ('B', 'bookmarks', False, _('compare bookmarks')),
5313 5313 ('b', 'branch', [], _('a specific branch you would like to push'),
5314 5314 _('BRANCH')),
5315 5315 ] + logopts + remoteopts + subrepoopts,
5316 5316 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5317 5317 def outgoing(ui, repo, dest=None, **opts):
5318 5318 """show changesets not found in the destination
5319 5319
5320 5320 Show changesets not found in the specified destination repository
5321 5321 or the default push location. These are the changesets that would
5322 5322 be pushed if a push was requested.
5323 5323
5324 5324 See pull for details of valid destination formats.
5325 5325
5326 5326 .. container:: verbose
5327 5327
5328 5328 With -B/--bookmarks, the result of bookmark comparison between
5329 5329 local and remote repositories is displayed. With -v/--verbose,
5330 5330 status is also displayed for each bookmark like below::
5331 5331
5332 5332 BM1 01234567890a added
5333 5333 BM2 deleted
5334 5334 BM3 234567890abc advanced
5335 5335 BM4 34567890abcd diverged
5336 5336 BM5 4567890abcde changed
5337 5337
5338 5338 The action taken when pushing depends on the
5339 5339 status of each bookmark:
5340 5340
5341 5341 :``added``: push with ``-B`` will create it
5342 5342 :``deleted``: push with ``-B`` will delete it
5343 5343 :``advanced``: push will update it
5344 5344 :``diverged``: push with ``-B`` will update it
5345 5345 :``changed``: push with ``-B`` will update it
5346 5346
5347 5347 From the point of view of pushing behavior, bookmarks
5348 5348 existing only in the remote repository are treated as
5349 5349 ``deleted``, even if it is in fact added remotely.
5350 5350
5351 5351 Returns 0 if there are outgoing changes, 1 otherwise.
5352 5352 """
5353 5353 if opts.get('graph'):
5354 5354 cmdutil.checkunsupportedgraphflags([], opts)
5355 5355 o, other = hg._outgoing(ui, repo, dest, opts)
5356 5356 if not o:
5357 5357 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5358 5358 return
5359 5359
5360 5360 revdag = cmdutil.graphrevs(repo, o, opts)
5361 5361 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5362 5362 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5363 5363 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5364 5364 return 0
5365 5365
5366 5366 if opts.get('bookmarks'):
5367 5367 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5368 5368 dest, branches = hg.parseurl(dest, opts.get('branch'))
5369 5369 other = hg.peer(repo, opts, dest)
5370 5370 if 'bookmarks' not in other.listkeys('namespaces'):
5371 5371 ui.warn(_("remote doesn't support bookmarks\n"))
5372 5372 return 0
5373 5373 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5374 5374 return bookmarks.outgoing(ui, repo, other)
5375 5375
5376 5376 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5377 5377 try:
5378 5378 return hg.outgoing(ui, repo, dest, opts)
5379 5379 finally:
5380 5380 del repo._subtoppath
5381 5381
5382 5382 @command('parents',
5383 5383 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5384 5384 ] + templateopts,
5385 5385 _('[-r REV] [FILE]'),
5386 5386 inferrepo=True)
5387 5387 def parents(ui, repo, file_=None, **opts):
5388 5388 """show the parents of the working directory or revision (DEPRECATED)
5389 5389
5390 5390 Print the working directory's parent revisions. If a revision is
5391 5391 given via -r/--rev, the parent of that revision will be printed.
5392 5392 If a file argument is given, the revision in which the file was
5393 5393 last changed (before the working directory revision or the
5394 5394 argument to --rev if given) is printed.
5395 5395
5396 5396 This command is equivalent to::
5397 5397
5398 5398 hg log -r "p1()+p2()" or
5399 5399 hg log -r "p1(REV)+p2(REV)" or
5400 5400 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5401 5401 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5402 5402
5403 5403 See :hg:`summary` and :hg:`help revsets` for related information.
5404 5404
5405 5405 Returns 0 on success.
5406 5406 """
5407 5407
5408 5408 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5409 5409
5410 5410 if file_:
5411 5411 m = scmutil.match(ctx, (file_,), opts)
5412 5412 if m.anypats() or len(m.files()) != 1:
5413 5413 raise error.Abort(_('can only specify an explicit filename'))
5414 5414 file_ = m.files()[0]
5415 5415 filenodes = []
5416 5416 for cp in ctx.parents():
5417 5417 if not cp:
5418 5418 continue
5419 5419 try:
5420 5420 filenodes.append(cp.filenode(file_))
5421 5421 except error.LookupError:
5422 5422 pass
5423 5423 if not filenodes:
5424 5424 raise error.Abort(_("'%s' not found in manifest!") % file_)
5425 5425 p = []
5426 5426 for fn in filenodes:
5427 5427 fctx = repo.filectx(file_, fileid=fn)
5428 5428 p.append(fctx.node())
5429 5429 else:
5430 5430 p = [cp.node() for cp in ctx.parents()]
5431 5431
5432 5432 displayer = cmdutil.show_changeset(ui, repo, opts)
5433 5433 for n in p:
5434 5434 if n != nullid:
5435 5435 displayer.show(repo[n])
5436 5436 displayer.close()
5437 5437
5438 5438 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5439 5439 def paths(ui, repo, search=None, **opts):
5440 5440 """show aliases for remote repositories
5441 5441
5442 5442 Show definition of symbolic path name NAME. If no name is given,
5443 5443 show definition of all available names.
5444 5444
5445 5445 Option -q/--quiet suppresses all output when searching for NAME
5446 5446 and shows only the path names when listing all definitions.
5447 5447
5448 5448 Path names are defined in the [paths] section of your
5449 5449 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5450 5450 repository, ``.hg/hgrc`` is used, too.
5451 5451
5452 5452 The path names ``default`` and ``default-push`` have a special
5453 5453 meaning. When performing a push or pull operation, they are used
5454 5454 as fallbacks if no location is specified on the command-line.
5455 5455 When ``default-push`` is set, it will be used for push and
5456 5456 ``default`` will be used for pull; otherwise ``default`` is used
5457 5457 as the fallback for both. When cloning a repository, the clone
5458 5458 source is written as ``default`` in ``.hg/hgrc``.
5459 5459
5460 5460 .. note::
5461 5461
5462 5462 ``default`` and ``default-push`` apply to all inbound (e.g.
5463 5463 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5464 5464 and :hg:`bundle`) operations.
5465 5465
5466 5466 See :hg:`help urls` for more information.
5467 5467
5468 5468 Returns 0 on success.
5469 5469 """
5470 5470 if search:
5471 5471 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5472 5472 if name == search]
5473 5473 else:
5474 5474 pathitems = sorted(ui.paths.iteritems())
5475 5475
5476 5476 fm = ui.formatter('paths', opts)
5477 5477 if fm:
5478 5478 hidepassword = str
5479 5479 else:
5480 5480 hidepassword = util.hidepassword
5481 5481 if ui.quiet:
5482 5482 namefmt = '%s\n'
5483 5483 else:
5484 5484 namefmt = '%s = '
5485 5485 showsubopts = not search and not ui.quiet
5486 5486
5487 5487 for name, path in pathitems:
5488 5488 fm.startitem()
5489 5489 fm.condwrite(not search, 'name', namefmt, name)
5490 5490 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5491 5491 for subopt, value in sorted(path.suboptions.items()):
5492 5492 assert subopt not in ('name', 'url')
5493 5493 if showsubopts:
5494 5494 fm.plain('%s:%s = ' % (name, subopt))
5495 5495 fm.condwrite(showsubopts, subopt, '%s\n', value)
5496 5496
5497 5497 fm.end()
5498 5498
5499 5499 if search and not pathitems:
5500 5500 if not ui.quiet:
5501 5501 ui.warn(_("not found!\n"))
5502 5502 return 1
5503 5503 else:
5504 5504 return 0
5505 5505
5506 5506 @command('phase',
5507 5507 [('p', 'public', False, _('set changeset phase to public')),
5508 5508 ('d', 'draft', False, _('set changeset phase to draft')),
5509 5509 ('s', 'secret', False, _('set changeset phase to secret')),
5510 5510 ('f', 'force', False, _('allow to move boundary backward')),
5511 5511 ('r', 'rev', [], _('target revision'), _('REV')),
5512 5512 ],
5513 5513 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5514 5514 def phase(ui, repo, *revs, **opts):
5515 5515 """set or show the current phase name
5516 5516
5517 5517 With no argument, show the phase name of the current revision(s).
5518 5518
5519 5519 With one of -p/--public, -d/--draft or -s/--secret, change the
5520 5520 phase value of the specified revisions.
5521 5521
5522 5522 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5523 5523 lower phase to an higher phase. Phases are ordered as follows::
5524 5524
5525 5525 public < draft < secret
5526 5526
5527 5527 Returns 0 on success, 1 if some phases could not be changed.
5528 5528
5529 5529 (For more information about the phases concept, see :hg:`help phases`.)
5530 5530 """
5531 5531 # search for a unique phase argument
5532 5532 targetphase = None
5533 5533 for idx, name in enumerate(phases.phasenames):
5534 5534 if opts[name]:
5535 5535 if targetphase is not None:
5536 5536 raise error.Abort(_('only one phase can be specified'))
5537 5537 targetphase = idx
5538 5538
5539 5539 # look for specified revision
5540 5540 revs = list(revs)
5541 5541 revs.extend(opts['rev'])
5542 5542 if not revs:
5543 5543 # display both parents as the second parent phase can influence
5544 5544 # the phase of a merge commit
5545 5545 revs = [c.rev() for c in repo[None].parents()]
5546 5546
5547 5547 revs = scmutil.revrange(repo, revs)
5548 5548
5549 5549 lock = None
5550 5550 ret = 0
5551 5551 if targetphase is None:
5552 5552 # display
5553 5553 for r in revs:
5554 5554 ctx = repo[r]
5555 5555 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5556 5556 else:
5557 5557 tr = None
5558 5558 lock = repo.lock()
5559 5559 try:
5560 5560 tr = repo.transaction("phase")
5561 5561 # set phase
5562 5562 if not revs:
5563 5563 raise error.Abort(_('empty revision set'))
5564 5564 nodes = [repo[r].node() for r in revs]
5565 5565 # moving revision from public to draft may hide them
5566 5566 # We have to check result on an unfiltered repository
5567 5567 unfi = repo.unfiltered()
5568 5568 getphase = unfi._phasecache.phase
5569 5569 olddata = [getphase(unfi, r) for r in unfi]
5570 5570 phases.advanceboundary(repo, tr, targetphase, nodes)
5571 5571 if opts['force']:
5572 5572 phases.retractboundary(repo, tr, targetphase, nodes)
5573 5573 tr.close()
5574 5574 finally:
5575 5575 if tr is not None:
5576 5576 tr.release()
5577 5577 lock.release()
5578 5578 getphase = unfi._phasecache.phase
5579 5579 newdata = [getphase(unfi, r) for r in unfi]
5580 5580 changes = sum(newdata[r] != olddata[r] for r in unfi)
5581 5581 cl = unfi.changelog
5582 5582 rejected = [n for n in nodes
5583 5583 if newdata[cl.rev(n)] < targetphase]
5584 5584 if rejected:
5585 5585 ui.warn(_('cannot move %i changesets to a higher '
5586 5586 'phase, use --force\n') % len(rejected))
5587 5587 ret = 1
5588 5588 if changes:
5589 5589 msg = _('phase changed for %i changesets\n') % changes
5590 5590 if ret:
5591 5591 ui.status(msg)
5592 5592 else:
5593 5593 ui.note(msg)
5594 5594 else:
5595 5595 ui.warn(_('no phases changed\n'))
5596 5596 return ret
5597 5597
5598 5598 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5599 5599 if modheads == 0:
5600 5600 return
5601 5601 if optupdate:
5602 5602 warndest = False
5603 5603 try:
5604 5604 movemarkfrom = None
5605 5605 if not checkout:
5606 5606 warndest = True
5607 5607 updata = destutil.destupdate(repo)
5608 5608 checkout, movemarkfrom, brev = updata
5609 5609 ret = hg.update(repo, checkout)
5610 5610 if warndest:
5611 5611 destutil.statusotherdests(ui, repo)
5612 5612 except error.UpdateAbort as inst:
5613 5613 msg = _("not updating: %s") % str(inst)
5614 5614 hint = inst.hint
5615 5615 raise error.UpdateAbort(msg, hint=hint)
5616 5616 if not ret and movemarkfrom:
5617 5617 if movemarkfrom == repo['.'].node():
5618 5618 pass # no-op update
5619 5619 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5620 5620 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5621 5621 elif brev in repo._bookmarks:
5622 5622 if brev != repo._activebookmark:
5623 5623 ui.status(_("(activating bookmark %s)\n") % brev)
5624 5624 bookmarks.activate(repo, brev)
5625 5625 elif brev:
5626 5626 if repo._activebookmark:
5627 5627 ui.status(_("(leaving bookmark %s)\n") %
5628 5628 repo._activebookmark)
5629 5629 bookmarks.deactivate(repo)
5630 5630 return ret
5631 5631 if modheads > 1:
5632 5632 currentbranchheads = len(repo.branchheads())
5633 5633 if currentbranchheads == modheads:
5634 5634 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5635 5635 elif currentbranchheads > 1:
5636 5636 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5637 5637 "merge)\n"))
5638 5638 else:
5639 5639 ui.status(_("(run 'hg heads' to see heads)\n"))
5640 5640 else:
5641 5641 ui.status(_("(run 'hg update' to get a working copy)\n"))
5642 5642
5643 5643 @command('^pull',
5644 5644 [('u', 'update', None,
5645 5645 _('update to new branch head if changesets were pulled')),
5646 5646 ('f', 'force', None, _('run even when remote repository is unrelated')),
5647 5647 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5648 5648 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5649 5649 ('b', 'branch', [], _('a specific branch you would like to pull'),
5650 5650 _('BRANCH')),
5651 5651 ] + remoteopts,
5652 5652 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5653 5653 def pull(ui, repo, source="default", **opts):
5654 5654 """pull changes from the specified source
5655 5655
5656 5656 Pull changes from a remote repository to a local one.
5657 5657
5658 5658 This finds all changes from the repository at the specified path
5659 5659 or URL and adds them to a local repository (the current one unless
5660 5660 -R is specified). By default, this does not update the copy of the
5661 5661 project in the working directory.
5662 5662
5663 5663 Use :hg:`incoming` if you want to see what would have been added
5664 5664 by a pull at the time you issued this command. If you then decide
5665 5665 to add those changes to the repository, you should use :hg:`pull
5666 5666 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5667 5667
5668 5668 If SOURCE is omitted, the 'default' path will be used.
5669 5669 See :hg:`help urls` for more information.
5670 5670
5671 5671 Returns 0 on success, 1 if an update had unresolved files.
5672 5672 """
5673 5673 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5674 5674 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5675 5675 other = hg.peer(repo, opts, source)
5676 5676 try:
5677 5677 revs, checkout = hg.addbranchrevs(repo, other, branches,
5678 5678 opts.get('rev'))
5679 5679
5680 5680
5681 5681 pullopargs = {}
5682 5682 if opts.get('bookmark'):
5683 5683 if not revs:
5684 5684 revs = []
5685 5685 # The list of bookmark used here is not the one used to actually
5686 5686 # update the bookmark name. This can result in the revision pulled
5687 5687 # not ending up with the name of the bookmark because of a race
5688 5688 # condition on the server. (See issue 4689 for details)
5689 5689 remotebookmarks = other.listkeys('bookmarks')
5690 5690 pullopargs['remotebookmarks'] = remotebookmarks
5691 5691 for b in opts['bookmark']:
5692 5692 if b not in remotebookmarks:
5693 5693 raise error.Abort(_('remote bookmark %s not found!') % b)
5694 5694 revs.append(remotebookmarks[b])
5695 5695
5696 5696 if revs:
5697 5697 try:
5698 5698 # When 'rev' is a bookmark name, we cannot guarantee that it
5699 5699 # will be updated with that name because of a race condition
5700 5700 # server side. (See issue 4689 for details)
5701 5701 oldrevs = revs
5702 5702 revs = [] # actually, nodes
5703 5703 for r in oldrevs:
5704 5704 node = other.lookup(r)
5705 5705 revs.append(node)
5706 5706 if r == checkout:
5707 5707 checkout = node
5708 5708 except error.CapabilityError:
5709 5709 err = _("other repository doesn't support revision lookup, "
5710 5710 "so a rev cannot be specified.")
5711 5711 raise error.Abort(err)
5712 5712
5713 5713 pullopargs.update(opts.get('opargs', {}))
5714 5714 modheads = exchange.pull(repo, other, heads=revs,
5715 5715 force=opts.get('force'),
5716 5716 bookmarks=opts.get('bookmark', ()),
5717 5717 opargs=pullopargs).cgresult
5718 5718
5719 5719 # brev is a name, which might be a bookmark to be activated at
5720 5720 # the end of the update. In other words, it is an explicit
5721 5721 # destination of the update
5722 5722 brev = None
5723 5723
5724 5724 if checkout:
5725 5725 checkout = str(repo.changelog.rev(checkout))
5726 5726
5727 5727 # order below depends on implementation of
5728 5728 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5729 5729 # because 'checkout' is determined without it.
5730 5730 if opts.get('rev'):
5731 5731 brev = opts['rev'][0]
5732 5732 elif opts.get('branch'):
5733 5733 brev = opts['branch'][0]
5734 5734 else:
5735 5735 brev = branches[0]
5736 5736 repo._subtoppath = source
5737 5737 try:
5738 5738 ret = postincoming(ui, repo, modheads, opts.get('update'),
5739 5739 checkout, brev)
5740 5740
5741 5741 finally:
5742 5742 del repo._subtoppath
5743 5743
5744 5744 finally:
5745 5745 other.close()
5746 5746 return ret
5747 5747
5748 5748 @command('^push',
5749 5749 [('f', 'force', None, _('force push')),
5750 5750 ('r', 'rev', [],
5751 5751 _('a changeset intended to be included in the destination'),
5752 5752 _('REV')),
5753 5753 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5754 5754 ('b', 'branch', [],
5755 5755 _('a specific branch you would like to push'), _('BRANCH')),
5756 5756 ('', 'new-branch', False, _('allow pushing a new branch')),
5757 5757 ] + remoteopts,
5758 5758 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5759 5759 def push(ui, repo, dest=None, **opts):
5760 5760 """push changes to the specified destination
5761 5761
5762 5762 Push changesets from the local repository to the specified
5763 5763 destination.
5764 5764
5765 5765 This operation is symmetrical to pull: it is identical to a pull
5766 5766 in the destination repository from the current one.
5767 5767
5768 5768 By default, push will not allow creation of new heads at the
5769 5769 destination, since multiple heads would make it unclear which head
5770 5770 to use. In this situation, it is recommended to pull and merge
5771 5771 before pushing.
5772 5772
5773 5773 Use --new-branch if you want to allow push to create a new named
5774 5774 branch that is not present at the destination. This allows you to
5775 5775 only create a new branch without forcing other changes.
5776 5776
5777 5777 .. note::
5778 5778
5779 5779 Extra care should be taken with the -f/--force option,
5780 5780 which will push all new heads on all branches, an action which will
5781 5781 almost always cause confusion for collaborators.
5782 5782
5783 5783 If -r/--rev is used, the specified revision and all its ancestors
5784 5784 will be pushed to the remote repository.
5785 5785
5786 5786 If -B/--bookmark is used, the specified bookmarked revision, its
5787 5787 ancestors, and the bookmark will be pushed to the remote
5788 5788 repository. Specifying ``.`` is equivalent to specifying the active
5789 5789 bookmark's name.
5790 5790
5791 5791 Please see :hg:`help urls` for important details about ``ssh://``
5792 5792 URLs. If DESTINATION is omitted, a default path will be used.
5793 5793
5794 5794 Returns 0 if push was successful, 1 if nothing to push.
5795 5795 """
5796 5796
5797 5797 if opts.get('bookmark'):
5798 5798 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5799 5799 for b in opts['bookmark']:
5800 5800 # translate -B options to -r so changesets get pushed
5801 5801 b = repo._bookmarks.expandname(b)
5802 5802 if b in repo._bookmarks:
5803 5803 opts.setdefault('rev', []).append(b)
5804 5804 else:
5805 5805 # if we try to push a deleted bookmark, translate it to null
5806 5806 # this lets simultaneous -r, -b options continue working
5807 5807 opts.setdefault('rev', []).append("null")
5808 5808
5809 5809 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5810 5810 if not path:
5811 5811 raise error.Abort(_('default repository not configured!'),
5812 5812 hint=_('see the "path" section in "hg help config"'))
5813 5813 dest = path.pushloc or path.loc
5814 5814 branches = (path.branch, opts.get('branch') or [])
5815 5815 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5816 5816 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5817 5817 other = hg.peer(repo, opts, dest)
5818 5818
5819 5819 if revs:
5820 5820 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5821 5821 if not revs:
5822 5822 raise error.Abort(_("specified revisions evaluate to an empty set"),
5823 5823 hint=_("use different revision arguments"))
5824 5824
5825 5825 repo._subtoppath = dest
5826 5826 try:
5827 5827 # push subrepos depth-first for coherent ordering
5828 5828 c = repo['']
5829 5829 subs = c.substate # only repos that are committed
5830 5830 for s in sorted(subs):
5831 5831 result = c.sub(s).push(opts)
5832 5832 if result == 0:
5833 5833 return not result
5834 5834 finally:
5835 5835 del repo._subtoppath
5836 5836 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5837 5837 newbranch=opts.get('new_branch'),
5838 5838 bookmarks=opts.get('bookmark', ()),
5839 5839 opargs=opts.get('opargs'))
5840 5840
5841 5841 result = not pushop.cgresult
5842 5842
5843 5843 if pushop.bkresult is not None:
5844 5844 if pushop.bkresult == 2:
5845 5845 result = 2
5846 5846 elif not result and pushop.bkresult:
5847 5847 result = 2
5848 5848
5849 5849 return result
5850 5850
5851 5851 @command('recover', [])
5852 5852 def recover(ui, repo):
5853 5853 """roll back an interrupted transaction
5854 5854
5855 5855 Recover from an interrupted commit or pull.
5856 5856
5857 5857 This command tries to fix the repository status after an
5858 5858 interrupted operation. It should only be necessary when Mercurial
5859 5859 suggests it.
5860 5860
5861 5861 Returns 0 if successful, 1 if nothing to recover or verify fails.
5862 5862 """
5863 5863 if repo.recover():
5864 5864 return hg.verify(repo)
5865 5865 return 1
5866 5866
5867 5867 @command('^remove|rm',
5868 5868 [('A', 'after', None, _('record delete for missing files')),
5869 5869 ('f', 'force', None,
5870 5870 _('remove (and delete) file even if added or modified')),
5871 5871 ] + subrepoopts + walkopts,
5872 5872 _('[OPTION]... FILE...'),
5873 5873 inferrepo=True)
5874 5874 def remove(ui, repo, *pats, **opts):
5875 5875 """remove the specified files on the next commit
5876 5876
5877 5877 Schedule the indicated files for removal from the current branch.
5878 5878
5879 5879 This command schedules the files to be removed at the next commit.
5880 5880 To undo a remove before that, see :hg:`revert`. To undo added
5881 5881 files, see :hg:`forget`.
5882 5882
5883 5883 .. container:: verbose
5884 5884
5885 5885 -A/--after can be used to remove only files that have already
5886 5886 been deleted, -f/--force can be used to force deletion, and -Af
5887 5887 can be used to remove files from the next revision without
5888 5888 deleting them from the working directory.
5889 5889
5890 5890 The following table details the behavior of remove for different
5891 5891 file states (columns) and option combinations (rows). The file
5892 5892 states are Added [A], Clean [C], Modified [M] and Missing [!]
5893 5893 (as reported by :hg:`status`). The actions are Warn, Remove
5894 5894 (from branch) and Delete (from disk):
5895 5895
5896 5896 ========= == == == ==
5897 5897 opt/state A C M !
5898 5898 ========= == == == ==
5899 5899 none W RD W R
5900 5900 -f R RD RD R
5901 5901 -A W W W R
5902 5902 -Af R R R R
5903 5903 ========= == == == ==
5904 5904
5905 5905 .. note::
5906 5906
5907 5907 :hg:`remove` never deletes files in Added [A] state from the
5908 5908 working directory, not even if ``--force`` is specified.
5909 5909
5910 5910 Returns 0 on success, 1 if any warnings encountered.
5911 5911 """
5912 5912
5913 5913 after, force = opts.get('after'), opts.get('force')
5914 5914 if not pats and not after:
5915 5915 raise error.Abort(_('no files specified'))
5916 5916
5917 5917 m = scmutil.match(repo[None], pats, opts)
5918 5918 subrepos = opts.get('subrepos')
5919 5919 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5920 5920
5921 5921 @command('rename|move|mv',
5922 5922 [('A', 'after', None, _('record a rename that has already occurred')),
5923 5923 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5924 5924 ] + walkopts + dryrunopts,
5925 5925 _('[OPTION]... SOURCE... DEST'))
5926 5926 def rename(ui, repo, *pats, **opts):
5927 5927 """rename files; equivalent of copy + remove
5928 5928
5929 5929 Mark dest as copies of sources; mark sources for deletion. If dest
5930 5930 is a directory, copies are put in that directory. If dest is a
5931 5931 file, there can only be one source.
5932 5932
5933 5933 By default, this command copies the contents of files as they
5934 5934 exist in the working directory. If invoked with -A/--after, the
5935 5935 operation is recorded, but no copying is performed.
5936 5936
5937 5937 This command takes effect at the next commit. To undo a rename
5938 5938 before that, see :hg:`revert`.
5939 5939
5940 5940 Returns 0 on success, 1 if errors are encountered.
5941 5941 """
5942 5942 with repo.wlock(False):
5943 5943 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5944 5944
5945 5945 @command('resolve',
5946 5946 [('a', 'all', None, _('select all unresolved files')),
5947 5947 ('l', 'list', None, _('list state of files needing merge')),
5948 5948 ('m', 'mark', None, _('mark files as resolved')),
5949 5949 ('u', 'unmark', None, _('mark files as unresolved')),
5950 5950 ('n', 'no-status', None, _('hide status prefix'))]
5951 5951 + mergetoolopts + walkopts + formatteropts,
5952 5952 _('[OPTION]... [FILE]...'),
5953 5953 inferrepo=True)
5954 5954 def resolve(ui, repo, *pats, **opts):
5955 5955 """redo merges or set/view the merge status of files
5956 5956
5957 5957 Merges with unresolved conflicts are often the result of
5958 5958 non-interactive merging using the ``internal:merge`` configuration
5959 5959 setting, or a command-line merge tool like ``diff3``. The resolve
5960 5960 command is used to manage the files involved in a merge, after
5961 5961 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5962 5962 working directory must have two parents). See :hg:`help
5963 5963 merge-tools` for information on configuring merge tools.
5964 5964
5965 5965 The resolve command can be used in the following ways:
5966 5966
5967 5967 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5968 5968 files, discarding any previous merge attempts. Re-merging is not
5969 5969 performed for files already marked as resolved. Use ``--all/-a``
5970 5970 to select all unresolved files. ``--tool`` can be used to specify
5971 5971 the merge tool used for the given files. It overrides the HGMERGE
5972 5972 environment variable and your configuration files. Previous file
5973 5973 contents are saved with a ``.orig`` suffix.
5974 5974
5975 5975 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5976 5976 (e.g. after having manually fixed-up the files). The default is
5977 5977 to mark all unresolved files.
5978 5978
5979 5979 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5980 5980 default is to mark all resolved files.
5981 5981
5982 5982 - :hg:`resolve -l`: list files which had or still have conflicts.
5983 5983 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5984 5984
5985 5985 .. note::
5986 5986
5987 5987 Mercurial will not let you commit files with unresolved merge
5988 5988 conflicts. You must use :hg:`resolve -m ...` before you can
5989 5989 commit after a conflicting merge.
5990 5990
5991 5991 Returns 0 on success, 1 if any files fail a resolve attempt.
5992 5992 """
5993 5993
5994 5994 all, mark, unmark, show, nostatus = \
5995 5995 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5996 5996
5997 5997 if (show and (mark or unmark)) or (mark and unmark):
5998 5998 raise error.Abort(_("too many options specified"))
5999 5999 if pats and all:
6000 6000 raise error.Abort(_("can't specify --all and patterns"))
6001 6001 if not (all or pats or show or mark or unmark):
6002 6002 raise error.Abort(_('no files or directories specified'),
6003 6003 hint=('use --all to re-merge all unresolved files'))
6004 6004
6005 6005 if show:
6006 6006 fm = ui.formatter('resolve', opts)
6007 6007 ms = mergemod.mergestate.read(repo)
6008 6008 m = scmutil.match(repo[None], pats, opts)
6009 6009 for f in ms:
6010 6010 if not m(f):
6011 6011 continue
6012 6012 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6013 6013 'd': 'driverresolved'}[ms[f]]
6014 6014 fm.startitem()
6015 6015 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6016 6016 fm.write('path', '%s\n', f, label=l)
6017 6017 fm.end()
6018 6018 return 0
6019 6019
6020 6020 with repo.wlock():
6021 6021 ms = mergemod.mergestate.read(repo)
6022 6022
6023 6023 if not (ms.active() or repo.dirstate.p2() != nullid):
6024 6024 raise error.Abort(
6025 6025 _('resolve command not applicable when not merging'))
6026 6026
6027 6027 wctx = repo[None]
6028 6028
6029 6029 if ms.mergedriver and ms.mdstate() == 'u':
6030 6030 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6031 6031 ms.commit()
6032 6032 # allow mark and unmark to go through
6033 6033 if not mark and not unmark and not proceed:
6034 6034 return 1
6035 6035
6036 6036 m = scmutil.match(wctx, pats, opts)
6037 6037 ret = 0
6038 6038 didwork = False
6039 6039 runconclude = False
6040 6040
6041 6041 tocomplete = []
6042 6042 for f in ms:
6043 6043 if not m(f):
6044 6044 continue
6045 6045
6046 6046 didwork = True
6047 6047
6048 6048 # don't let driver-resolved files be marked, and run the conclude
6049 6049 # step if asked to resolve
6050 6050 if ms[f] == "d":
6051 6051 exact = m.exact(f)
6052 6052 if mark:
6053 6053 if exact:
6054 6054 ui.warn(_('not marking %s as it is driver-resolved\n')
6055 6055 % f)
6056 6056 elif unmark:
6057 6057 if exact:
6058 6058 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6059 6059 % f)
6060 6060 else:
6061 6061 runconclude = True
6062 6062 continue
6063 6063
6064 6064 if mark:
6065 6065 ms.mark(f, "r")
6066 6066 elif unmark:
6067 6067 ms.mark(f, "u")
6068 6068 else:
6069 6069 # backup pre-resolve (merge uses .orig for its own purposes)
6070 6070 a = repo.wjoin(f)
6071 6071 try:
6072 6072 util.copyfile(a, a + ".resolve")
6073 6073 except (IOError, OSError) as inst:
6074 6074 if inst.errno != errno.ENOENT:
6075 6075 raise
6076 6076
6077 6077 try:
6078 6078 # preresolve file
6079 6079 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6080 6080 'resolve')
6081 6081 complete, r = ms.preresolve(f, wctx)
6082 6082 if not complete:
6083 6083 tocomplete.append(f)
6084 6084 elif r:
6085 6085 ret = 1
6086 6086 finally:
6087 6087 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6088 6088 ms.commit()
6089 6089
6090 6090 # replace filemerge's .orig file with our resolve file, but only
6091 6091 # for merges that are complete
6092 6092 if complete:
6093 6093 try:
6094 6094 util.rename(a + ".resolve",
6095 6095 scmutil.origpath(ui, repo, a))
6096 6096 except OSError as inst:
6097 6097 if inst.errno != errno.ENOENT:
6098 6098 raise
6099 6099
6100 6100 for f in tocomplete:
6101 6101 try:
6102 6102 # resolve file
6103 6103 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6104 6104 'resolve')
6105 6105 r = ms.resolve(f, wctx)
6106 6106 if r:
6107 6107 ret = 1
6108 6108 finally:
6109 6109 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6110 6110 ms.commit()
6111 6111
6112 6112 # replace filemerge's .orig file with our resolve file
6113 6113 a = repo.wjoin(f)
6114 6114 try:
6115 6115 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6116 6116 except OSError as inst:
6117 6117 if inst.errno != errno.ENOENT:
6118 6118 raise
6119 6119
6120 6120 ms.commit()
6121 6121 ms.recordactions()
6122 6122
6123 6123 if not didwork and pats:
6124 6124 ui.warn(_("arguments do not match paths that need resolving\n"))
6125 6125 elif ms.mergedriver and ms.mdstate() != 's':
6126 6126 # run conclude step when either a driver-resolved file is requested
6127 6127 # or there are no driver-resolved files
6128 6128 # we can't use 'ret' to determine whether any files are unresolved
6129 6129 # because we might not have tried to resolve some
6130 6130 if ((runconclude or not list(ms.driverresolved()))
6131 6131 and not list(ms.unresolved())):
6132 6132 proceed = mergemod.driverconclude(repo, ms, wctx)
6133 6133 ms.commit()
6134 6134 if not proceed:
6135 6135 return 1
6136 6136
6137 6137 # Nudge users into finishing an unfinished operation
6138 6138 unresolvedf = list(ms.unresolved())
6139 6139 driverresolvedf = list(ms.driverresolved())
6140 6140 if not unresolvedf and not driverresolvedf:
6141 6141 ui.status(_('(no more unresolved files)\n'))
6142 6142 cmdutil.checkafterresolved(repo)
6143 6143 elif not unresolvedf:
6144 6144 ui.status(_('(no more unresolved files -- '
6145 6145 'run "hg resolve --all" to conclude)\n'))
6146 6146
6147 6147 return ret
6148 6148
6149 6149 @command('revert',
6150 6150 [('a', 'all', None, _('revert all changes when no arguments given')),
6151 6151 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6152 6152 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6153 6153 ('C', 'no-backup', None, _('do not save backup copies of files')),
6154 6154 ('i', 'interactive', None,
6155 6155 _('interactively select the changes (EXPERIMENTAL)')),
6156 6156 ] + walkopts + dryrunopts,
6157 6157 _('[OPTION]... [-r REV] [NAME]...'))
6158 6158 def revert(ui, repo, *pats, **opts):
6159 6159 """restore files to their checkout state
6160 6160
6161 6161 .. note::
6162 6162
6163 6163 To check out earlier revisions, you should use :hg:`update REV`.
6164 6164 To cancel an uncommitted merge (and lose your changes),
6165 6165 use :hg:`update --clean .`.
6166 6166
6167 6167 With no revision specified, revert the specified files or directories
6168 6168 to the contents they had in the parent of the working directory.
6169 6169 This restores the contents of files to an unmodified
6170 6170 state and unschedules adds, removes, copies, and renames. If the
6171 6171 working directory has two parents, you must explicitly specify a
6172 6172 revision.
6173 6173
6174 6174 Using the -r/--rev or -d/--date options, revert the given files or
6175 6175 directories to their states as of a specific revision. Because
6176 6176 revert does not change the working directory parents, this will
6177 6177 cause these files to appear modified. This can be helpful to "back
6178 6178 out" some or all of an earlier change. See :hg:`backout` for a
6179 6179 related method.
6180 6180
6181 6181 Modified files are saved with a .orig suffix before reverting.
6182 6182 To disable these backups, use --no-backup.
6183 6183
6184 6184 See :hg:`help dates` for a list of formats valid for -d/--date.
6185 6185
6186 6186 See :hg:`help backout` for a way to reverse the effect of an
6187 6187 earlier changeset.
6188 6188
6189 6189 Returns 0 on success.
6190 6190 """
6191 6191
6192 6192 if opts.get("date"):
6193 6193 if opts.get("rev"):
6194 6194 raise error.Abort(_("you can't specify a revision and a date"))
6195 6195 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6196 6196
6197 6197 parent, p2 = repo.dirstate.parents()
6198 6198 if not opts.get('rev') and p2 != nullid:
6199 6199 # revert after merge is a trap for new users (issue2915)
6200 6200 raise error.Abort(_('uncommitted merge with no revision specified'),
6201 6201 hint=_('use "hg update" or see "hg help revert"'))
6202 6202
6203 6203 ctx = scmutil.revsingle(repo, opts.get('rev'))
6204 6204
6205 6205 if (not (pats or opts.get('include') or opts.get('exclude') or
6206 6206 opts.get('all') or opts.get('interactive'))):
6207 6207 msg = _("no files or directories specified")
6208 6208 if p2 != nullid:
6209 6209 hint = _("uncommitted merge, use --all to discard all changes,"
6210 6210 " or 'hg update -C .' to abort the merge")
6211 6211 raise error.Abort(msg, hint=hint)
6212 6212 dirty = any(repo.status())
6213 6213 node = ctx.node()
6214 6214 if node != parent:
6215 6215 if dirty:
6216 6216 hint = _("uncommitted changes, use --all to discard all"
6217 6217 " changes, or 'hg update %s' to update") % ctx.rev()
6218 6218 else:
6219 6219 hint = _("use --all to revert all files,"
6220 6220 " or 'hg update %s' to update") % ctx.rev()
6221 6221 elif dirty:
6222 6222 hint = _("uncommitted changes, use --all to discard all changes")
6223 6223 else:
6224 6224 hint = _("use --all to revert all files")
6225 6225 raise error.Abort(msg, hint=hint)
6226 6226
6227 6227 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6228 6228
6229 6229 @command('rollback', dryrunopts +
6230 6230 [('f', 'force', False, _('ignore safety measures'))])
6231 6231 def rollback(ui, repo, **opts):
6232 6232 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6233 6233
6234 6234 Please use :hg:`commit --amend` instead of rollback to correct
6235 6235 mistakes in the last commit.
6236 6236
6237 6237 This command should be used with care. There is only one level of
6238 6238 rollback, and there is no way to undo a rollback. It will also
6239 6239 restore the dirstate at the time of the last transaction, losing
6240 6240 any dirstate changes since that time. This command does not alter
6241 6241 the working directory.
6242 6242
6243 6243 Transactions are used to encapsulate the effects of all commands
6244 6244 that create new changesets or propagate existing changesets into a
6245 6245 repository.
6246 6246
6247 6247 .. container:: verbose
6248 6248
6249 6249 For example, the following commands are transactional, and their
6250 6250 effects can be rolled back:
6251 6251
6252 6252 - commit
6253 6253 - import
6254 6254 - pull
6255 6255 - push (with this repository as the destination)
6256 6256 - unbundle
6257 6257
6258 6258 To avoid permanent data loss, rollback will refuse to rollback a
6259 6259 commit transaction if it isn't checked out. Use --force to
6260 6260 override this protection.
6261 6261
6262 6262 This command is not intended for use on public repositories. Once
6263 6263 changes are visible for pull by other users, rolling a transaction
6264 6264 back locally is ineffective (someone else may already have pulled
6265 6265 the changes). Furthermore, a race is possible with readers of the
6266 6266 repository; for example an in-progress pull from the repository
6267 6267 may fail if a rollback is performed.
6268 6268
6269 6269 Returns 0 on success, 1 if no rollback data is available.
6270 6270 """
6271 6271 return repo.rollback(dryrun=opts.get('dry_run'),
6272 6272 force=opts.get('force'))
6273 6273
6274 6274 @command('root', [])
6275 6275 def root(ui, repo):
6276 6276 """print the root (top) of the current working directory
6277 6277
6278 6278 Print the root directory of the current repository.
6279 6279
6280 6280 Returns 0 on success.
6281 6281 """
6282 6282 ui.write(repo.root + "\n")
6283 6283
6284 6284 @command('^serve',
6285 6285 [('A', 'accesslog', '', _('name of access log file to write to'),
6286 6286 _('FILE')),
6287 6287 ('d', 'daemon', None, _('run server in background')),
6288 6288 ('', 'daemon-postexec', '', _('used internally by daemon mode')),
6289 6289 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6290 6290 # use string type, then we can check if something was passed
6291 6291 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6292 6292 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6293 6293 _('ADDR')),
6294 6294 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6295 6295 _('PREFIX')),
6296 6296 ('n', 'name', '',
6297 6297 _('name to show in web pages (default: working directory)'), _('NAME')),
6298 6298 ('', 'web-conf', '',
6299 6299 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6300 6300 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6301 6301 _('FILE')),
6302 6302 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6303 6303 ('', 'stdio', None, _('for remote clients')),
6304 6304 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6305 6305 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6306 6306 ('', 'style', '', _('template style to use'), _('STYLE')),
6307 6307 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6308 6308 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6309 6309 _('[OPTION]...'),
6310 6310 optionalrepo=True)
6311 6311 def serve(ui, repo, **opts):
6312 6312 """start stand-alone webserver
6313 6313
6314 6314 Start a local HTTP repository browser and pull server. You can use
6315 6315 this for ad-hoc sharing and browsing of repositories. It is
6316 6316 recommended to use a real web server to serve a repository for
6317 6317 longer periods of time.
6318 6318
6319 6319 Please note that the server does not implement access control.
6320 6320 This means that, by default, anybody can read from the server and
6321 6321 nobody can write to it by default. Set the ``web.allow_push``
6322 6322 option to ``*`` to allow everybody to push to the server. You
6323 6323 should use a real web server if you need to authenticate users.
6324 6324
6325 6325 By default, the server logs accesses to stdout and errors to
6326 6326 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6327 6327 files.
6328 6328
6329 6329 To have the server choose a free port number to listen on, specify
6330 6330 a port number of 0; in this case, the server will print the port
6331 6331 number it uses.
6332 6332
6333 6333 Returns 0 on success.
6334 6334 """
6335 6335
6336 6336 if opts["stdio"] and opts["cmdserver"]:
6337 6337 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6338 6338
6339 6339 if opts["stdio"]:
6340 6340 if repo is None:
6341 6341 raise error.RepoError(_("there is no Mercurial repository here"
6342 6342 " (.hg not found)"))
6343 6343 s = sshserver.sshserver(ui, repo)
6344 6344 s.serve_forever()
6345 6345
6346 6346 if opts["cmdserver"]:
6347 6347 service = commandserver.createservice(ui, repo, opts)
6348 6348 else:
6349 6349 service = hgweb.createservice(ui, repo, opts)
6350 6350 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6351 6351
6352 6352 @command('^status|st',
6353 6353 [('A', 'all', None, _('show status of all files')),
6354 6354 ('m', 'modified', None, _('show only modified files')),
6355 6355 ('a', 'added', None, _('show only added files')),
6356 6356 ('r', 'removed', None, _('show only removed files')),
6357 6357 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6358 6358 ('c', 'clean', None, _('show only files without changes')),
6359 6359 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6360 6360 ('i', 'ignored', None, _('show only ignored files')),
6361 6361 ('n', 'no-status', None, _('hide status prefix')),
6362 6362 ('C', 'copies', None, _('show source of copied files')),
6363 6363 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6364 6364 ('', 'rev', [], _('show difference from revision'), _('REV')),
6365 6365 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6366 6366 ] + walkopts + subrepoopts + formatteropts,
6367 6367 _('[OPTION]... [FILE]...'),
6368 6368 inferrepo=True)
6369 6369 def status(ui, repo, *pats, **opts):
6370 6370 """show changed files in the working directory
6371 6371
6372 6372 Show status of files in the repository. If names are given, only
6373 6373 files that match are shown. Files that are clean or ignored or
6374 6374 the source of a copy/move operation, are not listed unless
6375 6375 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6376 6376 Unless options described with "show only ..." are given, the
6377 6377 options -mardu are used.
6378 6378
6379 6379 Option -q/--quiet hides untracked (unknown and ignored) files
6380 6380 unless explicitly requested with -u/--unknown or -i/--ignored.
6381 6381
6382 6382 .. note::
6383 6383
6384 6384 :hg:`status` may appear to disagree with diff if permissions have
6385 6385 changed or a merge has occurred. The standard diff format does
6386 6386 not report permission changes and diff only reports changes
6387 6387 relative to one merge parent.
6388 6388
6389 6389 If one revision is given, it is used as the base revision.
6390 6390 If two revisions are given, the differences between them are
6391 6391 shown. The --change option can also be used as a shortcut to list
6392 6392 the changed files of a revision from its first parent.
6393 6393
6394 6394 The codes used to show the status of files are::
6395 6395
6396 6396 M = modified
6397 6397 A = added
6398 6398 R = removed
6399 6399 C = clean
6400 6400 ! = missing (deleted by non-hg command, but still tracked)
6401 6401 ? = not tracked
6402 6402 I = ignored
6403 6403 = origin of the previous file (with --copies)
6404 6404
6405 6405 .. container:: verbose
6406 6406
6407 6407 Examples:
6408 6408
6409 6409 - show changes in the working directory relative to a
6410 6410 changeset::
6411 6411
6412 6412 hg status --rev 9353
6413 6413
6414 6414 - show changes in the working directory relative to the
6415 6415 current directory (see :hg:`help patterns` for more information)::
6416 6416
6417 6417 hg status re:
6418 6418
6419 6419 - show all changes including copies in an existing changeset::
6420 6420
6421 6421 hg status --copies --change 9353
6422 6422
6423 6423 - get a NUL separated list of added files, suitable for xargs::
6424 6424
6425 6425 hg status -an0
6426 6426
6427 6427 Returns 0 on success.
6428 6428 """
6429 6429
6430 6430 revs = opts.get('rev')
6431 6431 change = opts.get('change')
6432 6432
6433 6433 if revs and change:
6434 6434 msg = _('cannot specify --rev and --change at the same time')
6435 6435 raise error.Abort(msg)
6436 6436 elif change:
6437 6437 node2 = scmutil.revsingle(repo, change, None).node()
6438 6438 node1 = repo[node2].p1().node()
6439 6439 else:
6440 6440 node1, node2 = scmutil.revpair(repo, revs)
6441 6441
6442 6442 if pats:
6443 6443 cwd = repo.getcwd()
6444 6444 else:
6445 6445 cwd = ''
6446 6446
6447 6447 if opts.get('print0'):
6448 6448 end = '\0'
6449 6449 else:
6450 6450 end = '\n'
6451 6451 copy = {}
6452 6452 states = 'modified added removed deleted unknown ignored clean'.split()
6453 6453 show = [k for k in states if opts.get(k)]
6454 6454 if opts.get('all'):
6455 6455 show += ui.quiet and (states[:4] + ['clean']) or states
6456 6456 if not show:
6457 6457 if ui.quiet:
6458 6458 show = states[:4]
6459 6459 else:
6460 6460 show = states[:5]
6461 6461
6462 6462 m = scmutil.match(repo[node2], pats, opts)
6463 6463 stat = repo.status(node1, node2, m,
6464 6464 'ignored' in show, 'clean' in show, 'unknown' in show,
6465 6465 opts.get('subrepos'))
6466 6466 changestates = zip(states, 'MAR!?IC', stat)
6467 6467
6468 6468 if (opts.get('all') or opts.get('copies')
6469 6469 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6470 6470 copy = copies.pathcopies(repo[node1], repo[node2], m)
6471 6471
6472 6472 fm = ui.formatter('status', opts)
6473 6473 fmt = '%s' + end
6474 6474 showchar = not opts.get('no_status')
6475 6475
6476 6476 for state, char, files in changestates:
6477 6477 if state in show:
6478 6478 label = 'status.' + state
6479 6479 for f in files:
6480 6480 fm.startitem()
6481 6481 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6482 6482 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6483 6483 if f in copy:
6484 6484 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6485 6485 label='status.copied')
6486 6486 fm.end()
6487 6487
6488 6488 @command('^summary|sum',
6489 6489 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6490 6490 def summary(ui, repo, **opts):
6491 6491 """summarize working directory state
6492 6492
6493 6493 This generates a brief summary of the working directory state,
6494 6494 including parents, branch, commit status, phase and available updates.
6495 6495
6496 6496 With the --remote option, this will check the default paths for
6497 6497 incoming and outgoing changes. This can be time-consuming.
6498 6498
6499 6499 Returns 0 on success.
6500 6500 """
6501 6501
6502 6502 ctx = repo[None]
6503 6503 parents = ctx.parents()
6504 6504 pnode = parents[0].node()
6505 6505 marks = []
6506 6506
6507 6507 for p in parents:
6508 6508 # label with log.changeset (instead of log.parent) since this
6509 6509 # shows a working directory parent *changeset*:
6510 6510 # i18n: column positioning for "hg summary"
6511 6511 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6512 6512 label='log.changeset changeset.%s' % p.phasestr())
6513 6513 ui.write(' '.join(p.tags()), label='log.tag')
6514 6514 if p.bookmarks():
6515 6515 marks.extend(p.bookmarks())
6516 6516 if p.rev() == -1:
6517 6517 if not len(repo):
6518 6518 ui.write(_(' (empty repository)'))
6519 6519 else:
6520 6520 ui.write(_(' (no revision checked out)'))
6521 6521 ui.write('\n')
6522 6522 if p.description():
6523 6523 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6524 6524 label='log.summary')
6525 6525
6526 6526 branch = ctx.branch()
6527 6527 bheads = repo.branchheads(branch)
6528 6528 # i18n: column positioning for "hg summary"
6529 6529 m = _('branch: %s\n') % branch
6530 6530 if branch != 'default':
6531 6531 ui.write(m, label='log.branch')
6532 6532 else:
6533 6533 ui.status(m, label='log.branch')
6534 6534
6535 6535 if marks:
6536 6536 active = repo._activebookmark
6537 6537 # i18n: column positioning for "hg summary"
6538 6538 ui.write(_('bookmarks:'), label='log.bookmark')
6539 6539 if active is not None:
6540 6540 if active in marks:
6541 6541 ui.write(' *' + active, label=activebookmarklabel)
6542 6542 marks.remove(active)
6543 6543 else:
6544 6544 ui.write(' [%s]' % active, label=activebookmarklabel)
6545 6545 for m in marks:
6546 6546 ui.write(' ' + m, label='log.bookmark')
6547 6547 ui.write('\n', label='log.bookmark')
6548 6548
6549 6549 status = repo.status(unknown=True)
6550 6550
6551 6551 c = repo.dirstate.copies()
6552 6552 copied, renamed = [], []
6553 6553 for d, s in c.iteritems():
6554 6554 if s in status.removed:
6555 6555 status.removed.remove(s)
6556 6556 renamed.append(d)
6557 6557 else:
6558 6558 copied.append(d)
6559 6559 if d in status.added:
6560 6560 status.added.remove(d)
6561 6561
6562 6562 try:
6563 6563 ms = mergemod.mergestate.read(repo)
6564 6564 except error.UnsupportedMergeRecords as e:
6565 6565 s = ' '.join(e.recordtypes)
6566 6566 ui.warn(
6567 6567 _('warning: merge state has unsupported record types: %s\n') % s)
6568 6568 unresolved = 0
6569 6569 else:
6570 6570 unresolved = [f for f in ms if ms[f] == 'u']
6571 6571
6572 6572 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6573 6573
6574 6574 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6575 6575 (ui.label(_('%d added'), 'status.added'), status.added),
6576 6576 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6577 6577 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6578 6578 (ui.label(_('%d copied'), 'status.copied'), copied),
6579 6579 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6580 6580 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6581 6581 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6582 6582 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6583 6583 t = []
6584 6584 for l, s in labels:
6585 6585 if s:
6586 6586 t.append(l % len(s))
6587 6587
6588 6588 t = ', '.join(t)
6589 6589 cleanworkdir = False
6590 6590
6591 6591 if repo.vfs.exists('graftstate'):
6592 6592 t += _(' (graft in progress)')
6593 6593 if repo.vfs.exists('updatestate'):
6594 6594 t += _(' (interrupted update)')
6595 6595 elif len(parents) > 1:
6596 6596 t += _(' (merge)')
6597 6597 elif branch != parents[0].branch():
6598 6598 t += _(' (new branch)')
6599 6599 elif (parents[0].closesbranch() and
6600 6600 pnode in repo.branchheads(branch, closed=True)):
6601 6601 t += _(' (head closed)')
6602 6602 elif not (status.modified or status.added or status.removed or renamed or
6603 6603 copied or subs):
6604 6604 t += _(' (clean)')
6605 6605 cleanworkdir = True
6606 6606 elif pnode not in bheads:
6607 6607 t += _(' (new branch head)')
6608 6608
6609 6609 if parents:
6610 6610 pendingphase = max(p.phase() for p in parents)
6611 6611 else:
6612 6612 pendingphase = phases.public
6613 6613
6614 6614 if pendingphase > phases.newcommitphase(ui):
6615 6615 t += ' (%s)' % phases.phasenames[pendingphase]
6616 6616
6617 6617 if cleanworkdir:
6618 6618 # i18n: column positioning for "hg summary"
6619 6619 ui.status(_('commit: %s\n') % t.strip())
6620 6620 else:
6621 6621 # i18n: column positioning for "hg summary"
6622 6622 ui.write(_('commit: %s\n') % t.strip())
6623 6623
6624 6624 # all ancestors of branch heads - all ancestors of parent = new csets
6625 6625 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6626 6626 bheads))
6627 6627
6628 6628 if new == 0:
6629 6629 # i18n: column positioning for "hg summary"
6630 6630 ui.status(_('update: (current)\n'))
6631 6631 elif pnode not in bheads:
6632 6632 # i18n: column positioning for "hg summary"
6633 6633 ui.write(_('update: %d new changesets (update)\n') % new)
6634 6634 else:
6635 6635 # i18n: column positioning for "hg summary"
6636 6636 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6637 6637 (new, len(bheads)))
6638 6638
6639 6639 t = []
6640 6640 draft = len(repo.revs('draft()'))
6641 6641 if draft:
6642 6642 t.append(_('%d draft') % draft)
6643 6643 secret = len(repo.revs('secret()'))
6644 6644 if secret:
6645 6645 t.append(_('%d secret') % secret)
6646 6646
6647 6647 if draft or secret:
6648 6648 ui.status(_('phases: %s\n') % ', '.join(t))
6649 6649
6650 6650 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6651 6651 for trouble in ("unstable", "divergent", "bumped"):
6652 6652 numtrouble = len(repo.revs(trouble + "()"))
6653 6653 # We write all the possibilities to ease translation
6654 6654 troublemsg = {
6655 6655 "unstable": _("unstable: %d changesets"),
6656 6656 "divergent": _("divergent: %d changesets"),
6657 6657 "bumped": _("bumped: %d changesets"),
6658 6658 }
6659 6659 if numtrouble > 0:
6660 6660 ui.status(troublemsg[trouble] % numtrouble + "\n")
6661 6661
6662 6662 cmdutil.summaryhooks(ui, repo)
6663 6663
6664 6664 if opts.get('remote'):
6665 6665 needsincoming, needsoutgoing = True, True
6666 6666 else:
6667 6667 needsincoming, needsoutgoing = False, False
6668 6668 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6669 6669 if i:
6670 6670 needsincoming = True
6671 6671 if o:
6672 6672 needsoutgoing = True
6673 6673 if not needsincoming and not needsoutgoing:
6674 6674 return
6675 6675
6676 6676 def getincoming():
6677 6677 source, branches = hg.parseurl(ui.expandpath('default'))
6678 6678 sbranch = branches[0]
6679 6679 try:
6680 6680 other = hg.peer(repo, {}, source)
6681 6681 except error.RepoError:
6682 6682 if opts.get('remote'):
6683 6683 raise
6684 6684 return source, sbranch, None, None, None
6685 6685 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6686 6686 if revs:
6687 6687 revs = [other.lookup(rev) for rev in revs]
6688 6688 ui.debug('comparing with %s\n' % util.hidepassword(source))
6689 6689 repo.ui.pushbuffer()
6690 6690 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6691 6691 repo.ui.popbuffer()
6692 6692 return source, sbranch, other, commoninc, commoninc[1]
6693 6693
6694 6694 if needsincoming:
6695 6695 source, sbranch, sother, commoninc, incoming = getincoming()
6696 6696 else:
6697 6697 source = sbranch = sother = commoninc = incoming = None
6698 6698
6699 6699 def getoutgoing():
6700 6700 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6701 6701 dbranch = branches[0]
6702 6702 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6703 6703 if source != dest:
6704 6704 try:
6705 6705 dother = hg.peer(repo, {}, dest)
6706 6706 except error.RepoError:
6707 6707 if opts.get('remote'):
6708 6708 raise
6709 6709 return dest, dbranch, None, None
6710 6710 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6711 6711 elif sother is None:
6712 6712 # there is no explicit destination peer, but source one is invalid
6713 6713 return dest, dbranch, None, None
6714 6714 else:
6715 6715 dother = sother
6716 6716 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6717 6717 common = None
6718 6718 else:
6719 6719 common = commoninc
6720 6720 if revs:
6721 6721 revs = [repo.lookup(rev) for rev in revs]
6722 6722 repo.ui.pushbuffer()
6723 6723 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6724 6724 commoninc=common)
6725 6725 repo.ui.popbuffer()
6726 6726 return dest, dbranch, dother, outgoing
6727 6727
6728 6728 if needsoutgoing:
6729 6729 dest, dbranch, dother, outgoing = getoutgoing()
6730 6730 else:
6731 6731 dest = dbranch = dother = outgoing = None
6732 6732
6733 6733 if opts.get('remote'):
6734 6734 t = []
6735 6735 if incoming:
6736 6736 t.append(_('1 or more incoming'))
6737 6737 o = outgoing.missing
6738 6738 if o:
6739 6739 t.append(_('%d outgoing') % len(o))
6740 6740 other = dother or sother
6741 6741 if 'bookmarks' in other.listkeys('namespaces'):
6742 6742 counts = bookmarks.summary(repo, other)
6743 6743 if counts[0] > 0:
6744 6744 t.append(_('%d incoming bookmarks') % counts[0])
6745 6745 if counts[1] > 0:
6746 6746 t.append(_('%d outgoing bookmarks') % counts[1])
6747 6747
6748 6748 if t:
6749 6749 # i18n: column positioning for "hg summary"
6750 6750 ui.write(_('remote: %s\n') % (', '.join(t)))
6751 6751 else:
6752 6752 # i18n: column positioning for "hg summary"
6753 6753 ui.status(_('remote: (synced)\n'))
6754 6754
6755 6755 cmdutil.summaryremotehooks(ui, repo, opts,
6756 6756 ((source, sbranch, sother, commoninc),
6757 6757 (dest, dbranch, dother, outgoing)))
6758 6758
6759 6759 @command('tag',
6760 6760 [('f', 'force', None, _('force tag')),
6761 6761 ('l', 'local', None, _('make the tag local')),
6762 6762 ('r', 'rev', '', _('revision to tag'), _('REV')),
6763 6763 ('', 'remove', None, _('remove a tag')),
6764 6764 # -l/--local is already there, commitopts cannot be used
6765 6765 ('e', 'edit', None, _('invoke editor on commit messages')),
6766 6766 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6767 6767 ] + commitopts2,
6768 6768 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6769 6769 def tag(ui, repo, name1, *names, **opts):
6770 6770 """add one or more tags for the current or given revision
6771 6771
6772 6772 Name a particular revision using <name>.
6773 6773
6774 6774 Tags are used to name particular revisions of the repository and are
6775 6775 very useful to compare different revisions, to go back to significant
6776 6776 earlier versions or to mark branch points as releases, etc. Changing
6777 6777 an existing tag is normally disallowed; use -f/--force to override.
6778 6778
6779 6779 If no revision is given, the parent of the working directory is
6780 6780 used.
6781 6781
6782 6782 To facilitate version control, distribution, and merging of tags,
6783 6783 they are stored as a file named ".hgtags" which is managed similarly
6784 6784 to other project files and can be hand-edited if necessary. This
6785 6785 also means that tagging creates a new commit. The file
6786 6786 ".hg/localtags" is used for local tags (not shared among
6787 6787 repositories).
6788 6788
6789 6789 Tag commits are usually made at the head of a branch. If the parent
6790 6790 of the working directory is not a branch head, :hg:`tag` aborts; use
6791 6791 -f/--force to force the tag commit to be based on a non-head
6792 6792 changeset.
6793 6793
6794 6794 See :hg:`help dates` for a list of formats valid for -d/--date.
6795 6795
6796 6796 Since tag names have priority over branch names during revision
6797 6797 lookup, using an existing branch name as a tag name is discouraged.
6798 6798
6799 6799 Returns 0 on success.
6800 6800 """
6801 6801 wlock = lock = None
6802 6802 try:
6803 6803 wlock = repo.wlock()
6804 6804 lock = repo.lock()
6805 6805 rev_ = "."
6806 6806 names = [t.strip() for t in (name1,) + names]
6807 6807 if len(names) != len(set(names)):
6808 6808 raise error.Abort(_('tag names must be unique'))
6809 6809 for n in names:
6810 6810 scmutil.checknewlabel(repo, n, 'tag')
6811 6811 if not n:
6812 6812 raise error.Abort(_('tag names cannot consist entirely of '
6813 6813 'whitespace'))
6814 6814 if opts.get('rev') and opts.get('remove'):
6815 6815 raise error.Abort(_("--rev and --remove are incompatible"))
6816 6816 if opts.get('rev'):
6817 6817 rev_ = opts['rev']
6818 6818 message = opts.get('message')
6819 6819 if opts.get('remove'):
6820 6820 if opts.get('local'):
6821 6821 expectedtype = 'local'
6822 6822 else:
6823 6823 expectedtype = 'global'
6824 6824
6825 6825 for n in names:
6826 6826 if not repo.tagtype(n):
6827 6827 raise error.Abort(_("tag '%s' does not exist") % n)
6828 6828 if repo.tagtype(n) != expectedtype:
6829 6829 if expectedtype == 'global':
6830 6830 raise error.Abort(_("tag '%s' is not a global tag") % n)
6831 6831 else:
6832 6832 raise error.Abort(_("tag '%s' is not a local tag") % n)
6833 6833 rev_ = 'null'
6834 6834 if not message:
6835 6835 # we don't translate commit messages
6836 6836 message = 'Removed tag %s' % ', '.join(names)
6837 6837 elif not opts.get('force'):
6838 6838 for n in names:
6839 6839 if n in repo.tags():
6840 6840 raise error.Abort(_("tag '%s' already exists "
6841 6841 "(use -f to force)") % n)
6842 6842 if not opts.get('local'):
6843 6843 p1, p2 = repo.dirstate.parents()
6844 6844 if p2 != nullid:
6845 6845 raise error.Abort(_('uncommitted merge'))
6846 6846 bheads = repo.branchheads()
6847 6847 if not opts.get('force') and bheads and p1 not in bheads:
6848 6848 raise error.Abort(_('not at a branch head (use -f to force)'))
6849 6849 r = scmutil.revsingle(repo, rev_).node()
6850 6850
6851 6851 if not message:
6852 6852 # we don't translate commit messages
6853 6853 message = ('Added tag %s for changeset %s' %
6854 6854 (', '.join(names), short(r)))
6855 6855
6856 6856 date = opts.get('date')
6857 6857 if date:
6858 6858 date = util.parsedate(date)
6859 6859
6860 6860 if opts.get('remove'):
6861 6861 editform = 'tag.remove'
6862 6862 else:
6863 6863 editform = 'tag.add'
6864 6864 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6865 6865
6866 6866 # don't allow tagging the null rev
6867 6867 if (not opts.get('remove') and
6868 6868 scmutil.revsingle(repo, rev_).rev() == nullrev):
6869 6869 raise error.Abort(_("cannot tag null revision"))
6870 6870
6871 6871 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6872 6872 editor=editor)
6873 6873 finally:
6874 6874 release(lock, wlock)
6875 6875
6876 6876 @command('tags', formatteropts, '')
6877 6877 def tags(ui, repo, **opts):
6878 6878 """list repository tags
6879 6879
6880 6880 This lists both regular and local tags. When the -v/--verbose
6881 6881 switch is used, a third column "local" is printed for local tags.
6882 6882 When the -q/--quiet switch is used, only the tag name is printed.
6883 6883
6884 6884 Returns 0 on success.
6885 6885 """
6886 6886
6887 6887 fm = ui.formatter('tags', opts)
6888 6888 hexfunc = fm.hexfunc
6889 6889 tagtype = ""
6890 6890
6891 6891 for t, n in reversed(repo.tagslist()):
6892 6892 hn = hexfunc(n)
6893 6893 label = 'tags.normal'
6894 6894 tagtype = ''
6895 6895 if repo.tagtype(t) == 'local':
6896 6896 label = 'tags.local'
6897 6897 tagtype = 'local'
6898 6898
6899 6899 fm.startitem()
6900 6900 fm.write('tag', '%s', t, label=label)
6901 6901 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6902 6902 fm.condwrite(not ui.quiet, 'rev node', fmt,
6903 6903 repo.changelog.rev(n), hn, label=label)
6904 6904 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6905 6905 tagtype, label=label)
6906 6906 fm.plain('\n')
6907 6907 fm.end()
6908 6908
6909 6909 @command('tip',
6910 6910 [('p', 'patch', None, _('show patch')),
6911 6911 ('g', 'git', None, _('use git extended diff format')),
6912 6912 ] + templateopts,
6913 6913 _('[-p] [-g]'))
6914 6914 def tip(ui, repo, **opts):
6915 6915 """show the tip revision (DEPRECATED)
6916 6916
6917 6917 The tip revision (usually just called the tip) is the changeset
6918 6918 most recently added to the repository (and therefore the most
6919 6919 recently changed head).
6920 6920
6921 6921 If you have just made a commit, that commit will be the tip. If
6922 6922 you have just pulled changes from another repository, the tip of
6923 6923 that repository becomes the current tip. The "tip" tag is special
6924 6924 and cannot be renamed or assigned to a different changeset.
6925 6925
6926 6926 This command is deprecated, please use :hg:`heads` instead.
6927 6927
6928 6928 Returns 0 on success.
6929 6929 """
6930 6930 displayer = cmdutil.show_changeset(ui, repo, opts)
6931 6931 displayer.show(repo['tip'])
6932 6932 displayer.close()
6933 6933
6934 6934 @command('unbundle',
6935 6935 [('u', 'update', None,
6936 6936 _('update to new branch head if changesets were unbundled'))],
6937 6937 _('[-u] FILE...'))
6938 6938 def unbundle(ui, repo, fname1, *fnames, **opts):
6939 6939 """apply one or more changegroup files
6940 6940
6941 6941 Apply one or more compressed changegroup files generated by the
6942 6942 bundle command.
6943 6943
6944 6944 Returns 0 on success, 1 if an update has unresolved files.
6945 6945 """
6946 6946 fnames = (fname1,) + fnames
6947 6947
6948 6948 with repo.lock():
6949 6949 for fname in fnames:
6950 6950 f = hg.openpath(ui, fname)
6951 6951 gen = exchange.readbundle(ui, f, fname)
6952 6952 if isinstance(gen, bundle2.unbundle20):
6953 6953 tr = repo.transaction('unbundle')
6954 6954 try:
6955 6955 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6956 6956 url='bundle:' + fname)
6957 6957 tr.close()
6958 6958 except error.BundleUnknownFeatureError as exc:
6959 6959 raise error.Abort(_('%s: unknown bundle feature, %s')
6960 6960 % (fname, exc),
6961 6961 hint=_("see https://mercurial-scm.org/"
6962 6962 "wiki/BundleFeature for more "
6963 6963 "information"))
6964 6964 finally:
6965 6965 if tr:
6966 6966 tr.release()
6967 6967 changes = [r.get('return', 0)
6968 6968 for r in op.records['changegroup']]
6969 6969 modheads = changegroup.combineresults(changes)
6970 6970 elif isinstance(gen, streamclone.streamcloneapplier):
6971 6971 raise error.Abort(
6972 6972 _('packed bundles cannot be applied with '
6973 6973 '"hg unbundle"'),
6974 6974 hint=_('use "hg debugapplystreamclonebundle"'))
6975 6975 else:
6976 6976 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6977 6977
6978 6978 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6979 6979
6980 6980 @command('^update|up|checkout|co',
6981 6981 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6982 6982 ('c', 'check', None,
6983 6983 _('update across branches if no uncommitted changes')),
6984 6984 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6985 6985 ('r', 'rev', '', _('revision'), _('REV'))
6986 6986 ] + mergetoolopts,
6987 6987 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6988 6988 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6989 6989 tool=None):
6990 6990 """update working directory (or switch revisions)
6991 6991
6992 6992 Update the repository's working directory to the specified
6993 6993 changeset. If no changeset is specified, update to the tip of the
6994 6994 current named branch and move the active bookmark (see :hg:`help
6995 6995 bookmarks`).
6996 6996
6997 6997 Update sets the working directory's parent revision to the specified
6998 6998 changeset (see :hg:`help parents`).
6999 6999
7000 7000 If the changeset is not a descendant or ancestor of the working
7001 7001 directory's parent, the update is aborted. With the -c/--check
7002 7002 option, the working directory is checked for uncommitted changes; if
7003 7003 none are found, the working directory is updated to the specified
7004 7004 changeset.
7005 7005
7006 7006 .. container:: verbose
7007 7007
7008 7008 The following rules apply when the working directory contains
7009 7009 uncommitted changes:
7010 7010
7011 7011 1. If neither -c/--check nor -C/--clean is specified, and if
7012 7012 the requested changeset is an ancestor or descendant of
7013 7013 the working directory's parent, the uncommitted changes
7014 7014 are merged into the requested changeset and the merged
7015 7015 result is left uncommitted. If the requested changeset is
7016 7016 not an ancestor or descendant (that is, it is on another
7017 7017 branch), the update is aborted and the uncommitted changes
7018 7018 are preserved.
7019 7019
7020 7020 2. With the -c/--check option, the update is aborted and the
7021 7021 uncommitted changes are preserved.
7022 7022
7023 7023 3. With the -C/--clean option, uncommitted changes are discarded and
7024 7024 the working directory is updated to the requested changeset.
7025 7025
7026 7026 To cancel an uncommitted merge (and lose your changes), use
7027 7027 :hg:`update --clean .`.
7028 7028
7029 7029 Use null as the changeset to remove the working directory (like
7030 7030 :hg:`clone -U`).
7031 7031
7032 7032 If you want to revert just one file to an older revision, use
7033 7033 :hg:`revert [-r REV] NAME`.
7034 7034
7035 7035 See :hg:`help dates` for a list of formats valid for -d/--date.
7036 7036
7037 7037 Returns 0 on success, 1 if there are unresolved files.
7038 7038 """
7039 7039 movemarkfrom = None
7040 7040 if rev and node:
7041 7041 raise error.Abort(_("please specify just one revision"))
7042 7042
7043 7043 if rev is None or rev == '':
7044 7044 rev = node
7045 7045
7046 7046 if date and rev is not None:
7047 7047 raise error.Abort(_("you can't specify a revision and a date"))
7048 7048
7049 7049 if check and clean:
7050 7050 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7051 7051
7052 7052 warndest = False
7053 7053
7054 7054 with repo.wlock():
7055 7055 cmdutil.clearunfinished(repo)
7056 7056
7057 7057 if date:
7058 7058 rev = cmdutil.finddate(ui, repo, date)
7059 7059
7060 7060 # if we defined a bookmark, we have to remember the original name
7061 7061 brev = rev
7062 7062 rev = scmutil.revsingle(repo, rev, rev).rev()
7063 7063
7064 7064 if check:
7065 7065 cmdutil.bailifchanged(repo, merge=False)
7066 7066 if rev is None:
7067 7067 updata = destutil.destupdate(repo, clean=clean, check=check)
7068 7068 rev, movemarkfrom, brev = updata
7069 7069 warndest = True
7070 7070
7071 7071 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7072 7072
7073 7073 if clean:
7074 7074 ret = hg.clean(repo, rev)
7075 7075 else:
7076 7076 ret = hg.update(repo, rev)
7077 7077
7078 7078 if not ret and movemarkfrom:
7079 7079 if movemarkfrom == repo['.'].node():
7080 7080 pass # no-op update
7081 7081 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
7082 7082 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
7083 7083 else:
7084 7084 # this can happen with a non-linear update
7085 7085 ui.status(_("(leaving bookmark %s)\n") %
7086 7086 repo._activebookmark)
7087 7087 bookmarks.deactivate(repo)
7088 7088 elif brev in repo._bookmarks:
7089 7089 bookmarks.activate(repo, brev)
7090 7090 ui.status(_("(activating bookmark %s)\n") % brev)
7091 7091 elif brev:
7092 7092 if repo._activebookmark:
7093 7093 ui.status(_("(leaving bookmark %s)\n") %
7094 7094 repo._activebookmark)
7095 7095 bookmarks.deactivate(repo)
7096 7096 if warndest:
7097 7097 destutil.statusotherdests(ui, repo)
7098 7098 return ret
7099 7099
7100 7100 @command('verify', [])
7101 7101 def verify(ui, repo):
7102 7102 """verify the integrity of the repository
7103 7103
7104 7104 Verify the integrity of the current repository.
7105 7105
7106 7106 This will perform an extensive check of the repository's
7107 7107 integrity, validating the hashes and checksums of each entry in
7108 7108 the changelog, manifest, and tracked files, as well as the
7109 7109 integrity of their crosslinks and indices.
7110 7110
7111 7111 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7112 7112 for more information about recovery from corruption of the
7113 7113 repository.
7114 7114
7115 7115 Returns 0 on success, 1 if errors are encountered.
7116 7116 """
7117 7117 return hg.verify(repo)
7118 7118
7119 7119 @command('version', [], norepo=True)
7120 7120 def version_(ui):
7121 7121 """output version and copyright information"""
7122 7122 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7123 7123 % util.version())
7124 7124 ui.status(_(
7125 7125 "(see https://mercurial-scm.org for more information)\n"
7126 7126 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7127 7127 "This is free software; see the source for copying conditions. "
7128 7128 "There is NO\nwarranty; "
7129 7129 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7130 7130 ))
7131 7131
7132 7132 ui.note(_("\nEnabled extensions:\n\n"))
7133 7133 if ui.verbose:
7134 7134 # format names and versions into columns
7135 7135 names = []
7136 7136 vers = []
7137 7137 place = []
7138 7138 for name, module in extensions.extensions():
7139 7139 names.append(name)
7140 7140 vers.append(extensions.moduleversion(module))
7141 7141 if extensions.ismoduleinternal(module):
7142 7142 place.append(_("internal"))
7143 7143 else:
7144 7144 place.append(_("external"))
7145 7145 if names:
7146 7146 maxnamelen = max(len(n) for n in names)
7147 7147 for i, name in enumerate(names):
7148 7148 ui.write(" %-*s %s %s\n" %
7149 7149 (maxnamelen, name, place[i], vers[i]))
7150
7151 def loadcmdtable(ui, name, cmdtable):
7152 """Load command functions from specified cmdtable
7153 """
7154 overrides = [cmd for cmd in cmdtable if cmd in table]
7155 if overrides:
7156 ui.warn(_("extension '%s' overrides commands: %s\n")
7157 % (name, " ".join(overrides)))
7158 table.update(cmdtable)
@@ -1,1039 +1,1048
1 1 # dispatch.py - command dispatching 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, print_function
9 9
10 10 import atexit
11 11 import difflib
12 12 import errno
13 13 import os
14 14 import pdb
15 15 import re
16 16 import shlex
17 17 import signal
18 18 import socket
19 19 import sys
20 20 import time
21 21 import traceback
22 22
23 23
24 24 from .i18n import _
25 25
26 26 from . import (
27 27 cmdutil,
28 28 commands,
29 29 demandimport,
30 30 encoding,
31 31 error,
32 32 extensions,
33 33 fancyopts,
34 34 hg,
35 35 hook,
36 36 ui as uimod,
37 37 util,
38 38 )
39 39
40 40 class request(object):
41 41 def __init__(self, args, ui=None, repo=None, fin=None, fout=None,
42 42 ferr=None):
43 43 self.args = args
44 44 self.ui = ui
45 45 self.repo = repo
46 46
47 47 # input/output/error streams
48 48 self.fin = fin
49 49 self.fout = fout
50 50 self.ferr = ferr
51 51
52 52 def run():
53 53 "run the command in sys.argv"
54 54 sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
55 55
56 56 def _getsimilar(symbols, value):
57 57 sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
58 58 # The cutoff for similarity here is pretty arbitrary. It should
59 59 # probably be investigated and tweaked.
60 60 return [s for s in symbols if sim(s) > 0.6]
61 61
62 62 def _reportsimilar(write, similar):
63 63 if len(similar) == 1:
64 64 write(_("(did you mean %s?)\n") % similar[0])
65 65 elif similar:
66 66 ss = ", ".join(sorted(similar))
67 67 write(_("(did you mean one of %s?)\n") % ss)
68 68
69 69 def _formatparse(write, inst):
70 70 similar = []
71 71 if isinstance(inst, error.UnknownIdentifier):
72 72 # make sure to check fileset first, as revset can invoke fileset
73 73 similar = _getsimilar(inst.symbols, inst.function)
74 74 if len(inst.args) > 1:
75 75 write(_("hg: parse error at %s: %s\n") %
76 76 (inst.args[1], inst.args[0]))
77 77 if (inst.args[0][0] == ' '):
78 78 write(_("unexpected leading whitespace\n"))
79 79 else:
80 80 write(_("hg: parse error: %s\n") % inst.args[0])
81 81 _reportsimilar(write, similar)
82 82
83 83 def dispatch(req):
84 84 "run the command specified in req.args"
85 85 if req.ferr:
86 86 ferr = req.ferr
87 87 elif req.ui:
88 88 ferr = req.ui.ferr
89 89 else:
90 90 ferr = sys.stderr
91 91
92 92 try:
93 93 if not req.ui:
94 94 req.ui = uimod.ui()
95 95 if '--traceback' in req.args:
96 96 req.ui.setconfig('ui', 'traceback', 'on', '--traceback')
97 97
98 98 # set ui streams from the request
99 99 if req.fin:
100 100 req.ui.fin = req.fin
101 101 if req.fout:
102 102 req.ui.fout = req.fout
103 103 if req.ferr:
104 104 req.ui.ferr = req.ferr
105 105 except error.Abort as inst:
106 106 ferr.write(_("abort: %s\n") % inst)
107 107 if inst.hint:
108 108 ferr.write(_("(%s)\n") % inst.hint)
109 109 return -1
110 110 except error.ParseError as inst:
111 111 _formatparse(ferr.write, inst)
112 112 if inst.hint:
113 113 ferr.write(_("(%s)\n") % inst.hint)
114 114 return -1
115 115
116 116 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
117 117 starttime = time.time()
118 118 ret = None
119 119 try:
120 120 ret = _runcatch(req)
121 121 return ret
122 122 finally:
123 123 duration = time.time() - starttime
124 124 req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n",
125 125 msg, ret or 0, duration)
126 126
127 127 def _runcatch(req):
128 128 def catchterm(*args):
129 129 raise error.SignalInterrupt
130 130
131 131 ui = req.ui
132 132 try:
133 133 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
134 134 num = getattr(signal, name, None)
135 135 if num:
136 136 signal.signal(num, catchterm)
137 137 except ValueError:
138 138 pass # happens if called in a thread
139 139
140 140 try:
141 141 try:
142 142 debugger = 'pdb'
143 143 debugtrace = {
144 144 'pdb' : pdb.set_trace
145 145 }
146 146 debugmortem = {
147 147 'pdb' : pdb.post_mortem
148 148 }
149 149
150 150 # read --config before doing anything else
151 151 # (e.g. to change trust settings for reading .hg/hgrc)
152 152 cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args))
153 153
154 154 if req.repo:
155 155 # copy configs that were passed on the cmdline (--config) to
156 156 # the repo ui
157 157 for sec, name, val in cfgs:
158 158 req.repo.ui.setconfig(sec, name, val, source='--config')
159 159
160 160 # developer config: ui.debugger
161 161 debugger = ui.config("ui", "debugger")
162 162 debugmod = pdb
163 163 if not debugger or ui.plain():
164 164 # if we are in HGPLAIN mode, then disable custom debugging
165 165 debugger = 'pdb'
166 166 elif '--debugger' in req.args:
167 167 # This import can be slow for fancy debuggers, so only
168 168 # do it when absolutely necessary, i.e. when actual
169 169 # debugging has been requested
170 170 with demandimport.deactivated():
171 171 try:
172 172 debugmod = __import__(debugger)
173 173 except ImportError:
174 174 pass # Leave debugmod = pdb
175 175
176 176 debugtrace[debugger] = debugmod.set_trace
177 177 debugmortem[debugger] = debugmod.post_mortem
178 178
179 179 # enter the debugger before command execution
180 180 if '--debugger' in req.args:
181 181 ui.warn(_("entering debugger - "
182 182 "type c to continue starting hg or h for help\n"))
183 183
184 184 if (debugger != 'pdb' and
185 185 debugtrace[debugger] == debugtrace['pdb']):
186 186 ui.warn(_("%s debugger specified "
187 187 "but its module was not found\n") % debugger)
188 188 with demandimport.deactivated():
189 189 debugtrace[debugger]()
190 190 try:
191 191 return _dispatch(req)
192 192 finally:
193 193 ui.flush()
194 194 except: # re-raises
195 195 # enter the debugger when we hit an exception
196 196 if '--debugger' in req.args:
197 197 traceback.print_exc()
198 198 debugmortem[debugger](sys.exc_info()[2])
199 199 ui.traceback()
200 200 raise
201 201
202 202 # Global exception handling, alphabetically
203 203 # Mercurial-specific first, followed by built-in and library exceptions
204 204 except error.AmbiguousCommand as inst:
205 205 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
206 206 (inst.args[0], " ".join(inst.args[1])))
207 207 except error.ParseError as inst:
208 208 _formatparse(ui.warn, inst)
209 209 if inst.hint:
210 210 ui.warn(_("(%s)\n") % inst.hint)
211 211 return -1
212 212 except error.LockHeld as inst:
213 213 if inst.errno == errno.ETIMEDOUT:
214 214 reason = _('timed out waiting for lock held by %s') % inst.locker
215 215 else:
216 216 reason = _('lock held by %s') % inst.locker
217 217 ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
218 218 except error.LockUnavailable as inst:
219 219 ui.warn(_("abort: could not lock %s: %s\n") %
220 220 (inst.desc or inst.filename, inst.strerror))
221 221 except error.CommandError as inst:
222 222 if inst.args[0]:
223 223 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
224 224 commands.help_(ui, inst.args[0], full=False, command=True)
225 225 else:
226 226 ui.warn(_("hg: %s\n") % inst.args[1])
227 227 commands.help_(ui, 'shortlist')
228 228 except error.OutOfBandError as inst:
229 229 if inst.args:
230 230 msg = _("abort: remote error:\n")
231 231 else:
232 232 msg = _("abort: remote error\n")
233 233 ui.warn(msg)
234 234 if inst.args:
235 235 ui.warn(''.join(inst.args))
236 236 if inst.hint:
237 237 ui.warn('(%s)\n' % inst.hint)
238 238 except error.RepoError as inst:
239 239 ui.warn(_("abort: %s!\n") % inst)
240 240 if inst.hint:
241 241 ui.warn(_("(%s)\n") % inst.hint)
242 242 except error.ResponseError as inst:
243 243 ui.warn(_("abort: %s") % inst.args[0])
244 244 if not isinstance(inst.args[1], basestring):
245 245 ui.warn(" %r\n" % (inst.args[1],))
246 246 elif not inst.args[1]:
247 247 ui.warn(_(" empty string\n"))
248 248 else:
249 249 ui.warn("\n%r\n" % util.ellipsis(inst.args[1]))
250 250 except error.CensoredNodeError as inst:
251 251 ui.warn(_("abort: file censored %s!\n") % inst)
252 252 except error.RevlogError as inst:
253 253 ui.warn(_("abort: %s!\n") % inst)
254 254 except error.SignalInterrupt:
255 255 ui.warn(_("killed!\n"))
256 256 except error.UnknownCommand as inst:
257 257 ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
258 258 try:
259 259 # check if the command is in a disabled extension
260 260 # (but don't check for extensions themselves)
261 261 commands.help_(ui, inst.args[0], unknowncmd=True)
262 262 except (error.UnknownCommand, error.Abort):
263 263 suggested = False
264 264 if len(inst.args) == 2:
265 265 sim = _getsimilar(inst.args[1], inst.args[0])
266 266 if sim:
267 267 _reportsimilar(ui.warn, sim)
268 268 suggested = True
269 269 if not suggested:
270 270 commands.help_(ui, 'shortlist')
271 271 except error.InterventionRequired as inst:
272 272 ui.warn("%s\n" % inst)
273 273 if inst.hint:
274 274 ui.warn(_("(%s)\n") % inst.hint)
275 275 return 1
276 276 except error.Abort as inst:
277 277 ui.warn(_("abort: %s\n") % inst)
278 278 if inst.hint:
279 279 ui.warn(_("(%s)\n") % inst.hint)
280 280 except ImportError as inst:
281 281 ui.warn(_("abort: %s!\n") % inst)
282 282 m = str(inst).split()[-1]
283 283 if m in "mpatch bdiff".split():
284 284 ui.warn(_("(did you forget to compile extensions?)\n"))
285 285 elif m in "zlib".split():
286 286 ui.warn(_("(is your Python install correct?)\n"))
287 287 except IOError as inst:
288 288 if util.safehasattr(inst, "code"):
289 289 ui.warn(_("abort: %s\n") % inst)
290 290 elif util.safehasattr(inst, "reason"):
291 291 try: # usually it is in the form (errno, strerror)
292 292 reason = inst.reason.args[1]
293 293 except (AttributeError, IndexError):
294 294 # it might be anything, for example a string
295 295 reason = inst.reason
296 296 if isinstance(reason, unicode):
297 297 # SSLError of Python 2.7.9 contains a unicode
298 298 reason = reason.encode(encoding.encoding, 'replace')
299 299 ui.warn(_("abort: error: %s\n") % reason)
300 300 elif (util.safehasattr(inst, "args")
301 301 and inst.args and inst.args[0] == errno.EPIPE):
302 302 pass
303 303 elif getattr(inst, "strerror", None):
304 304 if getattr(inst, "filename", None):
305 305 ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
306 306 else:
307 307 ui.warn(_("abort: %s\n") % inst.strerror)
308 308 else:
309 309 raise
310 310 except OSError as inst:
311 311 if getattr(inst, "filename", None) is not None:
312 312 ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename))
313 313 else:
314 314 ui.warn(_("abort: %s\n") % inst.strerror)
315 315 except KeyboardInterrupt:
316 316 try:
317 317 ui.warn(_("interrupted!\n"))
318 318 except IOError as inst:
319 319 if inst.errno != errno.EPIPE:
320 320 raise
321 321 except MemoryError:
322 322 ui.warn(_("abort: out of memory\n"))
323 323 except SystemExit as inst:
324 324 # Commands shouldn't sys.exit directly, but give a return code.
325 325 # Just in case catch this and and pass exit code to caller.
326 326 return inst.code
327 327 except socket.error as inst:
328 328 ui.warn(_("abort: %s\n") % inst.args[-1])
329 329 except: # re-raises
330 330 # For compatibility checking, we discard the portion of the hg
331 331 # version after the + on the assumption that if a "normal
332 332 # user" is running a build with a + in it the packager
333 333 # probably built from fairly close to a tag and anyone with a
334 334 # 'make local' copy of hg (where the version number can be out
335 335 # of date) will be clueful enough to notice the implausible
336 336 # version number and try updating.
337 337 ct = util.versiontuple(n=2)
338 338 worst = None, ct, ''
339 339 if ui.config('ui', 'supportcontact', None) is None:
340 340 for name, mod in extensions.extensions():
341 341 testedwith = getattr(mod, 'testedwith', '')
342 342 report = getattr(mod, 'buglink', _('the extension author.'))
343 343 if not testedwith.strip():
344 344 # We found an untested extension. It's likely the culprit.
345 345 worst = name, 'unknown', report
346 346 break
347 347
348 348 # Never blame on extensions bundled with Mercurial.
349 349 if testedwith == 'internal':
350 350 continue
351 351
352 352 tested = [util.versiontuple(t, 2) for t in testedwith.split()]
353 353 if ct in tested:
354 354 continue
355 355
356 356 lower = [t for t in tested if t < ct]
357 357 nearest = max(lower or tested)
358 358 if worst[0] is None or nearest < worst[1]:
359 359 worst = name, nearest, report
360 360 if worst[0] is not None:
361 361 name, testedwith, report = worst
362 362 if not isinstance(testedwith, str):
363 363 testedwith = '.'.join([str(c) for c in testedwith])
364 364 warning = (_('** Unknown exception encountered with '
365 365 'possibly-broken third-party extension %s\n'
366 366 '** which supports versions %s of Mercurial.\n'
367 367 '** Please disable %s and try your action again.\n'
368 368 '** If that fixes the bug please report it to %s\n')
369 369 % (name, testedwith, name, report))
370 370 else:
371 371 bugtracker = ui.config('ui', 'supportcontact', None)
372 372 if bugtracker is None:
373 373 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
374 374 warning = (_("** unknown exception encountered, "
375 375 "please report by visiting\n** ") + bugtracker + '\n')
376 376 warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) +
377 377 (_("** Mercurial Distributed SCM (version %s)\n") %
378 378 util.version()) +
379 379 (_("** Extensions loaded: %s\n") %
380 380 ", ".join([x[0] for x in extensions.extensions()])))
381 381 ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc())
382 382 ui.warn(warning)
383 383 raise
384 384
385 385 return -1
386 386
387 387 def aliasargs(fn, givenargs):
388 388 args = getattr(fn, 'args', [])
389 389 if args:
390 390 cmd = ' '.join(map(util.shellquote, args))
391 391
392 392 nums = []
393 393 def replacer(m):
394 394 num = int(m.group(1)) - 1
395 395 nums.append(num)
396 396 if num < len(givenargs):
397 397 return givenargs[num]
398 398 raise error.Abort(_('too few arguments for command alias'))
399 399 cmd = re.sub(r'\$(\d+|\$)', replacer, cmd)
400 400 givenargs = [x for i, x in enumerate(givenargs)
401 401 if i not in nums]
402 402 args = shlex.split(cmd)
403 403 return args + givenargs
404 404
405 405 def aliasinterpolate(name, args, cmd):
406 406 '''interpolate args into cmd for shell aliases
407 407
408 408 This also handles $0, $@ and "$@".
409 409 '''
410 410 # util.interpolate can't deal with "$@" (with quotes) because it's only
411 411 # built to match prefix + patterns.
412 412 replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args))
413 413 replacemap['$0'] = name
414 414 replacemap['$$'] = '$'
415 415 replacemap['$@'] = ' '.join(args)
416 416 # Typical Unix shells interpolate "$@" (with quotes) as all the positional
417 417 # parameters, separated out into words. Emulate the same behavior here by
418 418 # quoting the arguments individually. POSIX shells will then typically
419 419 # tokenize each argument into exactly one word.
420 420 replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args)
421 421 # escape '\$' for regex
422 422 regex = '|'.join(replacemap.keys()).replace('$', r'\$')
423 423 r = re.compile(regex)
424 424 return r.sub(lambda x: replacemap[x.group()], cmd)
425 425
426 426 class cmdalias(object):
427 427 def __init__(self, name, definition, cmdtable):
428 428 self.name = self.cmd = name
429 429 self.cmdname = ''
430 430 self.definition = definition
431 431 self.fn = None
432 432 self.args = []
433 433 self.opts = []
434 434 self.help = ''
435 435 self.norepo = True
436 436 self.optionalrepo = False
437 437 self.inferrepo = False
438 438 self.badalias = None
439 439 self.unknowncmd = False
440 440
441 441 try:
442 442 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
443 443 for alias, e in cmdtable.iteritems():
444 444 if e is entry:
445 445 self.cmd = alias
446 446 break
447 447 self.shadows = True
448 448 except error.UnknownCommand:
449 449 self.shadows = False
450 450
451 451 if not self.definition:
452 452 self.badalias = _("no definition for alias '%s'") % self.name
453 453 return
454 454
455 455 if self.definition.startswith('!'):
456 456 self.shell = True
457 457 def fn(ui, *args):
458 458 env = {'HG_ARGS': ' '.join((self.name,) + args)}
459 459 def _checkvar(m):
460 460 if m.groups()[0] == '$':
461 461 return m.group()
462 462 elif int(m.groups()[0]) <= len(args):
463 463 return m.group()
464 464 else:
465 465 ui.debug("No argument found for substitution "
466 466 "of %i variable in alias '%s' definition."
467 467 % (int(m.groups()[0]), self.name))
468 468 return ''
469 469 cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:])
470 470 cmd = aliasinterpolate(self.name, args, cmd)
471 471 return ui.system(cmd, environ=env)
472 472 self.fn = fn
473 473 return
474 474
475 475 try:
476 476 args = shlex.split(self.definition)
477 477 except ValueError as inst:
478 478 self.badalias = (_("error in definition for alias '%s': %s")
479 479 % (self.name, inst))
480 480 return
481 481 self.cmdname = cmd = args.pop(0)
482 482 args = map(util.expandpath, args)
483 483
484 484 for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
485 485 if _earlygetopt([invalidarg], args):
486 486 self.badalias = (_("error in definition for alias '%s': %s may "
487 487 "only be given on the command line")
488 488 % (self.name, invalidarg))
489 489 return
490 490
491 491 try:
492 492 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
493 493 if len(tableentry) > 2:
494 494 self.fn, self.opts, self.help = tableentry
495 495 else:
496 496 self.fn, self.opts = tableentry
497 497
498 498 self.args = aliasargs(self.fn, args)
499 499 if not self.fn.norepo:
500 500 self.norepo = False
501 501 if self.fn.optionalrepo:
502 502 self.optionalrepo = True
503 503 if self.fn.inferrepo:
504 504 self.inferrepo = True
505 505 if self.help.startswith("hg " + cmd):
506 506 # drop prefix in old-style help lines so hg shows the alias
507 507 self.help = self.help[4 + len(cmd):]
508 508 self.__doc__ = self.fn.__doc__
509 509
510 510 except error.UnknownCommand:
511 511 self.badalias = (_("alias '%s' resolves to unknown command '%s'")
512 512 % (self.name, cmd))
513 513 self.unknowncmd = True
514 514 except error.AmbiguousCommand:
515 515 self.badalias = (_("alias '%s' resolves to ambiguous command '%s'")
516 516 % (self.name, cmd))
517 517
518 518 def __call__(self, ui, *args, **opts):
519 519 if self.badalias:
520 520 hint = None
521 521 if self.unknowncmd:
522 522 try:
523 523 # check if the command is in a disabled extension
524 524 cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
525 525 hint = _("'%s' is provided by '%s' extension") % (cmd, ext)
526 526 except error.UnknownCommand:
527 527 pass
528 528 raise error.Abort(self.badalias, hint=hint)
529 529 if self.shadows:
530 530 ui.debug("alias '%s' shadows command '%s'\n" %
531 531 (self.name, self.cmdname))
532 532
533 533 if util.safehasattr(self, 'shell'):
534 534 return self.fn(ui, *args, **opts)
535 535 else:
536 536 try:
537 537 return util.checksignature(self.fn)(ui, *args, **opts)
538 538 except error.SignatureError:
539 539 args = ' '.join([self.cmdname] + self.args)
540 540 ui.debug("alias '%s' expands to '%s'\n" % (self.name, args))
541 541 raise
542 542
543 543 def addaliases(ui, cmdtable):
544 544 # aliases are processed after extensions have been loaded, so they
545 545 # may use extension commands. Aliases can also use other alias definitions,
546 546 # but only if they have been defined prior to the current definition.
547 547 for alias, definition in ui.configitems('alias'):
548 548 aliasdef = cmdalias(alias, definition, cmdtable)
549 549
550 550 try:
551 551 olddef = cmdtable[aliasdef.cmd][0]
552 552 if olddef.definition == aliasdef.definition:
553 553 continue
554 554 except (KeyError, AttributeError):
555 555 # definition might not exist or it might not be a cmdalias
556 556 pass
557 557
558 558 cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
559 559
560 560 def _parse(ui, args):
561 561 options = {}
562 562 cmdoptions = {}
563 563
564 564 try:
565 565 args = fancyopts.fancyopts(args, commands.globalopts, options)
566 566 except fancyopts.getopt.GetoptError as inst:
567 567 raise error.CommandError(None, inst)
568 568
569 569 if args:
570 570 cmd, args = args[0], args[1:]
571 571 aliases, entry = cmdutil.findcmd(cmd, commands.table,
572 572 ui.configbool("ui", "strict"))
573 573 cmd = aliases[0]
574 574 args = aliasargs(entry[0], args)
575 575 defaults = ui.config("defaults", cmd)
576 576 if defaults:
577 577 args = map(util.expandpath, shlex.split(defaults)) + args
578 578 c = list(entry[1])
579 579 else:
580 580 cmd = None
581 581 c = []
582 582
583 583 # combine global options into local
584 584 for o in commands.globalopts:
585 585 c.append((o[0], o[1], options[o[1]], o[3]))
586 586
587 587 try:
588 588 args = fancyopts.fancyopts(args, c, cmdoptions, True)
589 589 except fancyopts.getopt.GetoptError as inst:
590 590 raise error.CommandError(cmd, inst)
591 591
592 592 # separate global options back out
593 593 for o in commands.globalopts:
594 594 n = o[1]
595 595 options[n] = cmdoptions[n]
596 596 del cmdoptions[n]
597 597
598 598 return (cmd, cmd and entry[0] or None, args, options, cmdoptions)
599 599
600 600 def _parseconfig(ui, config):
601 601 """parse the --config options from the command line"""
602 602 configs = []
603 603
604 604 for cfg in config:
605 605 try:
606 606 name, value = [cfgelem.strip()
607 607 for cfgelem in cfg.split('=', 1)]
608 608 section, name = name.split('.', 1)
609 609 if not section or not name:
610 610 raise IndexError
611 611 ui.setconfig(section, name, value, '--config')
612 612 configs.append((section, name, value))
613 613 except (IndexError, ValueError):
614 614 raise error.Abort(_('malformed --config option: %r '
615 615 '(use --config section.name=value)') % cfg)
616 616
617 617 return configs
618 618
619 619 def _earlygetopt(aliases, args):
620 620 """Return list of values for an option (or aliases).
621 621
622 622 The values are listed in the order they appear in args.
623 623 The options and values are removed from args.
624 624
625 625 >>> args = ['x', '--cwd', 'foo', 'y']
626 626 >>> _earlygetopt(['--cwd'], args), args
627 627 (['foo'], ['x', 'y'])
628 628
629 629 >>> args = ['x', '--cwd=bar', 'y']
630 630 >>> _earlygetopt(['--cwd'], args), args
631 631 (['bar'], ['x', 'y'])
632 632
633 633 >>> args = ['x', '-R', 'foo', 'y']
634 634 >>> _earlygetopt(['-R'], args), args
635 635 (['foo'], ['x', 'y'])
636 636
637 637 >>> args = ['x', '-Rbar', 'y']
638 638 >>> _earlygetopt(['-R'], args), args
639 639 (['bar'], ['x', 'y'])
640 640 """
641 641 try:
642 642 argcount = args.index("--")
643 643 except ValueError:
644 644 argcount = len(args)
645 645 shortopts = [opt for opt in aliases if len(opt) == 2]
646 646 values = []
647 647 pos = 0
648 648 while pos < argcount:
649 649 fullarg = arg = args[pos]
650 650 equals = arg.find('=')
651 651 if equals > -1:
652 652 arg = arg[:equals]
653 653 if arg in aliases:
654 654 del args[pos]
655 655 if equals > -1:
656 656 values.append(fullarg[equals + 1:])
657 657 argcount -= 1
658 658 else:
659 659 if pos + 1 >= argcount:
660 660 # ignore and let getopt report an error if there is no value
661 661 break
662 662 values.append(args.pop(pos))
663 663 argcount -= 2
664 664 elif arg[:2] in shortopts:
665 665 # short option can have no following space, e.g. hg log -Rfoo
666 666 values.append(args.pop(pos)[2:])
667 667 argcount -= 1
668 668 else:
669 669 pos += 1
670 670 return values
671 671
672 672 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
673 673 # run pre-hook, and abort if it fails
674 674 hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs),
675 675 pats=cmdpats, opts=cmdoptions)
676 676 ret = _runcommand(ui, options, cmd, d)
677 677 # run post-hook, passing command result
678 678 hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs),
679 679 result=ret, pats=cmdpats, opts=cmdoptions)
680 680 return ret
681 681
682 682 def _getlocal(ui, rpath, wd=None):
683 683 """Return (path, local ui object) for the given target path.
684 684
685 685 Takes paths in [cwd]/.hg/hgrc into account."
686 686 """
687 687 if wd is None:
688 688 try:
689 689 wd = os.getcwd()
690 690 except OSError as e:
691 691 raise error.Abort(_("error getting current working directory: %s") %
692 692 e.strerror)
693 693 path = cmdutil.findrepo(wd) or ""
694 694 if not path:
695 695 lui = ui
696 696 else:
697 697 lui = ui.copy()
698 698 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
699 699
700 700 if rpath and rpath[-1]:
701 701 path = lui.expandpath(rpath[-1])
702 702 lui = ui.copy()
703 703 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
704 704
705 705 return path, lui
706 706
707 707 def _checkshellalias(lui, ui, args, precheck=True):
708 708 """Return the function to run the shell alias, if it is required
709 709
710 710 'precheck' is whether this function is invoked before adding
711 711 aliases or not.
712 712 """
713 713 options = {}
714 714
715 715 try:
716 716 args = fancyopts.fancyopts(args, commands.globalopts, options)
717 717 except fancyopts.getopt.GetoptError:
718 718 return
719 719
720 720 if not args:
721 721 return
722 722
723 723 if precheck:
724 724 strict = True
725 725 cmdtable = commands.table.copy()
726 726 addaliases(lui, cmdtable)
727 727 else:
728 728 strict = False
729 729 cmdtable = commands.table
730 730
731 731 cmd = args[0]
732 732 try:
733 733 aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
734 734 except (error.AmbiguousCommand, error.UnknownCommand):
735 735 return
736 736
737 737 cmd = aliases[0]
738 738 fn = entry[0]
739 739
740 740 if cmd and util.safehasattr(fn, 'shell'):
741 741 d = lambda: fn(ui, *args[1:])
742 742 return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
743 743 [], {})
744 744
745 745 _loaded = set()
746
747 # list of (objname, loadermod, loadername) tuple:
748 # - objname is the name of an object in extension module, from which
749 # extra information is loaded
750 # - loadermod is the module where loader is placed
751 # - loadername is the name of the function, which takes (ui, extensionname,
752 # extraobj) arguments
753 extraloaders = [
754 ('cmdtable', commands, 'loadcmdtable'),
755 ]
756
746 757 def _dispatch(req):
747 758 args = req.args
748 759 ui = req.ui
749 760
750 761 # check for cwd
751 762 cwd = _earlygetopt(['--cwd'], args)
752 763 if cwd:
753 764 os.chdir(cwd[-1])
754 765
755 766 rpath = _earlygetopt(["-R", "--repository", "--repo"], args)
756 767 path, lui = _getlocal(ui, rpath)
757 768
758 769 # Now that we're operating in the right directory/repository with
759 770 # the right config settings, check for shell aliases
760 771 shellaliasfn = _checkshellalias(lui, ui, args)
761 772 if shellaliasfn:
762 773 return shellaliasfn()
763 774
764 775 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
765 776 # reposetup. Programs like TortoiseHg will call _dispatch several
766 777 # times so we keep track of configured extensions in _loaded.
767 778 extensions.loadall(lui)
768 779 exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
769 780 # Propagate any changes to lui.__class__ by extensions
770 781 ui.__class__ = lui.__class__
771 782
772 783 # (uisetup and extsetup are handled in extensions.loadall)
773 784
774 785 for name, module in exts:
775 cmdtable = getattr(module, 'cmdtable', {})
776 overrides = [cmd for cmd in cmdtable if cmd in commands.table]
777 if overrides:
778 ui.warn(_("extension '%s' overrides commands: %s\n")
779 % (name, " ".join(overrides)))
780 commands.table.update(cmdtable)
786 for objname, loadermod, loadername in extraloaders:
787 extraobj = getattr(module, objname, None)
788 if extraobj is not None:
789 getattr(loadermod, loadername)(ui, name, extraobj)
781 790 _loaded.add(name)
782 791
783 792 # (reposetup is handled in hg.repository)
784 793
785 794 addaliases(lui, commands.table)
786 795
787 796 if not lui.configbool("ui", "strict"):
788 797 # All aliases and commands are completely defined, now.
789 798 # Check abbreviation/ambiguity of shell alias again, because shell
790 799 # alias may cause failure of "_parse" (see issue4355)
791 800 shellaliasfn = _checkshellalias(lui, ui, args, precheck=False)
792 801 if shellaliasfn:
793 802 return shellaliasfn()
794 803
795 804 # check for fallback encoding
796 805 fallback = lui.config('ui', 'fallbackencoding')
797 806 if fallback:
798 807 encoding.fallbackencoding = fallback
799 808
800 809 fullargs = args
801 810 cmd, func, args, options, cmdoptions = _parse(lui, args)
802 811
803 812 if options["config"]:
804 813 raise error.Abort(_("option --config may not be abbreviated!"))
805 814 if options["cwd"]:
806 815 raise error.Abort(_("option --cwd may not be abbreviated!"))
807 816 if options["repository"]:
808 817 raise error.Abort(_(
809 818 "option -R has to be separated from other options (e.g. not -qR) "
810 819 "and --repository may only be abbreviated as --repo!"))
811 820
812 821 if options["encoding"]:
813 822 encoding.encoding = options["encoding"]
814 823 if options["encodingmode"]:
815 824 encoding.encodingmode = options["encodingmode"]
816 825 if options["time"]:
817 826 def get_times():
818 827 t = os.times()
819 828 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
820 829 t = (t[0], t[1], t[2], t[3], time.clock())
821 830 return t
822 831 s = get_times()
823 832 def print_time():
824 833 t = get_times()
825 834 ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
826 835 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
827 836 atexit.register(print_time)
828 837
829 838 uis = set([ui, lui])
830 839
831 840 if req.repo:
832 841 uis.add(req.repo.ui)
833 842
834 843 if options['verbose'] or options['debug'] or options['quiet']:
835 844 for opt in ('verbose', 'debug', 'quiet'):
836 845 val = str(bool(options[opt]))
837 846 for ui_ in uis:
838 847 ui_.setconfig('ui', opt, val, '--' + opt)
839 848
840 849 if options['traceback']:
841 850 for ui_ in uis:
842 851 ui_.setconfig('ui', 'traceback', 'on', '--traceback')
843 852
844 853 if options['noninteractive']:
845 854 for ui_ in uis:
846 855 ui_.setconfig('ui', 'interactive', 'off', '-y')
847 856
848 857 if cmdoptions.get('insecure', False):
849 858 for ui_ in uis:
850 859 ui_.setconfig('web', 'cacerts', '!', '--insecure')
851 860
852 861 if options['version']:
853 862 return commands.version_(ui)
854 863 if options['help']:
855 864 return commands.help_(ui, cmd, command=cmd is not None)
856 865 elif not cmd:
857 866 return commands.help_(ui, 'shortlist')
858 867
859 868 repo = None
860 869 cmdpats = args[:]
861 870 if not func.norepo:
862 871 # use the repo from the request only if we don't have -R
863 872 if not rpath and not cwd:
864 873 repo = req.repo
865 874
866 875 if repo:
867 876 # set the descriptors of the repo ui to those of ui
868 877 repo.ui.fin = ui.fin
869 878 repo.ui.fout = ui.fout
870 879 repo.ui.ferr = ui.ferr
871 880 else:
872 881 try:
873 882 repo = hg.repository(ui, path=path)
874 883 if not repo.local():
875 884 raise error.Abort(_("repository '%s' is not local") % path)
876 885 repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo')
877 886 except error.RequirementError:
878 887 raise
879 888 except error.RepoError:
880 889 if rpath and rpath[-1]: # invalid -R path
881 890 raise
882 891 if not func.optionalrepo:
883 892 if func.inferrepo and args and not path:
884 893 # try to infer -R from command args
885 894 repos = map(cmdutil.findrepo, args)
886 895 guess = repos[0]
887 896 if guess and repos.count(guess) == len(repos):
888 897 req.args = ['--repository', guess] + fullargs
889 898 return _dispatch(req)
890 899 if not path:
891 900 raise error.RepoError(_("no repository found in '%s'"
892 901 " (.hg not found)")
893 902 % os.getcwd())
894 903 raise
895 904 if repo:
896 905 ui = repo.ui
897 906 if options['hidden']:
898 907 repo = repo.unfiltered()
899 908 args.insert(0, repo)
900 909 elif rpath:
901 910 ui.warn(_("warning: --repository ignored\n"))
902 911
903 912 msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
904 913 ui.log("command", '%s\n', msg)
905 914 d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
906 915 try:
907 916 return runcommand(lui, repo, cmd, fullargs, ui, options, d,
908 917 cmdpats, cmdoptions)
909 918 finally:
910 919 if repo and repo != req.repo:
911 920 repo.close()
912 921
913 922 def lsprofile(ui, func, fp):
914 923 format = ui.config('profiling', 'format', default='text')
915 924 field = ui.config('profiling', 'sort', default='inlinetime')
916 925 limit = ui.configint('profiling', 'limit', default=30)
917 926 climit = ui.configint('profiling', 'nested', default=0)
918 927
919 928 if format not in ['text', 'kcachegrind']:
920 929 ui.warn(_("unrecognized profiling format '%s'"
921 930 " - Ignored\n") % format)
922 931 format = 'text'
923 932
924 933 try:
925 934 from . import lsprof
926 935 except ImportError:
927 936 raise error.Abort(_(
928 937 'lsprof not available - install from '
929 938 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
930 939 p = lsprof.Profiler()
931 940 p.enable(subcalls=True)
932 941 try:
933 942 return func()
934 943 finally:
935 944 p.disable()
936 945
937 946 if format == 'kcachegrind':
938 947 from . import lsprofcalltree
939 948 calltree = lsprofcalltree.KCacheGrind(p)
940 949 calltree.output(fp)
941 950 else:
942 951 # format == 'text'
943 952 stats = lsprof.Stats(p.getstats())
944 953 stats.sort(field)
945 954 stats.pprint(limit=limit, file=fp, climit=climit)
946 955
947 956 def flameprofile(ui, func, fp):
948 957 try:
949 958 from flamegraph import flamegraph
950 959 except ImportError:
951 960 raise error.Abort(_(
952 961 'flamegraph not available - install from '
953 962 'https://github.com/evanhempel/python-flamegraph'))
954 963 # developer config: profiling.freq
955 964 freq = ui.configint('profiling', 'freq', default=1000)
956 965 filter_ = None
957 966 collapse_recursion = True
958 967 thread = flamegraph.ProfileThread(fp, 1.0 / freq,
959 968 filter_, collapse_recursion)
960 969 start_time = time.clock()
961 970 try:
962 971 thread.start()
963 972 func()
964 973 finally:
965 974 thread.stop()
966 975 thread.join()
967 976 print('Collected %d stack frames (%d unique) in %2.2f seconds.' % (
968 977 time.clock() - start_time, thread.num_frames(),
969 978 thread.num_frames(unique=True)))
970 979
971 980
972 981 def statprofile(ui, func, fp):
973 982 try:
974 983 import statprof
975 984 except ImportError:
976 985 raise error.Abort(_(
977 986 'statprof not available - install using "easy_install statprof"'))
978 987
979 988 freq = ui.configint('profiling', 'freq', default=1000)
980 989 if freq > 0:
981 990 statprof.reset(freq)
982 991 else:
983 992 ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq)
984 993
985 994 statprof.start()
986 995 try:
987 996 return func()
988 997 finally:
989 998 statprof.stop()
990 999 statprof.display(fp)
991 1000
992 1001 def _runcommand(ui, options, cmd, cmdfunc):
993 1002 """Enables the profiler if applicable.
994 1003
995 1004 ``profiling.enabled`` - boolean config that enables or disables profiling
996 1005 """
997 1006 def checkargs():
998 1007 try:
999 1008 return cmdfunc()
1000 1009 except error.SignatureError:
1001 1010 raise error.CommandError(cmd, _("invalid arguments"))
1002 1011
1003 1012 if options['profile'] or ui.configbool('profiling', 'enabled'):
1004 1013 profiler = os.getenv('HGPROF')
1005 1014 if profiler is None:
1006 1015 profiler = ui.config('profiling', 'type', default='ls')
1007 1016 if profiler not in ('ls', 'stat', 'flame'):
1008 1017 ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler)
1009 1018 profiler = 'ls'
1010 1019
1011 1020 output = ui.config('profiling', 'output')
1012 1021
1013 1022 if output == 'blackbox':
1014 1023 import StringIO
1015 1024 fp = StringIO.StringIO()
1016 1025 elif output:
1017 1026 path = ui.expandpath(output)
1018 1027 fp = open(path, 'wb')
1019 1028 else:
1020 1029 fp = sys.stderr
1021 1030
1022 1031 try:
1023 1032 if profiler == 'ls':
1024 1033 return lsprofile(ui, checkargs, fp)
1025 1034 elif profiler == 'flame':
1026 1035 return flameprofile(ui, checkargs, fp)
1027 1036 else:
1028 1037 return statprofile(ui, checkargs, fp)
1029 1038 finally:
1030 1039 if output:
1031 1040 if output == 'blackbox':
1032 1041 val = "Profile:\n%s" % fp.getvalue()
1033 1042 # ui.log treats the input as a format string,
1034 1043 # so we need to escape any % signs.
1035 1044 val = val.replace('%', '%%')
1036 1045 ui.log('profile', val)
1037 1046 fp.close()
1038 1047 else:
1039 1048 return checkargs()
General Comments 0
You need to be logged in to leave comments. Login now