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