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