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