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