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