##// END OF EJS Templates
commands: add postincoming docstring for explanation of arguments
FUJIWARA Katsunori -
r28502:e0d19d95 default
parent child Browse files
Show More
@@ -1,7138 +1,7147 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import difflib
11 11 import errno
12 12 import 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', [] + formatteropts, '', norepo=True)
2704 2704 def debuginstall(ui, **opts):
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 fm = ui.formatter('debuginstall', opts)
2720 2720 fm.startitem()
2721 2721
2722 2722 # encoding
2723 2723 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2724 2724 err = None
2725 2725 try:
2726 2726 encoding.fromlocal("test")
2727 2727 except error.Abort as inst:
2728 2728 err = inst
2729 2729 problems += 1
2730 2730 fm.condwrite(err, 'encodingerror', _(" %s\n"
2731 2731 " (check that your locale is properly set)\n"), err)
2732 2732
2733 2733 # Python
2734 2734 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2735 2735 sys.executable)
2736 2736 fm.write('pythonver', _("checking Python version (%s)\n"),
2737 2737 ("%s.%s.%s" % sys.version_info[:3]))
2738 2738 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2739 2739 os.path.dirname(os.__file__))
2740 2740
2741 2741 # compiled modules
2742 2742 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2743 2743 os.path.dirname(__file__))
2744 2744
2745 2745 err = None
2746 2746 try:
2747 2747 from . import (
2748 2748 base85,
2749 2749 bdiff,
2750 2750 mpatch,
2751 2751 osutil,
2752 2752 )
2753 2753 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2754 2754 except Exception as inst:
2755 2755 err = inst
2756 2756 problems += 1
2757 2757 fm.condwrite(err, 'extensionserror', " %s\n", err)
2758 2758
2759 2759 # templates
2760 2760 from . import templater
2761 2761 p = templater.templatepaths()
2762 2762 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2763 2763 fm.condwrite(not p, '', _(" no template directories found\n"))
2764 2764 if p:
2765 2765 m = templater.templatepath("map-cmdline.default")
2766 2766 if m:
2767 2767 # template found, check if it is working
2768 2768 err = None
2769 2769 try:
2770 2770 templater.templater(m)
2771 2771 except Exception as inst:
2772 2772 err = inst
2773 2773 p = None
2774 2774 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2775 2775 else:
2776 2776 p = None
2777 2777 fm.condwrite(p, 'defaulttemplate',
2778 2778 _("checking default template (%s)\n"), m)
2779 2779 fm.condwrite(not m, 'defaulttemplatenotfound',
2780 2780 _(" template '%s' not found\n"), "default")
2781 2781 if not p:
2782 2782 problems += 1
2783 2783 fm.condwrite(not p, '',
2784 2784 _(" (templates seem to have been installed incorrectly)\n"))
2785 2785
2786 2786 # editor
2787 2787 editor = ui.geteditor()
2788 2788 editor = util.expandpath(editor)
2789 2789 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2790 2790 cmdpath = util.findexe(shlex.split(editor)[0])
2791 2791 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2792 2792 _(" No commit editor set and can't find %s in PATH\n"
2793 2793 " (specify a commit editor in your configuration"
2794 2794 " file)\n"), not cmdpath and editor == 'vi' and editor)
2795 2795 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2796 2796 _(" Can't find editor '%s' in PATH\n"
2797 2797 " (specify a commit editor in your configuration"
2798 2798 " file)\n"), not cmdpath and editor)
2799 2799 if not cmdpath and editor != 'vi':
2800 2800 problems += 1
2801 2801
2802 2802 # check username
2803 2803 username = None
2804 2804 err = None
2805 2805 try:
2806 2806 username = ui.username()
2807 2807 except error.Abort as e:
2808 2808 err = e
2809 2809 problems += 1
2810 2810
2811 2811 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2812 2812 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2813 2813 " (specify a username in your configuration file)\n"), err)
2814 2814
2815 2815 fm.condwrite(not problems, '',
2816 2816 _("no problems detected\n"))
2817 2817 if not problems:
2818 2818 fm.data(problems=problems)
2819 2819 fm.condwrite(problems, 'problems',
2820 2820 _("%s problems detected,"
2821 2821 " please check your install!\n"), problems)
2822 2822 fm.end()
2823 2823
2824 2824 return problems
2825 2825
2826 2826 @command('debugknown', [], _('REPO ID...'), norepo=True)
2827 2827 def debugknown(ui, repopath, *ids, **opts):
2828 2828 """test whether node ids are known to a repo
2829 2829
2830 2830 Every ID must be a full-length hex node id string. Returns a list of 0s
2831 2831 and 1s indicating unknown/known.
2832 2832 """
2833 2833 repo = hg.peer(ui, opts, repopath)
2834 2834 if not repo.capable('known'):
2835 2835 raise error.Abort("known() not supported by target repository")
2836 2836 flags = repo.known([bin(s) for s in ids])
2837 2837 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2838 2838
2839 2839 @command('debuglabelcomplete', [], _('LABEL...'))
2840 2840 def debuglabelcomplete(ui, repo, *args):
2841 2841 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2842 2842 debugnamecomplete(ui, repo, *args)
2843 2843
2844 2844 @command('debugmergestate', [], '')
2845 2845 def debugmergestate(ui, repo, *args):
2846 2846 """print merge state
2847 2847
2848 2848 Use --verbose to print out information about whether v1 or v2 merge state
2849 2849 was chosen."""
2850 2850 def _hashornull(h):
2851 2851 if h == nullhex:
2852 2852 return 'null'
2853 2853 else:
2854 2854 return h
2855 2855
2856 2856 def printrecords(version):
2857 2857 ui.write(('* version %s records\n') % version)
2858 2858 if version == 1:
2859 2859 records = v1records
2860 2860 else:
2861 2861 records = v2records
2862 2862
2863 2863 for rtype, record in records:
2864 2864 # pretty print some record types
2865 2865 if rtype == 'L':
2866 2866 ui.write(('local: %s\n') % record)
2867 2867 elif rtype == 'O':
2868 2868 ui.write(('other: %s\n') % record)
2869 2869 elif rtype == 'm':
2870 2870 driver, mdstate = record.split('\0', 1)
2871 2871 ui.write(('merge driver: %s (state "%s")\n')
2872 2872 % (driver, mdstate))
2873 2873 elif rtype in 'FDC':
2874 2874 r = record.split('\0')
2875 2875 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2876 2876 if version == 1:
2877 2877 onode = 'not stored in v1 format'
2878 2878 flags = r[7]
2879 2879 else:
2880 2880 onode, flags = r[7:9]
2881 2881 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2882 2882 % (f, rtype, state, _hashornull(hash)))
2883 2883 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2884 2884 ui.write((' ancestor path: %s (node %s)\n')
2885 2885 % (afile, _hashornull(anode)))
2886 2886 ui.write((' other path: %s (node %s)\n')
2887 2887 % (ofile, _hashornull(onode)))
2888 2888 elif rtype == 'f':
2889 2889 filename, rawextras = record.split('\0', 1)
2890 2890 extras = rawextras.split('\0')
2891 2891 i = 0
2892 2892 extrastrings = []
2893 2893 while i < len(extras):
2894 2894 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2895 2895 i += 2
2896 2896
2897 2897 ui.write(('file extras: %s (%s)\n')
2898 2898 % (filename, ', '.join(extrastrings)))
2899 2899 else:
2900 2900 ui.write(('unrecognized entry: %s\t%s\n')
2901 2901 % (rtype, record.replace('\0', '\t')))
2902 2902
2903 2903 # Avoid mergestate.read() since it may raise an exception for unsupported
2904 2904 # merge state records. We shouldn't be doing this, but this is OK since this
2905 2905 # command is pretty low-level.
2906 2906 ms = mergemod.mergestate(repo)
2907 2907
2908 2908 # sort so that reasonable information is on top
2909 2909 v1records = ms._readrecordsv1()
2910 2910 v2records = ms._readrecordsv2()
2911 2911 order = 'LOm'
2912 2912 def key(r):
2913 2913 idx = order.find(r[0])
2914 2914 if idx == -1:
2915 2915 return (1, r[1])
2916 2916 else:
2917 2917 return (0, idx)
2918 2918 v1records.sort(key=key)
2919 2919 v2records.sort(key=key)
2920 2920
2921 2921 if not v1records and not v2records:
2922 2922 ui.write(('no merge state found\n'))
2923 2923 elif not v2records:
2924 2924 ui.note(('no version 2 merge state\n'))
2925 2925 printrecords(1)
2926 2926 elif ms._v1v2match(v1records, v2records):
2927 2927 ui.note(('v1 and v2 states match: using v2\n'))
2928 2928 printrecords(2)
2929 2929 else:
2930 2930 ui.note(('v1 and v2 states mismatch: using v1\n'))
2931 2931 printrecords(1)
2932 2932 if ui.verbose:
2933 2933 printrecords(2)
2934 2934
2935 2935 @command('debugnamecomplete', [], _('NAME...'))
2936 2936 def debugnamecomplete(ui, repo, *args):
2937 2937 '''complete "names" - tags, open branch names, bookmark names'''
2938 2938
2939 2939 names = set()
2940 2940 # since we previously only listed open branches, we will handle that
2941 2941 # specially (after this for loop)
2942 2942 for name, ns in repo.names.iteritems():
2943 2943 if name != 'branches':
2944 2944 names.update(ns.listnames(repo))
2945 2945 names.update(tag for (tag, heads, tip, closed)
2946 2946 in repo.branchmap().iterbranches() if not closed)
2947 2947 completions = set()
2948 2948 if not args:
2949 2949 args = ['']
2950 2950 for a in args:
2951 2951 completions.update(n for n in names if n.startswith(a))
2952 2952 ui.write('\n'.join(sorted(completions)))
2953 2953 ui.write('\n')
2954 2954
2955 2955 @command('debuglocks',
2956 2956 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2957 2957 ('W', 'force-wlock', None,
2958 2958 _('free the working state lock (DANGEROUS)'))],
2959 2959 _('[OPTION]...'))
2960 2960 def debuglocks(ui, repo, **opts):
2961 2961 """show or modify state of locks
2962 2962
2963 2963 By default, this command will show which locks are held. This
2964 2964 includes the user and process holding the lock, the amount of time
2965 2965 the lock has been held, and the machine name where the process is
2966 2966 running if it's not local.
2967 2967
2968 2968 Locks protect the integrity of Mercurial's data, so should be
2969 2969 treated with care. System crashes or other interruptions may cause
2970 2970 locks to not be properly released, though Mercurial will usually
2971 2971 detect and remove such stale locks automatically.
2972 2972
2973 2973 However, detecting stale locks may not always be possible (for
2974 2974 instance, on a shared filesystem). Removing locks may also be
2975 2975 blocked by filesystem permissions.
2976 2976
2977 2977 Returns 0 if no locks are held.
2978 2978
2979 2979 """
2980 2980
2981 2981 if opts.get('force_lock'):
2982 2982 repo.svfs.unlink('lock')
2983 2983 if opts.get('force_wlock'):
2984 2984 repo.vfs.unlink('wlock')
2985 2985 if opts.get('force_lock') or opts.get('force_lock'):
2986 2986 return 0
2987 2987
2988 2988 now = time.time()
2989 2989 held = 0
2990 2990
2991 2991 def report(vfs, name, method):
2992 2992 # this causes stale locks to get reaped for more accurate reporting
2993 2993 try:
2994 2994 l = method(False)
2995 2995 except error.LockHeld:
2996 2996 l = None
2997 2997
2998 2998 if l:
2999 2999 l.release()
3000 3000 else:
3001 3001 try:
3002 3002 stat = vfs.lstat(name)
3003 3003 age = now - stat.st_mtime
3004 3004 user = util.username(stat.st_uid)
3005 3005 locker = vfs.readlock(name)
3006 3006 if ":" in locker:
3007 3007 host, pid = locker.split(':')
3008 3008 if host == socket.gethostname():
3009 3009 locker = 'user %s, process %s' % (user, pid)
3010 3010 else:
3011 3011 locker = 'user %s, process %s, host %s' \
3012 3012 % (user, pid, host)
3013 3013 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
3014 3014 return 1
3015 3015 except OSError as e:
3016 3016 if e.errno != errno.ENOENT:
3017 3017 raise
3018 3018
3019 3019 ui.write("%-6s free\n" % (name + ":"))
3020 3020 return 0
3021 3021
3022 3022 held += report(repo.svfs, "lock", repo.lock)
3023 3023 held += report(repo.vfs, "wlock", repo.wlock)
3024 3024
3025 3025 return held
3026 3026
3027 3027 @command('debugobsolete',
3028 3028 [('', 'flags', 0, _('markers flag')),
3029 3029 ('', 'record-parents', False,
3030 3030 _('record parent information for the precursor')),
3031 3031 ('r', 'rev', [], _('display markers relevant to REV')),
3032 3032 ] + commitopts2,
3033 3033 _('[OBSOLETED [REPLACEMENT ...]]'))
3034 3034 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3035 3035 """create arbitrary obsolete marker
3036 3036
3037 3037 With no arguments, displays the list of obsolescence markers."""
3038 3038
3039 3039 def parsenodeid(s):
3040 3040 try:
3041 3041 # We do not use revsingle/revrange functions here to accept
3042 3042 # arbitrary node identifiers, possibly not present in the
3043 3043 # local repository.
3044 3044 n = bin(s)
3045 3045 if len(n) != len(nullid):
3046 3046 raise TypeError()
3047 3047 return n
3048 3048 except TypeError:
3049 3049 raise error.Abort('changeset references must be full hexadecimal '
3050 3050 'node identifiers')
3051 3051
3052 3052 if precursor is not None:
3053 3053 if opts['rev']:
3054 3054 raise error.Abort('cannot select revision when creating marker')
3055 3055 metadata = {}
3056 3056 metadata['user'] = opts['user'] or ui.username()
3057 3057 succs = tuple(parsenodeid(succ) for succ in successors)
3058 3058 l = repo.lock()
3059 3059 try:
3060 3060 tr = repo.transaction('debugobsolete')
3061 3061 try:
3062 3062 date = opts.get('date')
3063 3063 if date:
3064 3064 date = util.parsedate(date)
3065 3065 else:
3066 3066 date = None
3067 3067 prec = parsenodeid(precursor)
3068 3068 parents = None
3069 3069 if opts['record_parents']:
3070 3070 if prec not in repo.unfiltered():
3071 3071 raise error.Abort('cannot used --record-parents on '
3072 3072 'unknown changesets')
3073 3073 parents = repo.unfiltered()[prec].parents()
3074 3074 parents = tuple(p.node() for p in parents)
3075 3075 repo.obsstore.create(tr, prec, succs, opts['flags'],
3076 3076 parents=parents, date=date,
3077 3077 metadata=metadata)
3078 3078 tr.close()
3079 3079 except ValueError as exc:
3080 3080 raise error.Abort(_('bad obsmarker input: %s') % exc)
3081 3081 finally:
3082 3082 tr.release()
3083 3083 finally:
3084 3084 l.release()
3085 3085 else:
3086 3086 if opts['rev']:
3087 3087 revs = scmutil.revrange(repo, opts['rev'])
3088 3088 nodes = [repo[r].node() for r in revs]
3089 3089 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3090 3090 markers.sort(key=lambda x: x._data)
3091 3091 else:
3092 3092 markers = obsolete.getmarkers(repo)
3093 3093
3094 3094 for m in markers:
3095 3095 cmdutil.showmarker(ui, m)
3096 3096
3097 3097 @command('debugpathcomplete',
3098 3098 [('f', 'full', None, _('complete an entire path')),
3099 3099 ('n', 'normal', None, _('show only normal files')),
3100 3100 ('a', 'added', None, _('show only added files')),
3101 3101 ('r', 'removed', None, _('show only removed files'))],
3102 3102 _('FILESPEC...'))
3103 3103 def debugpathcomplete(ui, repo, *specs, **opts):
3104 3104 '''complete part or all of a tracked path
3105 3105
3106 3106 This command supports shells that offer path name completion. It
3107 3107 currently completes only files already known to the dirstate.
3108 3108
3109 3109 Completion extends only to the next path segment unless
3110 3110 --full is specified, in which case entire paths are used.'''
3111 3111
3112 3112 def complete(path, acceptable):
3113 3113 dirstate = repo.dirstate
3114 3114 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3115 3115 rootdir = repo.root + os.sep
3116 3116 if spec != repo.root and not spec.startswith(rootdir):
3117 3117 return [], []
3118 3118 if os.path.isdir(spec):
3119 3119 spec += '/'
3120 3120 spec = spec[len(rootdir):]
3121 3121 fixpaths = os.sep != '/'
3122 3122 if fixpaths:
3123 3123 spec = spec.replace(os.sep, '/')
3124 3124 speclen = len(spec)
3125 3125 fullpaths = opts['full']
3126 3126 files, dirs = set(), set()
3127 3127 adddir, addfile = dirs.add, files.add
3128 3128 for f, st in dirstate.iteritems():
3129 3129 if f.startswith(spec) and st[0] in acceptable:
3130 3130 if fixpaths:
3131 3131 f = f.replace('/', os.sep)
3132 3132 if fullpaths:
3133 3133 addfile(f)
3134 3134 continue
3135 3135 s = f.find(os.sep, speclen)
3136 3136 if s >= 0:
3137 3137 adddir(f[:s])
3138 3138 else:
3139 3139 addfile(f)
3140 3140 return files, dirs
3141 3141
3142 3142 acceptable = ''
3143 3143 if opts['normal']:
3144 3144 acceptable += 'nm'
3145 3145 if opts['added']:
3146 3146 acceptable += 'a'
3147 3147 if opts['removed']:
3148 3148 acceptable += 'r'
3149 3149 cwd = repo.getcwd()
3150 3150 if not specs:
3151 3151 specs = ['.']
3152 3152
3153 3153 files, dirs = set(), set()
3154 3154 for spec in specs:
3155 3155 f, d = complete(spec, acceptable or 'nmar')
3156 3156 files.update(f)
3157 3157 dirs.update(d)
3158 3158 files.update(dirs)
3159 3159 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3160 3160 ui.write('\n')
3161 3161
3162 3162 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3163 3163 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3164 3164 '''access the pushkey key/value protocol
3165 3165
3166 3166 With two args, list the keys in the given namespace.
3167 3167
3168 3168 With five args, set a key to new if it currently is set to old.
3169 3169 Reports success or failure.
3170 3170 '''
3171 3171
3172 3172 target = hg.peer(ui, {}, repopath)
3173 3173 if keyinfo:
3174 3174 key, old, new = keyinfo
3175 3175 r = target.pushkey(namespace, key, old, new)
3176 3176 ui.status(str(r) + '\n')
3177 3177 return not r
3178 3178 else:
3179 3179 for k, v in sorted(target.listkeys(namespace).iteritems()):
3180 3180 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3181 3181 v.encode('string-escape')))
3182 3182
3183 3183 @command('debugpvec', [], _('A B'))
3184 3184 def debugpvec(ui, repo, a, b=None):
3185 3185 ca = scmutil.revsingle(repo, a)
3186 3186 cb = scmutil.revsingle(repo, b)
3187 3187 pa = pvec.ctxpvec(ca)
3188 3188 pb = pvec.ctxpvec(cb)
3189 3189 if pa == pb:
3190 3190 rel = "="
3191 3191 elif pa > pb:
3192 3192 rel = ">"
3193 3193 elif pa < pb:
3194 3194 rel = "<"
3195 3195 elif pa | pb:
3196 3196 rel = "|"
3197 3197 ui.write(_("a: %s\n") % pa)
3198 3198 ui.write(_("b: %s\n") % pb)
3199 3199 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3200 3200 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3201 3201 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3202 3202 pa.distance(pb), rel))
3203 3203
3204 3204 @command('debugrebuilddirstate|debugrebuildstate',
3205 3205 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3206 3206 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3207 3207 'the working copy parent')),
3208 3208 ],
3209 3209 _('[-r REV]'))
3210 3210 def debugrebuilddirstate(ui, repo, rev, **opts):
3211 3211 """rebuild the dirstate as it would look like for the given revision
3212 3212
3213 3213 If no revision is specified the first current parent will be used.
3214 3214
3215 3215 The dirstate will be set to the files of the given revision.
3216 3216 The actual working directory content or existing dirstate
3217 3217 information such as adds or removes is not considered.
3218 3218
3219 3219 ``minimal`` will only rebuild the dirstate status for files that claim to be
3220 3220 tracked but are not in the parent manifest, or that exist in the parent
3221 3221 manifest but are not in the dirstate. It will not change adds, removes, or
3222 3222 modified files that are in the working copy parent.
3223 3223
3224 3224 One use of this command is to make the next :hg:`status` invocation
3225 3225 check the actual file content.
3226 3226 """
3227 3227 ctx = scmutil.revsingle(repo, rev)
3228 3228 with repo.wlock():
3229 3229 dirstate = repo.dirstate
3230 3230 changedfiles = None
3231 3231 # See command doc for what minimal does.
3232 3232 if opts.get('minimal'):
3233 3233 manifestfiles = set(ctx.manifest().keys())
3234 3234 dirstatefiles = set(dirstate)
3235 3235 manifestonly = manifestfiles - dirstatefiles
3236 3236 dsonly = dirstatefiles - manifestfiles
3237 3237 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3238 3238 changedfiles = manifestonly | dsnotadded
3239 3239
3240 3240 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3241 3241
3242 3242 @command('debugrebuildfncache', [], '')
3243 3243 def debugrebuildfncache(ui, repo):
3244 3244 """rebuild the fncache file"""
3245 3245 repair.rebuildfncache(ui, repo)
3246 3246
3247 3247 @command('debugrename',
3248 3248 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3249 3249 _('[-r REV] FILE'))
3250 3250 def debugrename(ui, repo, file1, *pats, **opts):
3251 3251 """dump rename information"""
3252 3252
3253 3253 ctx = scmutil.revsingle(repo, opts.get('rev'))
3254 3254 m = scmutil.match(ctx, (file1,) + pats, opts)
3255 3255 for abs in ctx.walk(m):
3256 3256 fctx = ctx[abs]
3257 3257 o = fctx.filelog().renamed(fctx.filenode())
3258 3258 rel = m.rel(abs)
3259 3259 if o:
3260 3260 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3261 3261 else:
3262 3262 ui.write(_("%s not renamed\n") % rel)
3263 3263
3264 3264 @command('debugrevlog', debugrevlogopts +
3265 3265 [('d', 'dump', False, _('dump index data'))],
3266 3266 _('-c|-m|FILE'),
3267 3267 optionalrepo=True)
3268 3268 def debugrevlog(ui, repo, file_=None, **opts):
3269 3269 """show data and statistics about a revlog"""
3270 3270 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3271 3271
3272 3272 if opts.get("dump"):
3273 3273 numrevs = len(r)
3274 3274 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3275 3275 " rawsize totalsize compression heads chainlen\n")
3276 3276 ts = 0
3277 3277 heads = set()
3278 3278
3279 3279 for rev in xrange(numrevs):
3280 3280 dbase = r.deltaparent(rev)
3281 3281 if dbase == -1:
3282 3282 dbase = rev
3283 3283 cbase = r.chainbase(rev)
3284 3284 clen = r.chainlen(rev)
3285 3285 p1, p2 = r.parentrevs(rev)
3286 3286 rs = r.rawsize(rev)
3287 3287 ts = ts + rs
3288 3288 heads -= set(r.parentrevs(rev))
3289 3289 heads.add(rev)
3290 3290 try:
3291 3291 compression = ts / r.end(rev)
3292 3292 except ZeroDivisionError:
3293 3293 compression = 0
3294 3294 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3295 3295 "%11d %5d %8d\n" %
3296 3296 (rev, p1, p2, r.start(rev), r.end(rev),
3297 3297 r.start(dbase), r.start(cbase),
3298 3298 r.start(p1), r.start(p2),
3299 3299 rs, ts, compression, len(heads), clen))
3300 3300 return 0
3301 3301
3302 3302 v = r.version
3303 3303 format = v & 0xFFFF
3304 3304 flags = []
3305 3305 gdelta = False
3306 3306 if v & revlog.REVLOGNGINLINEDATA:
3307 3307 flags.append('inline')
3308 3308 if v & revlog.REVLOGGENERALDELTA:
3309 3309 gdelta = True
3310 3310 flags.append('generaldelta')
3311 3311 if not flags:
3312 3312 flags = ['(none)']
3313 3313
3314 3314 nummerges = 0
3315 3315 numfull = 0
3316 3316 numprev = 0
3317 3317 nump1 = 0
3318 3318 nump2 = 0
3319 3319 numother = 0
3320 3320 nump1prev = 0
3321 3321 nump2prev = 0
3322 3322 chainlengths = []
3323 3323
3324 3324 datasize = [None, 0, 0L]
3325 3325 fullsize = [None, 0, 0L]
3326 3326 deltasize = [None, 0, 0L]
3327 3327
3328 3328 def addsize(size, l):
3329 3329 if l[0] is None or size < l[0]:
3330 3330 l[0] = size
3331 3331 if size > l[1]:
3332 3332 l[1] = size
3333 3333 l[2] += size
3334 3334
3335 3335 numrevs = len(r)
3336 3336 for rev in xrange(numrevs):
3337 3337 p1, p2 = r.parentrevs(rev)
3338 3338 delta = r.deltaparent(rev)
3339 3339 if format > 0:
3340 3340 addsize(r.rawsize(rev), datasize)
3341 3341 if p2 != nullrev:
3342 3342 nummerges += 1
3343 3343 size = r.length(rev)
3344 3344 if delta == nullrev:
3345 3345 chainlengths.append(0)
3346 3346 numfull += 1
3347 3347 addsize(size, fullsize)
3348 3348 else:
3349 3349 chainlengths.append(chainlengths[delta] + 1)
3350 3350 addsize(size, deltasize)
3351 3351 if delta == rev - 1:
3352 3352 numprev += 1
3353 3353 if delta == p1:
3354 3354 nump1prev += 1
3355 3355 elif delta == p2:
3356 3356 nump2prev += 1
3357 3357 elif delta == p1:
3358 3358 nump1 += 1
3359 3359 elif delta == p2:
3360 3360 nump2 += 1
3361 3361 elif delta != nullrev:
3362 3362 numother += 1
3363 3363
3364 3364 # Adjust size min value for empty cases
3365 3365 for size in (datasize, fullsize, deltasize):
3366 3366 if size[0] is None:
3367 3367 size[0] = 0
3368 3368
3369 3369 numdeltas = numrevs - numfull
3370 3370 numoprev = numprev - nump1prev - nump2prev
3371 3371 totalrawsize = datasize[2]
3372 3372 datasize[2] /= numrevs
3373 3373 fulltotal = fullsize[2]
3374 3374 fullsize[2] /= numfull
3375 3375 deltatotal = deltasize[2]
3376 3376 if numrevs - numfull > 0:
3377 3377 deltasize[2] /= numrevs - numfull
3378 3378 totalsize = fulltotal + deltatotal
3379 3379 avgchainlen = sum(chainlengths) / numrevs
3380 3380 maxchainlen = max(chainlengths)
3381 3381 compratio = 1
3382 3382 if totalsize:
3383 3383 compratio = totalrawsize / totalsize
3384 3384
3385 3385 basedfmtstr = '%%%dd\n'
3386 3386 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3387 3387
3388 3388 def dfmtstr(max):
3389 3389 return basedfmtstr % len(str(max))
3390 3390 def pcfmtstr(max, padding=0):
3391 3391 return basepcfmtstr % (len(str(max)), ' ' * padding)
3392 3392
3393 3393 def pcfmt(value, total):
3394 3394 if total:
3395 3395 return (value, 100 * float(value) / total)
3396 3396 else:
3397 3397 return value, 100.0
3398 3398
3399 3399 ui.write(('format : %d\n') % format)
3400 3400 ui.write(('flags : %s\n') % ', '.join(flags))
3401 3401
3402 3402 ui.write('\n')
3403 3403 fmt = pcfmtstr(totalsize)
3404 3404 fmt2 = dfmtstr(totalsize)
3405 3405 ui.write(('revisions : ') + fmt2 % numrevs)
3406 3406 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3407 3407 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3408 3408 ui.write(('revisions : ') + fmt2 % numrevs)
3409 3409 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3410 3410 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3411 3411 ui.write(('revision size : ') + fmt2 % totalsize)
3412 3412 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3413 3413 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3414 3414
3415 3415 ui.write('\n')
3416 3416 fmt = dfmtstr(max(avgchainlen, compratio))
3417 3417 ui.write(('avg chain length : ') + fmt % avgchainlen)
3418 3418 ui.write(('max chain length : ') + fmt % maxchainlen)
3419 3419 ui.write(('compression ratio : ') + fmt % compratio)
3420 3420
3421 3421 if format > 0:
3422 3422 ui.write('\n')
3423 3423 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3424 3424 % tuple(datasize))
3425 3425 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3426 3426 % tuple(fullsize))
3427 3427 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3428 3428 % tuple(deltasize))
3429 3429
3430 3430 if numdeltas > 0:
3431 3431 ui.write('\n')
3432 3432 fmt = pcfmtstr(numdeltas)
3433 3433 fmt2 = pcfmtstr(numdeltas, 4)
3434 3434 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3435 3435 if numprev > 0:
3436 3436 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3437 3437 numprev))
3438 3438 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3439 3439 numprev))
3440 3440 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3441 3441 numprev))
3442 3442 if gdelta:
3443 3443 ui.write(('deltas against p1 : ')
3444 3444 + fmt % pcfmt(nump1, numdeltas))
3445 3445 ui.write(('deltas against p2 : ')
3446 3446 + fmt % pcfmt(nump2, numdeltas))
3447 3447 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3448 3448 numdeltas))
3449 3449
3450 3450 @command('debugrevspec',
3451 3451 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3452 3452 ('REVSPEC'))
3453 3453 def debugrevspec(ui, repo, expr, **opts):
3454 3454 """parse and apply a revision specification
3455 3455
3456 3456 Use --verbose to print the parsed tree before and after aliases
3457 3457 expansion.
3458 3458 """
3459 3459 if ui.verbose:
3460 3460 tree = revset.parse(expr, lookup=repo.__contains__)
3461 3461 ui.note(revset.prettyformat(tree), "\n")
3462 3462 newtree = revset.findaliases(ui, tree)
3463 3463 if newtree != tree:
3464 3464 ui.note(revset.prettyformat(newtree), "\n")
3465 3465 tree = newtree
3466 3466 newtree = revset.foldconcat(tree)
3467 3467 if newtree != tree:
3468 3468 ui.note(revset.prettyformat(newtree), "\n")
3469 3469 if opts["optimize"]:
3470 3470 weight, optimizedtree = revset.optimize(newtree, True)
3471 3471 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3472 3472 func = revset.match(ui, expr, repo)
3473 3473 revs = func(repo)
3474 3474 if ui.verbose:
3475 3475 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3476 3476 for c in revs:
3477 3477 ui.write("%s\n" % c)
3478 3478
3479 3479 @command('debugsetparents', [], _('REV1 [REV2]'))
3480 3480 def debugsetparents(ui, repo, rev1, rev2=None):
3481 3481 """manually set the parents of the current working directory
3482 3482
3483 3483 This is useful for writing repository conversion tools, but should
3484 3484 be used with care. For example, neither the working directory nor the
3485 3485 dirstate is updated, so file status may be incorrect after running this
3486 3486 command.
3487 3487
3488 3488 Returns 0 on success.
3489 3489 """
3490 3490
3491 3491 r1 = scmutil.revsingle(repo, rev1).node()
3492 3492 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3493 3493
3494 3494 with repo.wlock():
3495 3495 repo.dirstate.beginparentchange()
3496 3496 repo.setparents(r1, r2)
3497 3497 repo.dirstate.endparentchange()
3498 3498
3499 3499 @command('debugdirstate|debugstate',
3500 3500 [('', 'nodates', None, _('do not display the saved mtime')),
3501 3501 ('', 'datesort', None, _('sort by saved mtime'))],
3502 3502 _('[OPTION]...'))
3503 3503 def debugstate(ui, repo, **opts):
3504 3504 """show the contents of the current dirstate"""
3505 3505
3506 3506 nodates = opts.get('nodates')
3507 3507 datesort = opts.get('datesort')
3508 3508
3509 3509 timestr = ""
3510 3510 if datesort:
3511 3511 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3512 3512 else:
3513 3513 keyfunc = None # sort by filename
3514 3514 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3515 3515 if ent[3] == -1:
3516 3516 timestr = 'unset '
3517 3517 elif nodates:
3518 3518 timestr = 'set '
3519 3519 else:
3520 3520 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3521 3521 time.localtime(ent[3]))
3522 3522 if ent[1] & 0o20000:
3523 3523 mode = 'lnk'
3524 3524 else:
3525 3525 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3526 3526 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3527 3527 for f in repo.dirstate.copies():
3528 3528 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3529 3529
3530 3530 @command('debugsub',
3531 3531 [('r', 'rev', '',
3532 3532 _('revision to check'), _('REV'))],
3533 3533 _('[-r REV] [REV]'))
3534 3534 def debugsub(ui, repo, rev=None):
3535 3535 ctx = scmutil.revsingle(repo, rev, None)
3536 3536 for k, v in sorted(ctx.substate.items()):
3537 3537 ui.write(('path %s\n') % k)
3538 3538 ui.write((' source %s\n') % v[0])
3539 3539 ui.write((' revision %s\n') % v[1])
3540 3540
3541 3541 @command('debugsuccessorssets',
3542 3542 [],
3543 3543 _('[REV]'))
3544 3544 def debugsuccessorssets(ui, repo, *revs):
3545 3545 """show set of successors for revision
3546 3546
3547 3547 A successors set of changeset A is a consistent group of revisions that
3548 3548 succeed A. It contains non-obsolete changesets only.
3549 3549
3550 3550 In most cases a changeset A has a single successors set containing a single
3551 3551 successor (changeset A replaced by A').
3552 3552
3553 3553 A changeset that is made obsolete with no successors are called "pruned".
3554 3554 Such changesets have no successors sets at all.
3555 3555
3556 3556 A changeset that has been "split" will have a successors set containing
3557 3557 more than one successor.
3558 3558
3559 3559 A changeset that has been rewritten in multiple different ways is called
3560 3560 "divergent". Such changesets have multiple successor sets (each of which
3561 3561 may also be split, i.e. have multiple successors).
3562 3562
3563 3563 Results are displayed as follows::
3564 3564
3565 3565 <rev1>
3566 3566 <successors-1A>
3567 3567 <rev2>
3568 3568 <successors-2A>
3569 3569 <successors-2B1> <successors-2B2> <successors-2B3>
3570 3570
3571 3571 Here rev2 has two possible (i.e. divergent) successors sets. The first
3572 3572 holds one element, whereas the second holds three (i.e. the changeset has
3573 3573 been split).
3574 3574 """
3575 3575 # passed to successorssets caching computation from one call to another
3576 3576 cache = {}
3577 3577 ctx2str = str
3578 3578 node2str = short
3579 3579 if ui.debug():
3580 3580 def ctx2str(ctx):
3581 3581 return ctx.hex()
3582 3582 node2str = hex
3583 3583 for rev in scmutil.revrange(repo, revs):
3584 3584 ctx = repo[rev]
3585 3585 ui.write('%s\n'% ctx2str(ctx))
3586 3586 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3587 3587 if succsset:
3588 3588 ui.write(' ')
3589 3589 ui.write(node2str(succsset[0]))
3590 3590 for node in succsset[1:]:
3591 3591 ui.write(' ')
3592 3592 ui.write(node2str(node))
3593 3593 ui.write('\n')
3594 3594
3595 3595 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3596 3596 def debugwalk(ui, repo, *pats, **opts):
3597 3597 """show how files match on given patterns"""
3598 3598 m = scmutil.match(repo[None], pats, opts)
3599 3599 items = list(repo.walk(m))
3600 3600 if not items:
3601 3601 return
3602 3602 f = lambda fn: fn
3603 3603 if ui.configbool('ui', 'slash') and os.sep != '/':
3604 3604 f = lambda fn: util.normpath(fn)
3605 3605 fmt = 'f %%-%ds %%-%ds %%s' % (
3606 3606 max([len(abs) for abs in items]),
3607 3607 max([len(m.rel(abs)) for abs in items]))
3608 3608 for abs in items:
3609 3609 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3610 3610 ui.write("%s\n" % line.rstrip())
3611 3611
3612 3612 @command('debugwireargs',
3613 3613 [('', 'three', '', 'three'),
3614 3614 ('', 'four', '', 'four'),
3615 3615 ('', 'five', '', 'five'),
3616 3616 ] + remoteopts,
3617 3617 _('REPO [OPTIONS]... [ONE [TWO]]'),
3618 3618 norepo=True)
3619 3619 def debugwireargs(ui, repopath, *vals, **opts):
3620 3620 repo = hg.peer(ui, opts, repopath)
3621 3621 for opt in remoteopts:
3622 3622 del opts[opt[1]]
3623 3623 args = {}
3624 3624 for k, v in opts.iteritems():
3625 3625 if v:
3626 3626 args[k] = v
3627 3627 # run twice to check that we don't mess up the stream for the next command
3628 3628 res1 = repo.debugwireargs(*vals, **args)
3629 3629 res2 = repo.debugwireargs(*vals, **args)
3630 3630 ui.write("%s\n" % res1)
3631 3631 if res1 != res2:
3632 3632 ui.warn("%s\n" % res2)
3633 3633
3634 3634 @command('^diff',
3635 3635 [('r', 'rev', [], _('revision'), _('REV')),
3636 3636 ('c', 'change', '', _('change made by revision'), _('REV'))
3637 3637 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3638 3638 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3639 3639 inferrepo=True)
3640 3640 def diff(ui, repo, *pats, **opts):
3641 3641 """diff repository (or selected files)
3642 3642
3643 3643 Show differences between revisions for the specified files.
3644 3644
3645 3645 Differences between files are shown using the unified diff format.
3646 3646
3647 3647 .. note::
3648 3648
3649 3649 :hg:`diff` may generate unexpected results for merges, as it will
3650 3650 default to comparing against the working directory's first
3651 3651 parent changeset if no revisions are specified.
3652 3652
3653 3653 When two revision arguments are given, then changes are shown
3654 3654 between those revisions. If only one revision is specified then
3655 3655 that revision is compared to the working directory, and, when no
3656 3656 revisions are specified, the working directory files are compared
3657 3657 to its first parent.
3658 3658
3659 3659 Alternatively you can specify -c/--change with a revision to see
3660 3660 the changes in that changeset relative to its first parent.
3661 3661
3662 3662 Without the -a/--text option, diff will avoid generating diffs of
3663 3663 files it detects as binary. With -a, diff will generate a diff
3664 3664 anyway, probably with undesirable results.
3665 3665
3666 3666 Use the -g/--git option to generate diffs in the git extended diff
3667 3667 format. For more information, read :hg:`help diffs`.
3668 3668
3669 3669 .. container:: verbose
3670 3670
3671 3671 Examples:
3672 3672
3673 3673 - compare a file in the current working directory to its parent::
3674 3674
3675 3675 hg diff foo.c
3676 3676
3677 3677 - compare two historical versions of a directory, with rename info::
3678 3678
3679 3679 hg diff --git -r 1.0:1.2 lib/
3680 3680
3681 3681 - get change stats relative to the last change on some date::
3682 3682
3683 3683 hg diff --stat -r "date('may 2')"
3684 3684
3685 3685 - diff all newly-added files that contain a keyword::
3686 3686
3687 3687 hg diff "set:added() and grep(GNU)"
3688 3688
3689 3689 - compare a revision and its parents::
3690 3690
3691 3691 hg diff -c 9353 # compare against first parent
3692 3692 hg diff -r 9353^:9353 # same using revset syntax
3693 3693 hg diff -r 9353^2:9353 # compare against the second parent
3694 3694
3695 3695 Returns 0 on success.
3696 3696 """
3697 3697
3698 3698 revs = opts.get('rev')
3699 3699 change = opts.get('change')
3700 3700 stat = opts.get('stat')
3701 3701 reverse = opts.get('reverse')
3702 3702
3703 3703 if revs and change:
3704 3704 msg = _('cannot specify --rev and --change at the same time')
3705 3705 raise error.Abort(msg)
3706 3706 elif change:
3707 3707 node2 = scmutil.revsingle(repo, change, None).node()
3708 3708 node1 = repo[node2].p1().node()
3709 3709 else:
3710 3710 node1, node2 = scmutil.revpair(repo, revs)
3711 3711
3712 3712 if reverse:
3713 3713 node1, node2 = node2, node1
3714 3714
3715 3715 diffopts = patch.diffallopts(ui, opts)
3716 3716 m = scmutil.match(repo[node2], pats, opts)
3717 3717 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3718 3718 listsubrepos=opts.get('subrepos'),
3719 3719 root=opts.get('root'))
3720 3720
3721 3721 @command('^export',
3722 3722 [('o', 'output', '',
3723 3723 _('print output to file with formatted name'), _('FORMAT')),
3724 3724 ('', 'switch-parent', None, _('diff against the second parent')),
3725 3725 ('r', 'rev', [], _('revisions to export'), _('REV')),
3726 3726 ] + diffopts,
3727 3727 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3728 3728 def export(ui, repo, *changesets, **opts):
3729 3729 """dump the header and diffs for one or more changesets
3730 3730
3731 3731 Print the changeset header and diffs for one or more revisions.
3732 3732 If no revision is given, the parent of the working directory is used.
3733 3733
3734 3734 The information shown in the changeset header is: author, date,
3735 3735 branch name (if non-default), changeset hash, parent(s) and commit
3736 3736 comment.
3737 3737
3738 3738 .. note::
3739 3739
3740 3740 :hg:`export` may generate unexpected diff output for merge
3741 3741 changesets, as it will compare the merge changeset against its
3742 3742 first parent only.
3743 3743
3744 3744 Output may be to a file, in which case the name of the file is
3745 3745 given using a format string. The formatting rules are as follows:
3746 3746
3747 3747 :``%%``: literal "%" character
3748 3748 :``%H``: changeset hash (40 hexadecimal digits)
3749 3749 :``%N``: number of patches being generated
3750 3750 :``%R``: changeset revision number
3751 3751 :``%b``: basename of the exporting repository
3752 3752 :``%h``: short-form changeset hash (12 hexadecimal digits)
3753 3753 :``%m``: first line of the commit message (only alphanumeric characters)
3754 3754 :``%n``: zero-padded sequence number, starting at 1
3755 3755 :``%r``: zero-padded changeset revision number
3756 3756
3757 3757 Without the -a/--text option, export will avoid generating diffs
3758 3758 of files it detects as binary. With -a, export will generate a
3759 3759 diff anyway, probably with undesirable results.
3760 3760
3761 3761 Use the -g/--git option to generate diffs in the git extended diff
3762 3762 format. See :hg:`help diffs` for more information.
3763 3763
3764 3764 With the --switch-parent option, the diff will be against the
3765 3765 second parent. It can be useful to review a merge.
3766 3766
3767 3767 .. container:: verbose
3768 3768
3769 3769 Examples:
3770 3770
3771 3771 - use export and import to transplant a bugfix to the current
3772 3772 branch::
3773 3773
3774 3774 hg export -r 9353 | hg import -
3775 3775
3776 3776 - export all the changesets between two revisions to a file with
3777 3777 rename information::
3778 3778
3779 3779 hg export --git -r 123:150 > changes.txt
3780 3780
3781 3781 - split outgoing changes into a series of patches with
3782 3782 descriptive names::
3783 3783
3784 3784 hg export -r "outgoing()" -o "%n-%m.patch"
3785 3785
3786 3786 Returns 0 on success.
3787 3787 """
3788 3788 changesets += tuple(opts.get('rev', []))
3789 3789 if not changesets:
3790 3790 changesets = ['.']
3791 3791 revs = scmutil.revrange(repo, changesets)
3792 3792 if not revs:
3793 3793 raise error.Abort(_("export requires at least one changeset"))
3794 3794 if len(revs) > 1:
3795 3795 ui.note(_('exporting patches:\n'))
3796 3796 else:
3797 3797 ui.note(_('exporting patch:\n'))
3798 3798 cmdutil.export(repo, revs, template=opts.get('output'),
3799 3799 switch_parent=opts.get('switch_parent'),
3800 3800 opts=patch.diffallopts(ui, opts))
3801 3801
3802 3802 @command('files',
3803 3803 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3804 3804 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3805 3805 ] + walkopts + formatteropts + subrepoopts,
3806 3806 _('[OPTION]... [PATTERN]...'))
3807 3807 def files(ui, repo, *pats, **opts):
3808 3808 """list tracked files
3809 3809
3810 3810 Print files under Mercurial control in the working directory or
3811 3811 specified revision whose names match the given patterns (excluding
3812 3812 removed files).
3813 3813
3814 3814 If no patterns are given to match, this command prints the names
3815 3815 of all files under Mercurial control in the working directory.
3816 3816
3817 3817 .. container:: verbose
3818 3818
3819 3819 Examples:
3820 3820
3821 3821 - list all files under the current directory::
3822 3822
3823 3823 hg files .
3824 3824
3825 3825 - shows sizes and flags for current revision::
3826 3826
3827 3827 hg files -vr .
3828 3828
3829 3829 - list all files named README::
3830 3830
3831 3831 hg files -I "**/README"
3832 3832
3833 3833 - list all binary files::
3834 3834
3835 3835 hg files "set:binary()"
3836 3836
3837 3837 - find files containing a regular expression::
3838 3838
3839 3839 hg files "set:grep('bob')"
3840 3840
3841 3841 - search tracked file contents with xargs and grep::
3842 3842
3843 3843 hg files -0 | xargs -0 grep foo
3844 3844
3845 3845 See :hg:`help patterns` and :hg:`help filesets` for more information
3846 3846 on specifying file patterns.
3847 3847
3848 3848 Returns 0 if a match is found, 1 otherwise.
3849 3849
3850 3850 """
3851 3851 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3852 3852
3853 3853 end = '\n'
3854 3854 if opts.get('print0'):
3855 3855 end = '\0'
3856 3856 fm = ui.formatter('files', opts)
3857 3857 fmt = '%s' + end
3858 3858
3859 3859 m = scmutil.match(ctx, pats, opts)
3860 3860 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3861 3861
3862 3862 fm.end()
3863 3863
3864 3864 return ret
3865 3865
3866 3866 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3867 3867 def forget(ui, repo, *pats, **opts):
3868 3868 """forget the specified files on the next commit
3869 3869
3870 3870 Mark the specified files so they will no longer be tracked
3871 3871 after the next commit.
3872 3872
3873 3873 This only removes files from the current branch, not from the
3874 3874 entire project history, and it does not delete them from the
3875 3875 working directory.
3876 3876
3877 3877 To delete the file from the working directory, see :hg:`remove`.
3878 3878
3879 3879 To undo a forget before the next commit, see :hg:`add`.
3880 3880
3881 3881 .. container:: verbose
3882 3882
3883 3883 Examples:
3884 3884
3885 3885 - forget newly-added binary files::
3886 3886
3887 3887 hg forget "set:added() and binary()"
3888 3888
3889 3889 - forget files that would be excluded by .hgignore::
3890 3890
3891 3891 hg forget "set:hgignore()"
3892 3892
3893 3893 Returns 0 on success.
3894 3894 """
3895 3895
3896 3896 if not pats:
3897 3897 raise error.Abort(_('no files specified'))
3898 3898
3899 3899 m = scmutil.match(repo[None], pats, opts)
3900 3900 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3901 3901 return rejected and 1 or 0
3902 3902
3903 3903 @command(
3904 3904 'graft',
3905 3905 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3906 3906 ('c', 'continue', False, _('resume interrupted graft')),
3907 3907 ('e', 'edit', False, _('invoke editor on commit messages')),
3908 3908 ('', 'log', None, _('append graft info to log message')),
3909 3909 ('f', 'force', False, _('force graft')),
3910 3910 ('D', 'currentdate', False,
3911 3911 _('record the current date as commit date')),
3912 3912 ('U', 'currentuser', False,
3913 3913 _('record the current user as committer'), _('DATE'))]
3914 3914 + commitopts2 + mergetoolopts + dryrunopts,
3915 3915 _('[OPTION]... [-r REV]... REV...'))
3916 3916 def graft(ui, repo, *revs, **opts):
3917 3917 '''copy changes from other branches onto the current branch
3918 3918
3919 3919 This command uses Mercurial's merge logic to copy individual
3920 3920 changes from other branches without merging branches in the
3921 3921 history graph. This is sometimes known as 'backporting' or
3922 3922 'cherry-picking'. By default, graft will copy user, date, and
3923 3923 description from the source changesets.
3924 3924
3925 3925 Changesets that are ancestors of the current revision, that have
3926 3926 already been grafted, or that are merges will be skipped.
3927 3927
3928 3928 If --log is specified, log messages will have a comment appended
3929 3929 of the form::
3930 3930
3931 3931 (grafted from CHANGESETHASH)
3932 3932
3933 3933 If --force is specified, revisions will be grafted even if they
3934 3934 are already ancestors of or have been grafted to the destination.
3935 3935 This is useful when the revisions have since been backed out.
3936 3936
3937 3937 If a graft merge results in conflicts, the graft process is
3938 3938 interrupted so that the current merge can be manually resolved.
3939 3939 Once all conflicts are addressed, the graft process can be
3940 3940 continued with the -c/--continue option.
3941 3941
3942 3942 .. note::
3943 3943
3944 3944 The -c/--continue option does not reapply earlier options, except
3945 3945 for --force.
3946 3946
3947 3947 .. container:: verbose
3948 3948
3949 3949 Examples:
3950 3950
3951 3951 - copy a single change to the stable branch and edit its description::
3952 3952
3953 3953 hg update stable
3954 3954 hg graft --edit 9393
3955 3955
3956 3956 - graft a range of changesets with one exception, updating dates::
3957 3957
3958 3958 hg graft -D "2085::2093 and not 2091"
3959 3959
3960 3960 - continue a graft after resolving conflicts::
3961 3961
3962 3962 hg graft -c
3963 3963
3964 3964 - show the source of a grafted changeset::
3965 3965
3966 3966 hg log --debug -r .
3967 3967
3968 3968 - show revisions sorted by date::
3969 3969
3970 3970 hg log -r 'sort(all(), date)'
3971 3971
3972 3972 See :hg:`help revisions` and :hg:`help revsets` for more about
3973 3973 specifying revisions.
3974 3974
3975 3975 Returns 0 on successful completion.
3976 3976 '''
3977 3977 with repo.wlock():
3978 3978 return _dograft(ui, repo, *revs, **opts)
3979 3979
3980 3980 def _dograft(ui, repo, *revs, **opts):
3981 3981 if revs and opts['rev']:
3982 3982 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3983 3983 'revision ordering!\n'))
3984 3984
3985 3985 revs = list(revs)
3986 3986 revs.extend(opts['rev'])
3987 3987
3988 3988 if not opts.get('user') and opts.get('currentuser'):
3989 3989 opts['user'] = ui.username()
3990 3990 if not opts.get('date') and opts.get('currentdate'):
3991 3991 opts['date'] = "%d %d" % util.makedate()
3992 3992
3993 3993 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3994 3994
3995 3995 cont = False
3996 3996 if opts['continue']:
3997 3997 cont = True
3998 3998 if revs:
3999 3999 raise error.Abort(_("can't specify --continue and revisions"))
4000 4000 # read in unfinished revisions
4001 4001 try:
4002 4002 nodes = repo.vfs.read('graftstate').splitlines()
4003 4003 revs = [repo[node].rev() for node in nodes]
4004 4004 except IOError as inst:
4005 4005 if inst.errno != errno.ENOENT:
4006 4006 raise
4007 4007 cmdutil.wrongtooltocontinue(repo, _('graft'))
4008 4008 else:
4009 4009 cmdutil.checkunfinished(repo)
4010 4010 cmdutil.bailifchanged(repo)
4011 4011 if not revs:
4012 4012 raise error.Abort(_('no revisions specified'))
4013 4013 revs = scmutil.revrange(repo, revs)
4014 4014
4015 4015 skipped = set()
4016 4016 # check for merges
4017 4017 for rev in repo.revs('%ld and merge()', revs):
4018 4018 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4019 4019 skipped.add(rev)
4020 4020 revs = [r for r in revs if r not in skipped]
4021 4021 if not revs:
4022 4022 return -1
4023 4023
4024 4024 # Don't check in the --continue case, in effect retaining --force across
4025 4025 # --continues. That's because without --force, any revisions we decided to
4026 4026 # skip would have been filtered out here, so they wouldn't have made their
4027 4027 # way to the graftstate. With --force, any revisions we would have otherwise
4028 4028 # skipped would not have been filtered out, and if they hadn't been applied
4029 4029 # already, they'd have been in the graftstate.
4030 4030 if not (cont or opts.get('force')):
4031 4031 # check for ancestors of dest branch
4032 4032 crev = repo['.'].rev()
4033 4033 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4034 4034 # Cannot use x.remove(y) on smart set, this has to be a list.
4035 4035 # XXX make this lazy in the future
4036 4036 revs = list(revs)
4037 4037 # don't mutate while iterating, create a copy
4038 4038 for rev in list(revs):
4039 4039 if rev in ancestors:
4040 4040 ui.warn(_('skipping ancestor revision %d:%s\n') %
4041 4041 (rev, repo[rev]))
4042 4042 # XXX remove on list is slow
4043 4043 revs.remove(rev)
4044 4044 if not revs:
4045 4045 return -1
4046 4046
4047 4047 # analyze revs for earlier grafts
4048 4048 ids = {}
4049 4049 for ctx in repo.set("%ld", revs):
4050 4050 ids[ctx.hex()] = ctx.rev()
4051 4051 n = ctx.extra().get('source')
4052 4052 if n:
4053 4053 ids[n] = ctx.rev()
4054 4054
4055 4055 # check ancestors for earlier grafts
4056 4056 ui.debug('scanning for duplicate grafts\n')
4057 4057
4058 4058 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4059 4059 ctx = repo[rev]
4060 4060 n = ctx.extra().get('source')
4061 4061 if n in ids:
4062 4062 try:
4063 4063 r = repo[n].rev()
4064 4064 except error.RepoLookupError:
4065 4065 r = None
4066 4066 if r in revs:
4067 4067 ui.warn(_('skipping revision %d:%s '
4068 4068 '(already grafted to %d:%s)\n')
4069 4069 % (r, repo[r], rev, ctx))
4070 4070 revs.remove(r)
4071 4071 elif ids[n] in revs:
4072 4072 if r is None:
4073 4073 ui.warn(_('skipping already grafted revision %d:%s '
4074 4074 '(%d:%s also has unknown origin %s)\n')
4075 4075 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4076 4076 else:
4077 4077 ui.warn(_('skipping already grafted revision %d:%s '
4078 4078 '(%d:%s also has origin %d:%s)\n')
4079 4079 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4080 4080 revs.remove(ids[n])
4081 4081 elif ctx.hex() in ids:
4082 4082 r = ids[ctx.hex()]
4083 4083 ui.warn(_('skipping already grafted revision %d:%s '
4084 4084 '(was grafted from %d:%s)\n') %
4085 4085 (r, repo[r], rev, ctx))
4086 4086 revs.remove(r)
4087 4087 if not revs:
4088 4088 return -1
4089 4089
4090 4090 for pos, ctx in enumerate(repo.set("%ld", revs)):
4091 4091 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4092 4092 ctx.description().split('\n', 1)[0])
4093 4093 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4094 4094 if names:
4095 4095 desc += ' (%s)' % ' '.join(names)
4096 4096 ui.status(_('grafting %s\n') % desc)
4097 4097 if opts.get('dry_run'):
4098 4098 continue
4099 4099
4100 4100 source = ctx.extra().get('source')
4101 4101 extra = {}
4102 4102 if source:
4103 4103 extra['source'] = source
4104 4104 extra['intermediate-source'] = ctx.hex()
4105 4105 else:
4106 4106 extra['source'] = ctx.hex()
4107 4107 user = ctx.user()
4108 4108 if opts.get('user'):
4109 4109 user = opts['user']
4110 4110 date = ctx.date()
4111 4111 if opts.get('date'):
4112 4112 date = opts['date']
4113 4113 message = ctx.description()
4114 4114 if opts.get('log'):
4115 4115 message += '\n(grafted from %s)' % ctx.hex()
4116 4116
4117 4117 # we don't merge the first commit when continuing
4118 4118 if not cont:
4119 4119 # perform the graft merge with p1(rev) as 'ancestor'
4120 4120 try:
4121 4121 # ui.forcemerge is an internal variable, do not document
4122 4122 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4123 4123 'graft')
4124 4124 stats = mergemod.graft(repo, ctx, ctx.p1(),
4125 4125 ['local', 'graft'])
4126 4126 finally:
4127 4127 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4128 4128 # report any conflicts
4129 4129 if stats and stats[3] > 0:
4130 4130 # write out state for --continue
4131 4131 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4132 4132 repo.vfs.write('graftstate', ''.join(nodelines))
4133 4133 extra = ''
4134 4134 if opts.get('user'):
4135 4135 extra += ' --user %s' % opts['user']
4136 4136 if opts.get('date'):
4137 4137 extra += ' --date %s' % opts['date']
4138 4138 if opts.get('log'):
4139 4139 extra += ' --log'
4140 4140 hint=_('use hg resolve and hg graft --continue%s') % extra
4141 4141 raise error.Abort(
4142 4142 _("unresolved conflicts, can't continue"),
4143 4143 hint=hint)
4144 4144 else:
4145 4145 cont = False
4146 4146
4147 4147 # commit
4148 4148 node = repo.commit(text=message, user=user,
4149 4149 date=date, extra=extra, editor=editor)
4150 4150 if node is None:
4151 4151 ui.warn(
4152 4152 _('note: graft of %d:%s created no changes to commit\n') %
4153 4153 (ctx.rev(), ctx))
4154 4154
4155 4155 # remove state when we complete successfully
4156 4156 if not opts.get('dry_run'):
4157 4157 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4158 4158
4159 4159 return 0
4160 4160
4161 4161 @command('grep',
4162 4162 [('0', 'print0', None, _('end fields with NUL')),
4163 4163 ('', 'all', None, _('print all revisions that match')),
4164 4164 ('a', 'text', None, _('treat all files as text')),
4165 4165 ('f', 'follow', None,
4166 4166 _('follow changeset history,'
4167 4167 ' or file history across copies and renames')),
4168 4168 ('i', 'ignore-case', None, _('ignore case when matching')),
4169 4169 ('l', 'files-with-matches', None,
4170 4170 _('print only filenames and revisions that match')),
4171 4171 ('n', 'line-number', None, _('print matching line numbers')),
4172 4172 ('r', 'rev', [],
4173 4173 _('only search files changed within revision range'), _('REV')),
4174 4174 ('u', 'user', None, _('list the author (long with -v)')),
4175 4175 ('d', 'date', None, _('list the date (short with -q)')),
4176 4176 ] + walkopts,
4177 4177 _('[OPTION]... PATTERN [FILE]...'),
4178 4178 inferrepo=True)
4179 4179 def grep(ui, repo, pattern, *pats, **opts):
4180 4180 """search for a pattern in specified files and revisions
4181 4181
4182 4182 Search revisions of files for a regular expression.
4183 4183
4184 4184 This command behaves differently than Unix grep. It only accepts
4185 4185 Python/Perl regexps. It searches repository history, not the
4186 4186 working directory. It always prints the revision number in which a
4187 4187 match appears.
4188 4188
4189 4189 By default, grep only prints output for the first revision of a
4190 4190 file in which it finds a match. To get it to print every revision
4191 4191 that contains a change in match status ("-" for a match that
4192 4192 becomes a non-match, or "+" for a non-match that becomes a match),
4193 4193 use the --all flag.
4194 4194
4195 4195 Returns 0 if a match is found, 1 otherwise.
4196 4196 """
4197 4197 reflags = re.M
4198 4198 if opts.get('ignore_case'):
4199 4199 reflags |= re.I
4200 4200 try:
4201 4201 regexp = util.re.compile(pattern, reflags)
4202 4202 except re.error as inst:
4203 4203 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4204 4204 return 1
4205 4205 sep, eol = ':', '\n'
4206 4206 if opts.get('print0'):
4207 4207 sep = eol = '\0'
4208 4208
4209 4209 getfile = util.lrucachefunc(repo.file)
4210 4210
4211 4211 def matchlines(body):
4212 4212 begin = 0
4213 4213 linenum = 0
4214 4214 while begin < len(body):
4215 4215 match = regexp.search(body, begin)
4216 4216 if not match:
4217 4217 break
4218 4218 mstart, mend = match.span()
4219 4219 linenum += body.count('\n', begin, mstart) + 1
4220 4220 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4221 4221 begin = body.find('\n', mend) + 1 or len(body) + 1
4222 4222 lend = begin - 1
4223 4223 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4224 4224
4225 4225 class linestate(object):
4226 4226 def __init__(self, line, linenum, colstart, colend):
4227 4227 self.line = line
4228 4228 self.linenum = linenum
4229 4229 self.colstart = colstart
4230 4230 self.colend = colend
4231 4231
4232 4232 def __hash__(self):
4233 4233 return hash((self.linenum, self.line))
4234 4234
4235 4235 def __eq__(self, other):
4236 4236 return self.line == other.line
4237 4237
4238 4238 def __iter__(self):
4239 4239 yield (self.line[:self.colstart], '')
4240 4240 yield (self.line[self.colstart:self.colend], 'grep.match')
4241 4241 rest = self.line[self.colend:]
4242 4242 while rest != '':
4243 4243 match = regexp.search(rest)
4244 4244 if not match:
4245 4245 yield (rest, '')
4246 4246 break
4247 4247 mstart, mend = match.span()
4248 4248 yield (rest[:mstart], '')
4249 4249 yield (rest[mstart:mend], 'grep.match')
4250 4250 rest = rest[mend:]
4251 4251
4252 4252 matches = {}
4253 4253 copies = {}
4254 4254 def grepbody(fn, rev, body):
4255 4255 matches[rev].setdefault(fn, [])
4256 4256 m = matches[rev][fn]
4257 4257 for lnum, cstart, cend, line in matchlines(body):
4258 4258 s = linestate(line, lnum, cstart, cend)
4259 4259 m.append(s)
4260 4260
4261 4261 def difflinestates(a, b):
4262 4262 sm = difflib.SequenceMatcher(None, a, b)
4263 4263 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4264 4264 if tag == 'insert':
4265 4265 for i in xrange(blo, bhi):
4266 4266 yield ('+', b[i])
4267 4267 elif tag == 'delete':
4268 4268 for i in xrange(alo, ahi):
4269 4269 yield ('-', a[i])
4270 4270 elif tag == 'replace':
4271 4271 for i in xrange(alo, ahi):
4272 4272 yield ('-', a[i])
4273 4273 for i in xrange(blo, bhi):
4274 4274 yield ('+', b[i])
4275 4275
4276 4276 def display(fn, ctx, pstates, states):
4277 4277 rev = ctx.rev()
4278 4278 if ui.quiet:
4279 4279 datefunc = util.shortdate
4280 4280 else:
4281 4281 datefunc = util.datestr
4282 4282 found = False
4283 4283 @util.cachefunc
4284 4284 def binary():
4285 4285 flog = getfile(fn)
4286 4286 return util.binary(flog.read(ctx.filenode(fn)))
4287 4287
4288 4288 if opts.get('all'):
4289 4289 iter = difflinestates(pstates, states)
4290 4290 else:
4291 4291 iter = [('', l) for l in states]
4292 4292 for change, l in iter:
4293 4293 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4294 4294
4295 4295 if opts.get('line_number'):
4296 4296 cols.append((str(l.linenum), 'grep.linenumber'))
4297 4297 if opts.get('all'):
4298 4298 cols.append((change, 'grep.change'))
4299 4299 if opts.get('user'):
4300 4300 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4301 4301 if opts.get('date'):
4302 4302 cols.append((datefunc(ctx.date()), 'grep.date'))
4303 4303 for col, label in cols[:-1]:
4304 4304 ui.write(col, label=label)
4305 4305 ui.write(sep, label='grep.sep')
4306 4306 ui.write(cols[-1][0], label=cols[-1][1])
4307 4307 if not opts.get('files_with_matches'):
4308 4308 ui.write(sep, label='grep.sep')
4309 4309 if not opts.get('text') and binary():
4310 4310 ui.write(" Binary file matches")
4311 4311 else:
4312 4312 for s, label in l:
4313 4313 ui.write(s, label=label)
4314 4314 ui.write(eol)
4315 4315 found = True
4316 4316 if opts.get('files_with_matches'):
4317 4317 break
4318 4318 return found
4319 4319
4320 4320 skip = {}
4321 4321 revfiles = {}
4322 4322 matchfn = scmutil.match(repo[None], pats, opts)
4323 4323 found = False
4324 4324 follow = opts.get('follow')
4325 4325
4326 4326 def prep(ctx, fns):
4327 4327 rev = ctx.rev()
4328 4328 pctx = ctx.p1()
4329 4329 parent = pctx.rev()
4330 4330 matches.setdefault(rev, {})
4331 4331 matches.setdefault(parent, {})
4332 4332 files = revfiles.setdefault(rev, [])
4333 4333 for fn in fns:
4334 4334 flog = getfile(fn)
4335 4335 try:
4336 4336 fnode = ctx.filenode(fn)
4337 4337 except error.LookupError:
4338 4338 continue
4339 4339
4340 4340 copied = flog.renamed(fnode)
4341 4341 copy = follow and copied and copied[0]
4342 4342 if copy:
4343 4343 copies.setdefault(rev, {})[fn] = copy
4344 4344 if fn in skip:
4345 4345 if copy:
4346 4346 skip[copy] = True
4347 4347 continue
4348 4348 files.append(fn)
4349 4349
4350 4350 if fn not in matches[rev]:
4351 4351 grepbody(fn, rev, flog.read(fnode))
4352 4352
4353 4353 pfn = copy or fn
4354 4354 if pfn not in matches[parent]:
4355 4355 try:
4356 4356 fnode = pctx.filenode(pfn)
4357 4357 grepbody(pfn, parent, flog.read(fnode))
4358 4358 except error.LookupError:
4359 4359 pass
4360 4360
4361 4361 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4362 4362 rev = ctx.rev()
4363 4363 parent = ctx.p1().rev()
4364 4364 for fn in sorted(revfiles.get(rev, [])):
4365 4365 states = matches[rev][fn]
4366 4366 copy = copies.get(rev, {}).get(fn)
4367 4367 if fn in skip:
4368 4368 if copy:
4369 4369 skip[copy] = True
4370 4370 continue
4371 4371 pstates = matches.get(parent, {}).get(copy or fn, [])
4372 4372 if pstates or states:
4373 4373 r = display(fn, ctx, pstates, states)
4374 4374 found = found or r
4375 4375 if r and not opts.get('all'):
4376 4376 skip[fn] = True
4377 4377 if copy:
4378 4378 skip[copy] = True
4379 4379 del matches[rev]
4380 4380 del revfiles[rev]
4381 4381
4382 4382 return not found
4383 4383
4384 4384 @command('heads',
4385 4385 [('r', 'rev', '',
4386 4386 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4387 4387 ('t', 'topo', False, _('show topological heads only')),
4388 4388 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4389 4389 ('c', 'closed', False, _('show normal and closed branch heads')),
4390 4390 ] + templateopts,
4391 4391 _('[-ct] [-r STARTREV] [REV]...'))
4392 4392 def heads(ui, repo, *branchrevs, **opts):
4393 4393 """show branch heads
4394 4394
4395 4395 With no arguments, show all open branch heads in the repository.
4396 4396 Branch heads are changesets that have no descendants on the
4397 4397 same branch. They are where development generally takes place and
4398 4398 are the usual targets for update and merge operations.
4399 4399
4400 4400 If one or more REVs are given, only open branch heads on the
4401 4401 branches associated with the specified changesets are shown. This
4402 4402 means that you can use :hg:`heads .` to see the heads on the
4403 4403 currently checked-out branch.
4404 4404
4405 4405 If -c/--closed is specified, also show branch heads marked closed
4406 4406 (see :hg:`commit --close-branch`).
4407 4407
4408 4408 If STARTREV is specified, only those heads that are descendants of
4409 4409 STARTREV will be displayed.
4410 4410
4411 4411 If -t/--topo is specified, named branch mechanics will be ignored and only
4412 4412 topological heads (changesets with no children) will be shown.
4413 4413
4414 4414 Returns 0 if matching heads are found, 1 if not.
4415 4415 """
4416 4416
4417 4417 start = None
4418 4418 if 'rev' in opts:
4419 4419 start = scmutil.revsingle(repo, opts['rev'], None).node()
4420 4420
4421 4421 if opts.get('topo'):
4422 4422 heads = [repo[h] for h in repo.heads(start)]
4423 4423 else:
4424 4424 heads = []
4425 4425 for branch in repo.branchmap():
4426 4426 heads += repo.branchheads(branch, start, opts.get('closed'))
4427 4427 heads = [repo[h] for h in heads]
4428 4428
4429 4429 if branchrevs:
4430 4430 branches = set(repo[br].branch() for br in branchrevs)
4431 4431 heads = [h for h in heads if h.branch() in branches]
4432 4432
4433 4433 if opts.get('active') and branchrevs:
4434 4434 dagheads = repo.heads(start)
4435 4435 heads = [h for h in heads if h.node() in dagheads]
4436 4436
4437 4437 if branchrevs:
4438 4438 haveheads = set(h.branch() for h in heads)
4439 4439 if branches - haveheads:
4440 4440 headless = ', '.join(b for b in branches - haveheads)
4441 4441 msg = _('no open branch heads found on branches %s')
4442 4442 if opts.get('rev'):
4443 4443 msg += _(' (started at %s)') % opts['rev']
4444 4444 ui.warn((msg + '\n') % headless)
4445 4445
4446 4446 if not heads:
4447 4447 return 1
4448 4448
4449 4449 heads = sorted(heads, key=lambda x: -x.rev())
4450 4450 displayer = cmdutil.show_changeset(ui, repo, opts)
4451 4451 for ctx in heads:
4452 4452 displayer.show(ctx)
4453 4453 displayer.close()
4454 4454
4455 4455 @command('help',
4456 4456 [('e', 'extension', None, _('show only help for extensions')),
4457 4457 ('c', 'command', None, _('show only help for commands')),
4458 4458 ('k', 'keyword', None, _('show topics matching keyword')),
4459 4459 ('s', 'system', [], _('show help for specific platform(s)')),
4460 4460 ],
4461 4461 _('[-ecks] [TOPIC]'),
4462 4462 norepo=True)
4463 4463 def help_(ui, name=None, **opts):
4464 4464 """show help for a given topic or a help overview
4465 4465
4466 4466 With no arguments, print a list of commands with short help messages.
4467 4467
4468 4468 Given a topic, extension, or command name, print help for that
4469 4469 topic.
4470 4470
4471 4471 Returns 0 if successful.
4472 4472 """
4473 4473
4474 4474 textwidth = min(ui.termwidth(), 80) - 2
4475 4475
4476 4476 keep = opts.get('system') or []
4477 4477 if len(keep) == 0:
4478 4478 if sys.platform.startswith('win'):
4479 4479 keep.append('windows')
4480 4480 elif sys.platform == 'OpenVMS':
4481 4481 keep.append('vms')
4482 4482 elif sys.platform == 'plan9':
4483 4483 keep.append('plan9')
4484 4484 else:
4485 4485 keep.append('unix')
4486 4486 keep.append(sys.platform.lower())
4487 4487 if ui.verbose:
4488 4488 keep.append('verbose')
4489 4489
4490 4490 section = None
4491 4491 subtopic = None
4492 4492 if name and '.' in name:
4493 4493 name, section = name.split('.', 1)
4494 4494 section = section.lower()
4495 4495 if '.' in section:
4496 4496 subtopic, section = section.split('.', 1)
4497 4497 else:
4498 4498 subtopic = section
4499 4499
4500 4500 text = help.help_(ui, name, subtopic=subtopic, **opts)
4501 4501
4502 4502 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4503 4503 section=section)
4504 4504
4505 4505 # We could have been given a weird ".foo" section without a name
4506 4506 # to look for, or we could have simply failed to found "foo.bar"
4507 4507 # because bar isn't a section of foo
4508 4508 if section and not (formatted and name):
4509 4509 raise error.Abort(_("help section not found"))
4510 4510
4511 4511 if 'verbose' in pruned:
4512 4512 keep.append('omitted')
4513 4513 else:
4514 4514 keep.append('notomitted')
4515 4515 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4516 4516 section=section)
4517 4517 ui.write(formatted)
4518 4518
4519 4519
4520 4520 @command('identify|id',
4521 4521 [('r', 'rev', '',
4522 4522 _('identify the specified revision'), _('REV')),
4523 4523 ('n', 'num', None, _('show local revision number')),
4524 4524 ('i', 'id', None, _('show global revision id')),
4525 4525 ('b', 'branch', None, _('show branch')),
4526 4526 ('t', 'tags', None, _('show tags')),
4527 4527 ('B', 'bookmarks', None, _('show bookmarks')),
4528 4528 ] + remoteopts,
4529 4529 _('[-nibtB] [-r REV] [SOURCE]'),
4530 4530 optionalrepo=True)
4531 4531 def identify(ui, repo, source=None, rev=None,
4532 4532 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4533 4533 """identify the working directory or specified revision
4534 4534
4535 4535 Print a summary identifying the repository state at REV using one or
4536 4536 two parent hash identifiers, followed by a "+" if the working
4537 4537 directory has uncommitted changes, the branch name (if not default),
4538 4538 a list of tags, and a list of bookmarks.
4539 4539
4540 4540 When REV is not given, print a summary of the current state of the
4541 4541 repository.
4542 4542
4543 4543 Specifying a path to a repository root or Mercurial bundle will
4544 4544 cause lookup to operate on that repository/bundle.
4545 4545
4546 4546 .. container:: verbose
4547 4547
4548 4548 Examples:
4549 4549
4550 4550 - generate a build identifier for the working directory::
4551 4551
4552 4552 hg id --id > build-id.dat
4553 4553
4554 4554 - find the revision corresponding to a tag::
4555 4555
4556 4556 hg id -n -r 1.3
4557 4557
4558 4558 - check the most recent revision of a remote repository::
4559 4559
4560 4560 hg id -r tip http://selenic.com/hg/
4561 4561
4562 4562 See :hg:`log` for generating more information about specific revisions,
4563 4563 including full hash identifiers.
4564 4564
4565 4565 Returns 0 if successful.
4566 4566 """
4567 4567
4568 4568 if not repo and not source:
4569 4569 raise error.Abort(_("there is no Mercurial repository here "
4570 4570 "(.hg not found)"))
4571 4571
4572 4572 if ui.debugflag:
4573 4573 hexfunc = hex
4574 4574 else:
4575 4575 hexfunc = short
4576 4576 default = not (num or id or branch or tags or bookmarks)
4577 4577 output = []
4578 4578 revs = []
4579 4579
4580 4580 if source:
4581 4581 source, branches = hg.parseurl(ui.expandpath(source))
4582 4582 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4583 4583 repo = peer.local()
4584 4584 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4585 4585
4586 4586 if not repo:
4587 4587 if num or branch or tags:
4588 4588 raise error.Abort(
4589 4589 _("can't query remote revision number, branch, or tags"))
4590 4590 if not rev and revs:
4591 4591 rev = revs[0]
4592 4592 if not rev:
4593 4593 rev = "tip"
4594 4594
4595 4595 remoterev = peer.lookup(rev)
4596 4596 if default or id:
4597 4597 output = [hexfunc(remoterev)]
4598 4598
4599 4599 def getbms():
4600 4600 bms = []
4601 4601
4602 4602 if 'bookmarks' in peer.listkeys('namespaces'):
4603 4603 hexremoterev = hex(remoterev)
4604 4604 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4605 4605 if bmr == hexremoterev]
4606 4606
4607 4607 return sorted(bms)
4608 4608
4609 4609 if bookmarks:
4610 4610 output.extend(getbms())
4611 4611 elif default and not ui.quiet:
4612 4612 # multiple bookmarks for a single parent separated by '/'
4613 4613 bm = '/'.join(getbms())
4614 4614 if bm:
4615 4615 output.append(bm)
4616 4616 else:
4617 4617 ctx = scmutil.revsingle(repo, rev, None)
4618 4618
4619 4619 if ctx.rev() is None:
4620 4620 ctx = repo[None]
4621 4621 parents = ctx.parents()
4622 4622 taglist = []
4623 4623 for p in parents:
4624 4624 taglist.extend(p.tags())
4625 4625
4626 4626 changed = ""
4627 4627 if default or id or num:
4628 4628 if (any(repo.status())
4629 4629 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4630 4630 changed = '+'
4631 4631 if default or id:
4632 4632 output = ["%s%s" %
4633 4633 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4634 4634 if num:
4635 4635 output.append("%s%s" %
4636 4636 ('+'.join([str(p.rev()) for p in parents]), changed))
4637 4637 else:
4638 4638 if default or id:
4639 4639 output = [hexfunc(ctx.node())]
4640 4640 if num:
4641 4641 output.append(str(ctx.rev()))
4642 4642 taglist = ctx.tags()
4643 4643
4644 4644 if default and not ui.quiet:
4645 4645 b = ctx.branch()
4646 4646 if b != 'default':
4647 4647 output.append("(%s)" % b)
4648 4648
4649 4649 # multiple tags for a single parent separated by '/'
4650 4650 t = '/'.join(taglist)
4651 4651 if t:
4652 4652 output.append(t)
4653 4653
4654 4654 # multiple bookmarks for a single parent separated by '/'
4655 4655 bm = '/'.join(ctx.bookmarks())
4656 4656 if bm:
4657 4657 output.append(bm)
4658 4658 else:
4659 4659 if branch:
4660 4660 output.append(ctx.branch())
4661 4661
4662 4662 if tags:
4663 4663 output.extend(taglist)
4664 4664
4665 4665 if bookmarks:
4666 4666 output.extend(ctx.bookmarks())
4667 4667
4668 4668 ui.write("%s\n" % ' '.join(output))
4669 4669
4670 4670 @command('import|patch',
4671 4671 [('p', 'strip', 1,
4672 4672 _('directory strip option for patch. This has the same '
4673 4673 'meaning as the corresponding patch option'), _('NUM')),
4674 4674 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4675 4675 ('e', 'edit', False, _('invoke editor on commit messages')),
4676 4676 ('f', 'force', None,
4677 4677 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4678 4678 ('', 'no-commit', None,
4679 4679 _("don't commit, just update the working directory")),
4680 4680 ('', 'bypass', None,
4681 4681 _("apply patch without touching the working directory")),
4682 4682 ('', 'partial', None,
4683 4683 _('commit even if some hunks fail')),
4684 4684 ('', 'exact', None,
4685 4685 _('apply patch to the nodes from which it was generated')),
4686 4686 ('', 'prefix', '',
4687 4687 _('apply patch to subdirectory'), _('DIR')),
4688 4688 ('', 'import-branch', None,
4689 4689 _('use any branch information in patch (implied by --exact)'))] +
4690 4690 commitopts + commitopts2 + similarityopts,
4691 4691 _('[OPTION]... PATCH...'))
4692 4692 def import_(ui, repo, patch1=None, *patches, **opts):
4693 4693 """import an ordered set of patches
4694 4694
4695 4695 Import a list of patches and commit them individually (unless
4696 4696 --no-commit is specified).
4697 4697
4698 4698 To read a patch from standard input, use "-" as the patch name. If
4699 4699 a URL is specified, the patch will be downloaded from there.
4700 4700
4701 4701 Import first applies changes to the working directory (unless
4702 4702 --bypass is specified), import will abort if there are outstanding
4703 4703 changes.
4704 4704
4705 4705 Use --bypass to apply and commit patches directly to the
4706 4706 repository, without affecting the working directory. Without
4707 4707 --exact, patches will be applied on top of the working directory
4708 4708 parent revision.
4709 4709
4710 4710 You can import a patch straight from a mail message. Even patches
4711 4711 as attachments work (to use the body part, it must have type
4712 4712 text/plain or text/x-patch). From and Subject headers of email
4713 4713 message are used as default committer and commit message. All
4714 4714 text/plain body parts before first diff are added to the commit
4715 4715 message.
4716 4716
4717 4717 If the imported patch was generated by :hg:`export`, user and
4718 4718 description from patch override values from message headers and
4719 4719 body. Values given on command line with -m/--message and -u/--user
4720 4720 override these.
4721 4721
4722 4722 If --exact is specified, import will set the working directory to
4723 4723 the parent of each patch before applying it, and will abort if the
4724 4724 resulting changeset has a different ID than the one recorded in
4725 4725 the patch. This may happen due to character set problems or other
4726 4726 deficiencies in the text patch format.
4727 4727
4728 4728 Use --partial to ensure a changeset will be created from the patch
4729 4729 even if some hunks fail to apply. Hunks that fail to apply will be
4730 4730 written to a <target-file>.rej file. Conflicts can then be resolved
4731 4731 by hand before :hg:`commit --amend` is run to update the created
4732 4732 changeset. This flag exists to let people import patches that
4733 4733 partially apply without losing the associated metadata (author,
4734 4734 date, description, ...).
4735 4735
4736 4736 .. note::
4737 4737
4738 4738 When no hunks apply cleanly, :hg:`import --partial` will create
4739 4739 an empty changeset, importing only the patch metadata.
4740 4740
4741 4741 With -s/--similarity, hg will attempt to discover renames and
4742 4742 copies in the patch in the same way as :hg:`addremove`.
4743 4743
4744 4744 It is possible to use external patch programs to perform the patch
4745 4745 by setting the ``ui.patch`` configuration option. For the default
4746 4746 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4747 4747 See :hg:`help config` for more information about configuration
4748 4748 files and how to use these options.
4749 4749
4750 4750 See :hg:`help dates` for a list of formats valid for -d/--date.
4751 4751
4752 4752 .. container:: verbose
4753 4753
4754 4754 Examples:
4755 4755
4756 4756 - import a traditional patch from a website and detect renames::
4757 4757
4758 4758 hg import -s 80 http://example.com/bugfix.patch
4759 4759
4760 4760 - import a changeset from an hgweb server::
4761 4761
4762 4762 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4763 4763
4764 4764 - import all the patches in an Unix-style mbox::
4765 4765
4766 4766 hg import incoming-patches.mbox
4767 4767
4768 4768 - attempt to exactly restore an exported changeset (not always
4769 4769 possible)::
4770 4770
4771 4771 hg import --exact proposed-fix.patch
4772 4772
4773 4773 - use an external tool to apply a patch which is too fuzzy for
4774 4774 the default internal tool.
4775 4775
4776 4776 hg import --config ui.patch="patch --merge" fuzzy.patch
4777 4777
4778 4778 - change the default fuzzing from 2 to a less strict 7
4779 4779
4780 4780 hg import --config ui.fuzz=7 fuzz.patch
4781 4781
4782 4782 Returns 0 on success, 1 on partial success (see --partial).
4783 4783 """
4784 4784
4785 4785 if not patch1:
4786 4786 raise error.Abort(_('need at least one patch to import'))
4787 4787
4788 4788 patches = (patch1,) + patches
4789 4789
4790 4790 date = opts.get('date')
4791 4791 if date:
4792 4792 opts['date'] = util.parsedate(date)
4793 4793
4794 4794 exact = opts.get('exact')
4795 4795 update = not opts.get('bypass')
4796 4796 if not update and opts.get('no_commit'):
4797 4797 raise error.Abort(_('cannot use --no-commit with --bypass'))
4798 4798 try:
4799 4799 sim = float(opts.get('similarity') or 0)
4800 4800 except ValueError:
4801 4801 raise error.Abort(_('similarity must be a number'))
4802 4802 if sim < 0 or sim > 100:
4803 4803 raise error.Abort(_('similarity must be between 0 and 100'))
4804 4804 if sim and not update:
4805 4805 raise error.Abort(_('cannot use --similarity with --bypass'))
4806 4806 if exact:
4807 4807 if opts.get('edit'):
4808 4808 raise error.Abort(_('cannot use --exact with --edit'))
4809 4809 if opts.get('prefix'):
4810 4810 raise error.Abort(_('cannot use --exact with --prefix'))
4811 4811
4812 4812 base = opts["base"]
4813 4813 wlock = dsguard = lock = tr = None
4814 4814 msgs = []
4815 4815 ret = 0
4816 4816
4817 4817
4818 4818 try:
4819 4819 wlock = repo.wlock()
4820 4820
4821 4821 if update:
4822 4822 cmdutil.checkunfinished(repo)
4823 4823 if (exact or not opts.get('force')):
4824 4824 cmdutil.bailifchanged(repo)
4825 4825
4826 4826 if not opts.get('no_commit'):
4827 4827 lock = repo.lock()
4828 4828 tr = repo.transaction('import')
4829 4829 else:
4830 4830 dsguard = cmdutil.dirstateguard(repo, 'import')
4831 4831 parents = repo[None].parents()
4832 4832 for patchurl in patches:
4833 4833 if patchurl == '-':
4834 4834 ui.status(_('applying patch from stdin\n'))
4835 4835 patchfile = ui.fin
4836 4836 patchurl = 'stdin' # for error message
4837 4837 else:
4838 4838 patchurl = os.path.join(base, patchurl)
4839 4839 ui.status(_('applying %s\n') % patchurl)
4840 4840 patchfile = hg.openpath(ui, patchurl)
4841 4841
4842 4842 haspatch = False
4843 4843 for hunk in patch.split(patchfile):
4844 4844 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4845 4845 parents, opts,
4846 4846 msgs, hg.clean)
4847 4847 if msg:
4848 4848 haspatch = True
4849 4849 ui.note(msg + '\n')
4850 4850 if update or exact:
4851 4851 parents = repo[None].parents()
4852 4852 else:
4853 4853 parents = [repo[node]]
4854 4854 if rej:
4855 4855 ui.write_err(_("patch applied partially\n"))
4856 4856 ui.write_err(_("(fix the .rej files and run "
4857 4857 "`hg commit --amend`)\n"))
4858 4858 ret = 1
4859 4859 break
4860 4860
4861 4861 if not haspatch:
4862 4862 raise error.Abort(_('%s: no diffs found') % patchurl)
4863 4863
4864 4864 if tr:
4865 4865 tr.close()
4866 4866 if msgs:
4867 4867 repo.savecommitmessage('\n* * *\n'.join(msgs))
4868 4868 if dsguard:
4869 4869 dsguard.close()
4870 4870 return ret
4871 4871 finally:
4872 4872 if tr:
4873 4873 tr.release()
4874 4874 release(lock, dsguard, wlock)
4875 4875
4876 4876 @command('incoming|in',
4877 4877 [('f', 'force', None,
4878 4878 _('run even if remote repository is unrelated')),
4879 4879 ('n', 'newest-first', None, _('show newest record first')),
4880 4880 ('', 'bundle', '',
4881 4881 _('file to store the bundles into'), _('FILE')),
4882 4882 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4883 4883 ('B', 'bookmarks', False, _("compare bookmarks")),
4884 4884 ('b', 'branch', [],
4885 4885 _('a specific branch you would like to pull'), _('BRANCH')),
4886 4886 ] + logopts + remoteopts + subrepoopts,
4887 4887 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4888 4888 def incoming(ui, repo, source="default", **opts):
4889 4889 """show new changesets found in source
4890 4890
4891 4891 Show new changesets found in the specified path/URL or the default
4892 4892 pull location. These are the changesets that would have been pulled
4893 4893 if a pull at the time you issued this command.
4894 4894
4895 4895 See pull for valid source format details.
4896 4896
4897 4897 .. container:: verbose
4898 4898
4899 4899 With -B/--bookmarks, the result of bookmark comparison between
4900 4900 local and remote repositories is displayed. With -v/--verbose,
4901 4901 status is also displayed for each bookmark like below::
4902 4902
4903 4903 BM1 01234567890a added
4904 4904 BM2 1234567890ab advanced
4905 4905 BM3 234567890abc diverged
4906 4906 BM4 34567890abcd changed
4907 4907
4908 4908 The action taken locally when pulling depends on the
4909 4909 status of each bookmark:
4910 4910
4911 4911 :``added``: pull will create it
4912 4912 :``advanced``: pull will update it
4913 4913 :``diverged``: pull will create a divergent bookmark
4914 4914 :``changed``: result depends on remote changesets
4915 4915
4916 4916 From the point of view of pulling behavior, bookmark
4917 4917 existing only in the remote repository are treated as ``added``,
4918 4918 even if it is in fact locally deleted.
4919 4919
4920 4920 .. container:: verbose
4921 4921
4922 4922 For remote repository, using --bundle avoids downloading the
4923 4923 changesets twice if the incoming is followed by a pull.
4924 4924
4925 4925 Examples:
4926 4926
4927 4927 - show incoming changes with patches and full description::
4928 4928
4929 4929 hg incoming -vp
4930 4930
4931 4931 - show incoming changes excluding merges, store a bundle::
4932 4932
4933 4933 hg in -vpM --bundle incoming.hg
4934 4934 hg pull incoming.hg
4935 4935
4936 4936 - briefly list changes inside a bundle::
4937 4937
4938 4938 hg in changes.hg -T "{desc|firstline}\\n"
4939 4939
4940 4940 Returns 0 if there are incoming changes, 1 otherwise.
4941 4941 """
4942 4942 if opts.get('graph'):
4943 4943 cmdutil.checkunsupportedgraphflags([], opts)
4944 4944 def display(other, chlist, displayer):
4945 4945 revdag = cmdutil.graphrevs(other, chlist, opts)
4946 4946 cmdutil.displaygraph(ui, repo, revdag, displayer,
4947 4947 graphmod.asciiedges)
4948 4948
4949 4949 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4950 4950 return 0
4951 4951
4952 4952 if opts.get('bundle') and opts.get('subrepos'):
4953 4953 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4954 4954
4955 4955 if opts.get('bookmarks'):
4956 4956 source, branches = hg.parseurl(ui.expandpath(source),
4957 4957 opts.get('branch'))
4958 4958 other = hg.peer(repo, opts, source)
4959 4959 if 'bookmarks' not in other.listkeys('namespaces'):
4960 4960 ui.warn(_("remote doesn't support bookmarks\n"))
4961 4961 return 0
4962 4962 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4963 4963 return bookmarks.incoming(ui, repo, other)
4964 4964
4965 4965 repo._subtoppath = ui.expandpath(source)
4966 4966 try:
4967 4967 return hg.incoming(ui, repo, source, opts)
4968 4968 finally:
4969 4969 del repo._subtoppath
4970 4970
4971 4971
4972 4972 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4973 4973 norepo=True)
4974 4974 def init(ui, dest=".", **opts):
4975 4975 """create a new repository in the given directory
4976 4976
4977 4977 Initialize a new repository in the given directory. If the given
4978 4978 directory does not exist, it will be created.
4979 4979
4980 4980 If no directory is given, the current directory is used.
4981 4981
4982 4982 It is possible to specify an ``ssh://`` URL as the destination.
4983 4983 See :hg:`help urls` for more information.
4984 4984
4985 4985 Returns 0 on success.
4986 4986 """
4987 4987 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4988 4988
4989 4989 @command('locate',
4990 4990 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4991 4991 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4992 4992 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4993 4993 ] + walkopts,
4994 4994 _('[OPTION]... [PATTERN]...'))
4995 4995 def locate(ui, repo, *pats, **opts):
4996 4996 """locate files matching specific patterns (DEPRECATED)
4997 4997
4998 4998 Print files under Mercurial control in the working directory whose
4999 4999 names match the given patterns.
5000 5000
5001 5001 By default, this command searches all directories in the working
5002 5002 directory. To search just the current directory and its
5003 5003 subdirectories, use "--include .".
5004 5004
5005 5005 If no patterns are given to match, this command prints the names
5006 5006 of all files under Mercurial control in the working directory.
5007 5007
5008 5008 If you want to feed the output of this command into the "xargs"
5009 5009 command, use the -0 option to both this command and "xargs". This
5010 5010 will avoid the problem of "xargs" treating single filenames that
5011 5011 contain whitespace as multiple filenames.
5012 5012
5013 5013 See :hg:`help files` for a more versatile command.
5014 5014
5015 5015 Returns 0 if a match is found, 1 otherwise.
5016 5016 """
5017 5017 if opts.get('print0'):
5018 5018 end = '\0'
5019 5019 else:
5020 5020 end = '\n'
5021 5021 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5022 5022
5023 5023 ret = 1
5024 5024 ctx = repo[rev]
5025 5025 m = scmutil.match(ctx, pats, opts, default='relglob',
5026 5026 badfn=lambda x, y: False)
5027 5027
5028 5028 for abs in ctx.matches(m):
5029 5029 if opts.get('fullpath'):
5030 5030 ui.write(repo.wjoin(abs), end)
5031 5031 else:
5032 5032 ui.write(((pats and m.rel(abs)) or abs), end)
5033 5033 ret = 0
5034 5034
5035 5035 return ret
5036 5036
5037 5037 @command('^log|history',
5038 5038 [('f', 'follow', None,
5039 5039 _('follow changeset history, or file history across copies and renames')),
5040 5040 ('', 'follow-first', None,
5041 5041 _('only follow the first parent of merge changesets (DEPRECATED)')),
5042 5042 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5043 5043 ('C', 'copies', None, _('show copied files')),
5044 5044 ('k', 'keyword', [],
5045 5045 _('do case-insensitive search for a given text'), _('TEXT')),
5046 5046 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5047 5047 ('', 'removed', None, _('include revisions where files were removed')),
5048 5048 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5049 5049 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5050 5050 ('', 'only-branch', [],
5051 5051 _('show only changesets within the given named branch (DEPRECATED)'),
5052 5052 _('BRANCH')),
5053 5053 ('b', 'branch', [],
5054 5054 _('show changesets within the given named branch'), _('BRANCH')),
5055 5055 ('P', 'prune', [],
5056 5056 _('do not display revision or any of its ancestors'), _('REV')),
5057 5057 ] + logopts + walkopts,
5058 5058 _('[OPTION]... [FILE]'),
5059 5059 inferrepo=True)
5060 5060 def log(ui, repo, *pats, **opts):
5061 5061 """show revision history of entire repository or files
5062 5062
5063 5063 Print the revision history of the specified files or the entire
5064 5064 project.
5065 5065
5066 5066 If no revision range is specified, the default is ``tip:0`` unless
5067 5067 --follow is set, in which case the working directory parent is
5068 5068 used as the starting revision.
5069 5069
5070 5070 File history is shown without following rename or copy history of
5071 5071 files. Use -f/--follow with a filename to follow history across
5072 5072 renames and copies. --follow without a filename will only show
5073 5073 ancestors or descendants of the starting revision.
5074 5074
5075 5075 By default this command prints revision number and changeset id,
5076 5076 tags, non-trivial parents, user, date and time, and a summary for
5077 5077 each commit. When the -v/--verbose switch is used, the list of
5078 5078 changed files and full commit message are shown.
5079 5079
5080 5080 With --graph the revisions are shown as an ASCII art DAG with the most
5081 5081 recent changeset at the top.
5082 5082 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5083 5083 and '+' represents a fork where the changeset from the lines below is a
5084 5084 parent of the 'o' merge on the same line.
5085 5085
5086 5086 .. note::
5087 5087
5088 5088 :hg:`log --patch` may generate unexpected diff output for merge
5089 5089 changesets, as it will only compare the merge changeset against
5090 5090 its first parent. Also, only files different from BOTH parents
5091 5091 will appear in files:.
5092 5092
5093 5093 .. note::
5094 5094
5095 5095 For performance reasons, :hg:`log FILE` may omit duplicate changes
5096 5096 made on branches and will not show removals or mode changes. To
5097 5097 see all such changes, use the --removed switch.
5098 5098
5099 5099 .. container:: verbose
5100 5100
5101 5101 Some examples:
5102 5102
5103 5103 - changesets with full descriptions and file lists::
5104 5104
5105 5105 hg log -v
5106 5106
5107 5107 - changesets ancestral to the working directory::
5108 5108
5109 5109 hg log -f
5110 5110
5111 5111 - last 10 commits on the current branch::
5112 5112
5113 5113 hg log -l 10 -b .
5114 5114
5115 5115 - changesets showing all modifications of a file, including removals::
5116 5116
5117 5117 hg log --removed file.c
5118 5118
5119 5119 - all changesets that touch a directory, with diffs, excluding merges::
5120 5120
5121 5121 hg log -Mp lib/
5122 5122
5123 5123 - all revision numbers that match a keyword::
5124 5124
5125 5125 hg log -k bug --template "{rev}\\n"
5126 5126
5127 5127 - the full hash identifier of the working directory parent::
5128 5128
5129 5129 hg log -r . --template "{node}\\n"
5130 5130
5131 5131 - list available log templates::
5132 5132
5133 5133 hg log -T list
5134 5134
5135 5135 - check if a given changeset is included in a tagged release::
5136 5136
5137 5137 hg log -r "a21ccf and ancestor(1.9)"
5138 5138
5139 5139 - find all changesets by some user in a date range::
5140 5140
5141 5141 hg log -k alice -d "may 2008 to jul 2008"
5142 5142
5143 5143 - summary of all changesets after the last tag::
5144 5144
5145 5145 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5146 5146
5147 5147 See :hg:`help dates` for a list of formats valid for -d/--date.
5148 5148
5149 5149 See :hg:`help revisions` and :hg:`help revsets` for more about
5150 5150 specifying and ordering revisions.
5151 5151
5152 5152 See :hg:`help templates` for more about pre-packaged styles and
5153 5153 specifying custom templates.
5154 5154
5155 5155 Returns 0 on success.
5156 5156
5157 5157 """
5158 5158 if opts.get('follow') and opts.get('rev'):
5159 5159 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5160 5160 del opts['follow']
5161 5161
5162 5162 if opts.get('graph'):
5163 5163 return cmdutil.graphlog(ui, repo, *pats, **opts)
5164 5164
5165 5165 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5166 5166 limit = cmdutil.loglimit(opts)
5167 5167 count = 0
5168 5168
5169 5169 getrenamed = None
5170 5170 if opts.get('copies'):
5171 5171 endrev = None
5172 5172 if opts.get('rev'):
5173 5173 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5174 5174 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5175 5175
5176 5176 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5177 5177 for rev in revs:
5178 5178 if count == limit:
5179 5179 break
5180 5180 ctx = repo[rev]
5181 5181 copies = None
5182 5182 if getrenamed is not None and rev:
5183 5183 copies = []
5184 5184 for fn in ctx.files():
5185 5185 rename = getrenamed(fn, rev)
5186 5186 if rename:
5187 5187 copies.append((fn, rename[0]))
5188 5188 if filematcher:
5189 5189 revmatchfn = filematcher(ctx.rev())
5190 5190 else:
5191 5191 revmatchfn = None
5192 5192 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5193 5193 if displayer.flush(ctx):
5194 5194 count += 1
5195 5195
5196 5196 displayer.close()
5197 5197
5198 5198 @command('manifest',
5199 5199 [('r', 'rev', '', _('revision to display'), _('REV')),
5200 5200 ('', 'all', False, _("list files from all revisions"))]
5201 5201 + formatteropts,
5202 5202 _('[-r REV]'))
5203 5203 def manifest(ui, repo, node=None, rev=None, **opts):
5204 5204 """output the current or given revision of the project manifest
5205 5205
5206 5206 Print a list of version controlled files for the given revision.
5207 5207 If no revision is given, the first parent of the working directory
5208 5208 is used, or the null revision if no revision is checked out.
5209 5209
5210 5210 With -v, print file permissions, symlink and executable bits.
5211 5211 With --debug, print file revision hashes.
5212 5212
5213 5213 If option --all is specified, the list of all files from all revisions
5214 5214 is printed. This includes deleted and renamed files.
5215 5215
5216 5216 Returns 0 on success.
5217 5217 """
5218 5218
5219 5219 fm = ui.formatter('manifest', opts)
5220 5220
5221 5221 if opts.get('all'):
5222 5222 if rev or node:
5223 5223 raise error.Abort(_("can't specify a revision with --all"))
5224 5224
5225 5225 res = []
5226 5226 prefix = "data/"
5227 5227 suffix = ".i"
5228 5228 plen = len(prefix)
5229 5229 slen = len(suffix)
5230 5230 with repo.lock():
5231 5231 for fn, b, size in repo.store.datafiles():
5232 5232 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5233 5233 res.append(fn[plen:-slen])
5234 5234 for f in res:
5235 5235 fm.startitem()
5236 5236 fm.write("path", '%s\n', f)
5237 5237 fm.end()
5238 5238 return
5239 5239
5240 5240 if rev and node:
5241 5241 raise error.Abort(_("please specify just one revision"))
5242 5242
5243 5243 if not node:
5244 5244 node = rev
5245 5245
5246 5246 char = {'l': '@', 'x': '*', '': ''}
5247 5247 mode = {'l': '644', 'x': '755', '': '644'}
5248 5248 ctx = scmutil.revsingle(repo, node)
5249 5249 mf = ctx.manifest()
5250 5250 for f in ctx:
5251 5251 fm.startitem()
5252 5252 fl = ctx[f].flags()
5253 5253 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5254 5254 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5255 5255 fm.write('path', '%s\n', f)
5256 5256 fm.end()
5257 5257
5258 5258 @command('^merge',
5259 5259 [('f', 'force', None,
5260 5260 _('force a merge including outstanding changes (DEPRECATED)')),
5261 5261 ('r', 'rev', '', _('revision to merge'), _('REV')),
5262 5262 ('P', 'preview', None,
5263 5263 _('review revisions to merge (no merge is performed)'))
5264 5264 ] + mergetoolopts,
5265 5265 _('[-P] [[-r] REV]'))
5266 5266 def merge(ui, repo, node=None, **opts):
5267 5267 """merge another revision into working directory
5268 5268
5269 5269 The current working directory is updated with all changes made in
5270 5270 the requested revision since the last common predecessor revision.
5271 5271
5272 5272 Files that changed between either parent are marked as changed for
5273 5273 the next commit and a commit must be performed before any further
5274 5274 updates to the repository are allowed. The next commit will have
5275 5275 two parents.
5276 5276
5277 5277 ``--tool`` can be used to specify the merge tool used for file
5278 5278 merges. It overrides the HGMERGE environment variable and your
5279 5279 configuration files. See :hg:`help merge-tools` for options.
5280 5280
5281 5281 If no revision is specified, the working directory's parent is a
5282 5282 head revision, and the current branch contains exactly one other
5283 5283 head, the other head is merged with by default. Otherwise, an
5284 5284 explicit revision with which to merge with must be provided.
5285 5285
5286 5286 See :hg:`help resolve` for information on handling file conflicts.
5287 5287
5288 5288 To undo an uncommitted merge, use :hg:`update --clean .` which
5289 5289 will check out a clean copy of the original merge parent, losing
5290 5290 all changes.
5291 5291
5292 5292 Returns 0 on success, 1 if there are unresolved files.
5293 5293 """
5294 5294
5295 5295 if opts.get('rev') and node:
5296 5296 raise error.Abort(_("please specify just one revision"))
5297 5297 if not node:
5298 5298 node = opts.get('rev')
5299 5299
5300 5300 if node:
5301 5301 node = scmutil.revsingle(repo, node).node()
5302 5302
5303 5303 if not node:
5304 5304 node = repo[destutil.destmerge(repo)].node()
5305 5305
5306 5306 if opts.get('preview'):
5307 5307 # find nodes that are ancestors of p2 but not of p1
5308 5308 p1 = repo.lookup('.')
5309 5309 p2 = repo.lookup(node)
5310 5310 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5311 5311
5312 5312 displayer = cmdutil.show_changeset(ui, repo, opts)
5313 5313 for node in nodes:
5314 5314 displayer.show(repo[node])
5315 5315 displayer.close()
5316 5316 return 0
5317 5317
5318 5318 try:
5319 5319 # ui.forcemerge is an internal variable, do not document
5320 5320 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5321 5321 force = opts.get('force')
5322 5322 return hg.merge(repo, node, force=force, mergeforce=force)
5323 5323 finally:
5324 5324 ui.setconfig('ui', 'forcemerge', '', 'merge')
5325 5325
5326 5326 @command('outgoing|out',
5327 5327 [('f', 'force', None, _('run even when the destination is unrelated')),
5328 5328 ('r', 'rev', [],
5329 5329 _('a changeset intended to be included in the destination'), _('REV')),
5330 5330 ('n', 'newest-first', None, _('show newest record first')),
5331 5331 ('B', 'bookmarks', False, _('compare bookmarks')),
5332 5332 ('b', 'branch', [], _('a specific branch you would like to push'),
5333 5333 _('BRANCH')),
5334 5334 ] + logopts + remoteopts + subrepoopts,
5335 5335 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5336 5336 def outgoing(ui, repo, dest=None, **opts):
5337 5337 """show changesets not found in the destination
5338 5338
5339 5339 Show changesets not found in the specified destination repository
5340 5340 or the default push location. These are the changesets that would
5341 5341 be pushed if a push was requested.
5342 5342
5343 5343 See pull for details of valid destination formats.
5344 5344
5345 5345 .. container:: verbose
5346 5346
5347 5347 With -B/--bookmarks, the result of bookmark comparison between
5348 5348 local and remote repositories is displayed. With -v/--verbose,
5349 5349 status is also displayed for each bookmark like below::
5350 5350
5351 5351 BM1 01234567890a added
5352 5352 BM2 deleted
5353 5353 BM3 234567890abc advanced
5354 5354 BM4 34567890abcd diverged
5355 5355 BM5 4567890abcde changed
5356 5356
5357 5357 The action taken when pushing depends on the
5358 5358 status of each bookmark:
5359 5359
5360 5360 :``added``: push with ``-B`` will create it
5361 5361 :``deleted``: push with ``-B`` will delete it
5362 5362 :``advanced``: push will update it
5363 5363 :``diverged``: push with ``-B`` will update it
5364 5364 :``changed``: push with ``-B`` will update it
5365 5365
5366 5366 From the point of view of pushing behavior, bookmarks
5367 5367 existing only in the remote repository are treated as
5368 5368 ``deleted``, even if it is in fact added remotely.
5369 5369
5370 5370 Returns 0 if there are outgoing changes, 1 otherwise.
5371 5371 """
5372 5372 if opts.get('graph'):
5373 5373 cmdutil.checkunsupportedgraphflags([], opts)
5374 5374 o, other = hg._outgoing(ui, repo, dest, opts)
5375 5375 if not o:
5376 5376 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5377 5377 return
5378 5378
5379 5379 revdag = cmdutil.graphrevs(repo, o, opts)
5380 5380 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5381 5381 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5382 5382 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5383 5383 return 0
5384 5384
5385 5385 if opts.get('bookmarks'):
5386 5386 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5387 5387 dest, branches = hg.parseurl(dest, opts.get('branch'))
5388 5388 other = hg.peer(repo, opts, dest)
5389 5389 if 'bookmarks' not in other.listkeys('namespaces'):
5390 5390 ui.warn(_("remote doesn't support bookmarks\n"))
5391 5391 return 0
5392 5392 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5393 5393 return bookmarks.outgoing(ui, repo, other)
5394 5394
5395 5395 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5396 5396 try:
5397 5397 return hg.outgoing(ui, repo, dest, opts)
5398 5398 finally:
5399 5399 del repo._subtoppath
5400 5400
5401 5401 @command('parents',
5402 5402 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5403 5403 ] + templateopts,
5404 5404 _('[-r REV] [FILE]'),
5405 5405 inferrepo=True)
5406 5406 def parents(ui, repo, file_=None, **opts):
5407 5407 """show the parents of the working directory or revision (DEPRECATED)
5408 5408
5409 5409 Print the working directory's parent revisions. If a revision is
5410 5410 given via -r/--rev, the parent of that revision will be printed.
5411 5411 If a file argument is given, the revision in which the file was
5412 5412 last changed (before the working directory revision or the
5413 5413 argument to --rev if given) is printed.
5414 5414
5415 5415 This command is equivalent to::
5416 5416
5417 5417 hg log -r "p1()+p2()" or
5418 5418 hg log -r "p1(REV)+p2(REV)" or
5419 5419 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5420 5420 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5421 5421
5422 5422 See :hg:`summary` and :hg:`help revsets` for related information.
5423 5423
5424 5424 Returns 0 on success.
5425 5425 """
5426 5426
5427 5427 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5428 5428
5429 5429 if file_:
5430 5430 m = scmutil.match(ctx, (file_,), opts)
5431 5431 if m.anypats() or len(m.files()) != 1:
5432 5432 raise error.Abort(_('can only specify an explicit filename'))
5433 5433 file_ = m.files()[0]
5434 5434 filenodes = []
5435 5435 for cp in ctx.parents():
5436 5436 if not cp:
5437 5437 continue
5438 5438 try:
5439 5439 filenodes.append(cp.filenode(file_))
5440 5440 except error.LookupError:
5441 5441 pass
5442 5442 if not filenodes:
5443 5443 raise error.Abort(_("'%s' not found in manifest!") % file_)
5444 5444 p = []
5445 5445 for fn in filenodes:
5446 5446 fctx = repo.filectx(file_, fileid=fn)
5447 5447 p.append(fctx.node())
5448 5448 else:
5449 5449 p = [cp.node() for cp in ctx.parents()]
5450 5450
5451 5451 displayer = cmdutil.show_changeset(ui, repo, opts)
5452 5452 for n in p:
5453 5453 if n != nullid:
5454 5454 displayer.show(repo[n])
5455 5455 displayer.close()
5456 5456
5457 5457 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5458 5458 def paths(ui, repo, search=None, **opts):
5459 5459 """show aliases for remote repositories
5460 5460
5461 5461 Show definition of symbolic path name NAME. If no name is given,
5462 5462 show definition of all available names.
5463 5463
5464 5464 Option -q/--quiet suppresses all output when searching for NAME
5465 5465 and shows only the path names when listing all definitions.
5466 5466
5467 5467 Path names are defined in the [paths] section of your
5468 5468 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5469 5469 repository, ``.hg/hgrc`` is used, too.
5470 5470
5471 5471 The path names ``default`` and ``default-push`` have a special
5472 5472 meaning. When performing a push or pull operation, they are used
5473 5473 as fallbacks if no location is specified on the command-line.
5474 5474 When ``default-push`` is set, it will be used for push and
5475 5475 ``default`` will be used for pull; otherwise ``default`` is used
5476 5476 as the fallback for both. When cloning a repository, the clone
5477 5477 source is written as ``default`` in ``.hg/hgrc``.
5478 5478
5479 5479 .. note::
5480 5480
5481 5481 ``default`` and ``default-push`` apply to all inbound (e.g.
5482 5482 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5483 5483 and :hg:`bundle`) operations.
5484 5484
5485 5485 See :hg:`help urls` for more information.
5486 5486
5487 5487 Returns 0 on success.
5488 5488 """
5489 5489 if search:
5490 5490 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5491 5491 if name == search]
5492 5492 else:
5493 5493 pathitems = sorted(ui.paths.iteritems())
5494 5494
5495 5495 fm = ui.formatter('paths', opts)
5496 5496 if fm:
5497 5497 hidepassword = str
5498 5498 else:
5499 5499 hidepassword = util.hidepassword
5500 5500 if ui.quiet:
5501 5501 namefmt = '%s\n'
5502 5502 else:
5503 5503 namefmt = '%s = '
5504 5504 showsubopts = not search and not ui.quiet
5505 5505
5506 5506 for name, path in pathitems:
5507 5507 fm.startitem()
5508 5508 fm.condwrite(not search, 'name', namefmt, name)
5509 5509 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5510 5510 for subopt, value in sorted(path.suboptions.items()):
5511 5511 assert subopt not in ('name', 'url')
5512 5512 if showsubopts:
5513 5513 fm.plain('%s:%s = ' % (name, subopt))
5514 5514 fm.condwrite(showsubopts, subopt, '%s\n', value)
5515 5515
5516 5516 fm.end()
5517 5517
5518 5518 if search and not pathitems:
5519 5519 if not ui.quiet:
5520 5520 ui.warn(_("not found!\n"))
5521 5521 return 1
5522 5522 else:
5523 5523 return 0
5524 5524
5525 5525 @command('phase',
5526 5526 [('p', 'public', False, _('set changeset phase to public')),
5527 5527 ('d', 'draft', False, _('set changeset phase to draft')),
5528 5528 ('s', 'secret', False, _('set changeset phase to secret')),
5529 5529 ('f', 'force', False, _('allow to move boundary backward')),
5530 5530 ('r', 'rev', [], _('target revision'), _('REV')),
5531 5531 ],
5532 5532 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5533 5533 def phase(ui, repo, *revs, **opts):
5534 5534 """set or show the current phase name
5535 5535
5536 5536 With no argument, show the phase name of the current revision(s).
5537 5537
5538 5538 With one of -p/--public, -d/--draft or -s/--secret, change the
5539 5539 phase value of the specified revisions.
5540 5540
5541 5541 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5542 5542 lower phase to an higher phase. Phases are ordered as follows::
5543 5543
5544 5544 public < draft < secret
5545 5545
5546 5546 Returns 0 on success, 1 if some phases could not be changed.
5547 5547
5548 5548 (For more information about the phases concept, see :hg:`help phases`.)
5549 5549 """
5550 5550 # search for a unique phase argument
5551 5551 targetphase = None
5552 5552 for idx, name in enumerate(phases.phasenames):
5553 5553 if opts[name]:
5554 5554 if targetphase is not None:
5555 5555 raise error.Abort(_('only one phase can be specified'))
5556 5556 targetphase = idx
5557 5557
5558 5558 # look for specified revision
5559 5559 revs = list(revs)
5560 5560 revs.extend(opts['rev'])
5561 5561 if not revs:
5562 5562 # display both parents as the second parent phase can influence
5563 5563 # the phase of a merge commit
5564 5564 revs = [c.rev() for c in repo[None].parents()]
5565 5565
5566 5566 revs = scmutil.revrange(repo, revs)
5567 5567
5568 5568 lock = None
5569 5569 ret = 0
5570 5570 if targetphase is None:
5571 5571 # display
5572 5572 for r in revs:
5573 5573 ctx = repo[r]
5574 5574 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5575 5575 else:
5576 5576 tr = None
5577 5577 lock = repo.lock()
5578 5578 try:
5579 5579 tr = repo.transaction("phase")
5580 5580 # set phase
5581 5581 if not revs:
5582 5582 raise error.Abort(_('empty revision set'))
5583 5583 nodes = [repo[r].node() for r in revs]
5584 5584 # moving revision from public to draft may hide them
5585 5585 # We have to check result on an unfiltered repository
5586 5586 unfi = repo.unfiltered()
5587 5587 getphase = unfi._phasecache.phase
5588 5588 olddata = [getphase(unfi, r) for r in unfi]
5589 5589 phases.advanceboundary(repo, tr, targetphase, nodes)
5590 5590 if opts['force']:
5591 5591 phases.retractboundary(repo, tr, targetphase, nodes)
5592 5592 tr.close()
5593 5593 finally:
5594 5594 if tr is not None:
5595 5595 tr.release()
5596 5596 lock.release()
5597 5597 getphase = unfi._phasecache.phase
5598 5598 newdata = [getphase(unfi, r) for r in unfi]
5599 5599 changes = sum(newdata[r] != olddata[r] for r in unfi)
5600 5600 cl = unfi.changelog
5601 5601 rejected = [n for n in nodes
5602 5602 if newdata[cl.rev(n)] < targetphase]
5603 5603 if rejected:
5604 5604 ui.warn(_('cannot move %i changesets to a higher '
5605 5605 'phase, use --force\n') % len(rejected))
5606 5606 ret = 1
5607 5607 if changes:
5608 5608 msg = _('phase changed for %i changesets\n') % changes
5609 5609 if ret:
5610 5610 ui.status(msg)
5611 5611 else:
5612 5612 ui.note(msg)
5613 5613 else:
5614 5614 ui.warn(_('no phases changed\n'))
5615 5615 return ret
5616 5616
5617 5617 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5618 """Run after a changegroup has been added via pull/unbundle
5619
5620 This takes arguments below:
5621
5622 :modheads: change of heads by pull/unbundle
5623 :optupdate: updating working directory is needed or not
5624 :checkout: update destination revision (or None to default destination)
5625 :brev: a name, which might be a bookmark to be activated after updating
5626 """
5618 5627 if modheads == 0:
5619 5628 return
5620 5629 if optupdate:
5621 5630 try:
5622 5631 return hg.updatetotally(ui, repo, checkout, brev)
5623 5632 except error.UpdateAbort as inst:
5624 5633 msg = _("not updating: %s") % str(inst)
5625 5634 hint = inst.hint
5626 5635 raise error.UpdateAbort(msg, hint=hint)
5627 5636 if modheads > 1:
5628 5637 currentbranchheads = len(repo.branchheads())
5629 5638 if currentbranchheads == modheads:
5630 5639 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5631 5640 elif currentbranchheads > 1:
5632 5641 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5633 5642 "merge)\n"))
5634 5643 else:
5635 5644 ui.status(_("(run 'hg heads' to see heads)\n"))
5636 5645 else:
5637 5646 ui.status(_("(run 'hg update' to get a working copy)\n"))
5638 5647
5639 5648 @command('^pull',
5640 5649 [('u', 'update', None,
5641 5650 _('update to new branch head if changesets were pulled')),
5642 5651 ('f', 'force', None, _('run even when remote repository is unrelated')),
5643 5652 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5644 5653 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5645 5654 ('b', 'branch', [], _('a specific branch you would like to pull'),
5646 5655 _('BRANCH')),
5647 5656 ] + remoteopts,
5648 5657 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5649 5658 def pull(ui, repo, source="default", **opts):
5650 5659 """pull changes from the specified source
5651 5660
5652 5661 Pull changes from a remote repository to a local one.
5653 5662
5654 5663 This finds all changes from the repository at the specified path
5655 5664 or URL and adds them to a local repository (the current one unless
5656 5665 -R is specified). By default, this does not update the copy of the
5657 5666 project in the working directory.
5658 5667
5659 5668 Use :hg:`incoming` if you want to see what would have been added
5660 5669 by a pull at the time you issued this command. If you then decide
5661 5670 to add those changes to the repository, you should use :hg:`pull
5662 5671 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5663 5672
5664 5673 If SOURCE is omitted, the 'default' path will be used.
5665 5674 See :hg:`help urls` for more information.
5666 5675
5667 5676 Returns 0 on success, 1 if an update had unresolved files.
5668 5677 """
5669 5678 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5670 5679 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5671 5680 other = hg.peer(repo, opts, source)
5672 5681 try:
5673 5682 revs, checkout = hg.addbranchrevs(repo, other, branches,
5674 5683 opts.get('rev'))
5675 5684
5676 5685
5677 5686 pullopargs = {}
5678 5687 if opts.get('bookmark'):
5679 5688 if not revs:
5680 5689 revs = []
5681 5690 # The list of bookmark used here is not the one used to actually
5682 5691 # update the bookmark name. This can result in the revision pulled
5683 5692 # not ending up with the name of the bookmark because of a race
5684 5693 # condition on the server. (See issue 4689 for details)
5685 5694 remotebookmarks = other.listkeys('bookmarks')
5686 5695 pullopargs['remotebookmarks'] = remotebookmarks
5687 5696 for b in opts['bookmark']:
5688 5697 if b not in remotebookmarks:
5689 5698 raise error.Abort(_('remote bookmark %s not found!') % b)
5690 5699 revs.append(remotebookmarks[b])
5691 5700
5692 5701 if revs:
5693 5702 try:
5694 5703 # When 'rev' is a bookmark name, we cannot guarantee that it
5695 5704 # will be updated with that name because of a race condition
5696 5705 # server side. (See issue 4689 for details)
5697 5706 oldrevs = revs
5698 5707 revs = [] # actually, nodes
5699 5708 for r in oldrevs:
5700 5709 node = other.lookup(r)
5701 5710 revs.append(node)
5702 5711 if r == checkout:
5703 5712 checkout = node
5704 5713 except error.CapabilityError:
5705 5714 err = _("other repository doesn't support revision lookup, "
5706 5715 "so a rev cannot be specified.")
5707 5716 raise error.Abort(err)
5708 5717
5709 5718 pullopargs.update(opts.get('opargs', {}))
5710 5719 modheads = exchange.pull(repo, other, heads=revs,
5711 5720 force=opts.get('force'),
5712 5721 bookmarks=opts.get('bookmark', ()),
5713 5722 opargs=pullopargs).cgresult
5714 5723
5715 5724 # brev is a name, which might be a bookmark to be activated at
5716 5725 # the end of the update. In other words, it is an explicit
5717 5726 # destination of the update
5718 5727 brev = None
5719 5728
5720 5729 if checkout:
5721 5730 checkout = str(repo.changelog.rev(checkout))
5722 5731
5723 5732 # order below depends on implementation of
5724 5733 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5725 5734 # because 'checkout' is determined without it.
5726 5735 if opts.get('rev'):
5727 5736 brev = opts['rev'][0]
5728 5737 elif opts.get('branch'):
5729 5738 brev = opts['branch'][0]
5730 5739 else:
5731 5740 brev = branches[0]
5732 5741 repo._subtoppath = source
5733 5742 try:
5734 5743 ret = postincoming(ui, repo, modheads, opts.get('update'),
5735 5744 checkout, brev)
5736 5745
5737 5746 finally:
5738 5747 del repo._subtoppath
5739 5748
5740 5749 finally:
5741 5750 other.close()
5742 5751 return ret
5743 5752
5744 5753 @command('^push',
5745 5754 [('f', 'force', None, _('force push')),
5746 5755 ('r', 'rev', [],
5747 5756 _('a changeset intended to be included in the destination'),
5748 5757 _('REV')),
5749 5758 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5750 5759 ('b', 'branch', [],
5751 5760 _('a specific branch you would like to push'), _('BRANCH')),
5752 5761 ('', 'new-branch', False, _('allow pushing a new branch')),
5753 5762 ] + remoteopts,
5754 5763 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5755 5764 def push(ui, repo, dest=None, **opts):
5756 5765 """push changes to the specified destination
5757 5766
5758 5767 Push changesets from the local repository to the specified
5759 5768 destination.
5760 5769
5761 5770 This operation is symmetrical to pull: it is identical to a pull
5762 5771 in the destination repository from the current one.
5763 5772
5764 5773 By default, push will not allow creation of new heads at the
5765 5774 destination, since multiple heads would make it unclear which head
5766 5775 to use. In this situation, it is recommended to pull and merge
5767 5776 before pushing.
5768 5777
5769 5778 Use --new-branch if you want to allow push to create a new named
5770 5779 branch that is not present at the destination. This allows you to
5771 5780 only create a new branch without forcing other changes.
5772 5781
5773 5782 .. note::
5774 5783
5775 5784 Extra care should be taken with the -f/--force option,
5776 5785 which will push all new heads on all branches, an action which will
5777 5786 almost always cause confusion for collaborators.
5778 5787
5779 5788 If -r/--rev is used, the specified revision and all its ancestors
5780 5789 will be pushed to the remote repository.
5781 5790
5782 5791 If -B/--bookmark is used, the specified bookmarked revision, its
5783 5792 ancestors, and the bookmark will be pushed to the remote
5784 5793 repository. Specifying ``.`` is equivalent to specifying the active
5785 5794 bookmark's name.
5786 5795
5787 5796 Please see :hg:`help urls` for important details about ``ssh://``
5788 5797 URLs. If DESTINATION is omitted, a default path will be used.
5789 5798
5790 5799 Returns 0 if push was successful, 1 if nothing to push.
5791 5800 """
5792 5801
5793 5802 if opts.get('bookmark'):
5794 5803 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5795 5804 for b in opts['bookmark']:
5796 5805 # translate -B options to -r so changesets get pushed
5797 5806 b = repo._bookmarks.expandname(b)
5798 5807 if b in repo._bookmarks:
5799 5808 opts.setdefault('rev', []).append(b)
5800 5809 else:
5801 5810 # if we try to push a deleted bookmark, translate it to null
5802 5811 # this lets simultaneous -r, -b options continue working
5803 5812 opts.setdefault('rev', []).append("null")
5804 5813
5805 5814 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5806 5815 if not path:
5807 5816 raise error.Abort(_('default repository not configured!'),
5808 5817 hint=_('see the "path" section in "hg help config"'))
5809 5818 dest = path.pushloc or path.loc
5810 5819 branches = (path.branch, opts.get('branch') or [])
5811 5820 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5812 5821 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5813 5822 other = hg.peer(repo, opts, dest)
5814 5823
5815 5824 if revs:
5816 5825 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5817 5826 if not revs:
5818 5827 raise error.Abort(_("specified revisions evaluate to an empty set"),
5819 5828 hint=_("use different revision arguments"))
5820 5829
5821 5830 repo._subtoppath = dest
5822 5831 try:
5823 5832 # push subrepos depth-first for coherent ordering
5824 5833 c = repo['']
5825 5834 subs = c.substate # only repos that are committed
5826 5835 for s in sorted(subs):
5827 5836 result = c.sub(s).push(opts)
5828 5837 if result == 0:
5829 5838 return not result
5830 5839 finally:
5831 5840 del repo._subtoppath
5832 5841 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5833 5842 newbranch=opts.get('new_branch'),
5834 5843 bookmarks=opts.get('bookmark', ()),
5835 5844 opargs=opts.get('opargs'))
5836 5845
5837 5846 result = not pushop.cgresult
5838 5847
5839 5848 if pushop.bkresult is not None:
5840 5849 if pushop.bkresult == 2:
5841 5850 result = 2
5842 5851 elif not result and pushop.bkresult:
5843 5852 result = 2
5844 5853
5845 5854 return result
5846 5855
5847 5856 @command('recover', [])
5848 5857 def recover(ui, repo):
5849 5858 """roll back an interrupted transaction
5850 5859
5851 5860 Recover from an interrupted commit or pull.
5852 5861
5853 5862 This command tries to fix the repository status after an
5854 5863 interrupted operation. It should only be necessary when Mercurial
5855 5864 suggests it.
5856 5865
5857 5866 Returns 0 if successful, 1 if nothing to recover or verify fails.
5858 5867 """
5859 5868 if repo.recover():
5860 5869 return hg.verify(repo)
5861 5870 return 1
5862 5871
5863 5872 @command('^remove|rm',
5864 5873 [('A', 'after', None, _('record delete for missing files')),
5865 5874 ('f', 'force', None,
5866 5875 _('remove (and delete) file even if added or modified')),
5867 5876 ] + subrepoopts + walkopts,
5868 5877 _('[OPTION]... FILE...'),
5869 5878 inferrepo=True)
5870 5879 def remove(ui, repo, *pats, **opts):
5871 5880 """remove the specified files on the next commit
5872 5881
5873 5882 Schedule the indicated files for removal from the current branch.
5874 5883
5875 5884 This command schedules the files to be removed at the next commit.
5876 5885 To undo a remove before that, see :hg:`revert`. To undo added
5877 5886 files, see :hg:`forget`.
5878 5887
5879 5888 .. container:: verbose
5880 5889
5881 5890 -A/--after can be used to remove only files that have already
5882 5891 been deleted, -f/--force can be used to force deletion, and -Af
5883 5892 can be used to remove files from the next revision without
5884 5893 deleting them from the working directory.
5885 5894
5886 5895 The following table details the behavior of remove for different
5887 5896 file states (columns) and option combinations (rows). The file
5888 5897 states are Added [A], Clean [C], Modified [M] and Missing [!]
5889 5898 (as reported by :hg:`status`). The actions are Warn, Remove
5890 5899 (from branch) and Delete (from disk):
5891 5900
5892 5901 ========= == == == ==
5893 5902 opt/state A C M !
5894 5903 ========= == == == ==
5895 5904 none W RD W R
5896 5905 -f R RD RD R
5897 5906 -A W W W R
5898 5907 -Af R R R R
5899 5908 ========= == == == ==
5900 5909
5901 5910 .. note::
5902 5911
5903 5912 :hg:`remove` never deletes files in Added [A] state from the
5904 5913 working directory, not even if ``--force`` is specified.
5905 5914
5906 5915 Returns 0 on success, 1 if any warnings encountered.
5907 5916 """
5908 5917
5909 5918 after, force = opts.get('after'), opts.get('force')
5910 5919 if not pats and not after:
5911 5920 raise error.Abort(_('no files specified'))
5912 5921
5913 5922 m = scmutil.match(repo[None], pats, opts)
5914 5923 subrepos = opts.get('subrepos')
5915 5924 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5916 5925
5917 5926 @command('rename|move|mv',
5918 5927 [('A', 'after', None, _('record a rename that has already occurred')),
5919 5928 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5920 5929 ] + walkopts + dryrunopts,
5921 5930 _('[OPTION]... SOURCE... DEST'))
5922 5931 def rename(ui, repo, *pats, **opts):
5923 5932 """rename files; equivalent of copy + remove
5924 5933
5925 5934 Mark dest as copies of sources; mark sources for deletion. If dest
5926 5935 is a directory, copies are put in that directory. If dest is a
5927 5936 file, there can only be one source.
5928 5937
5929 5938 By default, this command copies the contents of files as they
5930 5939 exist in the working directory. If invoked with -A/--after, the
5931 5940 operation is recorded, but no copying is performed.
5932 5941
5933 5942 This command takes effect at the next commit. To undo a rename
5934 5943 before that, see :hg:`revert`.
5935 5944
5936 5945 Returns 0 on success, 1 if errors are encountered.
5937 5946 """
5938 5947 with repo.wlock(False):
5939 5948 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5940 5949
5941 5950 @command('resolve',
5942 5951 [('a', 'all', None, _('select all unresolved files')),
5943 5952 ('l', 'list', None, _('list state of files needing merge')),
5944 5953 ('m', 'mark', None, _('mark files as resolved')),
5945 5954 ('u', 'unmark', None, _('mark files as unresolved')),
5946 5955 ('n', 'no-status', None, _('hide status prefix'))]
5947 5956 + mergetoolopts + walkopts + formatteropts,
5948 5957 _('[OPTION]... [FILE]...'),
5949 5958 inferrepo=True)
5950 5959 def resolve(ui, repo, *pats, **opts):
5951 5960 """redo merges or set/view the merge status of files
5952 5961
5953 5962 Merges with unresolved conflicts are often the result of
5954 5963 non-interactive merging using the ``internal:merge`` configuration
5955 5964 setting, or a command-line merge tool like ``diff3``. The resolve
5956 5965 command is used to manage the files involved in a merge, after
5957 5966 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5958 5967 working directory must have two parents). See :hg:`help
5959 5968 merge-tools` for information on configuring merge tools.
5960 5969
5961 5970 The resolve command can be used in the following ways:
5962 5971
5963 5972 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5964 5973 files, discarding any previous merge attempts. Re-merging is not
5965 5974 performed for files already marked as resolved. Use ``--all/-a``
5966 5975 to select all unresolved files. ``--tool`` can be used to specify
5967 5976 the merge tool used for the given files. It overrides the HGMERGE
5968 5977 environment variable and your configuration files. Previous file
5969 5978 contents are saved with a ``.orig`` suffix.
5970 5979
5971 5980 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5972 5981 (e.g. after having manually fixed-up the files). The default is
5973 5982 to mark all unresolved files.
5974 5983
5975 5984 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5976 5985 default is to mark all resolved files.
5977 5986
5978 5987 - :hg:`resolve -l`: list files which had or still have conflicts.
5979 5988 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5980 5989
5981 5990 .. note::
5982 5991
5983 5992 Mercurial will not let you commit files with unresolved merge
5984 5993 conflicts. You must use :hg:`resolve -m ...` before you can
5985 5994 commit after a conflicting merge.
5986 5995
5987 5996 Returns 0 on success, 1 if any files fail a resolve attempt.
5988 5997 """
5989 5998
5990 5999 flaglist = 'all mark unmark list no_status'.split()
5991 6000 all, mark, unmark, show, nostatus = \
5992 6001 [opts.get(o) for o in flaglist]
5993 6002
5994 6003 if (show and (mark or unmark)) or (mark and unmark):
5995 6004 raise error.Abort(_("too many options specified"))
5996 6005 if pats and all:
5997 6006 raise error.Abort(_("can't specify --all and patterns"))
5998 6007 if not (all or pats or show or mark or unmark):
5999 6008 raise error.Abort(_('no files or directories specified'),
6000 6009 hint=('use --all to re-merge all unresolved files'))
6001 6010
6002 6011 if show:
6003 6012 fm = ui.formatter('resolve', opts)
6004 6013 ms = mergemod.mergestate.read(repo)
6005 6014 m = scmutil.match(repo[None], pats, opts)
6006 6015 for f in ms:
6007 6016 if not m(f):
6008 6017 continue
6009 6018 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6010 6019 'd': 'driverresolved'}[ms[f]]
6011 6020 fm.startitem()
6012 6021 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6013 6022 fm.write('path', '%s\n', f, label=l)
6014 6023 fm.end()
6015 6024 return 0
6016 6025
6017 6026 with repo.wlock():
6018 6027 ms = mergemod.mergestate.read(repo)
6019 6028
6020 6029 if not (ms.active() or repo.dirstate.p2() != nullid):
6021 6030 raise error.Abort(
6022 6031 _('resolve command not applicable when not merging'))
6023 6032
6024 6033 wctx = repo[None]
6025 6034
6026 6035 if ms.mergedriver and ms.mdstate() == 'u':
6027 6036 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6028 6037 ms.commit()
6029 6038 # allow mark and unmark to go through
6030 6039 if not mark and not unmark and not proceed:
6031 6040 return 1
6032 6041
6033 6042 m = scmutil.match(wctx, pats, opts)
6034 6043 ret = 0
6035 6044 didwork = False
6036 6045 runconclude = False
6037 6046
6038 6047 tocomplete = []
6039 6048 for f in ms:
6040 6049 if not m(f):
6041 6050 continue
6042 6051
6043 6052 didwork = True
6044 6053
6045 6054 # don't let driver-resolved files be marked, and run the conclude
6046 6055 # step if asked to resolve
6047 6056 if ms[f] == "d":
6048 6057 exact = m.exact(f)
6049 6058 if mark:
6050 6059 if exact:
6051 6060 ui.warn(_('not marking %s as it is driver-resolved\n')
6052 6061 % f)
6053 6062 elif unmark:
6054 6063 if exact:
6055 6064 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6056 6065 % f)
6057 6066 else:
6058 6067 runconclude = True
6059 6068 continue
6060 6069
6061 6070 if mark:
6062 6071 ms.mark(f, "r")
6063 6072 elif unmark:
6064 6073 ms.mark(f, "u")
6065 6074 else:
6066 6075 # backup pre-resolve (merge uses .orig for its own purposes)
6067 6076 a = repo.wjoin(f)
6068 6077 try:
6069 6078 util.copyfile(a, a + ".resolve")
6070 6079 except (IOError, OSError) as inst:
6071 6080 if inst.errno != errno.ENOENT:
6072 6081 raise
6073 6082
6074 6083 try:
6075 6084 # preresolve file
6076 6085 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6077 6086 'resolve')
6078 6087 complete, r = ms.preresolve(f, wctx)
6079 6088 if not complete:
6080 6089 tocomplete.append(f)
6081 6090 elif r:
6082 6091 ret = 1
6083 6092 finally:
6084 6093 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6085 6094 ms.commit()
6086 6095
6087 6096 # replace filemerge's .orig file with our resolve file, but only
6088 6097 # for merges that are complete
6089 6098 if complete:
6090 6099 try:
6091 6100 util.rename(a + ".resolve",
6092 6101 scmutil.origpath(ui, repo, a))
6093 6102 except OSError as inst:
6094 6103 if inst.errno != errno.ENOENT:
6095 6104 raise
6096 6105
6097 6106 for f in tocomplete:
6098 6107 try:
6099 6108 # resolve file
6100 6109 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6101 6110 'resolve')
6102 6111 r = ms.resolve(f, wctx)
6103 6112 if r:
6104 6113 ret = 1
6105 6114 finally:
6106 6115 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6107 6116 ms.commit()
6108 6117
6109 6118 # replace filemerge's .orig file with our resolve file
6110 6119 a = repo.wjoin(f)
6111 6120 try:
6112 6121 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6113 6122 except OSError as inst:
6114 6123 if inst.errno != errno.ENOENT:
6115 6124 raise
6116 6125
6117 6126 ms.commit()
6118 6127 ms.recordactions()
6119 6128
6120 6129 if not didwork and pats:
6121 6130 hint = None
6122 6131 if not any([p for p in pats if p.find(':') >= 0]):
6123 6132 pats = ['path:%s' % p for p in pats]
6124 6133 m = scmutil.match(wctx, pats, opts)
6125 6134 for f in ms:
6126 6135 if not m(f):
6127 6136 continue
6128 6137 flags = ''.join(['-%s ' % o[0] for o in flaglist
6129 6138 if opts.get(o)])
6130 6139 hint = _("(try: hg resolve %s%s)\n") % (
6131 6140 flags,
6132 6141 ' '.join(pats))
6133 6142 break
6134 6143 ui.warn(_("arguments do not match paths that need resolving\n"))
6135 6144 if hint:
6136 6145 ui.warn(hint)
6137 6146 elif ms.mergedriver and ms.mdstate() != 's':
6138 6147 # run conclude step when either a driver-resolved file is requested
6139 6148 # or there are no driver-resolved files
6140 6149 # we can't use 'ret' to determine whether any files are unresolved
6141 6150 # because we might not have tried to resolve some
6142 6151 if ((runconclude or not list(ms.driverresolved()))
6143 6152 and not list(ms.unresolved())):
6144 6153 proceed = mergemod.driverconclude(repo, ms, wctx)
6145 6154 ms.commit()
6146 6155 if not proceed:
6147 6156 return 1
6148 6157
6149 6158 # Nudge users into finishing an unfinished operation
6150 6159 unresolvedf = list(ms.unresolved())
6151 6160 driverresolvedf = list(ms.driverresolved())
6152 6161 if not unresolvedf and not driverresolvedf:
6153 6162 ui.status(_('(no more unresolved files)\n'))
6154 6163 cmdutil.checkafterresolved(repo)
6155 6164 elif not unresolvedf:
6156 6165 ui.status(_('(no more unresolved files -- '
6157 6166 'run "hg resolve --all" to conclude)\n'))
6158 6167
6159 6168 return ret
6160 6169
6161 6170 @command('revert',
6162 6171 [('a', 'all', None, _('revert all changes when no arguments given')),
6163 6172 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6164 6173 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6165 6174 ('C', 'no-backup', None, _('do not save backup copies of files')),
6166 6175 ('i', 'interactive', None,
6167 6176 _('interactively select the changes (EXPERIMENTAL)')),
6168 6177 ] + walkopts + dryrunopts,
6169 6178 _('[OPTION]... [-r REV] [NAME]...'))
6170 6179 def revert(ui, repo, *pats, **opts):
6171 6180 """restore files to their checkout state
6172 6181
6173 6182 .. note::
6174 6183
6175 6184 To check out earlier revisions, you should use :hg:`update REV`.
6176 6185 To cancel an uncommitted merge (and lose your changes),
6177 6186 use :hg:`update --clean .`.
6178 6187
6179 6188 With no revision specified, revert the specified files or directories
6180 6189 to the contents they had in the parent of the working directory.
6181 6190 This restores the contents of files to an unmodified
6182 6191 state and unschedules adds, removes, copies, and renames. If the
6183 6192 working directory has two parents, you must explicitly specify a
6184 6193 revision.
6185 6194
6186 6195 Using the -r/--rev or -d/--date options, revert the given files or
6187 6196 directories to their states as of a specific revision. Because
6188 6197 revert does not change the working directory parents, this will
6189 6198 cause these files to appear modified. This can be helpful to "back
6190 6199 out" some or all of an earlier change. See :hg:`backout` for a
6191 6200 related method.
6192 6201
6193 6202 Modified files are saved with a .orig suffix before reverting.
6194 6203 To disable these backups, use --no-backup.
6195 6204
6196 6205 See :hg:`help dates` for a list of formats valid for -d/--date.
6197 6206
6198 6207 See :hg:`help backout` for a way to reverse the effect of an
6199 6208 earlier changeset.
6200 6209
6201 6210 Returns 0 on success.
6202 6211 """
6203 6212
6204 6213 if opts.get("date"):
6205 6214 if opts.get("rev"):
6206 6215 raise error.Abort(_("you can't specify a revision and a date"))
6207 6216 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6208 6217
6209 6218 parent, p2 = repo.dirstate.parents()
6210 6219 if not opts.get('rev') and p2 != nullid:
6211 6220 # revert after merge is a trap for new users (issue2915)
6212 6221 raise error.Abort(_('uncommitted merge with no revision specified'),
6213 6222 hint=_('use "hg update" or see "hg help revert"'))
6214 6223
6215 6224 ctx = scmutil.revsingle(repo, opts.get('rev'))
6216 6225
6217 6226 if (not (pats or opts.get('include') or opts.get('exclude') or
6218 6227 opts.get('all') or opts.get('interactive'))):
6219 6228 msg = _("no files or directories specified")
6220 6229 if p2 != nullid:
6221 6230 hint = _("uncommitted merge, use --all to discard all changes,"
6222 6231 " or 'hg update -C .' to abort the merge")
6223 6232 raise error.Abort(msg, hint=hint)
6224 6233 dirty = any(repo.status())
6225 6234 node = ctx.node()
6226 6235 if node != parent:
6227 6236 if dirty:
6228 6237 hint = _("uncommitted changes, use --all to discard all"
6229 6238 " changes, or 'hg update %s' to update") % ctx.rev()
6230 6239 else:
6231 6240 hint = _("use --all to revert all files,"
6232 6241 " or 'hg update %s' to update") % ctx.rev()
6233 6242 elif dirty:
6234 6243 hint = _("uncommitted changes, use --all to discard all changes")
6235 6244 else:
6236 6245 hint = _("use --all to revert all files")
6237 6246 raise error.Abort(msg, hint=hint)
6238 6247
6239 6248 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6240 6249
6241 6250 @command('rollback', dryrunopts +
6242 6251 [('f', 'force', False, _('ignore safety measures'))])
6243 6252 def rollback(ui, repo, **opts):
6244 6253 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6245 6254
6246 6255 Please use :hg:`commit --amend` instead of rollback to correct
6247 6256 mistakes in the last commit.
6248 6257
6249 6258 This command should be used with care. There is only one level of
6250 6259 rollback, and there is no way to undo a rollback. It will also
6251 6260 restore the dirstate at the time of the last transaction, losing
6252 6261 any dirstate changes since that time. This command does not alter
6253 6262 the working directory.
6254 6263
6255 6264 Transactions are used to encapsulate the effects of all commands
6256 6265 that create new changesets or propagate existing changesets into a
6257 6266 repository.
6258 6267
6259 6268 .. container:: verbose
6260 6269
6261 6270 For example, the following commands are transactional, and their
6262 6271 effects can be rolled back:
6263 6272
6264 6273 - commit
6265 6274 - import
6266 6275 - pull
6267 6276 - push (with this repository as the destination)
6268 6277 - unbundle
6269 6278
6270 6279 To avoid permanent data loss, rollback will refuse to rollback a
6271 6280 commit transaction if it isn't checked out. Use --force to
6272 6281 override this protection.
6273 6282
6274 6283 This command is not intended for use on public repositories. Once
6275 6284 changes are visible for pull by other users, rolling a transaction
6276 6285 back locally is ineffective (someone else may already have pulled
6277 6286 the changes). Furthermore, a race is possible with readers of the
6278 6287 repository; for example an in-progress pull from the repository
6279 6288 may fail if a rollback is performed.
6280 6289
6281 6290 Returns 0 on success, 1 if no rollback data is available.
6282 6291 """
6283 6292 return repo.rollback(dryrun=opts.get('dry_run'),
6284 6293 force=opts.get('force'))
6285 6294
6286 6295 @command('root', [])
6287 6296 def root(ui, repo):
6288 6297 """print the root (top) of the current working directory
6289 6298
6290 6299 Print the root directory of the current repository.
6291 6300
6292 6301 Returns 0 on success.
6293 6302 """
6294 6303 ui.write(repo.root + "\n")
6295 6304
6296 6305 @command('^serve',
6297 6306 [('A', 'accesslog', '', _('name of access log file to write to'),
6298 6307 _('FILE')),
6299 6308 ('d', 'daemon', None, _('run server in background')),
6300 6309 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6301 6310 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6302 6311 # use string type, then we can check if something was passed
6303 6312 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6304 6313 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6305 6314 _('ADDR')),
6306 6315 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6307 6316 _('PREFIX')),
6308 6317 ('n', 'name', '',
6309 6318 _('name to show in web pages (default: working directory)'), _('NAME')),
6310 6319 ('', 'web-conf', '',
6311 6320 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6312 6321 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6313 6322 _('FILE')),
6314 6323 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6315 6324 ('', 'stdio', None, _('for remote clients')),
6316 6325 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6317 6326 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6318 6327 ('', 'style', '', _('template style to use'), _('STYLE')),
6319 6328 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6320 6329 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6321 6330 _('[OPTION]...'),
6322 6331 optionalrepo=True)
6323 6332 def serve(ui, repo, **opts):
6324 6333 """start stand-alone webserver
6325 6334
6326 6335 Start a local HTTP repository browser and pull server. You can use
6327 6336 this for ad-hoc sharing and browsing of repositories. It is
6328 6337 recommended to use a real web server to serve a repository for
6329 6338 longer periods of time.
6330 6339
6331 6340 Please note that the server does not implement access control.
6332 6341 This means that, by default, anybody can read from the server and
6333 6342 nobody can write to it by default. Set the ``web.allow_push``
6334 6343 option to ``*`` to allow everybody to push to the server. You
6335 6344 should use a real web server if you need to authenticate users.
6336 6345
6337 6346 By default, the server logs accesses to stdout and errors to
6338 6347 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6339 6348 files.
6340 6349
6341 6350 To have the server choose a free port number to listen on, specify
6342 6351 a port number of 0; in this case, the server will print the port
6343 6352 number it uses.
6344 6353
6345 6354 Returns 0 on success.
6346 6355 """
6347 6356
6348 6357 if opts["stdio"] and opts["cmdserver"]:
6349 6358 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6350 6359
6351 6360 if opts["stdio"]:
6352 6361 if repo is None:
6353 6362 raise error.RepoError(_("there is no Mercurial repository here"
6354 6363 " (.hg not found)"))
6355 6364 s = sshserver.sshserver(ui, repo)
6356 6365 s.serve_forever()
6357 6366
6358 6367 if opts["cmdserver"]:
6359 6368 service = commandserver.createservice(ui, repo, opts)
6360 6369 else:
6361 6370 service = hgweb.createservice(ui, repo, opts)
6362 6371 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6363 6372
6364 6373 @command('^status|st',
6365 6374 [('A', 'all', None, _('show status of all files')),
6366 6375 ('m', 'modified', None, _('show only modified files')),
6367 6376 ('a', 'added', None, _('show only added files')),
6368 6377 ('r', 'removed', None, _('show only removed files')),
6369 6378 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6370 6379 ('c', 'clean', None, _('show only files without changes')),
6371 6380 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6372 6381 ('i', 'ignored', None, _('show only ignored files')),
6373 6382 ('n', 'no-status', None, _('hide status prefix')),
6374 6383 ('C', 'copies', None, _('show source of copied files')),
6375 6384 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6376 6385 ('', 'rev', [], _('show difference from revision'), _('REV')),
6377 6386 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6378 6387 ] + walkopts + subrepoopts + formatteropts,
6379 6388 _('[OPTION]... [FILE]...'),
6380 6389 inferrepo=True)
6381 6390 def status(ui, repo, *pats, **opts):
6382 6391 """show changed files in the working directory
6383 6392
6384 6393 Show status of files in the repository. If names are given, only
6385 6394 files that match are shown. Files that are clean or ignored or
6386 6395 the source of a copy/move operation, are not listed unless
6387 6396 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6388 6397 Unless options described with "show only ..." are given, the
6389 6398 options -mardu are used.
6390 6399
6391 6400 Option -q/--quiet hides untracked (unknown and ignored) files
6392 6401 unless explicitly requested with -u/--unknown or -i/--ignored.
6393 6402
6394 6403 .. note::
6395 6404
6396 6405 :hg:`status` may appear to disagree with diff if permissions have
6397 6406 changed or a merge has occurred. The standard diff format does
6398 6407 not report permission changes and diff only reports changes
6399 6408 relative to one merge parent.
6400 6409
6401 6410 If one revision is given, it is used as the base revision.
6402 6411 If two revisions are given, the differences between them are
6403 6412 shown. The --change option can also be used as a shortcut to list
6404 6413 the changed files of a revision from its first parent.
6405 6414
6406 6415 The codes used to show the status of files are::
6407 6416
6408 6417 M = modified
6409 6418 A = added
6410 6419 R = removed
6411 6420 C = clean
6412 6421 ! = missing (deleted by non-hg command, but still tracked)
6413 6422 ? = not tracked
6414 6423 I = ignored
6415 6424 = origin of the previous file (with --copies)
6416 6425
6417 6426 .. container:: verbose
6418 6427
6419 6428 Examples:
6420 6429
6421 6430 - show changes in the working directory relative to a
6422 6431 changeset::
6423 6432
6424 6433 hg status --rev 9353
6425 6434
6426 6435 - show changes in the working directory relative to the
6427 6436 current directory (see :hg:`help patterns` for more information)::
6428 6437
6429 6438 hg status re:
6430 6439
6431 6440 - show all changes including copies in an existing changeset::
6432 6441
6433 6442 hg status --copies --change 9353
6434 6443
6435 6444 - get a NUL separated list of added files, suitable for xargs::
6436 6445
6437 6446 hg status -an0
6438 6447
6439 6448 Returns 0 on success.
6440 6449 """
6441 6450
6442 6451 revs = opts.get('rev')
6443 6452 change = opts.get('change')
6444 6453
6445 6454 if revs and change:
6446 6455 msg = _('cannot specify --rev and --change at the same time')
6447 6456 raise error.Abort(msg)
6448 6457 elif change:
6449 6458 node2 = scmutil.revsingle(repo, change, None).node()
6450 6459 node1 = repo[node2].p1().node()
6451 6460 else:
6452 6461 node1, node2 = scmutil.revpair(repo, revs)
6453 6462
6454 6463 if pats:
6455 6464 cwd = repo.getcwd()
6456 6465 else:
6457 6466 cwd = ''
6458 6467
6459 6468 if opts.get('print0'):
6460 6469 end = '\0'
6461 6470 else:
6462 6471 end = '\n'
6463 6472 copy = {}
6464 6473 states = 'modified added removed deleted unknown ignored clean'.split()
6465 6474 show = [k for k in states if opts.get(k)]
6466 6475 if opts.get('all'):
6467 6476 show += ui.quiet and (states[:4] + ['clean']) or states
6468 6477 if not show:
6469 6478 if ui.quiet:
6470 6479 show = states[:4]
6471 6480 else:
6472 6481 show = states[:5]
6473 6482
6474 6483 m = scmutil.match(repo[node2], pats, opts)
6475 6484 stat = repo.status(node1, node2, m,
6476 6485 'ignored' in show, 'clean' in show, 'unknown' in show,
6477 6486 opts.get('subrepos'))
6478 6487 changestates = zip(states, 'MAR!?IC', stat)
6479 6488
6480 6489 if (opts.get('all') or opts.get('copies')
6481 6490 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6482 6491 copy = copies.pathcopies(repo[node1], repo[node2], m)
6483 6492
6484 6493 fm = ui.formatter('status', opts)
6485 6494 fmt = '%s' + end
6486 6495 showchar = not opts.get('no_status')
6487 6496
6488 6497 for state, char, files in changestates:
6489 6498 if state in show:
6490 6499 label = 'status.' + state
6491 6500 for f in files:
6492 6501 fm.startitem()
6493 6502 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6494 6503 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6495 6504 if f in copy:
6496 6505 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6497 6506 label='status.copied')
6498 6507 fm.end()
6499 6508
6500 6509 @command('^summary|sum',
6501 6510 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6502 6511 def summary(ui, repo, **opts):
6503 6512 """summarize working directory state
6504 6513
6505 6514 This generates a brief summary of the working directory state,
6506 6515 including parents, branch, commit status, phase and available updates.
6507 6516
6508 6517 With the --remote option, this will check the default paths for
6509 6518 incoming and outgoing changes. This can be time-consuming.
6510 6519
6511 6520 Returns 0 on success.
6512 6521 """
6513 6522
6514 6523 ctx = repo[None]
6515 6524 parents = ctx.parents()
6516 6525 pnode = parents[0].node()
6517 6526 marks = []
6518 6527
6519 6528 for p in parents:
6520 6529 # label with log.changeset (instead of log.parent) since this
6521 6530 # shows a working directory parent *changeset*:
6522 6531 # i18n: column positioning for "hg summary"
6523 6532 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6524 6533 label='log.changeset changeset.%s' % p.phasestr())
6525 6534 ui.write(' '.join(p.tags()), label='log.tag')
6526 6535 if p.bookmarks():
6527 6536 marks.extend(p.bookmarks())
6528 6537 if p.rev() == -1:
6529 6538 if not len(repo):
6530 6539 ui.write(_(' (empty repository)'))
6531 6540 else:
6532 6541 ui.write(_(' (no revision checked out)'))
6533 6542 ui.write('\n')
6534 6543 if p.description():
6535 6544 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6536 6545 label='log.summary')
6537 6546
6538 6547 branch = ctx.branch()
6539 6548 bheads = repo.branchheads(branch)
6540 6549 # i18n: column positioning for "hg summary"
6541 6550 m = _('branch: %s\n') % branch
6542 6551 if branch != 'default':
6543 6552 ui.write(m, label='log.branch')
6544 6553 else:
6545 6554 ui.status(m, label='log.branch')
6546 6555
6547 6556 if marks:
6548 6557 active = repo._activebookmark
6549 6558 # i18n: column positioning for "hg summary"
6550 6559 ui.write(_('bookmarks:'), label='log.bookmark')
6551 6560 if active is not None:
6552 6561 if active in marks:
6553 6562 ui.write(' *' + active, label=activebookmarklabel)
6554 6563 marks.remove(active)
6555 6564 else:
6556 6565 ui.write(' [%s]' % active, label=activebookmarklabel)
6557 6566 for m in marks:
6558 6567 ui.write(' ' + m, label='log.bookmark')
6559 6568 ui.write('\n', label='log.bookmark')
6560 6569
6561 6570 status = repo.status(unknown=True)
6562 6571
6563 6572 c = repo.dirstate.copies()
6564 6573 copied, renamed = [], []
6565 6574 for d, s in c.iteritems():
6566 6575 if s in status.removed:
6567 6576 status.removed.remove(s)
6568 6577 renamed.append(d)
6569 6578 else:
6570 6579 copied.append(d)
6571 6580 if d in status.added:
6572 6581 status.added.remove(d)
6573 6582
6574 6583 try:
6575 6584 ms = mergemod.mergestate.read(repo)
6576 6585 except error.UnsupportedMergeRecords as e:
6577 6586 s = ' '.join(e.recordtypes)
6578 6587 ui.warn(
6579 6588 _('warning: merge state has unsupported record types: %s\n') % s)
6580 6589 unresolved = 0
6581 6590 else:
6582 6591 unresolved = [f for f in ms if ms[f] == 'u']
6583 6592
6584 6593 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6585 6594
6586 6595 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6587 6596 (ui.label(_('%d added'), 'status.added'), status.added),
6588 6597 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6589 6598 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6590 6599 (ui.label(_('%d copied'), 'status.copied'), copied),
6591 6600 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6592 6601 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6593 6602 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6594 6603 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6595 6604 t = []
6596 6605 for l, s in labels:
6597 6606 if s:
6598 6607 t.append(l % len(s))
6599 6608
6600 6609 t = ', '.join(t)
6601 6610 cleanworkdir = False
6602 6611
6603 6612 if repo.vfs.exists('graftstate'):
6604 6613 t += _(' (graft in progress)')
6605 6614 if repo.vfs.exists('updatestate'):
6606 6615 t += _(' (interrupted update)')
6607 6616 elif len(parents) > 1:
6608 6617 t += _(' (merge)')
6609 6618 elif branch != parents[0].branch():
6610 6619 t += _(' (new branch)')
6611 6620 elif (parents[0].closesbranch() and
6612 6621 pnode in repo.branchheads(branch, closed=True)):
6613 6622 t += _(' (head closed)')
6614 6623 elif not (status.modified or status.added or status.removed or renamed or
6615 6624 copied or subs):
6616 6625 t += _(' (clean)')
6617 6626 cleanworkdir = True
6618 6627 elif pnode not in bheads:
6619 6628 t += _(' (new branch head)')
6620 6629
6621 6630 if parents:
6622 6631 pendingphase = max(p.phase() for p in parents)
6623 6632 else:
6624 6633 pendingphase = phases.public
6625 6634
6626 6635 if pendingphase > phases.newcommitphase(ui):
6627 6636 t += ' (%s)' % phases.phasenames[pendingphase]
6628 6637
6629 6638 if cleanworkdir:
6630 6639 # i18n: column positioning for "hg summary"
6631 6640 ui.status(_('commit: %s\n') % t.strip())
6632 6641 else:
6633 6642 # i18n: column positioning for "hg summary"
6634 6643 ui.write(_('commit: %s\n') % t.strip())
6635 6644
6636 6645 # all ancestors of branch heads - all ancestors of parent = new csets
6637 6646 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6638 6647 bheads))
6639 6648
6640 6649 if new == 0:
6641 6650 # i18n: column positioning for "hg summary"
6642 6651 ui.status(_('update: (current)\n'))
6643 6652 elif pnode not in bheads:
6644 6653 # i18n: column positioning for "hg summary"
6645 6654 ui.write(_('update: %d new changesets (update)\n') % new)
6646 6655 else:
6647 6656 # i18n: column positioning for "hg summary"
6648 6657 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6649 6658 (new, len(bheads)))
6650 6659
6651 6660 t = []
6652 6661 draft = len(repo.revs('draft()'))
6653 6662 if draft:
6654 6663 t.append(_('%d draft') % draft)
6655 6664 secret = len(repo.revs('secret()'))
6656 6665 if secret:
6657 6666 t.append(_('%d secret') % secret)
6658 6667
6659 6668 if draft or secret:
6660 6669 ui.status(_('phases: %s\n') % ', '.join(t))
6661 6670
6662 6671 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6663 6672 for trouble in ("unstable", "divergent", "bumped"):
6664 6673 numtrouble = len(repo.revs(trouble + "()"))
6665 6674 # We write all the possibilities to ease translation
6666 6675 troublemsg = {
6667 6676 "unstable": _("unstable: %d changesets"),
6668 6677 "divergent": _("divergent: %d changesets"),
6669 6678 "bumped": _("bumped: %d changesets"),
6670 6679 }
6671 6680 if numtrouble > 0:
6672 6681 ui.status(troublemsg[trouble] % numtrouble + "\n")
6673 6682
6674 6683 cmdutil.summaryhooks(ui, repo)
6675 6684
6676 6685 if opts.get('remote'):
6677 6686 needsincoming, needsoutgoing = True, True
6678 6687 else:
6679 6688 needsincoming, needsoutgoing = False, False
6680 6689 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6681 6690 if i:
6682 6691 needsincoming = True
6683 6692 if o:
6684 6693 needsoutgoing = True
6685 6694 if not needsincoming and not needsoutgoing:
6686 6695 return
6687 6696
6688 6697 def getincoming():
6689 6698 source, branches = hg.parseurl(ui.expandpath('default'))
6690 6699 sbranch = branches[0]
6691 6700 try:
6692 6701 other = hg.peer(repo, {}, source)
6693 6702 except error.RepoError:
6694 6703 if opts.get('remote'):
6695 6704 raise
6696 6705 return source, sbranch, None, None, None
6697 6706 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6698 6707 if revs:
6699 6708 revs = [other.lookup(rev) for rev in revs]
6700 6709 ui.debug('comparing with %s\n' % util.hidepassword(source))
6701 6710 repo.ui.pushbuffer()
6702 6711 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6703 6712 repo.ui.popbuffer()
6704 6713 return source, sbranch, other, commoninc, commoninc[1]
6705 6714
6706 6715 if needsincoming:
6707 6716 source, sbranch, sother, commoninc, incoming = getincoming()
6708 6717 else:
6709 6718 source = sbranch = sother = commoninc = incoming = None
6710 6719
6711 6720 def getoutgoing():
6712 6721 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6713 6722 dbranch = branches[0]
6714 6723 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6715 6724 if source != dest:
6716 6725 try:
6717 6726 dother = hg.peer(repo, {}, dest)
6718 6727 except error.RepoError:
6719 6728 if opts.get('remote'):
6720 6729 raise
6721 6730 return dest, dbranch, None, None
6722 6731 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6723 6732 elif sother is None:
6724 6733 # there is no explicit destination peer, but source one is invalid
6725 6734 return dest, dbranch, None, None
6726 6735 else:
6727 6736 dother = sother
6728 6737 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6729 6738 common = None
6730 6739 else:
6731 6740 common = commoninc
6732 6741 if revs:
6733 6742 revs = [repo.lookup(rev) for rev in revs]
6734 6743 repo.ui.pushbuffer()
6735 6744 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6736 6745 commoninc=common)
6737 6746 repo.ui.popbuffer()
6738 6747 return dest, dbranch, dother, outgoing
6739 6748
6740 6749 if needsoutgoing:
6741 6750 dest, dbranch, dother, outgoing = getoutgoing()
6742 6751 else:
6743 6752 dest = dbranch = dother = outgoing = None
6744 6753
6745 6754 if opts.get('remote'):
6746 6755 t = []
6747 6756 if incoming:
6748 6757 t.append(_('1 or more incoming'))
6749 6758 o = outgoing.missing
6750 6759 if o:
6751 6760 t.append(_('%d outgoing') % len(o))
6752 6761 other = dother or sother
6753 6762 if 'bookmarks' in other.listkeys('namespaces'):
6754 6763 counts = bookmarks.summary(repo, other)
6755 6764 if counts[0] > 0:
6756 6765 t.append(_('%d incoming bookmarks') % counts[0])
6757 6766 if counts[1] > 0:
6758 6767 t.append(_('%d outgoing bookmarks') % counts[1])
6759 6768
6760 6769 if t:
6761 6770 # i18n: column positioning for "hg summary"
6762 6771 ui.write(_('remote: %s\n') % (', '.join(t)))
6763 6772 else:
6764 6773 # i18n: column positioning for "hg summary"
6765 6774 ui.status(_('remote: (synced)\n'))
6766 6775
6767 6776 cmdutil.summaryremotehooks(ui, repo, opts,
6768 6777 ((source, sbranch, sother, commoninc),
6769 6778 (dest, dbranch, dother, outgoing)))
6770 6779
6771 6780 @command('tag',
6772 6781 [('f', 'force', None, _('force tag')),
6773 6782 ('l', 'local', None, _('make the tag local')),
6774 6783 ('r', 'rev', '', _('revision to tag'), _('REV')),
6775 6784 ('', 'remove', None, _('remove a tag')),
6776 6785 # -l/--local is already there, commitopts cannot be used
6777 6786 ('e', 'edit', None, _('invoke editor on commit messages')),
6778 6787 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6779 6788 ] + commitopts2,
6780 6789 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6781 6790 def tag(ui, repo, name1, *names, **opts):
6782 6791 """add one or more tags for the current or given revision
6783 6792
6784 6793 Name a particular revision using <name>.
6785 6794
6786 6795 Tags are used to name particular revisions of the repository and are
6787 6796 very useful to compare different revisions, to go back to significant
6788 6797 earlier versions or to mark branch points as releases, etc. Changing
6789 6798 an existing tag is normally disallowed; use -f/--force to override.
6790 6799
6791 6800 If no revision is given, the parent of the working directory is
6792 6801 used.
6793 6802
6794 6803 To facilitate version control, distribution, and merging of tags,
6795 6804 they are stored as a file named ".hgtags" which is managed similarly
6796 6805 to other project files and can be hand-edited if necessary. This
6797 6806 also means that tagging creates a new commit. The file
6798 6807 ".hg/localtags" is used for local tags (not shared among
6799 6808 repositories).
6800 6809
6801 6810 Tag commits are usually made at the head of a branch. If the parent
6802 6811 of the working directory is not a branch head, :hg:`tag` aborts; use
6803 6812 -f/--force to force the tag commit to be based on a non-head
6804 6813 changeset.
6805 6814
6806 6815 See :hg:`help dates` for a list of formats valid for -d/--date.
6807 6816
6808 6817 Since tag names have priority over branch names during revision
6809 6818 lookup, using an existing branch name as a tag name is discouraged.
6810 6819
6811 6820 Returns 0 on success.
6812 6821 """
6813 6822 wlock = lock = None
6814 6823 try:
6815 6824 wlock = repo.wlock()
6816 6825 lock = repo.lock()
6817 6826 rev_ = "."
6818 6827 names = [t.strip() for t in (name1,) + names]
6819 6828 if len(names) != len(set(names)):
6820 6829 raise error.Abort(_('tag names must be unique'))
6821 6830 for n in names:
6822 6831 scmutil.checknewlabel(repo, n, 'tag')
6823 6832 if not n:
6824 6833 raise error.Abort(_('tag names cannot consist entirely of '
6825 6834 'whitespace'))
6826 6835 if opts.get('rev') and opts.get('remove'):
6827 6836 raise error.Abort(_("--rev and --remove are incompatible"))
6828 6837 if opts.get('rev'):
6829 6838 rev_ = opts['rev']
6830 6839 message = opts.get('message')
6831 6840 if opts.get('remove'):
6832 6841 if opts.get('local'):
6833 6842 expectedtype = 'local'
6834 6843 else:
6835 6844 expectedtype = 'global'
6836 6845
6837 6846 for n in names:
6838 6847 if not repo.tagtype(n):
6839 6848 raise error.Abort(_("tag '%s' does not exist") % n)
6840 6849 if repo.tagtype(n) != expectedtype:
6841 6850 if expectedtype == 'global':
6842 6851 raise error.Abort(_("tag '%s' is not a global tag") % n)
6843 6852 else:
6844 6853 raise error.Abort(_("tag '%s' is not a local tag") % n)
6845 6854 rev_ = 'null'
6846 6855 if not message:
6847 6856 # we don't translate commit messages
6848 6857 message = 'Removed tag %s' % ', '.join(names)
6849 6858 elif not opts.get('force'):
6850 6859 for n in names:
6851 6860 if n in repo.tags():
6852 6861 raise error.Abort(_("tag '%s' already exists "
6853 6862 "(use -f to force)") % n)
6854 6863 if not opts.get('local'):
6855 6864 p1, p2 = repo.dirstate.parents()
6856 6865 if p2 != nullid:
6857 6866 raise error.Abort(_('uncommitted merge'))
6858 6867 bheads = repo.branchheads()
6859 6868 if not opts.get('force') and bheads and p1 not in bheads:
6860 6869 raise error.Abort(_('not at a branch head (use -f to force)'))
6861 6870 r = scmutil.revsingle(repo, rev_).node()
6862 6871
6863 6872 if not message:
6864 6873 # we don't translate commit messages
6865 6874 message = ('Added tag %s for changeset %s' %
6866 6875 (', '.join(names), short(r)))
6867 6876
6868 6877 date = opts.get('date')
6869 6878 if date:
6870 6879 date = util.parsedate(date)
6871 6880
6872 6881 if opts.get('remove'):
6873 6882 editform = 'tag.remove'
6874 6883 else:
6875 6884 editform = 'tag.add'
6876 6885 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6877 6886
6878 6887 # don't allow tagging the null rev
6879 6888 if (not opts.get('remove') and
6880 6889 scmutil.revsingle(repo, rev_).rev() == nullrev):
6881 6890 raise error.Abort(_("cannot tag null revision"))
6882 6891
6883 6892 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6884 6893 editor=editor)
6885 6894 finally:
6886 6895 release(lock, wlock)
6887 6896
6888 6897 @command('tags', formatteropts, '')
6889 6898 def tags(ui, repo, **opts):
6890 6899 """list repository tags
6891 6900
6892 6901 This lists both regular and local tags. When the -v/--verbose
6893 6902 switch is used, a third column "local" is printed for local tags.
6894 6903 When the -q/--quiet switch is used, only the tag name is printed.
6895 6904
6896 6905 Returns 0 on success.
6897 6906 """
6898 6907
6899 6908 fm = ui.formatter('tags', opts)
6900 6909 hexfunc = fm.hexfunc
6901 6910 tagtype = ""
6902 6911
6903 6912 for t, n in reversed(repo.tagslist()):
6904 6913 hn = hexfunc(n)
6905 6914 label = 'tags.normal'
6906 6915 tagtype = ''
6907 6916 if repo.tagtype(t) == 'local':
6908 6917 label = 'tags.local'
6909 6918 tagtype = 'local'
6910 6919
6911 6920 fm.startitem()
6912 6921 fm.write('tag', '%s', t, label=label)
6913 6922 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6914 6923 fm.condwrite(not ui.quiet, 'rev node', fmt,
6915 6924 repo.changelog.rev(n), hn, label=label)
6916 6925 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6917 6926 tagtype, label=label)
6918 6927 fm.plain('\n')
6919 6928 fm.end()
6920 6929
6921 6930 @command('tip',
6922 6931 [('p', 'patch', None, _('show patch')),
6923 6932 ('g', 'git', None, _('use git extended diff format')),
6924 6933 ] + templateopts,
6925 6934 _('[-p] [-g]'))
6926 6935 def tip(ui, repo, **opts):
6927 6936 """show the tip revision (DEPRECATED)
6928 6937
6929 6938 The tip revision (usually just called the tip) is the changeset
6930 6939 most recently added to the repository (and therefore the most
6931 6940 recently changed head).
6932 6941
6933 6942 If you have just made a commit, that commit will be the tip. If
6934 6943 you have just pulled changes from another repository, the tip of
6935 6944 that repository becomes the current tip. The "tip" tag is special
6936 6945 and cannot be renamed or assigned to a different changeset.
6937 6946
6938 6947 This command is deprecated, please use :hg:`heads` instead.
6939 6948
6940 6949 Returns 0 on success.
6941 6950 """
6942 6951 displayer = cmdutil.show_changeset(ui, repo, opts)
6943 6952 displayer.show(repo['tip'])
6944 6953 displayer.close()
6945 6954
6946 6955 @command('unbundle',
6947 6956 [('u', 'update', None,
6948 6957 _('update to new branch head if changesets were unbundled'))],
6949 6958 _('[-u] FILE...'))
6950 6959 def unbundle(ui, repo, fname1, *fnames, **opts):
6951 6960 """apply one or more changegroup files
6952 6961
6953 6962 Apply one or more compressed changegroup files generated by the
6954 6963 bundle command.
6955 6964
6956 6965 Returns 0 on success, 1 if an update has unresolved files.
6957 6966 """
6958 6967 fnames = (fname1,) + fnames
6959 6968
6960 6969 with repo.lock():
6961 6970 for fname in fnames:
6962 6971 f = hg.openpath(ui, fname)
6963 6972 gen = exchange.readbundle(ui, f, fname)
6964 6973 if isinstance(gen, bundle2.unbundle20):
6965 6974 tr = repo.transaction('unbundle')
6966 6975 try:
6967 6976 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6968 6977 url='bundle:' + fname)
6969 6978 tr.close()
6970 6979 except error.BundleUnknownFeatureError as exc:
6971 6980 raise error.Abort(_('%s: unknown bundle feature, %s')
6972 6981 % (fname, exc),
6973 6982 hint=_("see https://mercurial-scm.org/"
6974 6983 "wiki/BundleFeature for more "
6975 6984 "information"))
6976 6985 finally:
6977 6986 if tr:
6978 6987 tr.release()
6979 6988 changes = [r.get('return', 0)
6980 6989 for r in op.records['changegroup']]
6981 6990 modheads = changegroup.combineresults(changes)
6982 6991 elif isinstance(gen, streamclone.streamcloneapplier):
6983 6992 raise error.Abort(
6984 6993 _('packed bundles cannot be applied with '
6985 6994 '"hg unbundle"'),
6986 6995 hint=_('use "hg debugapplystreamclonebundle"'))
6987 6996 else:
6988 6997 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6989 6998
6990 6999 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6991 7000
6992 7001 @command('^update|up|checkout|co',
6993 7002 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6994 7003 ('c', 'check', None,
6995 7004 _('update across branches if no uncommitted changes')),
6996 7005 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6997 7006 ('r', 'rev', '', _('revision'), _('REV'))
6998 7007 ] + mergetoolopts,
6999 7008 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7000 7009 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7001 7010 tool=None):
7002 7011 """update working directory (or switch revisions)
7003 7012
7004 7013 Update the repository's working directory to the specified
7005 7014 changeset. If no changeset is specified, update to the tip of the
7006 7015 current named branch and move the active bookmark (see :hg:`help
7007 7016 bookmarks`).
7008 7017
7009 7018 Update sets the working directory's parent revision to the specified
7010 7019 changeset (see :hg:`help parents`).
7011 7020
7012 7021 If the changeset is not a descendant or ancestor of the working
7013 7022 directory's parent, the update is aborted. With the -c/--check
7014 7023 option, the working directory is checked for uncommitted changes; if
7015 7024 none are found, the working directory is updated to the specified
7016 7025 changeset.
7017 7026
7018 7027 .. container:: verbose
7019 7028
7020 7029 The following rules apply when the working directory contains
7021 7030 uncommitted changes:
7022 7031
7023 7032 1. If neither -c/--check nor -C/--clean is specified, and if
7024 7033 the requested changeset is an ancestor or descendant of
7025 7034 the working directory's parent, the uncommitted changes
7026 7035 are merged into the requested changeset and the merged
7027 7036 result is left uncommitted. If the requested changeset is
7028 7037 not an ancestor or descendant (that is, it is on another
7029 7038 branch), the update is aborted and the uncommitted changes
7030 7039 are preserved.
7031 7040
7032 7041 2. With the -c/--check option, the update is aborted and the
7033 7042 uncommitted changes are preserved.
7034 7043
7035 7044 3. With the -C/--clean option, uncommitted changes are discarded and
7036 7045 the working directory is updated to the requested changeset.
7037 7046
7038 7047 To cancel an uncommitted merge (and lose your changes), use
7039 7048 :hg:`update --clean .`.
7040 7049
7041 7050 Use null as the changeset to remove the working directory (like
7042 7051 :hg:`clone -U`).
7043 7052
7044 7053 If you want to revert just one file to an older revision, use
7045 7054 :hg:`revert [-r REV] NAME`.
7046 7055
7047 7056 See :hg:`help dates` for a list of formats valid for -d/--date.
7048 7057
7049 7058 Returns 0 on success, 1 if there are unresolved files.
7050 7059 """
7051 7060 if rev and node:
7052 7061 raise error.Abort(_("please specify just one revision"))
7053 7062
7054 7063 if rev is None or rev == '':
7055 7064 rev = node
7056 7065
7057 7066 if date and rev is not None:
7058 7067 raise error.Abort(_("you can't specify a revision and a date"))
7059 7068
7060 7069 if check and clean:
7061 7070 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7062 7071
7063 7072 with repo.wlock():
7064 7073 cmdutil.clearunfinished(repo)
7065 7074
7066 7075 if date:
7067 7076 rev = cmdutil.finddate(ui, repo, date)
7068 7077
7069 7078 # if we defined a bookmark, we have to remember the original name
7070 7079 brev = rev
7071 7080 rev = scmutil.revsingle(repo, rev, rev).rev()
7072 7081
7073 7082 if check:
7074 7083 cmdutil.bailifchanged(repo, merge=False)
7075 7084
7076 7085 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7077 7086
7078 7087 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7079 7088
7080 7089 @command('verify', [])
7081 7090 def verify(ui, repo):
7082 7091 """verify the integrity of the repository
7083 7092
7084 7093 Verify the integrity of the current repository.
7085 7094
7086 7095 This will perform an extensive check of the repository's
7087 7096 integrity, validating the hashes and checksums of each entry in
7088 7097 the changelog, manifest, and tracked files, as well as the
7089 7098 integrity of their crosslinks and indices.
7090 7099
7091 7100 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7092 7101 for more information about recovery from corruption of the
7093 7102 repository.
7094 7103
7095 7104 Returns 0 on success, 1 if errors are encountered.
7096 7105 """
7097 7106 return hg.verify(repo)
7098 7107
7099 7108 @command('version', [], norepo=True)
7100 7109 def version_(ui):
7101 7110 """output version and copyright information"""
7102 7111 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7103 7112 % util.version())
7104 7113 ui.status(_(
7105 7114 "(see https://mercurial-scm.org for more information)\n"
7106 7115 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7107 7116 "This is free software; see the source for copying conditions. "
7108 7117 "There is NO\nwarranty; "
7109 7118 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7110 7119 ))
7111 7120
7112 7121 ui.note(_("\nEnabled extensions:\n\n"))
7113 7122 if ui.verbose:
7114 7123 # format names and versions into columns
7115 7124 names = []
7116 7125 vers = []
7117 7126 place = []
7118 7127 for name, module in extensions.extensions():
7119 7128 names.append(name)
7120 7129 vers.append(extensions.moduleversion(module))
7121 7130 if extensions.ismoduleinternal(module):
7122 7131 place.append(_("internal"))
7123 7132 else:
7124 7133 place.append(_("external"))
7125 7134 if names:
7126 7135 maxnamelen = max(len(n) for n in names)
7127 7136 for i, name in enumerate(names):
7128 7137 ui.write(" %-*s %s %s\n" %
7129 7138 (maxnamelen, name, place[i], vers[i]))
7130 7139
7131 7140 def loadcmdtable(ui, name, cmdtable):
7132 7141 """Load command functions from specified cmdtable
7133 7142 """
7134 7143 overrides = [cmd for cmd in cmdtable if cmd in table]
7135 7144 if overrides:
7136 7145 ui.warn(_("extension '%s' overrides commands: %s\n")
7137 7146 % (name, " ".join(overrides)))
7138 7147 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now