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