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