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