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