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