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