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