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