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