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