##// END OF EJS Templates
update: check command line before modifying repo...
Martin von Zweigbergk -
r28032:8157c6b8 default
parent child Browse files
Show More
@@ -1,7065 +1,7065 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 node import hex, bin, nullhex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _
11 11 import os, re, difflib, time, tempfile, errno, shlex
12 12 import sys, socket
13 13 import hg, scmutil, util, revlog, copies, error, bookmarks
14 14 import patch, help, encoding, templatekw, discovery
15 15 import archival, changegroup, cmdutil, hbisect
16 16 import sshserver, hgweb
17 17 import extensions
18 18 import merge as mergemod
19 19 import minirst, revset, fileset
20 20 import dagparser, context, simplemerge, graphmod, copies
21 21 import random, operator
22 22 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
23 23 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
24 24 import ui as uimod
25 25 import streamclone
26 26 import commandserver
27 27
28 28 table = {}
29 29
30 30 command = cmdutil.command(table)
31 31
32 32 # Space delimited list of commands that don't require local repositories.
33 33 # This should be populated by passing norepo=True into the @command decorator.
34 34 norepo = ''
35 35 # Space delimited list of commands that optionally require local repositories.
36 36 # This should be populated by passing optionalrepo=True into the @command
37 37 # decorator.
38 38 optionalrepo = ''
39 39 # Space delimited list of commands that will examine arguments looking for
40 40 # a repository. This should be populated by passing inferrepo=True into the
41 41 # @command decorator.
42 42 inferrepo = ''
43 43
44 44 # label constants
45 45 # until 3.5, bookmarks.current was the advertised name, not
46 46 # bookmarks.active, so we must use both to avoid breaking old
47 47 # custom styles
48 48 activebookmarklabel = 'bookmarks.active bookmarks.current'
49 49
50 50 # common command options
51 51
52 52 globalopts = [
53 53 ('R', 'repository', '',
54 54 _('repository root directory or name of overlay bundle file'),
55 55 _('REPO')),
56 56 ('', 'cwd', '',
57 57 _('change working directory'), _('DIR')),
58 58 ('y', 'noninteractive', None,
59 59 _('do not prompt, automatically pick the first choice for all prompts')),
60 60 ('q', 'quiet', None, _('suppress output')),
61 61 ('v', 'verbose', None, _('enable additional output')),
62 62 ('', 'config', [],
63 63 _('set/override config option (use \'section.name=value\')'),
64 64 _('CONFIG')),
65 65 ('', 'debug', None, _('enable debugging output')),
66 66 ('', 'debugger', None, _('start debugger')),
67 67 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
68 68 _('ENCODE')),
69 69 ('', 'encodingmode', encoding.encodingmode,
70 70 _('set the charset encoding mode'), _('MODE')),
71 71 ('', 'traceback', None, _('always print a traceback on exception')),
72 72 ('', 'time', None, _('time how long the command takes')),
73 73 ('', 'profile', None, _('print command execution profile')),
74 74 ('', 'version', None, _('output version information and exit')),
75 75 ('h', 'help', None, _('display help and exit')),
76 76 ('', 'hidden', False, _('consider hidden changesets')),
77 77 ]
78 78
79 79 dryrunopts = [('n', 'dry-run', None,
80 80 _('do not perform actions, just print output'))]
81 81
82 82 remoteopts = [
83 83 ('e', 'ssh', '',
84 84 _('specify ssh command to use'), _('CMD')),
85 85 ('', 'remotecmd', '',
86 86 _('specify hg command to run on the remote side'), _('CMD')),
87 87 ('', 'insecure', None,
88 88 _('do not verify server certificate (ignoring web.cacerts config)')),
89 89 ]
90 90
91 91 walkopts = [
92 92 ('I', 'include', [],
93 93 _('include names matching the given patterns'), _('PATTERN')),
94 94 ('X', 'exclude', [],
95 95 _('exclude names matching the given patterns'), _('PATTERN')),
96 96 ]
97 97
98 98 commitopts = [
99 99 ('m', 'message', '',
100 100 _('use text as commit message'), _('TEXT')),
101 101 ('l', 'logfile', '',
102 102 _('read commit message from file'), _('FILE')),
103 103 ]
104 104
105 105 commitopts2 = [
106 106 ('d', 'date', '',
107 107 _('record the specified date as commit date'), _('DATE')),
108 108 ('u', 'user', '',
109 109 _('record the specified user as committer'), _('USER')),
110 110 ]
111 111
112 112 # hidden for now
113 113 formatteropts = [
114 114 ('T', 'template', '',
115 115 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
116 116 ]
117 117
118 118 templateopts = [
119 119 ('', 'style', '',
120 120 _('display using template map file (DEPRECATED)'), _('STYLE')),
121 121 ('T', 'template', '',
122 122 _('display with template'), _('TEMPLATE')),
123 123 ]
124 124
125 125 logopts = [
126 126 ('p', 'patch', None, _('show patch')),
127 127 ('g', 'git', None, _('use git extended diff format')),
128 128 ('l', 'limit', '',
129 129 _('limit number of changes displayed'), _('NUM')),
130 130 ('M', 'no-merges', None, _('do not show merges')),
131 131 ('', 'stat', None, _('output diffstat-style summary of changes')),
132 132 ('G', 'graph', None, _("show the revision DAG")),
133 133 ] + templateopts
134 134
135 135 diffopts = [
136 136 ('a', 'text', None, _('treat all files as text')),
137 137 ('g', 'git', None, _('use git extended diff format')),
138 138 ('', 'nodates', None, _('omit dates from diff headers'))
139 139 ]
140 140
141 141 diffwsopts = [
142 142 ('w', 'ignore-all-space', None,
143 143 _('ignore white space when comparing lines')),
144 144 ('b', 'ignore-space-change', None,
145 145 _('ignore changes in the amount of white space')),
146 146 ('B', 'ignore-blank-lines', None,
147 147 _('ignore changes whose lines are all blank')),
148 148 ]
149 149
150 150 diffopts2 = [
151 151 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
152 152 ('p', 'show-function', None, _('show which function each change is in')),
153 153 ('', 'reverse', None, _('produce a diff that undoes the changes')),
154 154 ] + diffwsopts + [
155 155 ('U', 'unified', '',
156 156 _('number of lines of context to show'), _('NUM')),
157 157 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 158 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
159 159 ]
160 160
161 161 mergetoolopts = [
162 162 ('t', 'tool', '', _('specify merge tool')),
163 163 ]
164 164
165 165 similarityopts = [
166 166 ('s', 'similarity', '',
167 167 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
168 168 ]
169 169
170 170 subrepoopts = [
171 171 ('S', 'subrepos', None,
172 172 _('recurse into subrepositories'))
173 173 ]
174 174
175 175 debugrevlogopts = [
176 176 ('c', 'changelog', False, _('open changelog')),
177 177 ('m', 'manifest', False, _('open manifest')),
178 178 ('', 'dir', False, _('open directory manifest')),
179 179 ]
180 180
181 181 # Commands start here, listed alphabetically
182 182
183 183 @command('^add',
184 184 walkopts + subrepoopts + dryrunopts,
185 185 _('[OPTION]... [FILE]...'),
186 186 inferrepo=True)
187 187 def add(ui, repo, *pats, **opts):
188 188 """add the specified files on the next commit
189 189
190 190 Schedule files to be version controlled and added to the
191 191 repository.
192 192
193 193 The files will be added to the repository at the next commit. To
194 194 undo an add before that, see :hg:`forget`.
195 195
196 196 If no names are given, add all files to the repository (except
197 197 files matching ``.hgignore``).
198 198
199 199 .. container:: verbose
200 200
201 201 Examples:
202 202
203 203 - New (unknown) files are added
204 204 automatically by :hg:`add`::
205 205
206 206 $ ls
207 207 foo.c
208 208 $ hg status
209 209 ? foo.c
210 210 $ hg add
211 211 adding foo.c
212 212 $ hg status
213 213 A foo.c
214 214
215 215 - Specific files to be added can be specified::
216 216
217 217 $ ls
218 218 bar.c foo.c
219 219 $ hg status
220 220 ? bar.c
221 221 ? foo.c
222 222 $ hg add bar.c
223 223 $ hg status
224 224 A bar.c
225 225 ? foo.c
226 226
227 227 Returns 0 if all files are successfully added.
228 228 """
229 229
230 230 m = scmutil.match(repo[None], pats, opts)
231 231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
232 232 return rejected and 1 or 0
233 233
234 234 @command('addremove',
235 235 similarityopts + subrepoopts + walkopts + dryrunopts,
236 236 _('[OPTION]... [FILE]...'),
237 237 inferrepo=True)
238 238 def addremove(ui, repo, *pats, **opts):
239 239 """add all new files, delete all missing files
240 240
241 241 Add all new files and remove all missing files from the
242 242 repository.
243 243
244 244 Unless names are given, new files are ignored if they match any of
245 245 the patterns in ``.hgignore``. As with add, these changes take
246 246 effect at the next commit.
247 247
248 248 Use the -s/--similarity option to detect renamed files. This
249 249 option takes a percentage between 0 (disabled) and 100 (files must
250 250 be identical) as its parameter. With a parameter greater than 0,
251 251 this compares every removed file with every added file and records
252 252 those similar enough as renames. Detecting renamed files this way
253 253 can be expensive. After using this option, :hg:`status -C` can be
254 254 used to check which files were identified as moved or renamed. If
255 255 not specified, -s/--similarity defaults to 100 and only renames of
256 256 identical files are detected.
257 257
258 258 .. container:: verbose
259 259
260 260 Examples:
261 261
262 262 - A number of files (bar.c and foo.c) are new,
263 263 while foobar.c has been removed (without using :hg:`remove`)
264 264 from the repository::
265 265
266 266 $ ls
267 267 bar.c foo.c
268 268 $ hg status
269 269 ! foobar.c
270 270 ? bar.c
271 271 ? foo.c
272 272 $ hg addremove
273 273 adding bar.c
274 274 adding foo.c
275 275 removing foobar.c
276 276 $ hg status
277 277 A bar.c
278 278 A foo.c
279 279 R foobar.c
280 280
281 281 - A file foobar.c was moved to foo.c without using :hg:`rename`.
282 282 Afterwards, it was edited slightly::
283 283
284 284 $ ls
285 285 foo.c
286 286 $ hg status
287 287 ! foobar.c
288 288 ? foo.c
289 289 $ hg addremove --similarity 90
290 290 removing foobar.c
291 291 adding foo.c
292 292 recording removal of foobar.c as rename to foo.c (94% similar)
293 293 $ hg status -C
294 294 A foo.c
295 295 foobar.c
296 296 R foobar.c
297 297
298 298 Returns 0 if all files are successfully added.
299 299 """
300 300 try:
301 301 sim = float(opts.get('similarity') or 100)
302 302 except ValueError:
303 303 raise error.Abort(_('similarity must be a number'))
304 304 if sim < 0 or sim > 100:
305 305 raise error.Abort(_('similarity must be between 0 and 100'))
306 306 matcher = scmutil.match(repo[None], pats, opts)
307 307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
308 308
309 309 @command('^annotate|blame',
310 310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
311 311 ('', 'follow', None,
312 312 _('follow copies/renames and list the filename (DEPRECATED)')),
313 313 ('', 'no-follow', None, _("don't follow copies and renames")),
314 314 ('a', 'text', None, _('treat all files as text')),
315 315 ('u', 'user', None, _('list the author (long with -v)')),
316 316 ('f', 'file', None, _('list the filename')),
317 317 ('d', 'date', None, _('list the date (short with -q)')),
318 318 ('n', 'number', None, _('list the revision number (default)')),
319 319 ('c', 'changeset', None, _('list the changeset')),
320 320 ('l', 'line-number', None, _('show line number at the first appearance'))
321 321 ] + diffwsopts + walkopts + formatteropts,
322 322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
323 323 inferrepo=True)
324 324 def annotate(ui, repo, *pats, **opts):
325 325 """show changeset information by line for each file
326 326
327 327 List changes in files, showing the revision id responsible for
328 328 each line.
329 329
330 330 This command is useful for discovering when a change was made and
331 331 by whom.
332 332
333 333 If you include --file, --user, or --date, the revision number is
334 334 suppressed unless you also include --number.
335 335
336 336 Without the -a/--text option, annotate will avoid processing files
337 337 it detects as binary. With -a, annotate will annotate the file
338 338 anyway, although the results will probably be neither useful
339 339 nor desirable.
340 340
341 341 Returns 0 on success.
342 342 """
343 343 if not pats:
344 344 raise error.Abort(_('at least one filename or pattern is required'))
345 345
346 346 if opts.get('follow'):
347 347 # --follow is deprecated and now just an alias for -f/--file
348 348 # to mimic the behavior of Mercurial before version 1.5
349 349 opts['file'] = True
350 350
351 351 ctx = scmutil.revsingle(repo, opts.get('rev'))
352 352
353 353 fm = ui.formatter('annotate', opts)
354 354 if ui.quiet:
355 355 datefunc = util.shortdate
356 356 else:
357 357 datefunc = util.datestr
358 358 if ctx.rev() is None:
359 359 def hexfn(node):
360 360 if node is None:
361 361 return None
362 362 else:
363 363 return fm.hexfunc(node)
364 364 if opts.get('changeset'):
365 365 # omit "+" suffix which is appended to node hex
366 366 def formatrev(rev):
367 367 if rev is None:
368 368 return '%d' % ctx.p1().rev()
369 369 else:
370 370 return '%d' % rev
371 371 else:
372 372 def formatrev(rev):
373 373 if rev is None:
374 374 return '%d+' % ctx.p1().rev()
375 375 else:
376 376 return '%d ' % rev
377 377 def formathex(hex):
378 378 if hex is None:
379 379 return '%s+' % fm.hexfunc(ctx.p1().node())
380 380 else:
381 381 return '%s ' % hex
382 382 else:
383 383 hexfn = fm.hexfunc
384 384 formatrev = formathex = str
385 385
386 386 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
387 387 ('number', ' ', lambda x: x[0].rev(), formatrev),
388 388 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
389 389 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
390 390 ('file', ' ', lambda x: x[0].path(), str),
391 391 ('line_number', ':', lambda x: x[1], str),
392 392 ]
393 393 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
394 394
395 395 if (not opts.get('user') and not opts.get('changeset')
396 396 and not opts.get('date') and not opts.get('file')):
397 397 opts['number'] = True
398 398
399 399 linenumber = opts.get('line_number') is not None
400 400 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
401 401 raise error.Abort(_('at least one of -n/-c is required for -l'))
402 402
403 403 if fm:
404 404 def makefunc(get, fmt):
405 405 return get
406 406 else:
407 407 def makefunc(get, fmt):
408 408 return lambda x: fmt(get(x))
409 409 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
410 410 if opts.get(op)]
411 411 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
412 412 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
413 413 if opts.get(op))
414 414
415 415 def bad(x, y):
416 416 raise error.Abort("%s: %s" % (x, y))
417 417
418 418 m = scmutil.match(ctx, pats, opts, badfn=bad)
419 419
420 420 follow = not opts.get('no_follow')
421 421 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
422 422 whitespace=True)
423 423 for abs in ctx.walk(m):
424 424 fctx = ctx[abs]
425 425 if not opts.get('text') and util.binary(fctx.data()):
426 426 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
427 427 continue
428 428
429 429 lines = fctx.annotate(follow=follow, linenumber=linenumber,
430 430 diffopts=diffopts)
431 431 formats = []
432 432 pieces = []
433 433
434 434 for f, sep in funcmap:
435 435 l = [f(n) for n, dummy in lines]
436 436 if l:
437 437 if fm:
438 438 formats.append(['%s' for x in l])
439 439 else:
440 440 sizes = [encoding.colwidth(x) for x in l]
441 441 ml = max(sizes)
442 442 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
443 443 pieces.append(l)
444 444
445 445 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
446 446 fm.startitem()
447 447 fm.write(fields, "".join(f), *p)
448 448 fm.write('line', ": %s", l[1])
449 449
450 450 if lines and not lines[-1][1].endswith('\n'):
451 451 fm.plain('\n')
452 452
453 453 fm.end()
454 454
455 455 @command('archive',
456 456 [('', 'no-decode', None, _('do not pass files through decoders')),
457 457 ('p', 'prefix', '', _('directory prefix for files in archive'),
458 458 _('PREFIX')),
459 459 ('r', 'rev', '', _('revision to distribute'), _('REV')),
460 460 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
461 461 ] + subrepoopts + walkopts,
462 462 _('[OPTION]... DEST'))
463 463 def archive(ui, repo, dest, **opts):
464 464 '''create an unversioned archive of a repository revision
465 465
466 466 By default, the revision used is the parent of the working
467 467 directory; use -r/--rev to specify a different revision.
468 468
469 469 The archive type is automatically detected based on file
470 470 extension (to override, use -t/--type).
471 471
472 472 .. container:: verbose
473 473
474 474 Examples:
475 475
476 476 - create a zip file containing the 1.0 release::
477 477
478 478 hg archive -r 1.0 project-1.0.zip
479 479
480 480 - create a tarball excluding .hg files::
481 481
482 482 hg archive project.tar.gz -X ".hg*"
483 483
484 484 Valid types are:
485 485
486 486 :``files``: a directory full of files (default)
487 487 :``tar``: tar archive, uncompressed
488 488 :``tbz2``: tar archive, compressed using bzip2
489 489 :``tgz``: tar archive, compressed using gzip
490 490 :``uzip``: zip archive, uncompressed
491 491 :``zip``: zip archive, compressed using deflate
492 492
493 493 The exact name of the destination archive or directory is given
494 494 using a format string; see :hg:`help export` for details.
495 495
496 496 Each member added to an archive file has a directory prefix
497 497 prepended. Use -p/--prefix to specify a format string for the
498 498 prefix. The default is the basename of the archive, with suffixes
499 499 removed.
500 500
501 501 Returns 0 on success.
502 502 '''
503 503
504 504 ctx = scmutil.revsingle(repo, opts.get('rev'))
505 505 if not ctx:
506 506 raise error.Abort(_('no working directory: please specify a revision'))
507 507 node = ctx.node()
508 508 dest = cmdutil.makefilename(repo, dest, node)
509 509 if os.path.realpath(dest) == repo.root:
510 510 raise error.Abort(_('repository root cannot be destination'))
511 511
512 512 kind = opts.get('type') or archival.guesskind(dest) or 'files'
513 513 prefix = opts.get('prefix')
514 514
515 515 if dest == '-':
516 516 if kind == 'files':
517 517 raise error.Abort(_('cannot archive plain files to stdout'))
518 518 dest = cmdutil.makefileobj(repo, dest)
519 519 if not prefix:
520 520 prefix = os.path.basename(repo.root) + '-%h'
521 521
522 522 prefix = cmdutil.makefilename(repo, prefix, node)
523 523 matchfn = scmutil.match(ctx, [], opts)
524 524 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
525 525 matchfn, prefix, subrepos=opts.get('subrepos'))
526 526
527 527 @command('backout',
528 528 [('', 'merge', None, _('merge with old dirstate parent after backout')),
529 529 ('', 'commit', None,
530 530 _('commit if no conflicts were encountered (DEPRECATED)')),
531 531 ('', 'no-commit', None, _('do not commit')),
532 532 ('', 'parent', '',
533 533 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
534 534 ('r', 'rev', '', _('revision to backout'), _('REV')),
535 535 ('e', 'edit', False, _('invoke editor on commit messages')),
536 536 ] + mergetoolopts + walkopts + commitopts + commitopts2,
537 537 _('[OPTION]... [-r] REV'))
538 538 def backout(ui, repo, node=None, rev=None, **opts):
539 539 '''reverse effect of earlier changeset
540 540
541 541 Prepare a new changeset with the effect of REV undone in the
542 542 current working directory. If no conflicts were encountered,
543 543 it will be committed immediately.
544 544
545 545 If REV is the parent of the working directory, then this new changeset
546 546 is committed automatically (unless --no-commit is specified).
547 547
548 548 .. note::
549 549
550 550 :hg:`backout` cannot be used to fix either an unwanted or
551 551 incorrect merge.
552 552
553 553 .. container:: verbose
554 554
555 555 Examples:
556 556
557 557 - Reverse the effect of the parent of the working directory.
558 558 This backout will be committed immediately::
559 559
560 560 hg backout -r .
561 561
562 562 - Reverse the effect of previous bad revision 23::
563 563
564 564 hg backout -r 23
565 565
566 566 - Reverse the effect of previous bad revision 23 and
567 567 leave changes uncommitted::
568 568
569 569 hg backout -r 23 --no-commit
570 570 hg commit -m "Backout revision 23"
571 571
572 572 By default, the pending changeset will have one parent,
573 573 maintaining a linear history. With --merge, the pending
574 574 changeset will instead have two parents: the old parent of the
575 575 working directory and a new child of REV that simply undoes REV.
576 576
577 577 Before version 1.7, the behavior without --merge was equivalent
578 578 to specifying --merge followed by :hg:`update --clean .` to
579 579 cancel the merge and leave the child of REV as a head to be
580 580 merged separately.
581 581
582 582 See :hg:`help dates` for a list of formats valid for -d/--date.
583 583
584 584 See :hg:`help revert` for a way to restore files to the state
585 585 of another revision.
586 586
587 587 Returns 0 on success, 1 if nothing to backout or there are unresolved
588 588 files.
589 589 '''
590 590 wlock = lock = None
591 591 try:
592 592 wlock = repo.wlock()
593 593 lock = repo.lock()
594 594 return _dobackout(ui, repo, node, rev, **opts)
595 595 finally:
596 596 release(lock, wlock)
597 597
598 598 def _dobackout(ui, repo, node=None, rev=None, **opts):
599 599 if opts.get('commit') and opts.get('no_commit'):
600 600 raise error.Abort(_("cannot use --commit with --no-commit"))
601 601 if opts.get('merge') and opts.get('no_commit'):
602 602 raise error.Abort(_("cannot use --merge with --no-commit"))
603 603
604 604 if rev and node:
605 605 raise error.Abort(_("please specify just one revision"))
606 606
607 607 if not rev:
608 608 rev = node
609 609
610 610 if not rev:
611 611 raise error.Abort(_("please specify a revision to backout"))
612 612
613 613 date = opts.get('date')
614 614 if date:
615 615 opts['date'] = util.parsedate(date)
616 616
617 617 cmdutil.checkunfinished(repo)
618 618 cmdutil.bailifchanged(repo)
619 619 node = scmutil.revsingle(repo, rev).node()
620 620
621 621 op1, op2 = repo.dirstate.parents()
622 622 if not repo.changelog.isancestor(node, op1):
623 623 raise error.Abort(_('cannot backout change that is not an ancestor'))
624 624
625 625 p1, p2 = repo.changelog.parents(node)
626 626 if p1 == nullid:
627 627 raise error.Abort(_('cannot backout a change with no parents'))
628 628 if p2 != nullid:
629 629 if not opts.get('parent'):
630 630 raise error.Abort(_('cannot backout a merge changeset'))
631 631 p = repo.lookup(opts['parent'])
632 632 if p not in (p1, p2):
633 633 raise error.Abort(_('%s is not a parent of %s') %
634 634 (short(p), short(node)))
635 635 parent = p
636 636 else:
637 637 if opts.get('parent'):
638 638 raise error.Abort(_('cannot use --parent on non-merge changeset'))
639 639 parent = p1
640 640
641 641 # the backout should appear on the same branch
642 642 branch = repo.dirstate.branch()
643 643 bheads = repo.branchheads(branch)
644 644 rctx = scmutil.revsingle(repo, hex(parent))
645 645 if not opts.get('merge') and op1 != node:
646 646 dsguard = cmdutil.dirstateguard(repo, 'backout')
647 647 try:
648 648 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
649 649 'backout')
650 650 stats = mergemod.update(repo, parent, True, True, node, False)
651 651 repo.setparents(op1, op2)
652 652 dsguard.close()
653 653 hg._showstats(repo, stats)
654 654 if stats[3]:
655 655 repo.ui.status(_("use 'hg resolve' to retry unresolved "
656 656 "file merges\n"))
657 657 return 1
658 658 finally:
659 659 ui.setconfig('ui', 'forcemerge', '', '')
660 660 lockmod.release(dsguard)
661 661 else:
662 662 hg.clean(repo, node, show_stats=False)
663 663 repo.dirstate.setbranch(branch)
664 664 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
665 665
666 666 if opts.get('no_commit'):
667 667 msg = _("changeset %s backed out, "
668 668 "don't forget to commit.\n")
669 669 ui.status(msg % short(node))
670 670 return 0
671 671
672 672 def commitfunc(ui, repo, message, match, opts):
673 673 editform = 'backout'
674 674 e = cmdutil.getcommiteditor(editform=editform, **opts)
675 675 if not message:
676 676 # we don't translate commit messages
677 677 message = "Backed out changeset %s" % short(node)
678 678 e = cmdutil.getcommiteditor(edit=True, editform=editform)
679 679 return repo.commit(message, opts.get('user'), opts.get('date'),
680 680 match, editor=e)
681 681 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
682 682 if not newnode:
683 683 ui.status(_("nothing changed\n"))
684 684 return 1
685 685 cmdutil.commitstatus(repo, newnode, branch, bheads)
686 686
687 687 def nice(node):
688 688 return '%d:%s' % (repo.changelog.rev(node), short(node))
689 689 ui.status(_('changeset %s backs out changeset %s\n') %
690 690 (nice(repo.changelog.tip()), nice(node)))
691 691 if opts.get('merge') and op1 != node:
692 692 hg.clean(repo, op1, show_stats=False)
693 693 ui.status(_('merging with changeset %s\n')
694 694 % nice(repo.changelog.tip()))
695 695 try:
696 696 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
697 697 'backout')
698 698 return hg.merge(repo, hex(repo.changelog.tip()))
699 699 finally:
700 700 ui.setconfig('ui', 'forcemerge', '', '')
701 701 return 0
702 702
703 703 @command('bisect',
704 704 [('r', 'reset', False, _('reset bisect state')),
705 705 ('g', 'good', False, _('mark changeset good')),
706 706 ('b', 'bad', False, _('mark changeset bad')),
707 707 ('s', 'skip', False, _('skip testing changeset')),
708 708 ('e', 'extend', False, _('extend the bisect range')),
709 709 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
710 710 ('U', 'noupdate', False, _('do not update to target'))],
711 711 _("[-gbsr] [-U] [-c CMD] [REV]"))
712 712 def bisect(ui, repo, rev=None, extra=None, command=None,
713 713 reset=None, good=None, bad=None, skip=None, extend=None,
714 714 noupdate=None):
715 715 """subdivision search of changesets
716 716
717 717 This command helps to find changesets which introduce problems. To
718 718 use, mark the earliest changeset you know exhibits the problem as
719 719 bad, then mark the latest changeset which is free from the problem
720 720 as good. Bisect will update your working directory to a revision
721 721 for testing (unless the -U/--noupdate option is specified). Once
722 722 you have performed tests, mark the working directory as good or
723 723 bad, and bisect will either update to another candidate changeset
724 724 or announce that it has found the bad revision.
725 725
726 726 As a shortcut, you can also use the revision argument to mark a
727 727 revision as good or bad without checking it out first.
728 728
729 729 If you supply a command, it will be used for automatic bisection.
730 730 The environment variable HG_NODE will contain the ID of the
731 731 changeset being tested. The exit status of the command will be
732 732 used to mark revisions as good or bad: status 0 means good, 125
733 733 means to skip the revision, 127 (command not found) will abort the
734 734 bisection, and any other non-zero exit status means the revision
735 735 is bad.
736 736
737 737 .. container:: verbose
738 738
739 739 Some examples:
740 740
741 741 - start a bisection with known bad revision 34, and good revision 12::
742 742
743 743 hg bisect --bad 34
744 744 hg bisect --good 12
745 745
746 746 - advance the current bisection by marking current revision as good or
747 747 bad::
748 748
749 749 hg bisect --good
750 750 hg bisect --bad
751 751
752 752 - mark the current revision, or a known revision, to be skipped (e.g. if
753 753 that revision is not usable because of another issue)::
754 754
755 755 hg bisect --skip
756 756 hg bisect --skip 23
757 757
758 758 - skip all revisions that do not touch directories ``foo`` or ``bar``::
759 759
760 760 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
761 761
762 762 - forget the current bisection::
763 763
764 764 hg bisect --reset
765 765
766 766 - use 'make && make tests' to automatically find the first broken
767 767 revision::
768 768
769 769 hg bisect --reset
770 770 hg bisect --bad 34
771 771 hg bisect --good 12
772 772 hg bisect --command "make && make tests"
773 773
774 774 - see all changesets whose states are already known in the current
775 775 bisection::
776 776
777 777 hg log -r "bisect(pruned)"
778 778
779 779 - see the changeset currently being bisected (especially useful
780 780 if running with -U/--noupdate)::
781 781
782 782 hg log -r "bisect(current)"
783 783
784 784 - see all changesets that took part in the current bisection::
785 785
786 786 hg log -r "bisect(range)"
787 787
788 788 - you can even get a nice graph::
789 789
790 790 hg log --graph -r "bisect(range)"
791 791
792 792 See :hg:`help revsets` for more about the `bisect()` keyword.
793 793
794 794 Returns 0 on success.
795 795 """
796 796 def extendbisectrange(nodes, good):
797 797 # bisect is incomplete when it ends on a merge node and
798 798 # one of the parent was not checked.
799 799 parents = repo[nodes[0]].parents()
800 800 if len(parents) > 1:
801 801 if good:
802 802 side = state['bad']
803 803 else:
804 804 side = state['good']
805 805 num = len(set(i.node() for i in parents) & set(side))
806 806 if num == 1:
807 807 return parents[0].ancestor(parents[1])
808 808 return None
809 809
810 810 def print_result(nodes, good):
811 811 displayer = cmdutil.show_changeset(ui, repo, {})
812 812 if len(nodes) == 1:
813 813 # narrowed it down to a single revision
814 814 if good:
815 815 ui.write(_("The first good revision is:\n"))
816 816 else:
817 817 ui.write(_("The first bad revision is:\n"))
818 818 displayer.show(repo[nodes[0]])
819 819 extendnode = extendbisectrange(nodes, good)
820 820 if extendnode is not None:
821 821 ui.write(_('Not all ancestors of this changeset have been'
822 822 ' checked.\nUse bisect --extend to continue the '
823 823 'bisection from\nthe common ancestor, %s.\n')
824 824 % extendnode)
825 825 else:
826 826 # multiple possible revisions
827 827 if good:
828 828 ui.write(_("Due to skipped revisions, the first "
829 829 "good revision could be any of:\n"))
830 830 else:
831 831 ui.write(_("Due to skipped revisions, the first "
832 832 "bad revision could be any of:\n"))
833 833 for n in nodes:
834 834 displayer.show(repo[n])
835 835 displayer.close()
836 836
837 837 def check_state(state, interactive=True):
838 838 if not state['good'] or not state['bad']:
839 839 if (good or bad or skip or reset) and interactive:
840 840 return
841 841 if not state['good']:
842 842 raise error.Abort(_('cannot bisect (no known good revisions)'))
843 843 else:
844 844 raise error.Abort(_('cannot bisect (no known bad revisions)'))
845 845 return True
846 846
847 847 # backward compatibility
848 848 if rev in "good bad reset init".split():
849 849 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
850 850 cmd, rev, extra = rev, extra, None
851 851 if cmd == "good":
852 852 good = True
853 853 elif cmd == "bad":
854 854 bad = True
855 855 else:
856 856 reset = True
857 857 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
858 858 raise error.Abort(_('incompatible arguments'))
859 859
860 860 cmdutil.checkunfinished(repo)
861 861
862 862 if reset:
863 863 p = repo.join("bisect.state")
864 864 if os.path.exists(p):
865 865 os.unlink(p)
866 866 return
867 867
868 868 state = hbisect.load_state(repo)
869 869
870 870 if command:
871 871 changesets = 1
872 872 if noupdate:
873 873 try:
874 874 node = state['current'][0]
875 875 except LookupError:
876 876 raise error.Abort(_('current bisect revision is unknown - '
877 877 'start a new bisect to fix'))
878 878 else:
879 879 node, p2 = repo.dirstate.parents()
880 880 if p2 != nullid:
881 881 raise error.Abort(_('current bisect revision is a merge'))
882 882 try:
883 883 while changesets:
884 884 # update state
885 885 state['current'] = [node]
886 886 hbisect.save_state(repo, state)
887 887 status = ui.system(command, environ={'HG_NODE': hex(node)})
888 888 if status == 125:
889 889 transition = "skip"
890 890 elif status == 0:
891 891 transition = "good"
892 892 # status < 0 means process was killed
893 893 elif status == 127:
894 894 raise error.Abort(_("failed to execute %s") % command)
895 895 elif status < 0:
896 896 raise error.Abort(_("%s killed") % command)
897 897 else:
898 898 transition = "bad"
899 899 ctx = scmutil.revsingle(repo, rev, node)
900 900 rev = None # clear for future iterations
901 901 state[transition].append(ctx.node())
902 902 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
903 903 check_state(state, interactive=False)
904 904 # bisect
905 905 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
906 906 # update to next check
907 907 node = nodes[0]
908 908 if not noupdate:
909 909 cmdutil.bailifchanged(repo)
910 910 hg.clean(repo, node, show_stats=False)
911 911 finally:
912 912 state['current'] = [node]
913 913 hbisect.save_state(repo, state)
914 914 print_result(nodes, bgood)
915 915 return
916 916
917 917 # update state
918 918
919 919 if rev:
920 920 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
921 921 else:
922 922 nodes = [repo.lookup('.')]
923 923
924 924 if good or bad or skip:
925 925 if good:
926 926 state['good'] += nodes
927 927 elif bad:
928 928 state['bad'] += nodes
929 929 elif skip:
930 930 state['skip'] += nodes
931 931 hbisect.save_state(repo, state)
932 932
933 933 if not check_state(state):
934 934 return
935 935
936 936 # actually bisect
937 937 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
938 938 if extend:
939 939 if not changesets:
940 940 extendnode = extendbisectrange(nodes, good)
941 941 if extendnode is not None:
942 942 ui.write(_("Extending search to changeset %d:%s\n")
943 943 % (extendnode.rev(), extendnode))
944 944 state['current'] = [extendnode.node()]
945 945 hbisect.save_state(repo, state)
946 946 if noupdate:
947 947 return
948 948 cmdutil.bailifchanged(repo)
949 949 return hg.clean(repo, extendnode.node())
950 950 raise error.Abort(_("nothing to extend"))
951 951
952 952 if changesets == 0:
953 953 print_result(nodes, good)
954 954 else:
955 955 assert len(nodes) == 1 # only a single node can be tested next
956 956 node = nodes[0]
957 957 # compute the approximate number of remaining tests
958 958 tests, size = 0, 2
959 959 while size <= changesets:
960 960 tests, size = tests + 1, size * 2
961 961 rev = repo.changelog.rev(node)
962 962 ui.write(_("Testing changeset %d:%s "
963 963 "(%d changesets remaining, ~%d tests)\n")
964 964 % (rev, short(node), changesets, tests))
965 965 state['current'] = [node]
966 966 hbisect.save_state(repo, state)
967 967 if not noupdate:
968 968 cmdutil.bailifchanged(repo)
969 969 return hg.clean(repo, node)
970 970
971 971 @command('bookmarks|bookmark',
972 972 [('f', 'force', False, _('force')),
973 973 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
974 974 ('d', 'delete', False, _('delete a given bookmark')),
975 975 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
976 976 ('i', 'inactive', False, _('mark a bookmark inactive')),
977 977 ] + formatteropts,
978 978 _('hg bookmarks [OPTIONS]... [NAME]...'))
979 979 def bookmark(ui, repo, *names, **opts):
980 980 '''create a new bookmark or list existing bookmarks
981 981
982 982 Bookmarks are labels on changesets to help track lines of development.
983 983 Bookmarks are unversioned and can be moved, renamed and deleted.
984 984 Deleting or moving a bookmark has no effect on the associated changesets.
985 985
986 986 Creating or updating to a bookmark causes it to be marked as 'active'.
987 987 The active bookmark is indicated with a '*'.
988 988 When a commit is made, the active bookmark will advance to the new commit.
989 989 A plain :hg:`update` will also advance an active bookmark, if possible.
990 990 Updating away from a bookmark will cause it to be deactivated.
991 991
992 992 Bookmarks can be pushed and pulled between repositories (see
993 993 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
994 994 diverged, a new 'divergent bookmark' of the form 'name@path' will
995 995 be created. Using :hg:`merge` will resolve the divergence.
996 996
997 997 A bookmark named '@' has the special property that :hg:`clone` will
998 998 check it out by default if it exists.
999 999
1000 1000 .. container:: verbose
1001 1001
1002 1002 Examples:
1003 1003
1004 1004 - create an active bookmark for a new line of development::
1005 1005
1006 1006 hg book new-feature
1007 1007
1008 1008 - create an inactive bookmark as a place marker::
1009 1009
1010 1010 hg book -i reviewed
1011 1011
1012 1012 - create an inactive bookmark on another changeset::
1013 1013
1014 1014 hg book -r .^ tested
1015 1015
1016 1016 - rename bookmark turkey to dinner::
1017 1017
1018 1018 hg book -m turkey dinner
1019 1019
1020 1020 - move the '@' bookmark from another branch::
1021 1021
1022 1022 hg book -f @
1023 1023 '''
1024 1024 force = opts.get('force')
1025 1025 rev = opts.get('rev')
1026 1026 delete = opts.get('delete')
1027 1027 rename = opts.get('rename')
1028 1028 inactive = opts.get('inactive')
1029 1029
1030 1030 def checkformat(mark):
1031 1031 mark = mark.strip()
1032 1032 if not mark:
1033 1033 raise error.Abort(_("bookmark names cannot consist entirely of "
1034 1034 "whitespace"))
1035 1035 scmutil.checknewlabel(repo, mark, 'bookmark')
1036 1036 return mark
1037 1037
1038 1038 def checkconflict(repo, mark, cur, force=False, target=None):
1039 1039 if mark in marks and not force:
1040 1040 if target:
1041 1041 if marks[mark] == target and target == cur:
1042 1042 # re-activating a bookmark
1043 1043 return
1044 1044 anc = repo.changelog.ancestors([repo[target].rev()])
1045 1045 bmctx = repo[marks[mark]]
1046 1046 divs = [repo[b].node() for b in marks
1047 1047 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1048 1048
1049 1049 # allow resolving a single divergent bookmark even if moving
1050 1050 # the bookmark across branches when a revision is specified
1051 1051 # that contains a divergent bookmark
1052 1052 if bmctx.rev() not in anc and target in divs:
1053 1053 bookmarks.deletedivergent(repo, [target], mark)
1054 1054 return
1055 1055
1056 1056 deletefrom = [b for b in divs
1057 1057 if repo[b].rev() in anc or b == target]
1058 1058 bookmarks.deletedivergent(repo, deletefrom, mark)
1059 1059 if bookmarks.validdest(repo, bmctx, repo[target]):
1060 1060 ui.status(_("moving bookmark '%s' forward from %s\n") %
1061 1061 (mark, short(bmctx.node())))
1062 1062 return
1063 1063 raise error.Abort(_("bookmark '%s' already exists "
1064 1064 "(use -f to force)") % mark)
1065 1065 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1066 1066 and not force):
1067 1067 raise error.Abort(
1068 1068 _("a bookmark cannot have the name of an existing branch"))
1069 1069
1070 1070 if delete and rename:
1071 1071 raise error.Abort(_("--delete and --rename are incompatible"))
1072 1072 if delete and rev:
1073 1073 raise error.Abort(_("--rev is incompatible with --delete"))
1074 1074 if rename and rev:
1075 1075 raise error.Abort(_("--rev is incompatible with --rename"))
1076 1076 if not names and (delete or rev):
1077 1077 raise error.Abort(_("bookmark name required"))
1078 1078
1079 1079 if delete or rename or names or inactive:
1080 1080 wlock = lock = tr = None
1081 1081 try:
1082 1082 wlock = repo.wlock()
1083 1083 lock = repo.lock()
1084 1084 cur = repo.changectx('.').node()
1085 1085 marks = repo._bookmarks
1086 1086 if delete:
1087 1087 tr = repo.transaction('bookmark')
1088 1088 for mark in names:
1089 1089 if mark not in marks:
1090 1090 raise error.Abort(_("bookmark '%s' does not exist") %
1091 1091 mark)
1092 1092 if mark == repo._activebookmark:
1093 1093 bookmarks.deactivate(repo)
1094 1094 del marks[mark]
1095 1095
1096 1096 elif rename:
1097 1097 tr = repo.transaction('bookmark')
1098 1098 if not names:
1099 1099 raise error.Abort(_("new bookmark name required"))
1100 1100 elif len(names) > 1:
1101 1101 raise error.Abort(_("only one new bookmark name allowed"))
1102 1102 mark = checkformat(names[0])
1103 1103 if rename not in marks:
1104 1104 raise error.Abort(_("bookmark '%s' does not exist")
1105 1105 % rename)
1106 1106 checkconflict(repo, mark, cur, force)
1107 1107 marks[mark] = marks[rename]
1108 1108 if repo._activebookmark == rename and not inactive:
1109 1109 bookmarks.activate(repo, mark)
1110 1110 del marks[rename]
1111 1111 elif names:
1112 1112 tr = repo.transaction('bookmark')
1113 1113 newact = None
1114 1114 for mark in names:
1115 1115 mark = checkformat(mark)
1116 1116 if newact is None:
1117 1117 newact = mark
1118 1118 if inactive and mark == repo._activebookmark:
1119 1119 bookmarks.deactivate(repo)
1120 1120 return
1121 1121 tgt = cur
1122 1122 if rev:
1123 1123 tgt = scmutil.revsingle(repo, rev).node()
1124 1124 checkconflict(repo, mark, cur, force, tgt)
1125 1125 marks[mark] = tgt
1126 1126 if not inactive and cur == marks[newact] and not rev:
1127 1127 bookmarks.activate(repo, newact)
1128 1128 elif cur != tgt and newact == repo._activebookmark:
1129 1129 bookmarks.deactivate(repo)
1130 1130 elif inactive:
1131 1131 if len(marks) == 0:
1132 1132 ui.status(_("no bookmarks set\n"))
1133 1133 elif not repo._activebookmark:
1134 1134 ui.status(_("no active bookmark\n"))
1135 1135 else:
1136 1136 bookmarks.deactivate(repo)
1137 1137 if tr is not None:
1138 1138 marks.recordchange(tr)
1139 1139 tr.close()
1140 1140 finally:
1141 1141 lockmod.release(tr, lock, wlock)
1142 1142 else: # show bookmarks
1143 1143 fm = ui.formatter('bookmarks', opts)
1144 1144 hexfn = fm.hexfunc
1145 1145 marks = repo._bookmarks
1146 1146 if len(marks) == 0 and not fm:
1147 1147 ui.status(_("no bookmarks set\n"))
1148 1148 for bmark, n in sorted(marks.iteritems()):
1149 1149 active = repo._activebookmark
1150 1150 if bmark == active:
1151 1151 prefix, label = '*', activebookmarklabel
1152 1152 else:
1153 1153 prefix, label = ' ', ''
1154 1154
1155 1155 fm.startitem()
1156 1156 if not ui.quiet:
1157 1157 fm.plain(' %s ' % prefix, label=label)
1158 1158 fm.write('bookmark', '%s', bmark, label=label)
1159 1159 pad = " " * (25 - encoding.colwidth(bmark))
1160 1160 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1161 1161 repo.changelog.rev(n), hexfn(n), label=label)
1162 1162 fm.data(active=(bmark == active))
1163 1163 fm.plain('\n')
1164 1164 fm.end()
1165 1165
1166 1166 @command('branch',
1167 1167 [('f', 'force', None,
1168 1168 _('set branch name even if it shadows an existing branch')),
1169 1169 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1170 1170 _('[-fC] [NAME]'))
1171 1171 def branch(ui, repo, label=None, **opts):
1172 1172 """set or show the current branch name
1173 1173
1174 1174 .. note::
1175 1175
1176 1176 Branch names are permanent and global. Use :hg:`bookmark` to create a
1177 1177 light-weight bookmark instead. See :hg:`help glossary` for more
1178 1178 information about named branches and bookmarks.
1179 1179
1180 1180 With no argument, show the current branch name. With one argument,
1181 1181 set the working directory branch name (the branch will not exist
1182 1182 in the repository until the next commit). Standard practice
1183 1183 recommends that primary development take place on the 'default'
1184 1184 branch.
1185 1185
1186 1186 Unless -f/--force is specified, branch will not let you set a
1187 1187 branch name that already exists.
1188 1188
1189 1189 Use -C/--clean to reset the working directory branch to that of
1190 1190 the parent of the working directory, negating a previous branch
1191 1191 change.
1192 1192
1193 1193 Use the command :hg:`update` to switch to an existing branch. Use
1194 1194 :hg:`commit --close-branch` to mark this branch head as closed.
1195 1195 When all heads of a branch are closed, the branch will be
1196 1196 considered closed.
1197 1197
1198 1198 Returns 0 on success.
1199 1199 """
1200 1200 if label:
1201 1201 label = label.strip()
1202 1202
1203 1203 if not opts.get('clean') and not label:
1204 1204 ui.write("%s\n" % repo.dirstate.branch())
1205 1205 return
1206 1206
1207 1207 with repo.wlock():
1208 1208 if opts.get('clean'):
1209 1209 label = repo[None].p1().branch()
1210 1210 repo.dirstate.setbranch(label)
1211 1211 ui.status(_('reset working directory to branch %s\n') % label)
1212 1212 elif label:
1213 1213 if not opts.get('force') and label in repo.branchmap():
1214 1214 if label not in [p.branch() for p in repo[None].parents()]:
1215 1215 raise error.Abort(_('a branch of the same name already'
1216 1216 ' exists'),
1217 1217 # i18n: "it" refers to an existing branch
1218 1218 hint=_("use 'hg update' to switch to it"))
1219 1219 scmutil.checknewlabel(repo, label, 'branch')
1220 1220 repo.dirstate.setbranch(label)
1221 1221 ui.status(_('marked working directory as branch %s\n') % label)
1222 1222
1223 1223 # find any open named branches aside from default
1224 1224 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1225 1225 if n != "default" and not c]
1226 1226 if not others:
1227 1227 ui.status(_('(branches are permanent and global, '
1228 1228 'did you want a bookmark?)\n'))
1229 1229
1230 1230 @command('branches',
1231 1231 [('a', 'active', False,
1232 1232 _('show only branches that have unmerged heads (DEPRECATED)')),
1233 1233 ('c', 'closed', False, _('show normal and closed branches')),
1234 1234 ] + formatteropts,
1235 1235 _('[-ac]'))
1236 1236 def branches(ui, repo, active=False, closed=False, **opts):
1237 1237 """list repository named branches
1238 1238
1239 1239 List the repository's named branches, indicating which ones are
1240 1240 inactive. If -c/--closed is specified, also list branches which have
1241 1241 been marked closed (see :hg:`commit --close-branch`).
1242 1242
1243 1243 Use the command :hg:`update` to switch to an existing branch.
1244 1244
1245 1245 Returns 0.
1246 1246 """
1247 1247
1248 1248 fm = ui.formatter('branches', opts)
1249 1249 hexfunc = fm.hexfunc
1250 1250
1251 1251 allheads = set(repo.heads())
1252 1252 branches = []
1253 1253 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1254 1254 isactive = not isclosed and bool(set(heads) & allheads)
1255 1255 branches.append((tag, repo[tip], isactive, not isclosed))
1256 1256 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1257 1257 reverse=True)
1258 1258
1259 1259 for tag, ctx, isactive, isopen in branches:
1260 1260 if active and not isactive:
1261 1261 continue
1262 1262 if isactive:
1263 1263 label = 'branches.active'
1264 1264 notice = ''
1265 1265 elif not isopen:
1266 1266 if not closed:
1267 1267 continue
1268 1268 label = 'branches.closed'
1269 1269 notice = _(' (closed)')
1270 1270 else:
1271 1271 label = 'branches.inactive'
1272 1272 notice = _(' (inactive)')
1273 1273 current = (tag == repo.dirstate.branch())
1274 1274 if current:
1275 1275 label = 'branches.current'
1276 1276
1277 1277 fm.startitem()
1278 1278 fm.write('branch', '%s', tag, label=label)
1279 1279 rev = ctx.rev()
1280 1280 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1281 1281 fmt = ' ' * padsize + ' %d:%s'
1282 1282 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1283 1283 label='log.changeset changeset.%s' % ctx.phasestr())
1284 1284 fm.data(active=isactive, closed=not isopen, current=current)
1285 1285 if not ui.quiet:
1286 1286 fm.plain(notice)
1287 1287 fm.plain('\n')
1288 1288 fm.end()
1289 1289
1290 1290 @command('bundle',
1291 1291 [('f', 'force', None, _('run even when the destination is unrelated')),
1292 1292 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1293 1293 _('REV')),
1294 1294 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1295 1295 _('BRANCH')),
1296 1296 ('', 'base', [],
1297 1297 _('a base changeset assumed to be available at the destination'),
1298 1298 _('REV')),
1299 1299 ('a', 'all', None, _('bundle all changesets in the repository')),
1300 1300 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1301 1301 ] + remoteopts,
1302 1302 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1303 1303 def bundle(ui, repo, fname, dest=None, **opts):
1304 1304 """create a changegroup file
1305 1305
1306 1306 Generate a changegroup file collecting changesets to be added
1307 1307 to a repository.
1308 1308
1309 1309 To create a bundle containing all changesets, use -a/--all
1310 1310 (or --base null). Otherwise, hg assumes the destination will have
1311 1311 all the nodes you specify with --base parameters. Otherwise, hg
1312 1312 will assume the repository has all the nodes in destination, or
1313 1313 default-push/default if no destination is specified.
1314 1314
1315 1315 You can change bundle format with the -t/--type option. You can
1316 1316 specify a compression, a bundle version or both using a dash
1317 1317 (comp-version). The available compression methods are: none, bzip2,
1318 1318 and gzip (by default, bundles are compressed using bzip2). The
1319 1319 available formats are: v1, v2 (default to most suitable).
1320 1320
1321 1321 The bundle file can then be transferred using conventional means
1322 1322 and applied to another repository with the unbundle or pull
1323 1323 command. This is useful when direct push and pull are not
1324 1324 available or when exporting an entire repository is undesirable.
1325 1325
1326 1326 Applying bundles preserves all changeset contents including
1327 1327 permissions, copy/rename information, and revision history.
1328 1328
1329 1329 Returns 0 on success, 1 if no changes found.
1330 1330 """
1331 1331 revs = None
1332 1332 if 'rev' in opts:
1333 1333 revstrings = opts['rev']
1334 1334 revs = scmutil.revrange(repo, revstrings)
1335 1335 if revstrings and not revs:
1336 1336 raise error.Abort(_('no commits to bundle'))
1337 1337
1338 1338 bundletype = opts.get('type', 'bzip2').lower()
1339 1339 try:
1340 1340 bcompression, cgversion, params = exchange.parsebundlespec(
1341 1341 repo, bundletype, strict=False)
1342 1342 except error.UnsupportedBundleSpecification as e:
1343 1343 raise error.Abort(str(e),
1344 1344 hint=_('see "hg help bundle" for supported '
1345 1345 'values for --type'))
1346 1346
1347 1347 # Packed bundles are a pseudo bundle format for now.
1348 1348 if cgversion == 's1':
1349 1349 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1350 1350 hint=_('use "hg debugcreatestreamclonebundle"'))
1351 1351
1352 1352 if opts.get('all'):
1353 1353 if dest:
1354 1354 raise error.Abort(_("--all is incompatible with specifying "
1355 1355 "a destination"))
1356 1356 if opts.get('base'):
1357 1357 ui.warn(_("ignoring --base because --all was specified\n"))
1358 1358 base = ['null']
1359 1359 else:
1360 1360 base = scmutil.revrange(repo, opts.get('base'))
1361 1361 # TODO: get desired bundlecaps from command line.
1362 1362 bundlecaps = None
1363 1363 if base:
1364 1364 if dest:
1365 1365 raise error.Abort(_("--base is incompatible with specifying "
1366 1366 "a destination"))
1367 1367 common = [repo.lookup(rev) for rev in base]
1368 1368 heads = revs and map(repo.lookup, revs) or revs
1369 1369 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1370 1370 common=common, bundlecaps=bundlecaps,
1371 1371 version=cgversion)
1372 1372 outgoing = None
1373 1373 else:
1374 1374 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1375 1375 dest, branches = hg.parseurl(dest, opts.get('branch'))
1376 1376 other = hg.peer(repo, opts, dest)
1377 1377 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1378 1378 heads = revs and map(repo.lookup, revs) or revs
1379 1379 outgoing = discovery.findcommonoutgoing(repo, other,
1380 1380 onlyheads=heads,
1381 1381 force=opts.get('force'),
1382 1382 portable=True)
1383 1383 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1384 1384 bundlecaps, version=cgversion)
1385 1385 if not cg:
1386 1386 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1387 1387 return 1
1388 1388
1389 1389 if cgversion == '01': #bundle1
1390 1390 if bcompression is None:
1391 1391 bcompression = 'UN'
1392 1392 bversion = 'HG10' + bcompression
1393 1393 bcompression = None
1394 1394 else:
1395 1395 assert cgversion == '02'
1396 1396 bversion = 'HG20'
1397 1397
1398 1398
1399 1399 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1400 1400
1401 1401 @command('cat',
1402 1402 [('o', 'output', '',
1403 1403 _('print output to file with formatted name'), _('FORMAT')),
1404 1404 ('r', 'rev', '', _('print the given revision'), _('REV')),
1405 1405 ('', 'decode', None, _('apply any matching decode filter')),
1406 1406 ] + walkopts,
1407 1407 _('[OPTION]... FILE...'),
1408 1408 inferrepo=True)
1409 1409 def cat(ui, repo, file1, *pats, **opts):
1410 1410 """output the current or given revision of files
1411 1411
1412 1412 Print the specified files as they were at the given revision. If
1413 1413 no revision is given, the parent of the working directory is used.
1414 1414
1415 1415 Output may be to a file, in which case the name of the file is
1416 1416 given using a format string. The formatting rules as follows:
1417 1417
1418 1418 :``%%``: literal "%" character
1419 1419 :``%s``: basename of file being printed
1420 1420 :``%d``: dirname of file being printed, or '.' if in repository root
1421 1421 :``%p``: root-relative path name of file being printed
1422 1422 :``%H``: changeset hash (40 hexadecimal digits)
1423 1423 :``%R``: changeset revision number
1424 1424 :``%h``: short-form changeset hash (12 hexadecimal digits)
1425 1425 :``%r``: zero-padded changeset revision number
1426 1426 :``%b``: basename of the exporting repository
1427 1427
1428 1428 Returns 0 on success.
1429 1429 """
1430 1430 ctx = scmutil.revsingle(repo, opts.get('rev'))
1431 1431 m = scmutil.match(ctx, (file1,) + pats, opts)
1432 1432
1433 1433 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1434 1434
1435 1435 @command('^clone',
1436 1436 [('U', 'noupdate', None, _('the clone will include an empty working '
1437 1437 'directory (only a repository)')),
1438 1438 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1439 1439 _('REV')),
1440 1440 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1441 1441 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1442 1442 ('', 'pull', None, _('use pull protocol to copy metadata')),
1443 1443 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1444 1444 ] + remoteopts,
1445 1445 _('[OPTION]... SOURCE [DEST]'),
1446 1446 norepo=True)
1447 1447 def clone(ui, source, dest=None, **opts):
1448 1448 """make a copy of an existing repository
1449 1449
1450 1450 Create a copy of an existing repository in a new directory.
1451 1451
1452 1452 If no destination directory name is specified, it defaults to the
1453 1453 basename of the source.
1454 1454
1455 1455 The location of the source is added to the new repository's
1456 1456 ``.hg/hgrc`` file, as the default to be used for future pulls.
1457 1457
1458 1458 Only local paths and ``ssh://`` URLs are supported as
1459 1459 destinations. For ``ssh://`` destinations, no working directory or
1460 1460 ``.hg/hgrc`` will be created on the remote side.
1461 1461
1462 1462 If the source repository has a bookmark called '@' set, that
1463 1463 revision will be checked out in the new repository by default.
1464 1464
1465 1465 To check out a particular version, use -u/--update, or
1466 1466 -U/--noupdate to create a clone with no working directory.
1467 1467
1468 1468 To pull only a subset of changesets, specify one or more revisions
1469 1469 identifiers with -r/--rev or branches with -b/--branch. The
1470 1470 resulting clone will contain only the specified changesets and
1471 1471 their ancestors. These options (or 'clone src#rev dest') imply
1472 1472 --pull, even for local source repositories.
1473 1473
1474 1474 .. note::
1475 1475
1476 1476 Specifying a tag will include the tagged changeset but not the
1477 1477 changeset containing the tag.
1478 1478
1479 1479 .. container:: verbose
1480 1480
1481 1481 For efficiency, hardlinks are used for cloning whenever the
1482 1482 source and destination are on the same filesystem (note this
1483 1483 applies only to the repository data, not to the working
1484 1484 directory). Some filesystems, such as AFS, implement hardlinking
1485 1485 incorrectly, but do not report errors. In these cases, use the
1486 1486 --pull option to avoid hardlinking.
1487 1487
1488 1488 In some cases, you can clone repositories and the working
1489 1489 directory using full hardlinks with ::
1490 1490
1491 1491 $ cp -al REPO REPOCLONE
1492 1492
1493 1493 This is the fastest way to clone, but it is not always safe. The
1494 1494 operation is not atomic (making sure REPO is not modified during
1495 1495 the operation is up to you) and you have to make sure your
1496 1496 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1497 1497 so). Also, this is not compatible with certain extensions that
1498 1498 place their metadata under the .hg directory, such as mq.
1499 1499
1500 1500 Mercurial will update the working directory to the first applicable
1501 1501 revision from this list:
1502 1502
1503 1503 a) null if -U or the source repository has no changesets
1504 1504 b) if -u . and the source repository is local, the first parent of
1505 1505 the source repository's working directory
1506 1506 c) the changeset specified with -u (if a branch name, this means the
1507 1507 latest head of that branch)
1508 1508 d) the changeset specified with -r
1509 1509 e) the tipmost head specified with -b
1510 1510 f) the tipmost head specified with the url#branch source syntax
1511 1511 g) the revision marked with the '@' bookmark, if present
1512 1512 h) the tipmost head of the default branch
1513 1513 i) tip
1514 1514
1515 1515 When cloning from servers that support it, Mercurial may fetch
1516 1516 pre-generated data from a server-advertised URL. When this is done,
1517 1517 hooks operating on incoming changesets and changegroups may fire twice,
1518 1518 once for the bundle fetched from the URL and another for any additional
1519 1519 data not fetched from this URL. In addition, if an error occurs, the
1520 1520 repository may be rolled back to a partial clone. This behavior may
1521 1521 change in future releases. See :hg:`help -e clonebundles` for more.
1522 1522
1523 1523 Examples:
1524 1524
1525 1525 - clone a remote repository to a new directory named hg/::
1526 1526
1527 1527 hg clone http://selenic.com/hg
1528 1528
1529 1529 - create a lightweight local clone::
1530 1530
1531 1531 hg clone project/ project-feature/
1532 1532
1533 1533 - clone from an absolute path on an ssh server (note double-slash)::
1534 1534
1535 1535 hg clone ssh://user@server//home/projects/alpha/
1536 1536
1537 1537 - do a high-speed clone over a LAN while checking out a
1538 1538 specified version::
1539 1539
1540 1540 hg clone --uncompressed http://server/repo -u 1.5
1541 1541
1542 1542 - create a repository without changesets after a particular revision::
1543 1543
1544 1544 hg clone -r 04e544 experimental/ good/
1545 1545
1546 1546 - clone (and track) a particular named branch::
1547 1547
1548 1548 hg clone http://selenic.com/hg#stable
1549 1549
1550 1550 See :hg:`help urls` for details on specifying URLs.
1551 1551
1552 1552 Returns 0 on success.
1553 1553 """
1554 1554 if opts.get('noupdate') and opts.get('updaterev'):
1555 1555 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1556 1556
1557 1557 r = hg.clone(ui, opts, source, dest,
1558 1558 pull=opts.get('pull'),
1559 1559 stream=opts.get('uncompressed'),
1560 1560 rev=opts.get('rev'),
1561 1561 update=opts.get('updaterev') or not opts.get('noupdate'),
1562 1562 branch=opts.get('branch'),
1563 1563 shareopts=opts.get('shareopts'))
1564 1564
1565 1565 return r is None
1566 1566
1567 1567 @command('^commit|ci',
1568 1568 [('A', 'addremove', None,
1569 1569 _('mark new/missing files as added/removed before committing')),
1570 1570 ('', 'close-branch', None,
1571 1571 _('mark a branch head as closed')),
1572 1572 ('', 'amend', None, _('amend the parent of the working directory')),
1573 1573 ('s', 'secret', None, _('use the secret phase for committing')),
1574 1574 ('e', 'edit', None, _('invoke editor on commit messages')),
1575 1575 ('i', 'interactive', None, _('use interactive mode')),
1576 1576 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1577 1577 _('[OPTION]... [FILE]...'),
1578 1578 inferrepo=True)
1579 1579 def commit(ui, repo, *pats, **opts):
1580 1580 """commit the specified files or all outstanding changes
1581 1581
1582 1582 Commit changes to the given files into the repository. Unlike a
1583 1583 centralized SCM, this operation is a local operation. See
1584 1584 :hg:`push` for a way to actively distribute your changes.
1585 1585
1586 1586 If a list of files is omitted, all changes reported by :hg:`status`
1587 1587 will be committed.
1588 1588
1589 1589 If you are committing the result of a merge, do not provide any
1590 1590 filenames or -I/-X filters.
1591 1591
1592 1592 If no commit message is specified, Mercurial starts your
1593 1593 configured editor where you can enter a message. In case your
1594 1594 commit fails, you will find a backup of your message in
1595 1595 ``.hg/last-message.txt``.
1596 1596
1597 1597 The --close-branch flag can be used to mark the current branch
1598 1598 head closed. When all heads of a branch are closed, the branch
1599 1599 will be considered closed and no longer listed.
1600 1600
1601 1601 The --amend flag can be used to amend the parent of the
1602 1602 working directory with a new commit that contains the changes
1603 1603 in the parent in addition to those currently reported by :hg:`status`,
1604 1604 if there are any. The old commit is stored in a backup bundle in
1605 1605 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1606 1606 on how to restore it).
1607 1607
1608 1608 Message, user and date are taken from the amended commit unless
1609 1609 specified. When a message isn't specified on the command line,
1610 1610 the editor will open with the message of the amended commit.
1611 1611
1612 1612 It is not possible to amend public changesets (see :hg:`help phases`)
1613 1613 or changesets that have children.
1614 1614
1615 1615 See :hg:`help dates` for a list of formats valid for -d/--date.
1616 1616
1617 1617 Returns 0 on success, 1 if nothing changed.
1618 1618
1619 1619 .. container:: verbose
1620 1620
1621 1621 Examples:
1622 1622
1623 1623 - commit all files ending in .py::
1624 1624
1625 1625 hg commit --include "set:**.py"
1626 1626
1627 1627 - commit all non-binary files::
1628 1628
1629 1629 hg commit --exclude "set:binary()"
1630 1630
1631 1631 - amend the current commit and set the date to now::
1632 1632
1633 1633 hg commit --amend --date now
1634 1634 """
1635 1635 wlock = lock = None
1636 1636 try:
1637 1637 wlock = repo.wlock()
1638 1638 lock = repo.lock()
1639 1639 return _docommit(ui, repo, *pats, **opts)
1640 1640 finally:
1641 1641 release(lock, wlock)
1642 1642
1643 1643 def _docommit(ui, repo, *pats, **opts):
1644 1644 if opts.get('interactive'):
1645 1645 opts.pop('interactive')
1646 1646 cmdutil.dorecord(ui, repo, commit, None, False,
1647 1647 cmdutil.recordfilter, *pats, **opts)
1648 1648 return
1649 1649
1650 1650 if opts.get('subrepos'):
1651 1651 if opts.get('amend'):
1652 1652 raise error.Abort(_('cannot amend with --subrepos'))
1653 1653 # Let --subrepos on the command line override config setting.
1654 1654 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1655 1655
1656 1656 cmdutil.checkunfinished(repo, commit=True)
1657 1657
1658 1658 branch = repo[None].branch()
1659 1659 bheads = repo.branchheads(branch)
1660 1660
1661 1661 extra = {}
1662 1662 if opts.get('close_branch'):
1663 1663 extra['close'] = 1
1664 1664
1665 1665 if not bheads:
1666 1666 raise error.Abort(_('can only close branch heads'))
1667 1667 elif opts.get('amend'):
1668 1668 if repo[None].parents()[0].p1().branch() != branch and \
1669 1669 repo[None].parents()[0].p2().branch() != branch:
1670 1670 raise error.Abort(_('can only close branch heads'))
1671 1671
1672 1672 if opts.get('amend'):
1673 1673 if ui.configbool('ui', 'commitsubrepos'):
1674 1674 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1675 1675
1676 1676 old = repo['.']
1677 1677 if not old.mutable():
1678 1678 raise error.Abort(_('cannot amend public changesets'))
1679 1679 if len(repo[None].parents()) > 1:
1680 1680 raise error.Abort(_('cannot amend while merging'))
1681 1681 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1682 1682 if not allowunstable and old.children():
1683 1683 raise error.Abort(_('cannot amend changeset with children'))
1684 1684
1685 1685 # commitfunc is used only for temporary amend commit by cmdutil.amend
1686 1686 def commitfunc(ui, repo, message, match, opts):
1687 1687 return repo.commit(message,
1688 1688 opts.get('user') or old.user(),
1689 1689 opts.get('date') or old.date(),
1690 1690 match,
1691 1691 extra=extra)
1692 1692
1693 1693 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1694 1694 if node == old.node():
1695 1695 ui.status(_("nothing changed\n"))
1696 1696 return 1
1697 1697 else:
1698 1698 def commitfunc(ui, repo, message, match, opts):
1699 1699 backup = ui.backupconfig('phases', 'new-commit')
1700 1700 baseui = repo.baseui
1701 1701 basebackup = baseui.backupconfig('phases', 'new-commit')
1702 1702 try:
1703 1703 if opts.get('secret'):
1704 1704 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1705 1705 # Propagate to subrepos
1706 1706 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1707 1707
1708 1708 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1709 1709 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1710 1710 return repo.commit(message, opts.get('user'), opts.get('date'),
1711 1711 match,
1712 1712 editor=editor,
1713 1713 extra=extra)
1714 1714 finally:
1715 1715 ui.restoreconfig(backup)
1716 1716 repo.baseui.restoreconfig(basebackup)
1717 1717
1718 1718
1719 1719 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1720 1720
1721 1721 if not node:
1722 1722 stat = cmdutil.postcommitstatus(repo, pats, opts)
1723 1723 if stat[3]:
1724 1724 ui.status(_("nothing changed (%d missing files, see "
1725 1725 "'hg status')\n") % len(stat[3]))
1726 1726 else:
1727 1727 ui.status(_("nothing changed\n"))
1728 1728 return 1
1729 1729
1730 1730 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1731 1731
1732 1732 @command('config|showconfig|debugconfig',
1733 1733 [('u', 'untrusted', None, _('show untrusted configuration options')),
1734 1734 ('e', 'edit', None, _('edit user config')),
1735 1735 ('l', 'local', None, _('edit repository config')),
1736 1736 ('g', 'global', None, _('edit global config'))],
1737 1737 _('[-u] [NAME]...'),
1738 1738 optionalrepo=True)
1739 1739 def config(ui, repo, *values, **opts):
1740 1740 """show combined config settings from all hgrc files
1741 1741
1742 1742 With no arguments, print names and values of all config items.
1743 1743
1744 1744 With one argument of the form section.name, print just the value
1745 1745 of that config item.
1746 1746
1747 1747 With multiple arguments, print names and values of all config
1748 1748 items with matching section names.
1749 1749
1750 1750 With --edit, start an editor on the user-level config file. With
1751 1751 --global, edit the system-wide config file. With --local, edit the
1752 1752 repository-level config file.
1753 1753
1754 1754 With --debug, the source (filename and line number) is printed
1755 1755 for each config item.
1756 1756
1757 1757 See :hg:`help config` for more information about config files.
1758 1758
1759 1759 Returns 0 on success, 1 if NAME does not exist.
1760 1760
1761 1761 """
1762 1762
1763 1763 if opts.get('edit') or opts.get('local') or opts.get('global'):
1764 1764 if opts.get('local') and opts.get('global'):
1765 1765 raise error.Abort(_("can't use --local and --global together"))
1766 1766
1767 1767 if opts.get('local'):
1768 1768 if not repo:
1769 1769 raise error.Abort(_("can't use --local outside a repository"))
1770 1770 paths = [repo.join('hgrc')]
1771 1771 elif opts.get('global'):
1772 1772 paths = scmutil.systemrcpath()
1773 1773 else:
1774 1774 paths = scmutil.userrcpath()
1775 1775
1776 1776 for f in paths:
1777 1777 if os.path.exists(f):
1778 1778 break
1779 1779 else:
1780 1780 if opts.get('global'):
1781 1781 samplehgrc = uimod.samplehgrcs['global']
1782 1782 elif opts.get('local'):
1783 1783 samplehgrc = uimod.samplehgrcs['local']
1784 1784 else:
1785 1785 samplehgrc = uimod.samplehgrcs['user']
1786 1786
1787 1787 f = paths[0]
1788 1788 fp = open(f, "w")
1789 1789 fp.write(samplehgrc)
1790 1790 fp.close()
1791 1791
1792 1792 editor = ui.geteditor()
1793 1793 ui.system("%s \"%s\"" % (editor, f),
1794 1794 onerr=error.Abort, errprefix=_("edit failed"))
1795 1795 return
1796 1796
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 value = str(value).replace('\n', '\\n')
1808 1808 sectname = section + '.' + name
1809 1809 if values:
1810 1810 for v in values:
1811 1811 if v == section:
1812 1812 ui.debug('%s: ' %
1813 1813 ui.configsource(section, name, untrusted))
1814 1814 ui.write('%s=%s\n' % (sectname, value))
1815 1815 matched = True
1816 1816 elif v == sectname:
1817 1817 ui.debug('%s: ' %
1818 1818 ui.configsource(section, name, untrusted))
1819 1819 ui.write(value, '\n')
1820 1820 matched = True
1821 1821 else:
1822 1822 ui.debug('%s: ' %
1823 1823 ui.configsource(section, name, untrusted))
1824 1824 ui.write('%s=%s\n' % (sectname, value))
1825 1825 matched = True
1826 1826 if matched:
1827 1827 return 0
1828 1828 return 1
1829 1829
1830 1830 @command('copy|cp',
1831 1831 [('A', 'after', None, _('record a copy that has already occurred')),
1832 1832 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1833 1833 ] + walkopts + dryrunopts,
1834 1834 _('[OPTION]... [SOURCE]... DEST'))
1835 1835 def copy(ui, repo, *pats, **opts):
1836 1836 """mark files as copied for the next commit
1837 1837
1838 1838 Mark dest as having copies of source files. If dest is a
1839 1839 directory, copies are put in that directory. If dest is a file,
1840 1840 the source must be a single file.
1841 1841
1842 1842 By default, this command copies the contents of files as they
1843 1843 exist in the working directory. If invoked with -A/--after, the
1844 1844 operation is recorded, but no copying is performed.
1845 1845
1846 1846 This command takes effect with the next commit. To undo a copy
1847 1847 before that, see :hg:`revert`.
1848 1848
1849 1849 Returns 0 on success, 1 if errors are encountered.
1850 1850 """
1851 1851 with repo.wlock(False):
1852 1852 return cmdutil.copy(ui, repo, pats, opts)
1853 1853
1854 1854 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1855 1855 def debugancestor(ui, repo, *args):
1856 1856 """find the ancestor revision of two revisions in a given index"""
1857 1857 if len(args) == 3:
1858 1858 index, rev1, rev2 = args
1859 1859 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1860 1860 lookup = r.lookup
1861 1861 elif len(args) == 2:
1862 1862 if not repo:
1863 1863 raise error.Abort(_("there is no Mercurial repository here "
1864 1864 "(.hg not found)"))
1865 1865 rev1, rev2 = args
1866 1866 r = repo.changelog
1867 1867 lookup = repo.lookup
1868 1868 else:
1869 1869 raise error.Abort(_('either two or three arguments required'))
1870 1870 a = r.ancestor(lookup(rev1), lookup(rev2))
1871 1871 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1872 1872
1873 1873 @command('debugbuilddag',
1874 1874 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1875 1875 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1876 1876 ('n', 'new-file', None, _('add new file at each rev'))],
1877 1877 _('[OPTION]... [TEXT]'))
1878 1878 def debugbuilddag(ui, repo, text=None,
1879 1879 mergeable_file=False,
1880 1880 overwritten_file=False,
1881 1881 new_file=False):
1882 1882 """builds a repo with a given DAG from scratch in the current empty repo
1883 1883
1884 1884 The description of the DAG is read from stdin if not given on the
1885 1885 command line.
1886 1886
1887 1887 Elements:
1888 1888
1889 1889 - "+n" is a linear run of n nodes based on the current default parent
1890 1890 - "." is a single node based on the current default parent
1891 1891 - "$" resets the default parent to null (implied at the start);
1892 1892 otherwise the default parent is always the last node created
1893 1893 - "<p" sets the default parent to the backref p
1894 1894 - "*p" is a fork at parent p, which is a backref
1895 1895 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1896 1896 - "/p2" is a merge of the preceding node and p2
1897 1897 - ":tag" defines a local tag for the preceding node
1898 1898 - "@branch" sets the named branch for subsequent nodes
1899 1899 - "#...\\n" is a comment up to the end of the line
1900 1900
1901 1901 Whitespace between the above elements is ignored.
1902 1902
1903 1903 A backref is either
1904 1904
1905 1905 - a number n, which references the node curr-n, where curr is the current
1906 1906 node, or
1907 1907 - the name of a local tag you placed earlier using ":tag", or
1908 1908 - empty to denote the default parent.
1909 1909
1910 1910 All string valued-elements are either strictly alphanumeric, or must
1911 1911 be enclosed in double quotes ("..."), with "\\" as escape character.
1912 1912 """
1913 1913
1914 1914 if text is None:
1915 1915 ui.status(_("reading DAG from stdin\n"))
1916 1916 text = ui.fin.read()
1917 1917
1918 1918 cl = repo.changelog
1919 1919 if len(cl) > 0:
1920 1920 raise error.Abort(_('repository is not empty'))
1921 1921
1922 1922 # determine number of revs in DAG
1923 1923 total = 0
1924 1924 for type, data in dagparser.parsedag(text):
1925 1925 if type == 'n':
1926 1926 total += 1
1927 1927
1928 1928 if mergeable_file:
1929 1929 linesperrev = 2
1930 1930 # make a file with k lines per rev
1931 1931 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1932 1932 initialmergedlines.append("")
1933 1933
1934 1934 tags = []
1935 1935
1936 1936 lock = tr = None
1937 1937 try:
1938 1938 lock = repo.lock()
1939 1939 tr = repo.transaction("builddag")
1940 1940
1941 1941 at = -1
1942 1942 atbranch = 'default'
1943 1943 nodeids = []
1944 1944 id = 0
1945 1945 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1946 1946 for type, data in dagparser.parsedag(text):
1947 1947 if type == 'n':
1948 1948 ui.note(('node %s\n' % str(data)))
1949 1949 id, ps = data
1950 1950
1951 1951 files = []
1952 1952 fctxs = {}
1953 1953
1954 1954 p2 = None
1955 1955 if mergeable_file:
1956 1956 fn = "mf"
1957 1957 p1 = repo[ps[0]]
1958 1958 if len(ps) > 1:
1959 1959 p2 = repo[ps[1]]
1960 1960 pa = p1.ancestor(p2)
1961 1961 base, local, other = [x[fn].data() for x in (pa, p1,
1962 1962 p2)]
1963 1963 m3 = simplemerge.Merge3Text(base, local, other)
1964 1964 ml = [l.strip() for l in m3.merge_lines()]
1965 1965 ml.append("")
1966 1966 elif at > 0:
1967 1967 ml = p1[fn].data().split("\n")
1968 1968 else:
1969 1969 ml = initialmergedlines
1970 1970 ml[id * linesperrev] += " r%i" % id
1971 1971 mergedtext = "\n".join(ml)
1972 1972 files.append(fn)
1973 1973 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1974 1974
1975 1975 if overwritten_file:
1976 1976 fn = "of"
1977 1977 files.append(fn)
1978 1978 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1979 1979
1980 1980 if new_file:
1981 1981 fn = "nf%i" % id
1982 1982 files.append(fn)
1983 1983 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1984 1984 if len(ps) > 1:
1985 1985 if not p2:
1986 1986 p2 = repo[ps[1]]
1987 1987 for fn in p2:
1988 1988 if fn.startswith("nf"):
1989 1989 files.append(fn)
1990 1990 fctxs[fn] = p2[fn]
1991 1991
1992 1992 def fctxfn(repo, cx, path):
1993 1993 return fctxs.get(path)
1994 1994
1995 1995 if len(ps) == 0 or ps[0] < 0:
1996 1996 pars = [None, None]
1997 1997 elif len(ps) == 1:
1998 1998 pars = [nodeids[ps[0]], None]
1999 1999 else:
2000 2000 pars = [nodeids[p] for p in ps]
2001 2001 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2002 2002 date=(id, 0),
2003 2003 user="debugbuilddag",
2004 2004 extra={'branch': atbranch})
2005 2005 nodeid = repo.commitctx(cx)
2006 2006 nodeids.append(nodeid)
2007 2007 at = id
2008 2008 elif type == 'l':
2009 2009 id, name = data
2010 2010 ui.note(('tag %s\n' % name))
2011 2011 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2012 2012 elif type == 'a':
2013 2013 ui.note(('branch %s\n' % data))
2014 2014 atbranch = data
2015 2015 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2016 2016 tr.close()
2017 2017
2018 2018 if tags:
2019 2019 repo.vfs.write("localtags", "".join(tags))
2020 2020 finally:
2021 2021 ui.progress(_('building'), None)
2022 2022 release(tr, lock)
2023 2023
2024 2024 @command('debugbundle',
2025 2025 [('a', 'all', None, _('show all details')),
2026 2026 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2027 2027 _('FILE'),
2028 2028 norepo=True)
2029 2029 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2030 2030 """lists the contents of a bundle"""
2031 2031 with hg.openpath(ui, bundlepath) as f:
2032 2032 if spec:
2033 2033 spec = exchange.getbundlespec(ui, f)
2034 2034 ui.write('%s\n' % spec)
2035 2035 return
2036 2036
2037 2037 gen = exchange.readbundle(ui, f, bundlepath)
2038 2038 if isinstance(gen, bundle2.unbundle20):
2039 2039 return _debugbundle2(ui, gen, all=all, **opts)
2040 2040 if all:
2041 2041 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2042 2042
2043 2043 def showchunks(named):
2044 2044 ui.write("\n%s\n" % named)
2045 2045 chain = None
2046 2046 while True:
2047 2047 chunkdata = gen.deltachunk(chain)
2048 2048 if not chunkdata:
2049 2049 break
2050 2050 node = chunkdata['node']
2051 2051 p1 = chunkdata['p1']
2052 2052 p2 = chunkdata['p2']
2053 2053 cs = chunkdata['cs']
2054 2054 deltabase = chunkdata['deltabase']
2055 2055 delta = chunkdata['delta']
2056 2056 ui.write("%s %s %s %s %s %s\n" %
2057 2057 (hex(node), hex(p1), hex(p2),
2058 2058 hex(cs), hex(deltabase), len(delta)))
2059 2059 chain = node
2060 2060
2061 2061 chunkdata = gen.changelogheader()
2062 2062 showchunks("changelog")
2063 2063 chunkdata = gen.manifestheader()
2064 2064 showchunks("manifest")
2065 2065 while True:
2066 2066 chunkdata = gen.filelogheader()
2067 2067 if not chunkdata:
2068 2068 break
2069 2069 fname = chunkdata['filename']
2070 2070 showchunks(fname)
2071 2071 else:
2072 2072 if isinstance(gen, bundle2.unbundle20):
2073 2073 raise error.Abort(_('use debugbundle2 for this file'))
2074 2074 chunkdata = gen.changelogheader()
2075 2075 chain = None
2076 2076 while True:
2077 2077 chunkdata = gen.deltachunk(chain)
2078 2078 if not chunkdata:
2079 2079 break
2080 2080 node = chunkdata['node']
2081 2081 ui.write("%s\n" % hex(node))
2082 2082 chain = node
2083 2083
2084 2084 def _debugbundle2(ui, gen, **opts):
2085 2085 """lists the contents of a bundle2"""
2086 2086 if not isinstance(gen, bundle2.unbundle20):
2087 2087 raise error.Abort(_('not a bundle2 file'))
2088 2088 ui.write(('Stream params: %s\n' % repr(gen.params)))
2089 2089 for part in gen.iterparts():
2090 2090 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2091 2091 if part.type == 'changegroup':
2092 2092 version = part.params.get('version', '01')
2093 2093 cg = changegroup.getunbundler(version, part, 'UN')
2094 2094 chunkdata = cg.changelogheader()
2095 2095 chain = None
2096 2096 while True:
2097 2097 chunkdata = cg.deltachunk(chain)
2098 2098 if not chunkdata:
2099 2099 break
2100 2100 node = chunkdata['node']
2101 2101 ui.write(" %s\n" % hex(node))
2102 2102 chain = node
2103 2103
2104 2104 @command('debugcreatestreamclonebundle', [], 'FILE')
2105 2105 def debugcreatestreamclonebundle(ui, repo, fname):
2106 2106 """create a stream clone bundle file
2107 2107
2108 2108 Stream bundles are special bundles that are essentially archives of
2109 2109 revlog files. They are commonly used for cloning very quickly.
2110 2110 """
2111 2111 requirements, gen = streamclone.generatebundlev1(repo)
2112 2112 changegroup.writechunks(ui, gen, fname)
2113 2113
2114 2114 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2115 2115
2116 2116 @command('debugapplystreamclonebundle', [], 'FILE')
2117 2117 def debugapplystreamclonebundle(ui, repo, fname):
2118 2118 """apply a stream clone bundle file"""
2119 2119 f = hg.openpath(ui, fname)
2120 2120 gen = exchange.readbundle(ui, f, fname)
2121 2121 gen.apply(repo)
2122 2122
2123 2123 @command('debugcheckstate', [], '')
2124 2124 def debugcheckstate(ui, repo):
2125 2125 """validate the correctness of the current dirstate"""
2126 2126 parent1, parent2 = repo.dirstate.parents()
2127 2127 m1 = repo[parent1].manifest()
2128 2128 m2 = repo[parent2].manifest()
2129 2129 errors = 0
2130 2130 for f in repo.dirstate:
2131 2131 state = repo.dirstate[f]
2132 2132 if state in "nr" and f not in m1:
2133 2133 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2134 2134 errors += 1
2135 2135 if state in "a" and f in m1:
2136 2136 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2137 2137 errors += 1
2138 2138 if state in "m" and f not in m1 and f not in m2:
2139 2139 ui.warn(_("%s in state %s, but not in either manifest\n") %
2140 2140 (f, state))
2141 2141 errors += 1
2142 2142 for f in m1:
2143 2143 state = repo.dirstate[f]
2144 2144 if state not in "nrm":
2145 2145 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2146 2146 errors += 1
2147 2147 if errors:
2148 2148 error = _(".hg/dirstate inconsistent with current parent's manifest")
2149 2149 raise error.Abort(error)
2150 2150
2151 2151 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2152 2152 def debugcommands(ui, cmd='', *args):
2153 2153 """list all available commands and options"""
2154 2154 for cmd, vals in sorted(table.iteritems()):
2155 2155 cmd = cmd.split('|')[0].strip('^')
2156 2156 opts = ', '.join([i[1] for i in vals[1]])
2157 2157 ui.write('%s: %s\n' % (cmd, opts))
2158 2158
2159 2159 @command('debugcomplete',
2160 2160 [('o', 'options', None, _('show the command options'))],
2161 2161 _('[-o] CMD'),
2162 2162 norepo=True)
2163 2163 def debugcomplete(ui, cmd='', **opts):
2164 2164 """returns the completion list associated with the given command"""
2165 2165
2166 2166 if opts.get('options'):
2167 2167 options = []
2168 2168 otables = [globalopts]
2169 2169 if cmd:
2170 2170 aliases, entry = cmdutil.findcmd(cmd, table, False)
2171 2171 otables.append(entry[1])
2172 2172 for t in otables:
2173 2173 for o in t:
2174 2174 if "(DEPRECATED)" in o[3]:
2175 2175 continue
2176 2176 if o[0]:
2177 2177 options.append('-%s' % o[0])
2178 2178 options.append('--%s' % o[1])
2179 2179 ui.write("%s\n" % "\n".join(options))
2180 2180 return
2181 2181
2182 2182 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2183 2183 if ui.verbose:
2184 2184 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2185 2185 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2186 2186
2187 2187 @command('debugdag',
2188 2188 [('t', 'tags', None, _('use tags as labels')),
2189 2189 ('b', 'branches', None, _('annotate with branch names')),
2190 2190 ('', 'dots', None, _('use dots for runs')),
2191 2191 ('s', 'spaces', None, _('separate elements by spaces'))],
2192 2192 _('[OPTION]... [FILE [REV]...]'),
2193 2193 optionalrepo=True)
2194 2194 def debugdag(ui, repo, file_=None, *revs, **opts):
2195 2195 """format the changelog or an index DAG as a concise textual description
2196 2196
2197 2197 If you pass a revlog index, the revlog's DAG is emitted. If you list
2198 2198 revision numbers, they get labeled in the output as rN.
2199 2199
2200 2200 Otherwise, the changelog DAG of the current repo is emitted.
2201 2201 """
2202 2202 spaces = opts.get('spaces')
2203 2203 dots = opts.get('dots')
2204 2204 if file_:
2205 2205 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2206 2206 revs = set((int(r) for r in revs))
2207 2207 def events():
2208 2208 for r in rlog:
2209 2209 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2210 2210 if p != -1))
2211 2211 if r in revs:
2212 2212 yield 'l', (r, "r%i" % r)
2213 2213 elif repo:
2214 2214 cl = repo.changelog
2215 2215 tags = opts.get('tags')
2216 2216 branches = opts.get('branches')
2217 2217 if tags:
2218 2218 labels = {}
2219 2219 for l, n in repo.tags().items():
2220 2220 labels.setdefault(cl.rev(n), []).append(l)
2221 2221 def events():
2222 2222 b = "default"
2223 2223 for r in cl:
2224 2224 if branches:
2225 2225 newb = cl.read(cl.node(r))[5]['branch']
2226 2226 if newb != b:
2227 2227 yield 'a', newb
2228 2228 b = newb
2229 2229 yield 'n', (r, list(p for p in cl.parentrevs(r)
2230 2230 if p != -1))
2231 2231 if tags:
2232 2232 ls = labels.get(r)
2233 2233 if ls:
2234 2234 for l in ls:
2235 2235 yield 'l', (r, l)
2236 2236 else:
2237 2237 raise error.Abort(_('need repo for changelog dag'))
2238 2238
2239 2239 for line in dagparser.dagtextlines(events(),
2240 2240 addspaces=spaces,
2241 2241 wraplabels=True,
2242 2242 wrapannotations=True,
2243 2243 wrapnonlinear=dots,
2244 2244 usedots=dots,
2245 2245 maxlinewidth=70):
2246 2246 ui.write(line)
2247 2247 ui.write("\n")
2248 2248
2249 2249 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2250 2250 def debugdata(ui, repo, file_, rev=None, **opts):
2251 2251 """dump the contents of a data file revision"""
2252 2252 if opts.get('changelog') or opts.get('manifest'):
2253 2253 file_, rev = None, file_
2254 2254 elif rev is None:
2255 2255 raise error.CommandError('debugdata', _('invalid arguments'))
2256 2256 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2257 2257 try:
2258 2258 ui.write(r.revision(r.lookup(rev)))
2259 2259 except KeyError:
2260 2260 raise error.Abort(_('invalid revision identifier %s') % rev)
2261 2261
2262 2262 @command('debugdate',
2263 2263 [('e', 'extended', None, _('try extended date formats'))],
2264 2264 _('[-e] DATE [RANGE]'),
2265 2265 norepo=True, optionalrepo=True)
2266 2266 def debugdate(ui, date, range=None, **opts):
2267 2267 """parse and display a date"""
2268 2268 if opts["extended"]:
2269 2269 d = util.parsedate(date, util.extendeddateformats)
2270 2270 else:
2271 2271 d = util.parsedate(date)
2272 2272 ui.write(("internal: %s %s\n") % d)
2273 2273 ui.write(("standard: %s\n") % util.datestr(d))
2274 2274 if range:
2275 2275 m = util.matchdate(range)
2276 2276 ui.write(("match: %s\n") % m(d[0]))
2277 2277
2278 2278 @command('debugdiscovery',
2279 2279 [('', 'old', None, _('use old-style discovery')),
2280 2280 ('', 'nonheads', None,
2281 2281 _('use old-style discovery with non-heads included')),
2282 2282 ] + remoteopts,
2283 2283 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2284 2284 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2285 2285 """runs the changeset discovery protocol in isolation"""
2286 2286 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2287 2287 opts.get('branch'))
2288 2288 remote = hg.peer(repo, opts, remoteurl)
2289 2289 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2290 2290
2291 2291 # make sure tests are repeatable
2292 2292 random.seed(12323)
2293 2293
2294 2294 def doit(localheads, remoteheads, remote=remote):
2295 2295 if opts.get('old'):
2296 2296 if localheads:
2297 2297 raise error.Abort('cannot use localheads with old style '
2298 2298 'discovery')
2299 2299 if not util.safehasattr(remote, 'branches'):
2300 2300 # enable in-client legacy support
2301 2301 remote = localrepo.locallegacypeer(remote.local())
2302 2302 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2303 2303 force=True)
2304 2304 common = set(common)
2305 2305 if not opts.get('nonheads'):
2306 2306 ui.write(("unpruned common: %s\n") %
2307 2307 " ".join(sorted(short(n) for n in common)))
2308 2308 dag = dagutil.revlogdag(repo.changelog)
2309 2309 all = dag.ancestorset(dag.internalizeall(common))
2310 2310 common = dag.externalizeall(dag.headsetofconnecteds(all))
2311 2311 else:
2312 2312 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2313 2313 common = set(common)
2314 2314 rheads = set(hds)
2315 2315 lheads = set(repo.heads())
2316 2316 ui.write(("common heads: %s\n") %
2317 2317 " ".join(sorted(short(n) for n in common)))
2318 2318 if lheads <= common:
2319 2319 ui.write(("local is subset\n"))
2320 2320 elif rheads <= common:
2321 2321 ui.write(("remote is subset\n"))
2322 2322
2323 2323 serverlogs = opts.get('serverlog')
2324 2324 if serverlogs:
2325 2325 for filename in serverlogs:
2326 2326 with open(filename, 'r') as logfile:
2327 2327 line = logfile.readline()
2328 2328 while line:
2329 2329 parts = line.strip().split(';')
2330 2330 op = parts[1]
2331 2331 if op == 'cg':
2332 2332 pass
2333 2333 elif op == 'cgss':
2334 2334 doit(parts[2].split(' '), parts[3].split(' '))
2335 2335 elif op == 'unb':
2336 2336 doit(parts[3].split(' '), parts[2].split(' '))
2337 2337 line = logfile.readline()
2338 2338 else:
2339 2339 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2340 2340 opts.get('remote_head'))
2341 2341 localrevs = opts.get('local_head')
2342 2342 doit(localrevs, remoterevs)
2343 2343
2344 2344 @command('debugextensions', formatteropts, [], norepo=True)
2345 2345 def debugextensions(ui, **opts):
2346 2346 '''show information about active extensions'''
2347 2347 exts = extensions.extensions(ui)
2348 2348 fm = ui.formatter('debugextensions', opts)
2349 2349 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2350 2350 extsource = extmod.__file__
2351 2351 exttestedwith = getattr(extmod, 'testedwith', None)
2352 2352 if exttestedwith is not None:
2353 2353 exttestedwith = exttestedwith.split()
2354 2354 extbuglink = getattr(extmod, 'buglink', None)
2355 2355
2356 2356 fm.startitem()
2357 2357
2358 2358 if ui.quiet or ui.verbose:
2359 2359 fm.write('name', '%s\n', extname)
2360 2360 else:
2361 2361 fm.write('name', '%s', extname)
2362 2362 if not exttestedwith:
2363 2363 fm.plain(_(' (untested!)\n'))
2364 2364 else:
2365 2365 if exttestedwith == ['internal'] or \
2366 2366 util.version() in exttestedwith:
2367 2367 fm.plain('\n')
2368 2368 else:
2369 2369 lasttestedversion = exttestedwith[-1]
2370 2370 fm.plain(' (%s!)\n' % lasttestedversion)
2371 2371
2372 2372 fm.condwrite(ui.verbose and extsource, 'source',
2373 2373 _(' location: %s\n'), extsource or "")
2374 2374
2375 2375 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2376 2376 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2377 2377
2378 2378 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2379 2379 _(' bug reporting: %s\n'), extbuglink or "")
2380 2380
2381 2381 fm.end()
2382 2382
2383 2383 @command('debugfileset',
2384 2384 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2385 2385 _('[-r REV] FILESPEC'))
2386 2386 def debugfileset(ui, repo, expr, **opts):
2387 2387 '''parse and apply a fileset specification'''
2388 2388 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2389 2389 if ui.verbose:
2390 2390 tree = fileset.parse(expr)
2391 2391 ui.note(fileset.prettyformat(tree), "\n")
2392 2392
2393 2393 for f in ctx.getfileset(expr):
2394 2394 ui.write("%s\n" % f)
2395 2395
2396 2396 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2397 2397 def debugfsinfo(ui, path="."):
2398 2398 """show information detected about current filesystem"""
2399 2399 util.writefile('.debugfsinfo', '')
2400 2400 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2401 2401 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2402 2402 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2403 2403 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2404 2404 and 'yes' or 'no'))
2405 2405 os.unlink('.debugfsinfo')
2406 2406
2407 2407 @command('debuggetbundle',
2408 2408 [('H', 'head', [], _('id of head node'), _('ID')),
2409 2409 ('C', 'common', [], _('id of common node'), _('ID')),
2410 2410 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2411 2411 _('REPO FILE [-H|-C ID]...'),
2412 2412 norepo=True)
2413 2413 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2414 2414 """retrieves a bundle from a repo
2415 2415
2416 2416 Every ID must be a full-length hex node id string. Saves the bundle to the
2417 2417 given file.
2418 2418 """
2419 2419 repo = hg.peer(ui, opts, repopath)
2420 2420 if not repo.capable('getbundle'):
2421 2421 raise error.Abort("getbundle() not supported by target repository")
2422 2422 args = {}
2423 2423 if common:
2424 2424 args['common'] = [bin(s) for s in common]
2425 2425 if head:
2426 2426 args['heads'] = [bin(s) for s in head]
2427 2427 # TODO: get desired bundlecaps from command line.
2428 2428 args['bundlecaps'] = None
2429 2429 bundle = repo.getbundle('debug', **args)
2430 2430
2431 2431 bundletype = opts.get('type', 'bzip2').lower()
2432 2432 btypes = {'none': 'HG10UN',
2433 2433 'bzip2': 'HG10BZ',
2434 2434 'gzip': 'HG10GZ',
2435 2435 'bundle2': 'HG20'}
2436 2436 bundletype = btypes.get(bundletype)
2437 2437 if bundletype not in changegroup.bundletypes:
2438 2438 raise error.Abort(_('unknown bundle type specified with --type'))
2439 2439 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2440 2440
2441 2441 @command('debugignore', [], '[FILE]')
2442 2442 def debugignore(ui, repo, *files, **opts):
2443 2443 """display the combined ignore pattern and information about ignored files
2444 2444
2445 2445 With no argument display the combined ignore pattern.
2446 2446
2447 2447 Given space separated file names, shows if the given file is ignored and
2448 2448 if so, show the ignore rule (file and line number) that matched it.
2449 2449 """
2450 2450 ignore = repo.dirstate._ignore
2451 2451 if not files:
2452 2452 # Show all the patterns
2453 2453 includepat = getattr(ignore, 'includepat', None)
2454 2454 if includepat is not None:
2455 2455 ui.write("%s\n" % includepat)
2456 2456 else:
2457 2457 raise error.Abort(_("no ignore patterns found"))
2458 2458 else:
2459 2459 for f in files:
2460 2460 ignored = None
2461 2461 ignoredata = None
2462 2462 if f != '.':
2463 2463 if ignore(f):
2464 2464 ignored = f
2465 2465 ignoredata = repo.dirstate._ignorefileandline(f)
2466 2466 else:
2467 2467 for p in util.finddirs(f):
2468 2468 if ignore(p):
2469 2469 ignored = p
2470 2470 ignoredata = repo.dirstate._ignorefileandline(p)
2471 2471 break
2472 2472 if ignored:
2473 2473 if ignored == f:
2474 2474 ui.write("%s is ignored\n" % f)
2475 2475 else:
2476 2476 ui.write("%s is ignored because of containing folder %s\n"
2477 2477 % (f, ignored))
2478 2478 ignorefile, lineno, line = ignoredata
2479 2479 ui.write("(ignore rule in %s, line %d: '%s')\n"
2480 2480 % (ignorefile, lineno, line))
2481 2481 else:
2482 2482 ui.write("%s is not ignored\n" % f)
2483 2483
2484 2484 @command('debugindex', debugrevlogopts +
2485 2485 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2486 2486 _('[-f FORMAT] -c|-m|FILE'),
2487 2487 optionalrepo=True)
2488 2488 def debugindex(ui, repo, file_=None, **opts):
2489 2489 """dump the contents of an index file"""
2490 2490 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2491 2491 format = opts.get('format', 0)
2492 2492 if format not in (0, 1):
2493 2493 raise error.Abort(_("unknown format %d") % format)
2494 2494
2495 2495 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2496 2496 if generaldelta:
2497 2497 basehdr = ' delta'
2498 2498 else:
2499 2499 basehdr = ' base'
2500 2500
2501 2501 if ui.debugflag:
2502 2502 shortfn = hex
2503 2503 else:
2504 2504 shortfn = short
2505 2505
2506 2506 # There might not be anything in r, so have a sane default
2507 2507 idlen = 12
2508 2508 for i in r:
2509 2509 idlen = len(shortfn(r.node(i)))
2510 2510 break
2511 2511
2512 2512 if format == 0:
2513 2513 ui.write(" rev offset length " + basehdr + " linkrev"
2514 2514 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2515 2515 elif format == 1:
2516 2516 ui.write(" rev flag offset length"
2517 2517 " size " + basehdr + " link p1 p2"
2518 2518 " %s\n" % "nodeid".rjust(idlen))
2519 2519
2520 2520 for i in r:
2521 2521 node = r.node(i)
2522 2522 if generaldelta:
2523 2523 base = r.deltaparent(i)
2524 2524 else:
2525 2525 base = r.chainbase(i)
2526 2526 if format == 0:
2527 2527 try:
2528 2528 pp = r.parents(node)
2529 2529 except Exception:
2530 2530 pp = [nullid, nullid]
2531 2531 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2532 2532 i, r.start(i), r.length(i), base, r.linkrev(i),
2533 2533 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2534 2534 elif format == 1:
2535 2535 pr = r.parentrevs(i)
2536 2536 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2537 2537 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2538 2538 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2539 2539
2540 2540 @command('debugindexdot', debugrevlogopts,
2541 2541 _('-c|-m|FILE'), optionalrepo=True)
2542 2542 def debugindexdot(ui, repo, file_=None, **opts):
2543 2543 """dump an index DAG as a graphviz dot file"""
2544 2544 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2545 2545 ui.write(("digraph G {\n"))
2546 2546 for i in r:
2547 2547 node = r.node(i)
2548 2548 pp = r.parents(node)
2549 2549 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2550 2550 if pp[1] != nullid:
2551 2551 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2552 2552 ui.write("}\n")
2553 2553
2554 2554 @command('debugdeltachain',
2555 2555 debugrevlogopts + formatteropts,
2556 2556 _('-c|-m|FILE'),
2557 2557 optionalrepo=True)
2558 2558 def debugdeltachain(ui, repo, file_=None, **opts):
2559 2559 """dump information about delta chains in a revlog
2560 2560
2561 2561 Output can be templatized. Available template keywords are:
2562 2562
2563 2563 rev revision number
2564 2564 chainid delta chain identifier (numbered by unique base)
2565 2565 chainlen delta chain length to this revision
2566 2566 prevrev previous revision in delta chain
2567 2567 deltatype role of delta / how it was computed
2568 2568 compsize compressed size of revision
2569 2569 uncompsize uncompressed size of revision
2570 2570 chainsize total size of compressed revisions in chain
2571 2571 chainratio total chain size divided by uncompressed revision size
2572 2572 (new delta chains typically start at ratio 2.00)
2573 2573 lindist linear distance from base revision in delta chain to end
2574 2574 of this revision
2575 2575 extradist total size of revisions not part of this delta chain from
2576 2576 base of delta chain to end of this revision; a measurement
2577 2577 of how much extra data we need to read/seek across to read
2578 2578 the delta chain for this revision
2579 2579 extraratio extradist divided by chainsize; another representation of
2580 2580 how much unrelated data is needed to load this delta chain
2581 2581 """
2582 2582 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2583 2583 index = r.index
2584 2584 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2585 2585
2586 2586 def revinfo(rev):
2587 2587 e = index[rev]
2588 2588 compsize = e[1]
2589 2589 uncompsize = e[2]
2590 2590 chainsize = 0
2591 2591
2592 2592 if generaldelta:
2593 2593 if e[3] == e[5]:
2594 2594 deltatype = 'p1'
2595 2595 elif e[3] == e[6]:
2596 2596 deltatype = 'p2'
2597 2597 elif e[3] == rev - 1:
2598 2598 deltatype = 'prev'
2599 2599 elif e[3] == rev:
2600 2600 deltatype = 'base'
2601 2601 else:
2602 2602 deltatype = 'other'
2603 2603 else:
2604 2604 if e[3] == rev:
2605 2605 deltatype = 'base'
2606 2606 else:
2607 2607 deltatype = 'prev'
2608 2608
2609 2609 chain = r._deltachain(rev)[0]
2610 2610 for iterrev in chain:
2611 2611 e = index[iterrev]
2612 2612 chainsize += e[1]
2613 2613
2614 2614 return compsize, uncompsize, deltatype, chain, chainsize
2615 2615
2616 2616 fm = ui.formatter('debugdeltachain', opts)
2617 2617
2618 2618 fm.plain(' rev chain# chainlen prev delta '
2619 2619 'size rawsize chainsize ratio lindist extradist '
2620 2620 'extraratio\n')
2621 2621
2622 2622 chainbases = {}
2623 2623 for rev in r:
2624 2624 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2625 2625 chainbase = chain[0]
2626 2626 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2627 2627 basestart = r.start(chainbase)
2628 2628 revstart = r.start(rev)
2629 2629 lineardist = revstart + comp - basestart
2630 2630 extradist = lineardist - chainsize
2631 2631 try:
2632 2632 prevrev = chain[-2]
2633 2633 except IndexError:
2634 2634 prevrev = -1
2635 2635
2636 2636 chainratio = float(chainsize) / float(uncomp)
2637 2637 extraratio = float(extradist) / float(chainsize)
2638 2638
2639 2639 fm.startitem()
2640 2640 fm.write('rev chainid chainlen prevrev deltatype compsize '
2641 2641 'uncompsize chainsize chainratio lindist extradist '
2642 2642 'extraratio',
2643 2643 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2644 2644 rev, chainid, len(chain), prevrev, deltatype, comp,
2645 2645 uncomp, chainsize, chainratio, lineardist, extradist,
2646 2646 extraratio,
2647 2647 rev=rev, chainid=chainid, chainlen=len(chain),
2648 2648 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2649 2649 uncompsize=uncomp, chainsize=chainsize,
2650 2650 chainratio=chainratio, lindist=lineardist,
2651 2651 extradist=extradist, extraratio=extraratio)
2652 2652
2653 2653 fm.end()
2654 2654
2655 2655 @command('debuginstall', [], '', norepo=True)
2656 2656 def debuginstall(ui):
2657 2657 '''test Mercurial installation
2658 2658
2659 2659 Returns 0 on success.
2660 2660 '''
2661 2661
2662 2662 def writetemp(contents):
2663 2663 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2664 2664 f = os.fdopen(fd, "wb")
2665 2665 f.write(contents)
2666 2666 f.close()
2667 2667 return name
2668 2668
2669 2669 problems = 0
2670 2670
2671 2671 # encoding
2672 2672 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2673 2673 try:
2674 2674 encoding.fromlocal("test")
2675 2675 except error.Abort as inst:
2676 2676 ui.write(" %s\n" % inst)
2677 2677 ui.write(_(" (check that your locale is properly set)\n"))
2678 2678 problems += 1
2679 2679
2680 2680 # Python
2681 2681 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2682 2682 ui.status(_("checking Python version (%s)\n")
2683 2683 % ("%s.%s.%s" % sys.version_info[:3]))
2684 2684 ui.status(_("checking Python lib (%s)...\n")
2685 2685 % os.path.dirname(os.__file__))
2686 2686
2687 2687 # compiled modules
2688 2688 ui.status(_("checking installed modules (%s)...\n")
2689 2689 % os.path.dirname(__file__))
2690 2690 try:
2691 2691 import bdiff, mpatch, base85, osutil
2692 2692 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2693 2693 except Exception as inst:
2694 2694 ui.write(" %s\n" % inst)
2695 2695 ui.write(_(" One or more extensions could not be found"))
2696 2696 ui.write(_(" (check that you compiled the extensions)\n"))
2697 2697 problems += 1
2698 2698
2699 2699 # templates
2700 2700 import templater
2701 2701 p = templater.templatepaths()
2702 2702 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2703 2703 if p:
2704 2704 m = templater.templatepath("map-cmdline.default")
2705 2705 if m:
2706 2706 # template found, check if it is working
2707 2707 try:
2708 2708 templater.templater(m)
2709 2709 except Exception as inst:
2710 2710 ui.write(" %s\n" % inst)
2711 2711 p = None
2712 2712 else:
2713 2713 ui.write(_(" template 'default' not found\n"))
2714 2714 p = None
2715 2715 else:
2716 2716 ui.write(_(" no template directories found\n"))
2717 2717 if not p:
2718 2718 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2719 2719 problems += 1
2720 2720
2721 2721 # editor
2722 2722 ui.status(_("checking commit editor...\n"))
2723 2723 editor = ui.geteditor()
2724 2724 editor = util.expandpath(editor)
2725 2725 cmdpath = util.findexe(shlex.split(editor)[0])
2726 2726 if not cmdpath:
2727 2727 if editor == 'vi':
2728 2728 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2729 2729 ui.write(_(" (specify a commit editor in your configuration"
2730 2730 " file)\n"))
2731 2731 else:
2732 2732 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2733 2733 ui.write(_(" (specify a commit editor in your configuration"
2734 2734 " file)\n"))
2735 2735 problems += 1
2736 2736
2737 2737 # check username
2738 2738 ui.status(_("checking username...\n"))
2739 2739 try:
2740 2740 ui.username()
2741 2741 except error.Abort as e:
2742 2742 ui.write(" %s\n" % e)
2743 2743 ui.write(_(" (specify a username in your configuration file)\n"))
2744 2744 problems += 1
2745 2745
2746 2746 if not problems:
2747 2747 ui.status(_("no problems detected\n"))
2748 2748 else:
2749 2749 ui.write(_("%s problems detected,"
2750 2750 " please check your install!\n") % problems)
2751 2751
2752 2752 return problems
2753 2753
2754 2754 @command('debugknown', [], _('REPO ID...'), norepo=True)
2755 2755 def debugknown(ui, repopath, *ids, **opts):
2756 2756 """test whether node ids are known to a repo
2757 2757
2758 2758 Every ID must be a full-length hex node id string. Returns a list of 0s
2759 2759 and 1s indicating unknown/known.
2760 2760 """
2761 2761 repo = hg.peer(ui, opts, repopath)
2762 2762 if not repo.capable('known'):
2763 2763 raise error.Abort("known() not supported by target repository")
2764 2764 flags = repo.known([bin(s) for s in ids])
2765 2765 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2766 2766
2767 2767 @command('debuglabelcomplete', [], _('LABEL...'))
2768 2768 def debuglabelcomplete(ui, repo, *args):
2769 2769 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2770 2770 debugnamecomplete(ui, repo, *args)
2771 2771
2772 2772 @command('debugmergestate', [], '')
2773 2773 def debugmergestate(ui, repo, *args):
2774 2774 """print merge state
2775 2775
2776 2776 Use --verbose to print out information about whether v1 or v2 merge state
2777 2777 was chosen."""
2778 2778 def _hashornull(h):
2779 2779 if h == nullhex:
2780 2780 return 'null'
2781 2781 else:
2782 2782 return h
2783 2783
2784 2784 def printrecords(version):
2785 2785 ui.write(('* version %s records\n') % version)
2786 2786 if version == 1:
2787 2787 records = v1records
2788 2788 else:
2789 2789 records = v2records
2790 2790
2791 2791 for rtype, record in records:
2792 2792 # pretty print some record types
2793 2793 if rtype == 'L':
2794 2794 ui.write(('local: %s\n') % record)
2795 2795 elif rtype == 'O':
2796 2796 ui.write(('other: %s\n') % record)
2797 2797 elif rtype == 'm':
2798 2798 driver, mdstate = record.split('\0', 1)
2799 2799 ui.write(('merge driver: %s (state "%s")\n')
2800 2800 % (driver, mdstate))
2801 2801 elif rtype in 'FDC':
2802 2802 r = record.split('\0')
2803 2803 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2804 2804 if version == 1:
2805 2805 onode = 'not stored in v1 format'
2806 2806 flags = r[7]
2807 2807 else:
2808 2808 onode, flags = r[7:9]
2809 2809 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2810 2810 % (f, rtype, state, _hashornull(hash)))
2811 2811 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2812 2812 ui.write((' ancestor path: %s (node %s)\n')
2813 2813 % (afile, _hashornull(anode)))
2814 2814 ui.write((' other path: %s (node %s)\n')
2815 2815 % (ofile, _hashornull(onode)))
2816 2816 elif rtype == 'f':
2817 2817 filename, rawextras = record.split('\0', 1)
2818 2818 extras = rawextras.split('\0')
2819 2819 i = 0
2820 2820 extrastrings = []
2821 2821 while i < len(extras):
2822 2822 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2823 2823 i += 2
2824 2824
2825 2825 ui.write(('file extras: %s (%s)\n')
2826 2826 % (filename, ', '.join(extrastrings)))
2827 2827 else:
2828 2828 ui.write(('unrecognized entry: %s\t%s\n')
2829 2829 % (rtype, record.replace('\0', '\t')))
2830 2830
2831 2831 # Avoid mergestate.read() since it may raise an exception for unsupported
2832 2832 # merge state records. We shouldn't be doing this, but this is OK since this
2833 2833 # command is pretty low-level.
2834 2834 ms = mergemod.mergestate(repo)
2835 2835
2836 2836 # sort so that reasonable information is on top
2837 2837 v1records = ms._readrecordsv1()
2838 2838 v2records = ms._readrecordsv2()
2839 2839 order = 'LOm'
2840 2840 def key(r):
2841 2841 idx = order.find(r[0])
2842 2842 if idx == -1:
2843 2843 return (1, r[1])
2844 2844 else:
2845 2845 return (0, idx)
2846 2846 v1records.sort(key=key)
2847 2847 v2records.sort(key=key)
2848 2848
2849 2849 if not v1records and not v2records:
2850 2850 ui.write(('no merge state found\n'))
2851 2851 elif not v2records:
2852 2852 ui.note(('no version 2 merge state\n'))
2853 2853 printrecords(1)
2854 2854 elif ms._v1v2match(v1records, v2records):
2855 2855 ui.note(('v1 and v2 states match: using v2\n'))
2856 2856 printrecords(2)
2857 2857 else:
2858 2858 ui.note(('v1 and v2 states mismatch: using v1\n'))
2859 2859 printrecords(1)
2860 2860 if ui.verbose:
2861 2861 printrecords(2)
2862 2862
2863 2863 @command('debugnamecomplete', [], _('NAME...'))
2864 2864 def debugnamecomplete(ui, repo, *args):
2865 2865 '''complete "names" - tags, open branch names, bookmark names'''
2866 2866
2867 2867 names = set()
2868 2868 # since we previously only listed open branches, we will handle that
2869 2869 # specially (after this for loop)
2870 2870 for name, ns in repo.names.iteritems():
2871 2871 if name != 'branches':
2872 2872 names.update(ns.listnames(repo))
2873 2873 names.update(tag for (tag, heads, tip, closed)
2874 2874 in repo.branchmap().iterbranches() if not closed)
2875 2875 completions = set()
2876 2876 if not args:
2877 2877 args = ['']
2878 2878 for a in args:
2879 2879 completions.update(n for n in names if n.startswith(a))
2880 2880 ui.write('\n'.join(sorted(completions)))
2881 2881 ui.write('\n')
2882 2882
2883 2883 @command('debuglocks',
2884 2884 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2885 2885 ('W', 'force-wlock', None,
2886 2886 _('free the working state lock (DANGEROUS)'))],
2887 2887 _('[OPTION]...'))
2888 2888 def debuglocks(ui, repo, **opts):
2889 2889 """show or modify state of locks
2890 2890
2891 2891 By default, this command will show which locks are held. This
2892 2892 includes the user and process holding the lock, the amount of time
2893 2893 the lock has been held, and the machine name where the process is
2894 2894 running if it's not local.
2895 2895
2896 2896 Locks protect the integrity of Mercurial's data, so should be
2897 2897 treated with care. System crashes or other interruptions may cause
2898 2898 locks to not be properly released, though Mercurial will usually
2899 2899 detect and remove such stale locks automatically.
2900 2900
2901 2901 However, detecting stale locks may not always be possible (for
2902 2902 instance, on a shared filesystem). Removing locks may also be
2903 2903 blocked by filesystem permissions.
2904 2904
2905 2905 Returns 0 if no locks are held.
2906 2906
2907 2907 """
2908 2908
2909 2909 if opts.get('force_lock'):
2910 2910 repo.svfs.unlink('lock')
2911 2911 if opts.get('force_wlock'):
2912 2912 repo.vfs.unlink('wlock')
2913 2913 if opts.get('force_lock') or opts.get('force_lock'):
2914 2914 return 0
2915 2915
2916 2916 now = time.time()
2917 2917 held = 0
2918 2918
2919 2919 def report(vfs, name, method):
2920 2920 # this causes stale locks to get reaped for more accurate reporting
2921 2921 try:
2922 2922 l = method(False)
2923 2923 except error.LockHeld:
2924 2924 l = None
2925 2925
2926 2926 if l:
2927 2927 l.release()
2928 2928 else:
2929 2929 try:
2930 2930 stat = vfs.lstat(name)
2931 2931 age = now - stat.st_mtime
2932 2932 user = util.username(stat.st_uid)
2933 2933 locker = vfs.readlock(name)
2934 2934 if ":" in locker:
2935 2935 host, pid = locker.split(':')
2936 2936 if host == socket.gethostname():
2937 2937 locker = 'user %s, process %s' % (user, pid)
2938 2938 else:
2939 2939 locker = 'user %s, process %s, host %s' \
2940 2940 % (user, pid, host)
2941 2941 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2942 2942 return 1
2943 2943 except OSError as e:
2944 2944 if e.errno != errno.ENOENT:
2945 2945 raise
2946 2946
2947 2947 ui.write("%-6s free\n" % (name + ":"))
2948 2948 return 0
2949 2949
2950 2950 held += report(repo.svfs, "lock", repo.lock)
2951 2951 held += report(repo.vfs, "wlock", repo.wlock)
2952 2952
2953 2953 return held
2954 2954
2955 2955 @command('debugobsolete',
2956 2956 [('', 'flags', 0, _('markers flag')),
2957 2957 ('', 'record-parents', False,
2958 2958 _('record parent information for the precursor')),
2959 2959 ('r', 'rev', [], _('display markers relevant to REV')),
2960 2960 ] + commitopts2,
2961 2961 _('[OBSOLETED [REPLACEMENT ...]]'))
2962 2962 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2963 2963 """create arbitrary obsolete marker
2964 2964
2965 2965 With no arguments, displays the list of obsolescence markers."""
2966 2966
2967 2967 def parsenodeid(s):
2968 2968 try:
2969 2969 # We do not use revsingle/revrange functions here to accept
2970 2970 # arbitrary node identifiers, possibly not present in the
2971 2971 # local repository.
2972 2972 n = bin(s)
2973 2973 if len(n) != len(nullid):
2974 2974 raise TypeError()
2975 2975 return n
2976 2976 except TypeError:
2977 2977 raise error.Abort('changeset references must be full hexadecimal '
2978 2978 'node identifiers')
2979 2979
2980 2980 if precursor is not None:
2981 2981 if opts['rev']:
2982 2982 raise error.Abort('cannot select revision when creating marker')
2983 2983 metadata = {}
2984 2984 metadata['user'] = opts['user'] or ui.username()
2985 2985 succs = tuple(parsenodeid(succ) for succ in successors)
2986 2986 l = repo.lock()
2987 2987 try:
2988 2988 tr = repo.transaction('debugobsolete')
2989 2989 try:
2990 2990 date = opts.get('date')
2991 2991 if date:
2992 2992 date = util.parsedate(date)
2993 2993 else:
2994 2994 date = None
2995 2995 prec = parsenodeid(precursor)
2996 2996 parents = None
2997 2997 if opts['record_parents']:
2998 2998 if prec not in repo.unfiltered():
2999 2999 raise error.Abort('cannot used --record-parents on '
3000 3000 'unknown changesets')
3001 3001 parents = repo.unfiltered()[prec].parents()
3002 3002 parents = tuple(p.node() for p in parents)
3003 3003 repo.obsstore.create(tr, prec, succs, opts['flags'],
3004 3004 parents=parents, date=date,
3005 3005 metadata=metadata)
3006 3006 tr.close()
3007 3007 except ValueError as exc:
3008 3008 raise error.Abort(_('bad obsmarker input: %s') % exc)
3009 3009 finally:
3010 3010 tr.release()
3011 3011 finally:
3012 3012 l.release()
3013 3013 else:
3014 3014 if opts['rev']:
3015 3015 revs = scmutil.revrange(repo, opts['rev'])
3016 3016 nodes = [repo[r].node() for r in revs]
3017 3017 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3018 3018 markers.sort(key=lambda x: x._data)
3019 3019 else:
3020 3020 markers = obsolete.getmarkers(repo)
3021 3021
3022 3022 for m in markers:
3023 3023 cmdutil.showmarker(ui, m)
3024 3024
3025 3025 @command('debugpathcomplete',
3026 3026 [('f', 'full', None, _('complete an entire path')),
3027 3027 ('n', 'normal', None, _('show only normal files')),
3028 3028 ('a', 'added', None, _('show only added files')),
3029 3029 ('r', 'removed', None, _('show only removed files'))],
3030 3030 _('FILESPEC...'))
3031 3031 def debugpathcomplete(ui, repo, *specs, **opts):
3032 3032 '''complete part or all of a tracked path
3033 3033
3034 3034 This command supports shells that offer path name completion. It
3035 3035 currently completes only files already known to the dirstate.
3036 3036
3037 3037 Completion extends only to the next path segment unless
3038 3038 --full is specified, in which case entire paths are used.'''
3039 3039
3040 3040 def complete(path, acceptable):
3041 3041 dirstate = repo.dirstate
3042 3042 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3043 3043 rootdir = repo.root + os.sep
3044 3044 if spec != repo.root and not spec.startswith(rootdir):
3045 3045 return [], []
3046 3046 if os.path.isdir(spec):
3047 3047 spec += '/'
3048 3048 spec = spec[len(rootdir):]
3049 3049 fixpaths = os.sep != '/'
3050 3050 if fixpaths:
3051 3051 spec = spec.replace(os.sep, '/')
3052 3052 speclen = len(spec)
3053 3053 fullpaths = opts['full']
3054 3054 files, dirs = set(), set()
3055 3055 adddir, addfile = dirs.add, files.add
3056 3056 for f, st in dirstate.iteritems():
3057 3057 if f.startswith(spec) and st[0] in acceptable:
3058 3058 if fixpaths:
3059 3059 f = f.replace('/', os.sep)
3060 3060 if fullpaths:
3061 3061 addfile(f)
3062 3062 continue
3063 3063 s = f.find(os.sep, speclen)
3064 3064 if s >= 0:
3065 3065 adddir(f[:s])
3066 3066 else:
3067 3067 addfile(f)
3068 3068 return files, dirs
3069 3069
3070 3070 acceptable = ''
3071 3071 if opts['normal']:
3072 3072 acceptable += 'nm'
3073 3073 if opts['added']:
3074 3074 acceptable += 'a'
3075 3075 if opts['removed']:
3076 3076 acceptable += 'r'
3077 3077 cwd = repo.getcwd()
3078 3078 if not specs:
3079 3079 specs = ['.']
3080 3080
3081 3081 files, dirs = set(), set()
3082 3082 for spec in specs:
3083 3083 f, d = complete(spec, acceptable or 'nmar')
3084 3084 files.update(f)
3085 3085 dirs.update(d)
3086 3086 files.update(dirs)
3087 3087 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3088 3088 ui.write('\n')
3089 3089
3090 3090 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3091 3091 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3092 3092 '''access the pushkey key/value protocol
3093 3093
3094 3094 With two args, list the keys in the given namespace.
3095 3095
3096 3096 With five args, set a key to new if it currently is set to old.
3097 3097 Reports success or failure.
3098 3098 '''
3099 3099
3100 3100 target = hg.peer(ui, {}, repopath)
3101 3101 if keyinfo:
3102 3102 key, old, new = keyinfo
3103 3103 r = target.pushkey(namespace, key, old, new)
3104 3104 ui.status(str(r) + '\n')
3105 3105 return not r
3106 3106 else:
3107 3107 for k, v in sorted(target.listkeys(namespace).iteritems()):
3108 3108 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3109 3109 v.encode('string-escape')))
3110 3110
3111 3111 @command('debugpvec', [], _('A B'))
3112 3112 def debugpvec(ui, repo, a, b=None):
3113 3113 ca = scmutil.revsingle(repo, a)
3114 3114 cb = scmutil.revsingle(repo, b)
3115 3115 pa = pvec.ctxpvec(ca)
3116 3116 pb = pvec.ctxpvec(cb)
3117 3117 if pa == pb:
3118 3118 rel = "="
3119 3119 elif pa > pb:
3120 3120 rel = ">"
3121 3121 elif pa < pb:
3122 3122 rel = "<"
3123 3123 elif pa | pb:
3124 3124 rel = "|"
3125 3125 ui.write(_("a: %s\n") % pa)
3126 3126 ui.write(_("b: %s\n") % pb)
3127 3127 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3128 3128 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3129 3129 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3130 3130 pa.distance(pb), rel))
3131 3131
3132 3132 @command('debugrebuilddirstate|debugrebuildstate',
3133 3133 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3134 3134 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3135 3135 'the working copy parent')),
3136 3136 ],
3137 3137 _('[-r REV]'))
3138 3138 def debugrebuilddirstate(ui, repo, rev, **opts):
3139 3139 """rebuild the dirstate as it would look like for the given revision
3140 3140
3141 3141 If no revision is specified the first current parent will be used.
3142 3142
3143 3143 The dirstate will be set to the files of the given revision.
3144 3144 The actual working directory content or existing dirstate
3145 3145 information such as adds or removes is not considered.
3146 3146
3147 3147 ``minimal`` will only rebuild the dirstate status for files that claim to be
3148 3148 tracked but are not in the parent manifest, or that exist in the parent
3149 3149 manifest but are not in the dirstate. It will not change adds, removes, or
3150 3150 modified files that are in the working copy parent.
3151 3151
3152 3152 One use of this command is to make the next :hg:`status` invocation
3153 3153 check the actual file content.
3154 3154 """
3155 3155 ctx = scmutil.revsingle(repo, rev)
3156 3156 with repo.wlock():
3157 3157 dirstate = repo.dirstate
3158 3158 changedfiles = None
3159 3159 # See command doc for what minimal does.
3160 3160 if opts.get('minimal'):
3161 3161 manifestfiles = set(ctx.manifest().keys())
3162 3162 dirstatefiles = set(dirstate)
3163 3163 manifestonly = manifestfiles - dirstatefiles
3164 3164 dsonly = dirstatefiles - manifestfiles
3165 3165 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3166 3166 changedfiles = manifestonly | dsnotadded
3167 3167
3168 3168 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3169 3169
3170 3170 @command('debugrebuildfncache', [], '')
3171 3171 def debugrebuildfncache(ui, repo):
3172 3172 """rebuild the fncache file"""
3173 3173 repair.rebuildfncache(ui, repo)
3174 3174
3175 3175 @command('debugrename',
3176 3176 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3177 3177 _('[-r REV] FILE'))
3178 3178 def debugrename(ui, repo, file1, *pats, **opts):
3179 3179 """dump rename information"""
3180 3180
3181 3181 ctx = scmutil.revsingle(repo, opts.get('rev'))
3182 3182 m = scmutil.match(ctx, (file1,) + pats, opts)
3183 3183 for abs in ctx.walk(m):
3184 3184 fctx = ctx[abs]
3185 3185 o = fctx.filelog().renamed(fctx.filenode())
3186 3186 rel = m.rel(abs)
3187 3187 if o:
3188 3188 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3189 3189 else:
3190 3190 ui.write(_("%s not renamed\n") % rel)
3191 3191
3192 3192 @command('debugrevlog', debugrevlogopts +
3193 3193 [('d', 'dump', False, _('dump index data'))],
3194 3194 _('-c|-m|FILE'),
3195 3195 optionalrepo=True)
3196 3196 def debugrevlog(ui, repo, file_=None, **opts):
3197 3197 """show data and statistics about a revlog"""
3198 3198 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3199 3199
3200 3200 if opts.get("dump"):
3201 3201 numrevs = len(r)
3202 3202 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3203 3203 " rawsize totalsize compression heads chainlen\n")
3204 3204 ts = 0
3205 3205 heads = set()
3206 3206
3207 3207 for rev in xrange(numrevs):
3208 3208 dbase = r.deltaparent(rev)
3209 3209 if dbase == -1:
3210 3210 dbase = rev
3211 3211 cbase = r.chainbase(rev)
3212 3212 clen = r.chainlen(rev)
3213 3213 p1, p2 = r.parentrevs(rev)
3214 3214 rs = r.rawsize(rev)
3215 3215 ts = ts + rs
3216 3216 heads -= set(r.parentrevs(rev))
3217 3217 heads.add(rev)
3218 3218 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3219 3219 "%11d %5d %8d\n" %
3220 3220 (rev, p1, p2, r.start(rev), r.end(rev),
3221 3221 r.start(dbase), r.start(cbase),
3222 3222 r.start(p1), r.start(p2),
3223 3223 rs, ts, ts / r.end(rev), len(heads), clen))
3224 3224 return 0
3225 3225
3226 3226 v = r.version
3227 3227 format = v & 0xFFFF
3228 3228 flags = []
3229 3229 gdelta = False
3230 3230 if v & revlog.REVLOGNGINLINEDATA:
3231 3231 flags.append('inline')
3232 3232 if v & revlog.REVLOGGENERALDELTA:
3233 3233 gdelta = True
3234 3234 flags.append('generaldelta')
3235 3235 if not flags:
3236 3236 flags = ['(none)']
3237 3237
3238 3238 nummerges = 0
3239 3239 numfull = 0
3240 3240 numprev = 0
3241 3241 nump1 = 0
3242 3242 nump2 = 0
3243 3243 numother = 0
3244 3244 nump1prev = 0
3245 3245 nump2prev = 0
3246 3246 chainlengths = []
3247 3247
3248 3248 datasize = [None, 0, 0L]
3249 3249 fullsize = [None, 0, 0L]
3250 3250 deltasize = [None, 0, 0L]
3251 3251
3252 3252 def addsize(size, l):
3253 3253 if l[0] is None or size < l[0]:
3254 3254 l[0] = size
3255 3255 if size > l[1]:
3256 3256 l[1] = size
3257 3257 l[2] += size
3258 3258
3259 3259 numrevs = len(r)
3260 3260 for rev in xrange(numrevs):
3261 3261 p1, p2 = r.parentrevs(rev)
3262 3262 delta = r.deltaparent(rev)
3263 3263 if format > 0:
3264 3264 addsize(r.rawsize(rev), datasize)
3265 3265 if p2 != nullrev:
3266 3266 nummerges += 1
3267 3267 size = r.length(rev)
3268 3268 if delta == nullrev:
3269 3269 chainlengths.append(0)
3270 3270 numfull += 1
3271 3271 addsize(size, fullsize)
3272 3272 else:
3273 3273 chainlengths.append(chainlengths[delta] + 1)
3274 3274 addsize(size, deltasize)
3275 3275 if delta == rev - 1:
3276 3276 numprev += 1
3277 3277 if delta == p1:
3278 3278 nump1prev += 1
3279 3279 elif delta == p2:
3280 3280 nump2prev += 1
3281 3281 elif delta == p1:
3282 3282 nump1 += 1
3283 3283 elif delta == p2:
3284 3284 nump2 += 1
3285 3285 elif delta != nullrev:
3286 3286 numother += 1
3287 3287
3288 3288 # Adjust size min value for empty cases
3289 3289 for size in (datasize, fullsize, deltasize):
3290 3290 if size[0] is None:
3291 3291 size[0] = 0
3292 3292
3293 3293 numdeltas = numrevs - numfull
3294 3294 numoprev = numprev - nump1prev - nump2prev
3295 3295 totalrawsize = datasize[2]
3296 3296 datasize[2] /= numrevs
3297 3297 fulltotal = fullsize[2]
3298 3298 fullsize[2] /= numfull
3299 3299 deltatotal = deltasize[2]
3300 3300 if numrevs - numfull > 0:
3301 3301 deltasize[2] /= numrevs - numfull
3302 3302 totalsize = fulltotal + deltatotal
3303 3303 avgchainlen = sum(chainlengths) / numrevs
3304 3304 maxchainlen = max(chainlengths)
3305 3305 compratio = 1
3306 3306 if totalsize:
3307 3307 compratio = totalrawsize / totalsize
3308 3308
3309 3309 basedfmtstr = '%%%dd\n'
3310 3310 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3311 3311
3312 3312 def dfmtstr(max):
3313 3313 return basedfmtstr % len(str(max))
3314 3314 def pcfmtstr(max, padding=0):
3315 3315 return basepcfmtstr % (len(str(max)), ' ' * padding)
3316 3316
3317 3317 def pcfmt(value, total):
3318 3318 if total:
3319 3319 return (value, 100 * float(value) / total)
3320 3320 else:
3321 3321 return value, 100.0
3322 3322
3323 3323 ui.write(('format : %d\n') % format)
3324 3324 ui.write(('flags : %s\n') % ', '.join(flags))
3325 3325
3326 3326 ui.write('\n')
3327 3327 fmt = pcfmtstr(totalsize)
3328 3328 fmt2 = dfmtstr(totalsize)
3329 3329 ui.write(('revisions : ') + fmt2 % numrevs)
3330 3330 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3331 3331 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3332 3332 ui.write(('revisions : ') + fmt2 % numrevs)
3333 3333 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3334 3334 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3335 3335 ui.write(('revision size : ') + fmt2 % totalsize)
3336 3336 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3337 3337 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3338 3338
3339 3339 ui.write('\n')
3340 3340 fmt = dfmtstr(max(avgchainlen, compratio))
3341 3341 ui.write(('avg chain length : ') + fmt % avgchainlen)
3342 3342 ui.write(('max chain length : ') + fmt % maxchainlen)
3343 3343 ui.write(('compression ratio : ') + fmt % compratio)
3344 3344
3345 3345 if format > 0:
3346 3346 ui.write('\n')
3347 3347 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3348 3348 % tuple(datasize))
3349 3349 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3350 3350 % tuple(fullsize))
3351 3351 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3352 3352 % tuple(deltasize))
3353 3353
3354 3354 if numdeltas > 0:
3355 3355 ui.write('\n')
3356 3356 fmt = pcfmtstr(numdeltas)
3357 3357 fmt2 = pcfmtstr(numdeltas, 4)
3358 3358 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3359 3359 if numprev > 0:
3360 3360 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3361 3361 numprev))
3362 3362 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3363 3363 numprev))
3364 3364 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3365 3365 numprev))
3366 3366 if gdelta:
3367 3367 ui.write(('deltas against p1 : ')
3368 3368 + fmt % pcfmt(nump1, numdeltas))
3369 3369 ui.write(('deltas against p2 : ')
3370 3370 + fmt % pcfmt(nump2, numdeltas))
3371 3371 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3372 3372 numdeltas))
3373 3373
3374 3374 @command('debugrevspec',
3375 3375 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3376 3376 ('REVSPEC'))
3377 3377 def debugrevspec(ui, repo, expr, **opts):
3378 3378 """parse and apply a revision specification
3379 3379
3380 3380 Use --verbose to print the parsed tree before and after aliases
3381 3381 expansion.
3382 3382 """
3383 3383 if ui.verbose:
3384 3384 tree = revset.parse(expr, lookup=repo.__contains__)
3385 3385 ui.note(revset.prettyformat(tree), "\n")
3386 3386 newtree = revset.findaliases(ui, tree)
3387 3387 if newtree != tree:
3388 3388 ui.note(revset.prettyformat(newtree), "\n")
3389 3389 tree = newtree
3390 3390 newtree = revset.foldconcat(tree)
3391 3391 if newtree != tree:
3392 3392 ui.note(revset.prettyformat(newtree), "\n")
3393 3393 if opts["optimize"]:
3394 3394 weight, optimizedtree = revset.optimize(newtree, True)
3395 3395 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3396 3396 func = revset.match(ui, expr, repo)
3397 3397 revs = func(repo)
3398 3398 if ui.verbose:
3399 3399 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3400 3400 for c in revs:
3401 3401 ui.write("%s\n" % c)
3402 3402
3403 3403 @command('debugsetparents', [], _('REV1 [REV2]'))
3404 3404 def debugsetparents(ui, repo, rev1, rev2=None):
3405 3405 """manually set the parents of the current working directory
3406 3406
3407 3407 This is useful for writing repository conversion tools, but should
3408 3408 be used with care. For example, neither the working directory nor the
3409 3409 dirstate is updated, so file status may be incorrect after running this
3410 3410 command.
3411 3411
3412 3412 Returns 0 on success.
3413 3413 """
3414 3414
3415 3415 r1 = scmutil.revsingle(repo, rev1).node()
3416 3416 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3417 3417
3418 3418 with repo.wlock():
3419 3419 repo.dirstate.beginparentchange()
3420 3420 repo.setparents(r1, r2)
3421 3421 repo.dirstate.endparentchange()
3422 3422
3423 3423 @command('debugdirstate|debugstate',
3424 3424 [('', 'nodates', None, _('do not display the saved mtime')),
3425 3425 ('', 'datesort', None, _('sort by saved mtime'))],
3426 3426 _('[OPTION]...'))
3427 3427 def debugstate(ui, repo, **opts):
3428 3428 """show the contents of the current dirstate"""
3429 3429
3430 3430 nodates = opts.get('nodates')
3431 3431 datesort = opts.get('datesort')
3432 3432
3433 3433 timestr = ""
3434 3434 if datesort:
3435 3435 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3436 3436 else:
3437 3437 keyfunc = None # sort by filename
3438 3438 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3439 3439 if ent[3] == -1:
3440 3440 timestr = 'unset '
3441 3441 elif nodates:
3442 3442 timestr = 'set '
3443 3443 else:
3444 3444 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3445 3445 time.localtime(ent[3]))
3446 3446 if ent[1] & 0o20000:
3447 3447 mode = 'lnk'
3448 3448 else:
3449 3449 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3450 3450 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3451 3451 for f in repo.dirstate.copies():
3452 3452 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3453 3453
3454 3454 @command('debugsub',
3455 3455 [('r', 'rev', '',
3456 3456 _('revision to check'), _('REV'))],
3457 3457 _('[-r REV] [REV]'))
3458 3458 def debugsub(ui, repo, rev=None):
3459 3459 ctx = scmutil.revsingle(repo, rev, None)
3460 3460 for k, v in sorted(ctx.substate.items()):
3461 3461 ui.write(('path %s\n') % k)
3462 3462 ui.write((' source %s\n') % v[0])
3463 3463 ui.write((' revision %s\n') % v[1])
3464 3464
3465 3465 @command('debugsuccessorssets',
3466 3466 [],
3467 3467 _('[REV]'))
3468 3468 def debugsuccessorssets(ui, repo, *revs):
3469 3469 """show set of successors for revision
3470 3470
3471 3471 A successors set of changeset A is a consistent group of revisions that
3472 3472 succeed A. It contains non-obsolete changesets only.
3473 3473
3474 3474 In most cases a changeset A has a single successors set containing a single
3475 3475 successor (changeset A replaced by A').
3476 3476
3477 3477 A changeset that is made obsolete with no successors are called "pruned".
3478 3478 Such changesets have no successors sets at all.
3479 3479
3480 3480 A changeset that has been "split" will have a successors set containing
3481 3481 more than one successor.
3482 3482
3483 3483 A changeset that has been rewritten in multiple different ways is called
3484 3484 "divergent". Such changesets have multiple successor sets (each of which
3485 3485 may also be split, i.e. have multiple successors).
3486 3486
3487 3487 Results are displayed as follows::
3488 3488
3489 3489 <rev1>
3490 3490 <successors-1A>
3491 3491 <rev2>
3492 3492 <successors-2A>
3493 3493 <successors-2B1> <successors-2B2> <successors-2B3>
3494 3494
3495 3495 Here rev2 has two possible (i.e. divergent) successors sets. The first
3496 3496 holds one element, whereas the second holds three (i.e. the changeset has
3497 3497 been split).
3498 3498 """
3499 3499 # passed to successorssets caching computation from one call to another
3500 3500 cache = {}
3501 3501 ctx2str = str
3502 3502 node2str = short
3503 3503 if ui.debug():
3504 3504 def ctx2str(ctx):
3505 3505 return ctx.hex()
3506 3506 node2str = hex
3507 3507 for rev in scmutil.revrange(repo, revs):
3508 3508 ctx = repo[rev]
3509 3509 ui.write('%s\n'% ctx2str(ctx))
3510 3510 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3511 3511 if succsset:
3512 3512 ui.write(' ')
3513 3513 ui.write(node2str(succsset[0]))
3514 3514 for node in succsset[1:]:
3515 3515 ui.write(' ')
3516 3516 ui.write(node2str(node))
3517 3517 ui.write('\n')
3518 3518
3519 3519 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3520 3520 def debugwalk(ui, repo, *pats, **opts):
3521 3521 """show how files match on given patterns"""
3522 3522 m = scmutil.match(repo[None], pats, opts)
3523 3523 items = list(repo.walk(m))
3524 3524 if not items:
3525 3525 return
3526 3526 f = lambda fn: fn
3527 3527 if ui.configbool('ui', 'slash') and os.sep != '/':
3528 3528 f = lambda fn: util.normpath(fn)
3529 3529 fmt = 'f %%-%ds %%-%ds %%s' % (
3530 3530 max([len(abs) for abs in items]),
3531 3531 max([len(m.rel(abs)) for abs in items]))
3532 3532 for abs in items:
3533 3533 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3534 3534 ui.write("%s\n" % line.rstrip())
3535 3535
3536 3536 @command('debugwireargs',
3537 3537 [('', 'three', '', 'three'),
3538 3538 ('', 'four', '', 'four'),
3539 3539 ('', 'five', '', 'five'),
3540 3540 ] + remoteopts,
3541 3541 _('REPO [OPTIONS]... [ONE [TWO]]'),
3542 3542 norepo=True)
3543 3543 def debugwireargs(ui, repopath, *vals, **opts):
3544 3544 repo = hg.peer(ui, opts, repopath)
3545 3545 for opt in remoteopts:
3546 3546 del opts[opt[1]]
3547 3547 args = {}
3548 3548 for k, v in opts.iteritems():
3549 3549 if v:
3550 3550 args[k] = v
3551 3551 # run twice to check that we don't mess up the stream for the next command
3552 3552 res1 = repo.debugwireargs(*vals, **args)
3553 3553 res2 = repo.debugwireargs(*vals, **args)
3554 3554 ui.write("%s\n" % res1)
3555 3555 if res1 != res2:
3556 3556 ui.warn("%s\n" % res2)
3557 3557
3558 3558 @command('^diff',
3559 3559 [('r', 'rev', [], _('revision'), _('REV')),
3560 3560 ('c', 'change', '', _('change made by revision'), _('REV'))
3561 3561 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3562 3562 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3563 3563 inferrepo=True)
3564 3564 def diff(ui, repo, *pats, **opts):
3565 3565 """diff repository (or selected files)
3566 3566
3567 3567 Show differences between revisions for the specified files.
3568 3568
3569 3569 Differences between files are shown using the unified diff format.
3570 3570
3571 3571 .. note::
3572 3572
3573 3573 :hg:`diff` may generate unexpected results for merges, as it will
3574 3574 default to comparing against the working directory's first
3575 3575 parent changeset if no revisions are specified.
3576 3576
3577 3577 When two revision arguments are given, then changes are shown
3578 3578 between those revisions. If only one revision is specified then
3579 3579 that revision is compared to the working directory, and, when no
3580 3580 revisions are specified, the working directory files are compared
3581 3581 to its first parent.
3582 3582
3583 3583 Alternatively you can specify -c/--change with a revision to see
3584 3584 the changes in that changeset relative to its first parent.
3585 3585
3586 3586 Without the -a/--text option, diff will avoid generating diffs of
3587 3587 files it detects as binary. With -a, diff will generate a diff
3588 3588 anyway, probably with undesirable results.
3589 3589
3590 3590 Use the -g/--git option to generate diffs in the git extended diff
3591 3591 format. For more information, read :hg:`help diffs`.
3592 3592
3593 3593 .. container:: verbose
3594 3594
3595 3595 Examples:
3596 3596
3597 3597 - compare a file in the current working directory to its parent::
3598 3598
3599 3599 hg diff foo.c
3600 3600
3601 3601 - compare two historical versions of a directory, with rename info::
3602 3602
3603 3603 hg diff --git -r 1.0:1.2 lib/
3604 3604
3605 3605 - get change stats relative to the last change on some date::
3606 3606
3607 3607 hg diff --stat -r "date('may 2')"
3608 3608
3609 3609 - diff all newly-added files that contain a keyword::
3610 3610
3611 3611 hg diff "set:added() and grep(GNU)"
3612 3612
3613 3613 - compare a revision and its parents::
3614 3614
3615 3615 hg diff -c 9353 # compare against first parent
3616 3616 hg diff -r 9353^:9353 # same using revset syntax
3617 3617 hg diff -r 9353^2:9353 # compare against the second parent
3618 3618
3619 3619 Returns 0 on success.
3620 3620 """
3621 3621
3622 3622 revs = opts.get('rev')
3623 3623 change = opts.get('change')
3624 3624 stat = opts.get('stat')
3625 3625 reverse = opts.get('reverse')
3626 3626
3627 3627 if revs and change:
3628 3628 msg = _('cannot specify --rev and --change at the same time')
3629 3629 raise error.Abort(msg)
3630 3630 elif change:
3631 3631 node2 = scmutil.revsingle(repo, change, None).node()
3632 3632 node1 = repo[node2].p1().node()
3633 3633 else:
3634 3634 node1, node2 = scmutil.revpair(repo, revs)
3635 3635
3636 3636 if reverse:
3637 3637 node1, node2 = node2, node1
3638 3638
3639 3639 diffopts = patch.diffallopts(ui, opts)
3640 3640 m = scmutil.match(repo[node2], pats, opts)
3641 3641 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3642 3642 listsubrepos=opts.get('subrepos'),
3643 3643 root=opts.get('root'))
3644 3644
3645 3645 @command('^export',
3646 3646 [('o', 'output', '',
3647 3647 _('print output to file with formatted name'), _('FORMAT')),
3648 3648 ('', 'switch-parent', None, _('diff against the second parent')),
3649 3649 ('r', 'rev', [], _('revisions to export'), _('REV')),
3650 3650 ] + diffopts,
3651 3651 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3652 3652 def export(ui, repo, *changesets, **opts):
3653 3653 """dump the header and diffs for one or more changesets
3654 3654
3655 3655 Print the changeset header and diffs for one or more revisions.
3656 3656 If no revision is given, the parent of the working directory is used.
3657 3657
3658 3658 The information shown in the changeset header is: author, date,
3659 3659 branch name (if non-default), changeset hash, parent(s) and commit
3660 3660 comment.
3661 3661
3662 3662 .. note::
3663 3663
3664 3664 :hg:`export` may generate unexpected diff output for merge
3665 3665 changesets, as it will compare the merge changeset against its
3666 3666 first parent only.
3667 3667
3668 3668 Output may be to a file, in which case the name of the file is
3669 3669 given using a format string. The formatting rules are as follows:
3670 3670
3671 3671 :``%%``: literal "%" character
3672 3672 :``%H``: changeset hash (40 hexadecimal digits)
3673 3673 :``%N``: number of patches being generated
3674 3674 :``%R``: changeset revision number
3675 3675 :``%b``: basename of the exporting repository
3676 3676 :``%h``: short-form changeset hash (12 hexadecimal digits)
3677 3677 :``%m``: first line of the commit message (only alphanumeric characters)
3678 3678 :``%n``: zero-padded sequence number, starting at 1
3679 3679 :``%r``: zero-padded changeset revision number
3680 3680
3681 3681 Without the -a/--text option, export will avoid generating diffs
3682 3682 of files it detects as binary. With -a, export will generate a
3683 3683 diff anyway, probably with undesirable results.
3684 3684
3685 3685 Use the -g/--git option to generate diffs in the git extended diff
3686 3686 format. See :hg:`help diffs` for more information.
3687 3687
3688 3688 With the --switch-parent option, the diff will be against the
3689 3689 second parent. It can be useful to review a merge.
3690 3690
3691 3691 .. container:: verbose
3692 3692
3693 3693 Examples:
3694 3694
3695 3695 - use export and import to transplant a bugfix to the current
3696 3696 branch::
3697 3697
3698 3698 hg export -r 9353 | hg import -
3699 3699
3700 3700 - export all the changesets between two revisions to a file with
3701 3701 rename information::
3702 3702
3703 3703 hg export --git -r 123:150 > changes.txt
3704 3704
3705 3705 - split outgoing changes into a series of patches with
3706 3706 descriptive names::
3707 3707
3708 3708 hg export -r "outgoing()" -o "%n-%m.patch"
3709 3709
3710 3710 Returns 0 on success.
3711 3711 """
3712 3712 changesets += tuple(opts.get('rev', []))
3713 3713 if not changesets:
3714 3714 changesets = ['.']
3715 3715 revs = scmutil.revrange(repo, changesets)
3716 3716 if not revs:
3717 3717 raise error.Abort(_("export requires at least one changeset"))
3718 3718 if len(revs) > 1:
3719 3719 ui.note(_('exporting patches:\n'))
3720 3720 else:
3721 3721 ui.note(_('exporting patch:\n'))
3722 3722 cmdutil.export(repo, revs, template=opts.get('output'),
3723 3723 switch_parent=opts.get('switch_parent'),
3724 3724 opts=patch.diffallopts(ui, opts))
3725 3725
3726 3726 @command('files',
3727 3727 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3728 3728 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3729 3729 ] + walkopts + formatteropts + subrepoopts,
3730 3730 _('[OPTION]... [PATTERN]...'))
3731 3731 def files(ui, repo, *pats, **opts):
3732 3732 """list tracked files
3733 3733
3734 3734 Print files under Mercurial control in the working directory or
3735 3735 specified revision whose names match the given patterns (excluding
3736 3736 removed files).
3737 3737
3738 3738 If no patterns are given to match, this command prints the names
3739 3739 of all files under Mercurial control in the working directory.
3740 3740
3741 3741 .. container:: verbose
3742 3742
3743 3743 Examples:
3744 3744
3745 3745 - list all files under the current directory::
3746 3746
3747 3747 hg files .
3748 3748
3749 3749 - shows sizes and flags for current revision::
3750 3750
3751 3751 hg files -vr .
3752 3752
3753 3753 - list all files named README::
3754 3754
3755 3755 hg files -I "**/README"
3756 3756
3757 3757 - list all binary files::
3758 3758
3759 3759 hg files "set:binary()"
3760 3760
3761 3761 - find files containing a regular expression::
3762 3762
3763 3763 hg files "set:grep('bob')"
3764 3764
3765 3765 - search tracked file contents with xargs and grep::
3766 3766
3767 3767 hg files -0 | xargs -0 grep foo
3768 3768
3769 3769 See :hg:`help patterns` and :hg:`help filesets` for more information
3770 3770 on specifying file patterns.
3771 3771
3772 3772 Returns 0 if a match is found, 1 otherwise.
3773 3773
3774 3774 """
3775 3775 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3776 3776
3777 3777 end = '\n'
3778 3778 if opts.get('print0'):
3779 3779 end = '\0'
3780 3780 fm = ui.formatter('files', opts)
3781 3781 fmt = '%s' + end
3782 3782
3783 3783 m = scmutil.match(ctx, pats, opts)
3784 3784 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3785 3785
3786 3786 fm.end()
3787 3787
3788 3788 return ret
3789 3789
3790 3790 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3791 3791 def forget(ui, repo, *pats, **opts):
3792 3792 """forget the specified files on the next commit
3793 3793
3794 3794 Mark the specified files so they will no longer be tracked
3795 3795 after the next commit.
3796 3796
3797 3797 This only removes files from the current branch, not from the
3798 3798 entire project history, and it does not delete them from the
3799 3799 working directory.
3800 3800
3801 3801 To delete the file from the working directory, see :hg:`remove`.
3802 3802
3803 3803 To undo a forget before the next commit, see :hg:`add`.
3804 3804
3805 3805 .. container:: verbose
3806 3806
3807 3807 Examples:
3808 3808
3809 3809 - forget newly-added binary files::
3810 3810
3811 3811 hg forget "set:added() and binary()"
3812 3812
3813 3813 - forget files that would be excluded by .hgignore::
3814 3814
3815 3815 hg forget "set:hgignore()"
3816 3816
3817 3817 Returns 0 on success.
3818 3818 """
3819 3819
3820 3820 if not pats:
3821 3821 raise error.Abort(_('no files specified'))
3822 3822
3823 3823 m = scmutil.match(repo[None], pats, opts)
3824 3824 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3825 3825 return rejected and 1 or 0
3826 3826
3827 3827 @command(
3828 3828 'graft',
3829 3829 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3830 3830 ('c', 'continue', False, _('resume interrupted graft')),
3831 3831 ('e', 'edit', False, _('invoke editor on commit messages')),
3832 3832 ('', 'log', None, _('append graft info to log message')),
3833 3833 ('f', 'force', False, _('force graft')),
3834 3834 ('D', 'currentdate', False,
3835 3835 _('record the current date as commit date')),
3836 3836 ('U', 'currentuser', False,
3837 3837 _('record the current user as committer'), _('DATE'))]
3838 3838 + commitopts2 + mergetoolopts + dryrunopts,
3839 3839 _('[OPTION]... [-r REV]... REV...'))
3840 3840 def graft(ui, repo, *revs, **opts):
3841 3841 '''copy changes from other branches onto the current branch
3842 3842
3843 3843 This command uses Mercurial's merge logic to copy individual
3844 3844 changes from other branches without merging branches in the
3845 3845 history graph. This is sometimes known as 'backporting' or
3846 3846 'cherry-picking'. By default, graft will copy user, date, and
3847 3847 description from the source changesets.
3848 3848
3849 3849 Changesets that are ancestors of the current revision, that have
3850 3850 already been grafted, or that are merges will be skipped.
3851 3851
3852 3852 If --log is specified, log messages will have a comment appended
3853 3853 of the form::
3854 3854
3855 3855 (grafted from CHANGESETHASH)
3856 3856
3857 3857 If --force is specified, revisions will be grafted even if they
3858 3858 are already ancestors of or have been grafted to the destination.
3859 3859 This is useful when the revisions have since been backed out.
3860 3860
3861 3861 If a graft merge results in conflicts, the graft process is
3862 3862 interrupted so that the current merge can be manually resolved.
3863 3863 Once all conflicts are addressed, the graft process can be
3864 3864 continued with the -c/--continue option.
3865 3865
3866 3866 .. note::
3867 3867
3868 3868 The -c/--continue option does not reapply earlier options, except
3869 3869 for --force.
3870 3870
3871 3871 .. container:: verbose
3872 3872
3873 3873 Examples:
3874 3874
3875 3875 - copy a single change to the stable branch and edit its description::
3876 3876
3877 3877 hg update stable
3878 3878 hg graft --edit 9393
3879 3879
3880 3880 - graft a range of changesets with one exception, updating dates::
3881 3881
3882 3882 hg graft -D "2085::2093 and not 2091"
3883 3883
3884 3884 - continue a graft after resolving conflicts::
3885 3885
3886 3886 hg graft -c
3887 3887
3888 3888 - show the source of a grafted changeset::
3889 3889
3890 3890 hg log --debug -r .
3891 3891
3892 3892 - show revisions sorted by date::
3893 3893
3894 3894 hg log -r 'sort(all(), date)'
3895 3895
3896 3896 See :hg:`help revisions` and :hg:`help revsets` for more about
3897 3897 specifying revisions.
3898 3898
3899 3899 Returns 0 on successful completion.
3900 3900 '''
3901 3901 with repo.wlock():
3902 3902 return _dograft(ui, repo, *revs, **opts)
3903 3903
3904 3904 def _dograft(ui, repo, *revs, **opts):
3905 3905 if revs and opts['rev']:
3906 3906 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3907 3907 'revision ordering!\n'))
3908 3908
3909 3909 revs = list(revs)
3910 3910 revs.extend(opts['rev'])
3911 3911
3912 3912 if not opts.get('user') and opts.get('currentuser'):
3913 3913 opts['user'] = ui.username()
3914 3914 if not opts.get('date') and opts.get('currentdate'):
3915 3915 opts['date'] = "%d %d" % util.makedate()
3916 3916
3917 3917 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3918 3918
3919 3919 cont = False
3920 3920 if opts['continue']:
3921 3921 cont = True
3922 3922 if revs:
3923 3923 raise error.Abort(_("can't specify --continue and revisions"))
3924 3924 # read in unfinished revisions
3925 3925 try:
3926 3926 nodes = repo.vfs.read('graftstate').splitlines()
3927 3927 revs = [repo[node].rev() for node in nodes]
3928 3928 except IOError as inst:
3929 3929 if inst.errno != errno.ENOENT:
3930 3930 raise
3931 3931 raise error.Abort(_("no graft state found, can't continue"))
3932 3932 else:
3933 3933 cmdutil.checkunfinished(repo)
3934 3934 cmdutil.bailifchanged(repo)
3935 3935 if not revs:
3936 3936 raise error.Abort(_('no revisions specified'))
3937 3937 revs = scmutil.revrange(repo, revs)
3938 3938
3939 3939 skipped = set()
3940 3940 # check for merges
3941 3941 for rev in repo.revs('%ld and merge()', revs):
3942 3942 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3943 3943 skipped.add(rev)
3944 3944 revs = [r for r in revs if r not in skipped]
3945 3945 if not revs:
3946 3946 return -1
3947 3947
3948 3948 # Don't check in the --continue case, in effect retaining --force across
3949 3949 # --continues. That's because without --force, any revisions we decided to
3950 3950 # skip would have been filtered out here, so they wouldn't have made their
3951 3951 # way to the graftstate. With --force, any revisions we would have otherwise
3952 3952 # skipped would not have been filtered out, and if they hadn't been applied
3953 3953 # already, they'd have been in the graftstate.
3954 3954 if not (cont or opts.get('force')):
3955 3955 # check for ancestors of dest branch
3956 3956 crev = repo['.'].rev()
3957 3957 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3958 3958 # Cannot use x.remove(y) on smart set, this has to be a list.
3959 3959 # XXX make this lazy in the future
3960 3960 revs = list(revs)
3961 3961 # don't mutate while iterating, create a copy
3962 3962 for rev in list(revs):
3963 3963 if rev in ancestors:
3964 3964 ui.warn(_('skipping ancestor revision %d:%s\n') %
3965 3965 (rev, repo[rev]))
3966 3966 # XXX remove on list is slow
3967 3967 revs.remove(rev)
3968 3968 if not revs:
3969 3969 return -1
3970 3970
3971 3971 # analyze revs for earlier grafts
3972 3972 ids = {}
3973 3973 for ctx in repo.set("%ld", revs):
3974 3974 ids[ctx.hex()] = ctx.rev()
3975 3975 n = ctx.extra().get('source')
3976 3976 if n:
3977 3977 ids[n] = ctx.rev()
3978 3978
3979 3979 # check ancestors for earlier grafts
3980 3980 ui.debug('scanning for duplicate grafts\n')
3981 3981
3982 3982 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3983 3983 ctx = repo[rev]
3984 3984 n = ctx.extra().get('source')
3985 3985 if n in ids:
3986 3986 try:
3987 3987 r = repo[n].rev()
3988 3988 except error.RepoLookupError:
3989 3989 r = None
3990 3990 if r in revs:
3991 3991 ui.warn(_('skipping revision %d:%s '
3992 3992 '(already grafted to %d:%s)\n')
3993 3993 % (r, repo[r], rev, ctx))
3994 3994 revs.remove(r)
3995 3995 elif ids[n] in revs:
3996 3996 if r is None:
3997 3997 ui.warn(_('skipping already grafted revision %d:%s '
3998 3998 '(%d:%s also has unknown origin %s)\n')
3999 3999 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4000 4000 else:
4001 4001 ui.warn(_('skipping already grafted revision %d:%s '
4002 4002 '(%d:%s also has origin %d:%s)\n')
4003 4003 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4004 4004 revs.remove(ids[n])
4005 4005 elif ctx.hex() in ids:
4006 4006 r = ids[ctx.hex()]
4007 4007 ui.warn(_('skipping already grafted revision %d:%s '
4008 4008 '(was grafted from %d:%s)\n') %
4009 4009 (r, repo[r], rev, ctx))
4010 4010 revs.remove(r)
4011 4011 if not revs:
4012 4012 return -1
4013 4013
4014 4014 for pos, ctx in enumerate(repo.set("%ld", revs)):
4015 4015 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4016 4016 ctx.description().split('\n', 1)[0])
4017 4017 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4018 4018 if names:
4019 4019 desc += ' (%s)' % ' '.join(names)
4020 4020 ui.status(_('grafting %s\n') % desc)
4021 4021 if opts.get('dry_run'):
4022 4022 continue
4023 4023
4024 4024 source = ctx.extra().get('source')
4025 4025 extra = {}
4026 4026 if source:
4027 4027 extra['source'] = source
4028 4028 extra['intermediate-source'] = ctx.hex()
4029 4029 else:
4030 4030 extra['source'] = ctx.hex()
4031 4031 user = ctx.user()
4032 4032 if opts.get('user'):
4033 4033 user = opts['user']
4034 4034 date = ctx.date()
4035 4035 if opts.get('date'):
4036 4036 date = opts['date']
4037 4037 message = ctx.description()
4038 4038 if opts.get('log'):
4039 4039 message += '\n(grafted from %s)' % ctx.hex()
4040 4040
4041 4041 # we don't merge the first commit when continuing
4042 4042 if not cont:
4043 4043 # perform the graft merge with p1(rev) as 'ancestor'
4044 4044 try:
4045 4045 # ui.forcemerge is an internal variable, do not document
4046 4046 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4047 4047 'graft')
4048 4048 stats = mergemod.graft(repo, ctx, ctx.p1(),
4049 4049 ['local', 'graft'])
4050 4050 finally:
4051 4051 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4052 4052 # report any conflicts
4053 4053 if stats and stats[3] > 0:
4054 4054 # write out state for --continue
4055 4055 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4056 4056 repo.vfs.write('graftstate', ''.join(nodelines))
4057 4057 extra = ''
4058 4058 if opts.get('user'):
4059 4059 extra += ' --user %s' % opts['user']
4060 4060 if opts.get('date'):
4061 4061 extra += ' --date %s' % opts['date']
4062 4062 if opts.get('log'):
4063 4063 extra += ' --log'
4064 4064 hint=_('use hg resolve and hg graft --continue%s') % extra
4065 4065 raise error.Abort(
4066 4066 _("unresolved conflicts, can't continue"),
4067 4067 hint=hint)
4068 4068 else:
4069 4069 cont = False
4070 4070
4071 4071 # commit
4072 4072 node = repo.commit(text=message, user=user,
4073 4073 date=date, extra=extra, editor=editor)
4074 4074 if node is None:
4075 4075 ui.warn(
4076 4076 _('note: graft of %d:%s created no changes to commit\n') %
4077 4077 (ctx.rev(), ctx))
4078 4078
4079 4079 # remove state when we complete successfully
4080 4080 if not opts.get('dry_run'):
4081 4081 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4082 4082
4083 4083 return 0
4084 4084
4085 4085 @command('grep',
4086 4086 [('0', 'print0', None, _('end fields with NUL')),
4087 4087 ('', 'all', None, _('print all revisions that match')),
4088 4088 ('a', 'text', None, _('treat all files as text')),
4089 4089 ('f', 'follow', None,
4090 4090 _('follow changeset history,'
4091 4091 ' or file history across copies and renames')),
4092 4092 ('i', 'ignore-case', None, _('ignore case when matching')),
4093 4093 ('l', 'files-with-matches', None,
4094 4094 _('print only filenames and revisions that match')),
4095 4095 ('n', 'line-number', None, _('print matching line numbers')),
4096 4096 ('r', 'rev', [],
4097 4097 _('only search files changed within revision range'), _('REV')),
4098 4098 ('u', 'user', None, _('list the author (long with -v)')),
4099 4099 ('d', 'date', None, _('list the date (short with -q)')),
4100 4100 ] + walkopts,
4101 4101 _('[OPTION]... PATTERN [FILE]...'),
4102 4102 inferrepo=True)
4103 4103 def grep(ui, repo, pattern, *pats, **opts):
4104 4104 """search for a pattern in specified files and revisions
4105 4105
4106 4106 Search revisions of files for a regular expression.
4107 4107
4108 4108 This command behaves differently than Unix grep. It only accepts
4109 4109 Python/Perl regexps. It searches repository history, not the
4110 4110 working directory. It always prints the revision number in which a
4111 4111 match appears.
4112 4112
4113 4113 By default, grep only prints output for the first revision of a
4114 4114 file in which it finds a match. To get it to print every revision
4115 4115 that contains a change in match status ("-" for a match that
4116 4116 becomes a non-match, or "+" for a non-match that becomes a match),
4117 4117 use the --all flag.
4118 4118
4119 4119 Returns 0 if a match is found, 1 otherwise.
4120 4120 """
4121 4121 reflags = re.M
4122 4122 if opts.get('ignore_case'):
4123 4123 reflags |= re.I
4124 4124 try:
4125 4125 regexp = util.re.compile(pattern, reflags)
4126 4126 except re.error as inst:
4127 4127 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4128 4128 return 1
4129 4129 sep, eol = ':', '\n'
4130 4130 if opts.get('print0'):
4131 4131 sep = eol = '\0'
4132 4132
4133 4133 getfile = util.lrucachefunc(repo.file)
4134 4134
4135 4135 def matchlines(body):
4136 4136 begin = 0
4137 4137 linenum = 0
4138 4138 while begin < len(body):
4139 4139 match = regexp.search(body, begin)
4140 4140 if not match:
4141 4141 break
4142 4142 mstart, mend = match.span()
4143 4143 linenum += body.count('\n', begin, mstart) + 1
4144 4144 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4145 4145 begin = body.find('\n', mend) + 1 or len(body) + 1
4146 4146 lend = begin - 1
4147 4147 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4148 4148
4149 4149 class linestate(object):
4150 4150 def __init__(self, line, linenum, colstart, colend):
4151 4151 self.line = line
4152 4152 self.linenum = linenum
4153 4153 self.colstart = colstart
4154 4154 self.colend = colend
4155 4155
4156 4156 def __hash__(self):
4157 4157 return hash((self.linenum, self.line))
4158 4158
4159 4159 def __eq__(self, other):
4160 4160 return self.line == other.line
4161 4161
4162 4162 def __iter__(self):
4163 4163 yield (self.line[:self.colstart], '')
4164 4164 yield (self.line[self.colstart:self.colend], 'grep.match')
4165 4165 rest = self.line[self.colend:]
4166 4166 while rest != '':
4167 4167 match = regexp.search(rest)
4168 4168 if not match:
4169 4169 yield (rest, '')
4170 4170 break
4171 4171 mstart, mend = match.span()
4172 4172 yield (rest[:mstart], '')
4173 4173 yield (rest[mstart:mend], 'grep.match')
4174 4174 rest = rest[mend:]
4175 4175
4176 4176 matches = {}
4177 4177 copies = {}
4178 4178 def grepbody(fn, rev, body):
4179 4179 matches[rev].setdefault(fn, [])
4180 4180 m = matches[rev][fn]
4181 4181 for lnum, cstart, cend, line in matchlines(body):
4182 4182 s = linestate(line, lnum, cstart, cend)
4183 4183 m.append(s)
4184 4184
4185 4185 def difflinestates(a, b):
4186 4186 sm = difflib.SequenceMatcher(None, a, b)
4187 4187 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4188 4188 if tag == 'insert':
4189 4189 for i in xrange(blo, bhi):
4190 4190 yield ('+', b[i])
4191 4191 elif tag == 'delete':
4192 4192 for i in xrange(alo, ahi):
4193 4193 yield ('-', a[i])
4194 4194 elif tag == 'replace':
4195 4195 for i in xrange(alo, ahi):
4196 4196 yield ('-', a[i])
4197 4197 for i in xrange(blo, bhi):
4198 4198 yield ('+', b[i])
4199 4199
4200 4200 def display(fn, ctx, pstates, states):
4201 4201 rev = ctx.rev()
4202 4202 if ui.quiet:
4203 4203 datefunc = util.shortdate
4204 4204 else:
4205 4205 datefunc = util.datestr
4206 4206 found = False
4207 4207 @util.cachefunc
4208 4208 def binary():
4209 4209 flog = getfile(fn)
4210 4210 return util.binary(flog.read(ctx.filenode(fn)))
4211 4211
4212 4212 if opts.get('all'):
4213 4213 iter = difflinestates(pstates, states)
4214 4214 else:
4215 4215 iter = [('', l) for l in states]
4216 4216 for change, l in iter:
4217 4217 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4218 4218
4219 4219 if opts.get('line_number'):
4220 4220 cols.append((str(l.linenum), 'grep.linenumber'))
4221 4221 if opts.get('all'):
4222 4222 cols.append((change, 'grep.change'))
4223 4223 if opts.get('user'):
4224 4224 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4225 4225 if opts.get('date'):
4226 4226 cols.append((datefunc(ctx.date()), 'grep.date'))
4227 4227 for col, label in cols[:-1]:
4228 4228 ui.write(col, label=label)
4229 4229 ui.write(sep, label='grep.sep')
4230 4230 ui.write(cols[-1][0], label=cols[-1][1])
4231 4231 if not opts.get('files_with_matches'):
4232 4232 ui.write(sep, label='grep.sep')
4233 4233 if not opts.get('text') and binary():
4234 4234 ui.write(" Binary file matches")
4235 4235 else:
4236 4236 for s, label in l:
4237 4237 ui.write(s, label=label)
4238 4238 ui.write(eol)
4239 4239 found = True
4240 4240 if opts.get('files_with_matches'):
4241 4241 break
4242 4242 return found
4243 4243
4244 4244 skip = {}
4245 4245 revfiles = {}
4246 4246 matchfn = scmutil.match(repo[None], pats, opts)
4247 4247 found = False
4248 4248 follow = opts.get('follow')
4249 4249
4250 4250 def prep(ctx, fns):
4251 4251 rev = ctx.rev()
4252 4252 pctx = ctx.p1()
4253 4253 parent = pctx.rev()
4254 4254 matches.setdefault(rev, {})
4255 4255 matches.setdefault(parent, {})
4256 4256 files = revfiles.setdefault(rev, [])
4257 4257 for fn in fns:
4258 4258 flog = getfile(fn)
4259 4259 try:
4260 4260 fnode = ctx.filenode(fn)
4261 4261 except error.LookupError:
4262 4262 continue
4263 4263
4264 4264 copied = flog.renamed(fnode)
4265 4265 copy = follow and copied and copied[0]
4266 4266 if copy:
4267 4267 copies.setdefault(rev, {})[fn] = copy
4268 4268 if fn in skip:
4269 4269 if copy:
4270 4270 skip[copy] = True
4271 4271 continue
4272 4272 files.append(fn)
4273 4273
4274 4274 if fn not in matches[rev]:
4275 4275 grepbody(fn, rev, flog.read(fnode))
4276 4276
4277 4277 pfn = copy or fn
4278 4278 if pfn not in matches[parent]:
4279 4279 try:
4280 4280 fnode = pctx.filenode(pfn)
4281 4281 grepbody(pfn, parent, flog.read(fnode))
4282 4282 except error.LookupError:
4283 4283 pass
4284 4284
4285 4285 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4286 4286 rev = ctx.rev()
4287 4287 parent = ctx.p1().rev()
4288 4288 for fn in sorted(revfiles.get(rev, [])):
4289 4289 states = matches[rev][fn]
4290 4290 copy = copies.get(rev, {}).get(fn)
4291 4291 if fn in skip:
4292 4292 if copy:
4293 4293 skip[copy] = True
4294 4294 continue
4295 4295 pstates = matches.get(parent, {}).get(copy or fn, [])
4296 4296 if pstates or states:
4297 4297 r = display(fn, ctx, pstates, states)
4298 4298 found = found or r
4299 4299 if r and not opts.get('all'):
4300 4300 skip[fn] = True
4301 4301 if copy:
4302 4302 skip[copy] = True
4303 4303 del matches[rev]
4304 4304 del revfiles[rev]
4305 4305
4306 4306 return not found
4307 4307
4308 4308 @command('heads',
4309 4309 [('r', 'rev', '',
4310 4310 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4311 4311 ('t', 'topo', False, _('show topological heads only')),
4312 4312 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4313 4313 ('c', 'closed', False, _('show normal and closed branch heads')),
4314 4314 ] + templateopts,
4315 4315 _('[-ct] [-r STARTREV] [REV]...'))
4316 4316 def heads(ui, repo, *branchrevs, **opts):
4317 4317 """show branch heads
4318 4318
4319 4319 With no arguments, show all open branch heads in the repository.
4320 4320 Branch heads are changesets that have no descendants on the
4321 4321 same branch. They are where development generally takes place and
4322 4322 are the usual targets for update and merge operations.
4323 4323
4324 4324 If one or more REVs are given, only open branch heads on the
4325 4325 branches associated with the specified changesets are shown. This
4326 4326 means that you can use :hg:`heads .` to see the heads on the
4327 4327 currently checked-out branch.
4328 4328
4329 4329 If -c/--closed is specified, also show branch heads marked closed
4330 4330 (see :hg:`commit --close-branch`).
4331 4331
4332 4332 If STARTREV is specified, only those heads that are descendants of
4333 4333 STARTREV will be displayed.
4334 4334
4335 4335 If -t/--topo is specified, named branch mechanics will be ignored and only
4336 4336 topological heads (changesets with no children) will be shown.
4337 4337
4338 4338 Returns 0 if matching heads are found, 1 if not.
4339 4339 """
4340 4340
4341 4341 start = None
4342 4342 if 'rev' in opts:
4343 4343 start = scmutil.revsingle(repo, opts['rev'], None).node()
4344 4344
4345 4345 if opts.get('topo'):
4346 4346 heads = [repo[h] for h in repo.heads(start)]
4347 4347 else:
4348 4348 heads = []
4349 4349 for branch in repo.branchmap():
4350 4350 heads += repo.branchheads(branch, start, opts.get('closed'))
4351 4351 heads = [repo[h] for h in heads]
4352 4352
4353 4353 if branchrevs:
4354 4354 branches = set(repo[br].branch() for br in branchrevs)
4355 4355 heads = [h for h in heads if h.branch() in branches]
4356 4356
4357 4357 if opts.get('active') and branchrevs:
4358 4358 dagheads = repo.heads(start)
4359 4359 heads = [h for h in heads if h.node() in dagheads]
4360 4360
4361 4361 if branchrevs:
4362 4362 haveheads = set(h.branch() for h in heads)
4363 4363 if branches - haveheads:
4364 4364 headless = ', '.join(b for b in branches - haveheads)
4365 4365 msg = _('no open branch heads found on branches %s')
4366 4366 if opts.get('rev'):
4367 4367 msg += _(' (started at %s)') % opts['rev']
4368 4368 ui.warn((msg + '\n') % headless)
4369 4369
4370 4370 if not heads:
4371 4371 return 1
4372 4372
4373 4373 heads = sorted(heads, key=lambda x: -x.rev())
4374 4374 displayer = cmdutil.show_changeset(ui, repo, opts)
4375 4375 for ctx in heads:
4376 4376 displayer.show(ctx)
4377 4377 displayer.close()
4378 4378
4379 4379 @command('help',
4380 4380 [('e', 'extension', None, _('show only help for extensions')),
4381 4381 ('c', 'command', None, _('show only help for commands')),
4382 4382 ('k', 'keyword', None, _('show topics matching keyword')),
4383 4383 ('s', 'system', [], _('show help for specific platform(s)')),
4384 4384 ],
4385 4385 _('[-ecks] [TOPIC]'),
4386 4386 norepo=True)
4387 4387 def help_(ui, name=None, **opts):
4388 4388 """show help for a given topic or a help overview
4389 4389
4390 4390 With no arguments, print a list of commands with short help messages.
4391 4391
4392 4392 Given a topic, extension, or command name, print help for that
4393 4393 topic.
4394 4394
4395 4395 Returns 0 if successful.
4396 4396 """
4397 4397
4398 4398 textwidth = min(ui.termwidth(), 80) - 2
4399 4399
4400 4400 keep = opts.get('system') or []
4401 4401 if len(keep) == 0:
4402 4402 if sys.platform.startswith('win'):
4403 4403 keep.append('windows')
4404 4404 elif sys.platform == 'OpenVMS':
4405 4405 keep.append('vms')
4406 4406 elif sys.platform == 'plan9':
4407 4407 keep.append('plan9')
4408 4408 else:
4409 4409 keep.append('unix')
4410 4410 keep.append(sys.platform.lower())
4411 4411 if ui.verbose:
4412 4412 keep.append('verbose')
4413 4413
4414 4414 section = None
4415 4415 subtopic = None
4416 4416 if name and '.' in name:
4417 4417 name, section = name.split('.', 1)
4418 4418 section = section.lower()
4419 4419 if '.' in section:
4420 4420 subtopic, section = section.split('.', 1)
4421 4421 else:
4422 4422 subtopic = section
4423 4423
4424 4424 text = help.help_(ui, name, subtopic=subtopic, **opts)
4425 4425
4426 4426 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4427 4427 section=section)
4428 4428
4429 4429 # We could have been given a weird ".foo" section without a name
4430 4430 # to look for, or we could have simply failed to found "foo.bar"
4431 4431 # because bar isn't a section of foo
4432 4432 if section and not (formatted and name):
4433 4433 raise error.Abort(_("help section not found"))
4434 4434
4435 4435 if 'verbose' in pruned:
4436 4436 keep.append('omitted')
4437 4437 else:
4438 4438 keep.append('notomitted')
4439 4439 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4440 4440 section=section)
4441 4441 ui.write(formatted)
4442 4442
4443 4443
4444 4444 @command('identify|id',
4445 4445 [('r', 'rev', '',
4446 4446 _('identify the specified revision'), _('REV')),
4447 4447 ('n', 'num', None, _('show local revision number')),
4448 4448 ('i', 'id', None, _('show global revision id')),
4449 4449 ('b', 'branch', None, _('show branch')),
4450 4450 ('t', 'tags', None, _('show tags')),
4451 4451 ('B', 'bookmarks', None, _('show bookmarks')),
4452 4452 ] + remoteopts,
4453 4453 _('[-nibtB] [-r REV] [SOURCE]'),
4454 4454 optionalrepo=True)
4455 4455 def identify(ui, repo, source=None, rev=None,
4456 4456 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4457 4457 """identify the working directory or specified revision
4458 4458
4459 4459 Print a summary identifying the repository state at REV using one or
4460 4460 two parent hash identifiers, followed by a "+" if the working
4461 4461 directory has uncommitted changes, the branch name (if not default),
4462 4462 a list of tags, and a list of bookmarks.
4463 4463
4464 4464 When REV is not given, print a summary of the current state of the
4465 4465 repository.
4466 4466
4467 4467 Specifying a path to a repository root or Mercurial bundle will
4468 4468 cause lookup to operate on that repository/bundle.
4469 4469
4470 4470 .. container:: verbose
4471 4471
4472 4472 Examples:
4473 4473
4474 4474 - generate a build identifier for the working directory::
4475 4475
4476 4476 hg id --id > build-id.dat
4477 4477
4478 4478 - find the revision corresponding to a tag::
4479 4479
4480 4480 hg id -n -r 1.3
4481 4481
4482 4482 - check the most recent revision of a remote repository::
4483 4483
4484 4484 hg id -r tip http://selenic.com/hg/
4485 4485
4486 4486 See :hg:`log` for generating more information about specific revisions,
4487 4487 including full hash identifiers.
4488 4488
4489 4489 Returns 0 if successful.
4490 4490 """
4491 4491
4492 4492 if not repo and not source:
4493 4493 raise error.Abort(_("there is no Mercurial repository here "
4494 4494 "(.hg not found)"))
4495 4495
4496 4496 if ui.debugflag:
4497 4497 hexfunc = hex
4498 4498 else:
4499 4499 hexfunc = short
4500 4500 default = not (num or id or branch or tags or bookmarks)
4501 4501 output = []
4502 4502 revs = []
4503 4503
4504 4504 if source:
4505 4505 source, branches = hg.parseurl(ui.expandpath(source))
4506 4506 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4507 4507 repo = peer.local()
4508 4508 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4509 4509
4510 4510 if not repo:
4511 4511 if num or branch or tags:
4512 4512 raise error.Abort(
4513 4513 _("can't query remote revision number, branch, or tags"))
4514 4514 if not rev and revs:
4515 4515 rev = revs[0]
4516 4516 if not rev:
4517 4517 rev = "tip"
4518 4518
4519 4519 remoterev = peer.lookup(rev)
4520 4520 if default or id:
4521 4521 output = [hexfunc(remoterev)]
4522 4522
4523 4523 def getbms():
4524 4524 bms = []
4525 4525
4526 4526 if 'bookmarks' in peer.listkeys('namespaces'):
4527 4527 hexremoterev = hex(remoterev)
4528 4528 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4529 4529 if bmr == hexremoterev]
4530 4530
4531 4531 return sorted(bms)
4532 4532
4533 4533 if bookmarks:
4534 4534 output.extend(getbms())
4535 4535 elif default and not ui.quiet:
4536 4536 # multiple bookmarks for a single parent separated by '/'
4537 4537 bm = '/'.join(getbms())
4538 4538 if bm:
4539 4539 output.append(bm)
4540 4540 else:
4541 4541 ctx = scmutil.revsingle(repo, rev, None)
4542 4542
4543 4543 if ctx.rev() is None:
4544 4544 ctx = repo[None]
4545 4545 parents = ctx.parents()
4546 4546 taglist = []
4547 4547 for p in parents:
4548 4548 taglist.extend(p.tags())
4549 4549
4550 4550 changed = ""
4551 4551 if default or id or num:
4552 4552 if (any(repo.status())
4553 4553 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4554 4554 changed = '+'
4555 4555 if default or id:
4556 4556 output = ["%s%s" %
4557 4557 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4558 4558 if num:
4559 4559 output.append("%s%s" %
4560 4560 ('+'.join([str(p.rev()) for p in parents]), changed))
4561 4561 else:
4562 4562 if default or id:
4563 4563 output = [hexfunc(ctx.node())]
4564 4564 if num:
4565 4565 output.append(str(ctx.rev()))
4566 4566 taglist = ctx.tags()
4567 4567
4568 4568 if default and not ui.quiet:
4569 4569 b = ctx.branch()
4570 4570 if b != 'default':
4571 4571 output.append("(%s)" % b)
4572 4572
4573 4573 # multiple tags for a single parent separated by '/'
4574 4574 t = '/'.join(taglist)
4575 4575 if t:
4576 4576 output.append(t)
4577 4577
4578 4578 # multiple bookmarks for a single parent separated by '/'
4579 4579 bm = '/'.join(ctx.bookmarks())
4580 4580 if bm:
4581 4581 output.append(bm)
4582 4582 else:
4583 4583 if branch:
4584 4584 output.append(ctx.branch())
4585 4585
4586 4586 if tags:
4587 4587 output.extend(taglist)
4588 4588
4589 4589 if bookmarks:
4590 4590 output.extend(ctx.bookmarks())
4591 4591
4592 4592 ui.write("%s\n" % ' '.join(output))
4593 4593
4594 4594 @command('import|patch',
4595 4595 [('p', 'strip', 1,
4596 4596 _('directory strip option for patch. This has the same '
4597 4597 'meaning as the corresponding patch option'), _('NUM')),
4598 4598 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4599 4599 ('e', 'edit', False, _('invoke editor on commit messages')),
4600 4600 ('f', 'force', None,
4601 4601 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4602 4602 ('', 'no-commit', None,
4603 4603 _("don't commit, just update the working directory")),
4604 4604 ('', 'bypass', None,
4605 4605 _("apply patch without touching the working directory")),
4606 4606 ('', 'partial', None,
4607 4607 _('commit even if some hunks fail')),
4608 4608 ('', 'exact', None,
4609 4609 _('apply patch to the nodes from which it was generated')),
4610 4610 ('', 'prefix', '',
4611 4611 _('apply patch to subdirectory'), _('DIR')),
4612 4612 ('', 'import-branch', None,
4613 4613 _('use any branch information in patch (implied by --exact)'))] +
4614 4614 commitopts + commitopts2 + similarityopts,
4615 4615 _('[OPTION]... PATCH...'))
4616 4616 def import_(ui, repo, patch1=None, *patches, **opts):
4617 4617 """import an ordered set of patches
4618 4618
4619 4619 Import a list of patches and commit them individually (unless
4620 4620 --no-commit is specified).
4621 4621
4622 4622 To read a patch from standard input, use "-" as the patch name. If
4623 4623 a URL is specified, the patch will be downloaded from there.
4624 4624
4625 4625 Import first applies changes to the working directory (unless
4626 4626 --bypass is specified), import will abort if there are outstanding
4627 4627 changes.
4628 4628
4629 4629 Use --bypass to apply and commit patches directly to the
4630 4630 repository, without affecting the working directory. Without
4631 4631 --exact, patches will be applied on top of the working directory
4632 4632 parent revision.
4633 4633
4634 4634 You can import a patch straight from a mail message. Even patches
4635 4635 as attachments work (to use the body part, it must have type
4636 4636 text/plain or text/x-patch). From and Subject headers of email
4637 4637 message are used as default committer and commit message. All
4638 4638 text/plain body parts before first diff are added to the commit
4639 4639 message.
4640 4640
4641 4641 If the imported patch was generated by :hg:`export`, user and
4642 4642 description from patch override values from message headers and
4643 4643 body. Values given on command line with -m/--message and -u/--user
4644 4644 override these.
4645 4645
4646 4646 If --exact is specified, import will set the working directory to
4647 4647 the parent of each patch before applying it, and will abort if the
4648 4648 resulting changeset has a different ID than the one recorded in
4649 4649 the patch. This may happen due to character set problems or other
4650 4650 deficiencies in the text patch format.
4651 4651
4652 4652 Use --partial to ensure a changeset will be created from the patch
4653 4653 even if some hunks fail to apply. Hunks that fail to apply will be
4654 4654 written to a <target-file>.rej file. Conflicts can then be resolved
4655 4655 by hand before :hg:`commit --amend` is run to update the created
4656 4656 changeset. This flag exists to let people import patches that
4657 4657 partially apply without losing the associated metadata (author,
4658 4658 date, description, ...).
4659 4659
4660 4660 .. note::
4661 4661
4662 4662 When no hunks apply cleanly, :hg:`import --partial` will create
4663 4663 an empty changeset, importing only the patch metadata.
4664 4664
4665 4665 With -s/--similarity, hg will attempt to discover renames and
4666 4666 copies in the patch in the same way as :hg:`addremove`.
4667 4667
4668 4668 It is possible to use external patch programs to perform the patch
4669 4669 by setting the ``ui.patch`` configuration option. For the default
4670 4670 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4671 4671 See :hg:`help config` for more information about configuration
4672 4672 files and how to use these options.
4673 4673
4674 4674 See :hg:`help dates` for a list of formats valid for -d/--date.
4675 4675
4676 4676 .. container:: verbose
4677 4677
4678 4678 Examples:
4679 4679
4680 4680 - import a traditional patch from a website and detect renames::
4681 4681
4682 4682 hg import -s 80 http://example.com/bugfix.patch
4683 4683
4684 4684 - import a changeset from an hgweb server::
4685 4685
4686 4686 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4687 4687
4688 4688 - import all the patches in an Unix-style mbox::
4689 4689
4690 4690 hg import incoming-patches.mbox
4691 4691
4692 4692 - attempt to exactly restore an exported changeset (not always
4693 4693 possible)::
4694 4694
4695 4695 hg import --exact proposed-fix.patch
4696 4696
4697 4697 - use an external tool to apply a patch which is too fuzzy for
4698 4698 the default internal tool.
4699 4699
4700 4700 hg import --config ui.patch="patch --merge" fuzzy.patch
4701 4701
4702 4702 - change the default fuzzing from 2 to a less strict 7
4703 4703
4704 4704 hg import --config ui.fuzz=7 fuzz.patch
4705 4705
4706 4706 Returns 0 on success, 1 on partial success (see --partial).
4707 4707 """
4708 4708
4709 4709 if not patch1:
4710 4710 raise error.Abort(_('need at least one patch to import'))
4711 4711
4712 4712 patches = (patch1,) + patches
4713 4713
4714 4714 date = opts.get('date')
4715 4715 if date:
4716 4716 opts['date'] = util.parsedate(date)
4717 4717
4718 4718 exact = opts.get('exact')
4719 4719 update = not opts.get('bypass')
4720 4720 if not update and opts.get('no_commit'):
4721 4721 raise error.Abort(_('cannot use --no-commit with --bypass'))
4722 4722 try:
4723 4723 sim = float(opts.get('similarity') or 0)
4724 4724 except ValueError:
4725 4725 raise error.Abort(_('similarity must be a number'))
4726 4726 if sim < 0 or sim > 100:
4727 4727 raise error.Abort(_('similarity must be between 0 and 100'))
4728 4728 if sim and not update:
4729 4729 raise error.Abort(_('cannot use --similarity with --bypass'))
4730 4730 if exact:
4731 4731 if opts.get('edit'):
4732 4732 raise error.Abort(_('cannot use --exact with --edit'))
4733 4733 if opts.get('prefix'):
4734 4734 raise error.Abort(_('cannot use --exact with --prefix'))
4735 4735
4736 4736 base = opts["base"]
4737 4737 wlock = dsguard = lock = tr = None
4738 4738 msgs = []
4739 4739 ret = 0
4740 4740
4741 4741
4742 4742 try:
4743 4743 wlock = repo.wlock()
4744 4744
4745 4745 if update:
4746 4746 cmdutil.checkunfinished(repo)
4747 4747 if (exact or not opts.get('force')):
4748 4748 cmdutil.bailifchanged(repo)
4749 4749
4750 4750 if not opts.get('no_commit'):
4751 4751 lock = repo.lock()
4752 4752 tr = repo.transaction('import')
4753 4753 else:
4754 4754 dsguard = cmdutil.dirstateguard(repo, 'import')
4755 4755 parents = repo[None].parents()
4756 4756 for patchurl in patches:
4757 4757 if patchurl == '-':
4758 4758 ui.status(_('applying patch from stdin\n'))
4759 4759 patchfile = ui.fin
4760 4760 patchurl = 'stdin' # for error message
4761 4761 else:
4762 4762 patchurl = os.path.join(base, patchurl)
4763 4763 ui.status(_('applying %s\n') % patchurl)
4764 4764 patchfile = hg.openpath(ui, patchurl)
4765 4765
4766 4766 haspatch = False
4767 4767 for hunk in patch.split(patchfile):
4768 4768 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4769 4769 parents, opts,
4770 4770 msgs, hg.clean)
4771 4771 if msg:
4772 4772 haspatch = True
4773 4773 ui.note(msg + '\n')
4774 4774 if update or exact:
4775 4775 parents = repo[None].parents()
4776 4776 else:
4777 4777 parents = [repo[node]]
4778 4778 if rej:
4779 4779 ui.write_err(_("patch applied partially\n"))
4780 4780 ui.write_err(_("(fix the .rej files and run "
4781 4781 "`hg commit --amend`)\n"))
4782 4782 ret = 1
4783 4783 break
4784 4784
4785 4785 if not haspatch:
4786 4786 raise error.Abort(_('%s: no diffs found') % patchurl)
4787 4787
4788 4788 if tr:
4789 4789 tr.close()
4790 4790 if msgs:
4791 4791 repo.savecommitmessage('\n* * *\n'.join(msgs))
4792 4792 if dsguard:
4793 4793 dsguard.close()
4794 4794 return ret
4795 4795 finally:
4796 4796 if tr:
4797 4797 tr.release()
4798 4798 release(lock, dsguard, wlock)
4799 4799
4800 4800 @command('incoming|in',
4801 4801 [('f', 'force', None,
4802 4802 _('run even if remote repository is unrelated')),
4803 4803 ('n', 'newest-first', None, _('show newest record first')),
4804 4804 ('', 'bundle', '',
4805 4805 _('file to store the bundles into'), _('FILE')),
4806 4806 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4807 4807 ('B', 'bookmarks', False, _("compare bookmarks")),
4808 4808 ('b', 'branch', [],
4809 4809 _('a specific branch you would like to pull'), _('BRANCH')),
4810 4810 ] + logopts + remoteopts + subrepoopts,
4811 4811 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4812 4812 def incoming(ui, repo, source="default", **opts):
4813 4813 """show new changesets found in source
4814 4814
4815 4815 Show new changesets found in the specified path/URL or the default
4816 4816 pull location. These are the changesets that would have been pulled
4817 4817 if a pull at the time you issued this command.
4818 4818
4819 4819 See pull for valid source format details.
4820 4820
4821 4821 .. container:: verbose
4822 4822
4823 4823 With -B/--bookmarks, the result of bookmark comparison between
4824 4824 local and remote repositories is displayed. With -v/--verbose,
4825 4825 status is also displayed for each bookmark like below::
4826 4826
4827 4827 BM1 01234567890a added
4828 4828 BM2 1234567890ab advanced
4829 4829 BM3 234567890abc diverged
4830 4830 BM4 34567890abcd changed
4831 4831
4832 4832 The action taken locally when pulling depends on the
4833 4833 status of each bookmark:
4834 4834
4835 4835 :``added``: pull will create it
4836 4836 :``advanced``: pull will update it
4837 4837 :``diverged``: pull will create a divergent bookmark
4838 4838 :``changed``: result depends on remote changesets
4839 4839
4840 4840 From the point of view of pulling behavior, bookmark
4841 4841 existing only in the remote repository are treated as ``added``,
4842 4842 even if it is in fact locally deleted.
4843 4843
4844 4844 .. container:: verbose
4845 4845
4846 4846 For remote repository, using --bundle avoids downloading the
4847 4847 changesets twice if the incoming is followed by a pull.
4848 4848
4849 4849 Examples:
4850 4850
4851 4851 - show incoming changes with patches and full description::
4852 4852
4853 4853 hg incoming -vp
4854 4854
4855 4855 - show incoming changes excluding merges, store a bundle::
4856 4856
4857 4857 hg in -vpM --bundle incoming.hg
4858 4858 hg pull incoming.hg
4859 4859
4860 4860 - briefly list changes inside a bundle::
4861 4861
4862 4862 hg in changes.hg -T "{desc|firstline}\\n"
4863 4863
4864 4864 Returns 0 if there are incoming changes, 1 otherwise.
4865 4865 """
4866 4866 if opts.get('graph'):
4867 4867 cmdutil.checkunsupportedgraphflags([], opts)
4868 4868 def display(other, chlist, displayer):
4869 4869 revdag = cmdutil.graphrevs(other, chlist, opts)
4870 4870 cmdutil.displaygraph(ui, repo, revdag, displayer,
4871 4871 graphmod.asciiedges)
4872 4872
4873 4873 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4874 4874 return 0
4875 4875
4876 4876 if opts.get('bundle') and opts.get('subrepos'):
4877 4877 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4878 4878
4879 4879 if opts.get('bookmarks'):
4880 4880 source, branches = hg.parseurl(ui.expandpath(source),
4881 4881 opts.get('branch'))
4882 4882 other = hg.peer(repo, opts, source)
4883 4883 if 'bookmarks' not in other.listkeys('namespaces'):
4884 4884 ui.warn(_("remote doesn't support bookmarks\n"))
4885 4885 return 0
4886 4886 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4887 4887 return bookmarks.incoming(ui, repo, other)
4888 4888
4889 4889 repo._subtoppath = ui.expandpath(source)
4890 4890 try:
4891 4891 return hg.incoming(ui, repo, source, opts)
4892 4892 finally:
4893 4893 del repo._subtoppath
4894 4894
4895 4895
4896 4896 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4897 4897 norepo=True)
4898 4898 def init(ui, dest=".", **opts):
4899 4899 """create a new repository in the given directory
4900 4900
4901 4901 Initialize a new repository in the given directory. If the given
4902 4902 directory does not exist, it will be created.
4903 4903
4904 4904 If no directory is given, the current directory is used.
4905 4905
4906 4906 It is possible to specify an ``ssh://`` URL as the destination.
4907 4907 See :hg:`help urls` for more information.
4908 4908
4909 4909 Returns 0 on success.
4910 4910 """
4911 4911 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4912 4912
4913 4913 @command('locate',
4914 4914 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4915 4915 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4916 4916 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4917 4917 ] + walkopts,
4918 4918 _('[OPTION]... [PATTERN]...'))
4919 4919 def locate(ui, repo, *pats, **opts):
4920 4920 """locate files matching specific patterns (DEPRECATED)
4921 4921
4922 4922 Print files under Mercurial control in the working directory whose
4923 4923 names match the given patterns.
4924 4924
4925 4925 By default, this command searches all directories in the working
4926 4926 directory. To search just the current directory and its
4927 4927 subdirectories, use "--include .".
4928 4928
4929 4929 If no patterns are given to match, this command prints the names
4930 4930 of all files under Mercurial control in the working directory.
4931 4931
4932 4932 If you want to feed the output of this command into the "xargs"
4933 4933 command, use the -0 option to both this command and "xargs". This
4934 4934 will avoid the problem of "xargs" treating single filenames that
4935 4935 contain whitespace as multiple filenames.
4936 4936
4937 4937 See :hg:`help files` for a more versatile command.
4938 4938
4939 4939 Returns 0 if a match is found, 1 otherwise.
4940 4940 """
4941 4941 if opts.get('print0'):
4942 4942 end = '\0'
4943 4943 else:
4944 4944 end = '\n'
4945 4945 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4946 4946
4947 4947 ret = 1
4948 4948 ctx = repo[rev]
4949 4949 m = scmutil.match(ctx, pats, opts, default='relglob',
4950 4950 badfn=lambda x, y: False)
4951 4951
4952 4952 for abs in ctx.matches(m):
4953 4953 if opts.get('fullpath'):
4954 4954 ui.write(repo.wjoin(abs), end)
4955 4955 else:
4956 4956 ui.write(((pats and m.rel(abs)) or abs), end)
4957 4957 ret = 0
4958 4958
4959 4959 return ret
4960 4960
4961 4961 @command('^log|history',
4962 4962 [('f', 'follow', None,
4963 4963 _('follow changeset history, or file history across copies and renames')),
4964 4964 ('', 'follow-first', None,
4965 4965 _('only follow the first parent of merge changesets (DEPRECATED)')),
4966 4966 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4967 4967 ('C', 'copies', None, _('show copied files')),
4968 4968 ('k', 'keyword', [],
4969 4969 _('do case-insensitive search for a given text'), _('TEXT')),
4970 4970 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4971 4971 ('', 'removed', None, _('include revisions where files were removed')),
4972 4972 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4973 4973 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4974 4974 ('', 'only-branch', [],
4975 4975 _('show only changesets within the given named branch (DEPRECATED)'),
4976 4976 _('BRANCH')),
4977 4977 ('b', 'branch', [],
4978 4978 _('show changesets within the given named branch'), _('BRANCH')),
4979 4979 ('P', 'prune', [],
4980 4980 _('do not display revision or any of its ancestors'), _('REV')),
4981 4981 ] + logopts + walkopts,
4982 4982 _('[OPTION]... [FILE]'),
4983 4983 inferrepo=True)
4984 4984 def log(ui, repo, *pats, **opts):
4985 4985 """show revision history of entire repository or files
4986 4986
4987 4987 Print the revision history of the specified files or the entire
4988 4988 project.
4989 4989
4990 4990 If no revision range is specified, the default is ``tip:0`` unless
4991 4991 --follow is set, in which case the working directory parent is
4992 4992 used as the starting revision.
4993 4993
4994 4994 File history is shown without following rename or copy history of
4995 4995 files. Use -f/--follow with a filename to follow history across
4996 4996 renames and copies. --follow without a filename will only show
4997 4997 ancestors or descendants of the starting revision.
4998 4998
4999 4999 By default this command prints revision number and changeset id,
5000 5000 tags, non-trivial parents, user, date and time, and a summary for
5001 5001 each commit. When the -v/--verbose switch is used, the list of
5002 5002 changed files and full commit message are shown.
5003 5003
5004 5004 With --graph the revisions are shown as an ASCII art DAG with the most
5005 5005 recent changeset at the top.
5006 5006 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5007 5007 and '+' represents a fork where the changeset from the lines below is a
5008 5008 parent of the 'o' merge on the same line.
5009 5009
5010 5010 .. note::
5011 5011
5012 5012 :hg:`log --patch` may generate unexpected diff output for merge
5013 5013 changesets, as it will only compare the merge changeset against
5014 5014 its first parent. Also, only files different from BOTH parents
5015 5015 will appear in files:.
5016 5016
5017 5017 .. note::
5018 5018
5019 5019 For performance reasons, :hg:`log FILE` may omit duplicate changes
5020 5020 made on branches and will not show removals or mode changes. To
5021 5021 see all such changes, use the --removed switch.
5022 5022
5023 5023 .. container:: verbose
5024 5024
5025 5025 Some examples:
5026 5026
5027 5027 - changesets with full descriptions and file lists::
5028 5028
5029 5029 hg log -v
5030 5030
5031 5031 - changesets ancestral to the working directory::
5032 5032
5033 5033 hg log -f
5034 5034
5035 5035 - last 10 commits on the current branch::
5036 5036
5037 5037 hg log -l 10 -b .
5038 5038
5039 5039 - changesets showing all modifications of a file, including removals::
5040 5040
5041 5041 hg log --removed file.c
5042 5042
5043 5043 - all changesets that touch a directory, with diffs, excluding merges::
5044 5044
5045 5045 hg log -Mp lib/
5046 5046
5047 5047 - all revision numbers that match a keyword::
5048 5048
5049 5049 hg log -k bug --template "{rev}\\n"
5050 5050
5051 5051 - the full hash identifier of the working directory parent::
5052 5052
5053 5053 hg log -r . --template "{node}\\n"
5054 5054
5055 5055 - list available log templates::
5056 5056
5057 5057 hg log -T list
5058 5058
5059 5059 - check if a given changeset is included in a tagged release::
5060 5060
5061 5061 hg log -r "a21ccf and ancestor(1.9)"
5062 5062
5063 5063 - find all changesets by some user in a date range::
5064 5064
5065 5065 hg log -k alice -d "may 2008 to jul 2008"
5066 5066
5067 5067 - summary of all changesets after the last tag::
5068 5068
5069 5069 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5070 5070
5071 5071 See :hg:`help dates` for a list of formats valid for -d/--date.
5072 5072
5073 5073 See :hg:`help revisions` and :hg:`help revsets` for more about
5074 5074 specifying and ordering revisions.
5075 5075
5076 5076 See :hg:`help templates` for more about pre-packaged styles and
5077 5077 specifying custom templates.
5078 5078
5079 5079 Returns 0 on success.
5080 5080
5081 5081 """
5082 5082 if opts.get('follow') and opts.get('rev'):
5083 5083 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5084 5084 del opts['follow']
5085 5085
5086 5086 if opts.get('graph'):
5087 5087 return cmdutil.graphlog(ui, repo, *pats, **opts)
5088 5088
5089 5089 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5090 5090 limit = cmdutil.loglimit(opts)
5091 5091 count = 0
5092 5092
5093 5093 getrenamed = None
5094 5094 if opts.get('copies'):
5095 5095 endrev = None
5096 5096 if opts.get('rev'):
5097 5097 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5098 5098 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5099 5099
5100 5100 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5101 5101 for rev in revs:
5102 5102 if count == limit:
5103 5103 break
5104 5104 ctx = repo[rev]
5105 5105 copies = None
5106 5106 if getrenamed is not None and rev:
5107 5107 copies = []
5108 5108 for fn in ctx.files():
5109 5109 rename = getrenamed(fn, rev)
5110 5110 if rename:
5111 5111 copies.append((fn, rename[0]))
5112 5112 if filematcher:
5113 5113 revmatchfn = filematcher(ctx.rev())
5114 5114 else:
5115 5115 revmatchfn = None
5116 5116 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5117 5117 if displayer.flush(ctx):
5118 5118 count += 1
5119 5119
5120 5120 displayer.close()
5121 5121
5122 5122 @command('manifest',
5123 5123 [('r', 'rev', '', _('revision to display'), _('REV')),
5124 5124 ('', 'all', False, _("list files from all revisions"))]
5125 5125 + formatteropts,
5126 5126 _('[-r REV]'))
5127 5127 def manifest(ui, repo, node=None, rev=None, **opts):
5128 5128 """output the current or given revision of the project manifest
5129 5129
5130 5130 Print a list of version controlled files for the given revision.
5131 5131 If no revision is given, the first parent of the working directory
5132 5132 is used, or the null revision if no revision is checked out.
5133 5133
5134 5134 With -v, print file permissions, symlink and executable bits.
5135 5135 With --debug, print file revision hashes.
5136 5136
5137 5137 If option --all is specified, the list of all files from all revisions
5138 5138 is printed. This includes deleted and renamed files.
5139 5139
5140 5140 Returns 0 on success.
5141 5141 """
5142 5142
5143 5143 fm = ui.formatter('manifest', opts)
5144 5144
5145 5145 if opts.get('all'):
5146 5146 if rev or node:
5147 5147 raise error.Abort(_("can't specify a revision with --all"))
5148 5148
5149 5149 res = []
5150 5150 prefix = "data/"
5151 5151 suffix = ".i"
5152 5152 plen = len(prefix)
5153 5153 slen = len(suffix)
5154 5154 with repo.lock():
5155 5155 for fn, b, size in repo.store.datafiles():
5156 5156 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5157 5157 res.append(fn[plen:-slen])
5158 5158 for f in res:
5159 5159 fm.startitem()
5160 5160 fm.write("path", '%s\n', f)
5161 5161 fm.end()
5162 5162 return
5163 5163
5164 5164 if rev and node:
5165 5165 raise error.Abort(_("please specify just one revision"))
5166 5166
5167 5167 if not node:
5168 5168 node = rev
5169 5169
5170 5170 char = {'l': '@', 'x': '*', '': ''}
5171 5171 mode = {'l': '644', 'x': '755', '': '644'}
5172 5172 ctx = scmutil.revsingle(repo, node)
5173 5173 mf = ctx.manifest()
5174 5174 for f in ctx:
5175 5175 fm.startitem()
5176 5176 fl = ctx[f].flags()
5177 5177 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5178 5178 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5179 5179 fm.write('path', '%s\n', f)
5180 5180 fm.end()
5181 5181
5182 5182 @command('^merge',
5183 5183 [('f', 'force', None,
5184 5184 _('force a merge including outstanding changes (DEPRECATED)')),
5185 5185 ('r', 'rev', '', _('revision to merge'), _('REV')),
5186 5186 ('P', 'preview', None,
5187 5187 _('review revisions to merge (no merge is performed)'))
5188 5188 ] + mergetoolopts,
5189 5189 _('[-P] [-f] [[-r] REV]'))
5190 5190 def merge(ui, repo, node=None, **opts):
5191 5191 """merge another revision into working directory
5192 5192
5193 5193 The current working directory is updated with all changes made in
5194 5194 the requested revision since the last common predecessor revision.
5195 5195
5196 5196 Files that changed between either parent are marked as changed for
5197 5197 the next commit and a commit must be performed before any further
5198 5198 updates to the repository are allowed. The next commit will have
5199 5199 two parents.
5200 5200
5201 5201 ``--tool`` can be used to specify the merge tool used for file
5202 5202 merges. It overrides the HGMERGE environment variable and your
5203 5203 configuration files. See :hg:`help merge-tools` for options.
5204 5204
5205 5205 If no revision is specified, the working directory's parent is a
5206 5206 head revision, and the current branch contains exactly one other
5207 5207 head, the other head is merged with by default. Otherwise, an
5208 5208 explicit revision with which to merge with must be provided.
5209 5209
5210 5210 See :hg:`help resolve` for information on handling file conflicts.
5211 5211
5212 5212 To undo an uncommitted merge, use :hg:`update --clean .` which
5213 5213 will check out a clean copy of the original merge parent, losing
5214 5214 all changes.
5215 5215
5216 5216 Returns 0 on success, 1 if there are unresolved files.
5217 5217 """
5218 5218
5219 5219 if opts.get('rev') and node:
5220 5220 raise error.Abort(_("please specify just one revision"))
5221 5221 if not node:
5222 5222 node = opts.get('rev')
5223 5223
5224 5224 if node:
5225 5225 node = scmutil.revsingle(repo, node).node()
5226 5226
5227 5227 if not node:
5228 5228 node = repo[destutil.destmerge(repo)].node()
5229 5229
5230 5230 if opts.get('preview'):
5231 5231 # find nodes that are ancestors of p2 but not of p1
5232 5232 p1 = repo.lookup('.')
5233 5233 p2 = repo.lookup(node)
5234 5234 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5235 5235
5236 5236 displayer = cmdutil.show_changeset(ui, repo, opts)
5237 5237 for node in nodes:
5238 5238 displayer.show(repo[node])
5239 5239 displayer.close()
5240 5240 return 0
5241 5241
5242 5242 try:
5243 5243 # ui.forcemerge is an internal variable, do not document
5244 5244 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5245 5245 force = opts.get('force')
5246 5246 return hg.merge(repo, node, force=force, mergeforce=force)
5247 5247 finally:
5248 5248 ui.setconfig('ui', 'forcemerge', '', 'merge')
5249 5249
5250 5250 @command('outgoing|out',
5251 5251 [('f', 'force', None, _('run even when the destination is unrelated')),
5252 5252 ('r', 'rev', [],
5253 5253 _('a changeset intended to be included in the destination'), _('REV')),
5254 5254 ('n', 'newest-first', None, _('show newest record first')),
5255 5255 ('B', 'bookmarks', False, _('compare bookmarks')),
5256 5256 ('b', 'branch', [], _('a specific branch you would like to push'),
5257 5257 _('BRANCH')),
5258 5258 ] + logopts + remoteopts + subrepoopts,
5259 5259 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5260 5260 def outgoing(ui, repo, dest=None, **opts):
5261 5261 """show changesets not found in the destination
5262 5262
5263 5263 Show changesets not found in the specified destination repository
5264 5264 or the default push location. These are the changesets that would
5265 5265 be pushed if a push was requested.
5266 5266
5267 5267 See pull for details of valid destination formats.
5268 5268
5269 5269 .. container:: verbose
5270 5270
5271 5271 With -B/--bookmarks, the result of bookmark comparison between
5272 5272 local and remote repositories is displayed. With -v/--verbose,
5273 5273 status is also displayed for each bookmark like below::
5274 5274
5275 5275 BM1 01234567890a added
5276 5276 BM2 deleted
5277 5277 BM3 234567890abc advanced
5278 5278 BM4 34567890abcd diverged
5279 5279 BM5 4567890abcde changed
5280 5280
5281 5281 The action taken when pushing depends on the
5282 5282 status of each bookmark:
5283 5283
5284 5284 :``added``: push with ``-B`` will create it
5285 5285 :``deleted``: push with ``-B`` will delete it
5286 5286 :``advanced``: push will update it
5287 5287 :``diverged``: push with ``-B`` will update it
5288 5288 :``changed``: push with ``-B`` will update it
5289 5289
5290 5290 From the point of view of pushing behavior, bookmarks
5291 5291 existing only in the remote repository are treated as
5292 5292 ``deleted``, even if it is in fact added remotely.
5293 5293
5294 5294 Returns 0 if there are outgoing changes, 1 otherwise.
5295 5295 """
5296 5296 if opts.get('graph'):
5297 5297 cmdutil.checkunsupportedgraphflags([], opts)
5298 5298 o, other = hg._outgoing(ui, repo, dest, opts)
5299 5299 if not o:
5300 5300 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5301 5301 return
5302 5302
5303 5303 revdag = cmdutil.graphrevs(repo, o, opts)
5304 5304 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5305 5305 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5306 5306 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5307 5307 return 0
5308 5308
5309 5309 if opts.get('bookmarks'):
5310 5310 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5311 5311 dest, branches = hg.parseurl(dest, opts.get('branch'))
5312 5312 other = hg.peer(repo, opts, dest)
5313 5313 if 'bookmarks' not in other.listkeys('namespaces'):
5314 5314 ui.warn(_("remote doesn't support bookmarks\n"))
5315 5315 return 0
5316 5316 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5317 5317 return bookmarks.outgoing(ui, repo, other)
5318 5318
5319 5319 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5320 5320 try:
5321 5321 return hg.outgoing(ui, repo, dest, opts)
5322 5322 finally:
5323 5323 del repo._subtoppath
5324 5324
5325 5325 @command('parents',
5326 5326 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5327 5327 ] + templateopts,
5328 5328 _('[-r REV] [FILE]'),
5329 5329 inferrepo=True)
5330 5330 def parents(ui, repo, file_=None, **opts):
5331 5331 """show the parents of the working directory or revision (DEPRECATED)
5332 5332
5333 5333 Print the working directory's parent revisions. If a revision is
5334 5334 given via -r/--rev, the parent of that revision will be printed.
5335 5335 If a file argument is given, the revision in which the file was
5336 5336 last changed (before the working directory revision or the
5337 5337 argument to --rev if given) is printed.
5338 5338
5339 5339 This command is equivalent to::
5340 5340
5341 5341 hg log -r "p1()+p2()" or
5342 5342 hg log -r "p1(REV)+p2(REV)" or
5343 5343 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5344 5344 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5345 5345
5346 5346 See :hg:`summary` and :hg:`help revsets` for related information.
5347 5347
5348 5348 Returns 0 on success.
5349 5349 """
5350 5350
5351 5351 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5352 5352
5353 5353 if file_:
5354 5354 m = scmutil.match(ctx, (file_,), opts)
5355 5355 if m.anypats() or len(m.files()) != 1:
5356 5356 raise error.Abort(_('can only specify an explicit filename'))
5357 5357 file_ = m.files()[0]
5358 5358 filenodes = []
5359 5359 for cp in ctx.parents():
5360 5360 if not cp:
5361 5361 continue
5362 5362 try:
5363 5363 filenodes.append(cp.filenode(file_))
5364 5364 except error.LookupError:
5365 5365 pass
5366 5366 if not filenodes:
5367 5367 raise error.Abort(_("'%s' not found in manifest!") % file_)
5368 5368 p = []
5369 5369 for fn in filenodes:
5370 5370 fctx = repo.filectx(file_, fileid=fn)
5371 5371 p.append(fctx.node())
5372 5372 else:
5373 5373 p = [cp.node() for cp in ctx.parents()]
5374 5374
5375 5375 displayer = cmdutil.show_changeset(ui, repo, opts)
5376 5376 for n in p:
5377 5377 if n != nullid:
5378 5378 displayer.show(repo[n])
5379 5379 displayer.close()
5380 5380
5381 5381 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5382 5382 def paths(ui, repo, search=None, **opts):
5383 5383 """show aliases for remote repositories
5384 5384
5385 5385 Show definition of symbolic path name NAME. If no name is given,
5386 5386 show definition of all available names.
5387 5387
5388 5388 Option -q/--quiet suppresses all output when searching for NAME
5389 5389 and shows only the path names when listing all definitions.
5390 5390
5391 5391 Path names are defined in the [paths] section of your
5392 5392 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5393 5393 repository, ``.hg/hgrc`` is used, too.
5394 5394
5395 5395 The path names ``default`` and ``default-push`` have a special
5396 5396 meaning. When performing a push or pull operation, they are used
5397 5397 as fallbacks if no location is specified on the command-line.
5398 5398 When ``default-push`` is set, it will be used for push and
5399 5399 ``default`` will be used for pull; otherwise ``default`` is used
5400 5400 as the fallback for both. When cloning a repository, the clone
5401 5401 source is written as ``default`` in ``.hg/hgrc``.
5402 5402
5403 5403 .. note::
5404 5404
5405 5405 ``default`` and ``default-push`` apply to all inbound (e.g.
5406 5406 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5407 5407 and :hg:`bundle`) operations.
5408 5408
5409 5409 See :hg:`help urls` for more information.
5410 5410
5411 5411 Returns 0 on success.
5412 5412 """
5413 5413 if search:
5414 5414 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5415 5415 if name == search]
5416 5416 else:
5417 5417 pathitems = sorted(ui.paths.iteritems())
5418 5418
5419 5419 fm = ui.formatter('paths', opts)
5420 5420 if fm:
5421 5421 hidepassword = str
5422 5422 else:
5423 5423 hidepassword = util.hidepassword
5424 5424 if ui.quiet:
5425 5425 namefmt = '%s\n'
5426 5426 else:
5427 5427 namefmt = '%s = '
5428 5428 showsubopts = not search and not ui.quiet
5429 5429
5430 5430 for name, path in pathitems:
5431 5431 fm.startitem()
5432 5432 fm.condwrite(not search, 'name', namefmt, name)
5433 5433 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5434 5434 for subopt, value in sorted(path.suboptions.items()):
5435 5435 assert subopt not in ('name', 'url')
5436 5436 if showsubopts:
5437 5437 fm.plain('%s:%s = ' % (name, subopt))
5438 5438 fm.condwrite(showsubopts, subopt, '%s\n', value)
5439 5439
5440 5440 fm.end()
5441 5441
5442 5442 if search and not pathitems:
5443 5443 if not ui.quiet:
5444 5444 ui.warn(_("not found!\n"))
5445 5445 return 1
5446 5446 else:
5447 5447 return 0
5448 5448
5449 5449 @command('phase',
5450 5450 [('p', 'public', False, _('set changeset phase to public')),
5451 5451 ('d', 'draft', False, _('set changeset phase to draft')),
5452 5452 ('s', 'secret', False, _('set changeset phase to secret')),
5453 5453 ('f', 'force', False, _('allow to move boundary backward')),
5454 5454 ('r', 'rev', [], _('target revision'), _('REV')),
5455 5455 ],
5456 5456 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5457 5457 def phase(ui, repo, *revs, **opts):
5458 5458 """set or show the current phase name
5459 5459
5460 5460 With no argument, show the phase name of the current revision(s).
5461 5461
5462 5462 With one of -p/--public, -d/--draft or -s/--secret, change the
5463 5463 phase value of the specified revisions.
5464 5464
5465 5465 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5466 5466 lower phase to an higher phase. Phases are ordered as follows::
5467 5467
5468 5468 public < draft < secret
5469 5469
5470 5470 Returns 0 on success, 1 if some phases could not be changed.
5471 5471
5472 5472 (For more information about the phases concept, see :hg:`help phases`.)
5473 5473 """
5474 5474 # search for a unique phase argument
5475 5475 targetphase = None
5476 5476 for idx, name in enumerate(phases.phasenames):
5477 5477 if opts[name]:
5478 5478 if targetphase is not None:
5479 5479 raise error.Abort(_('only one phase can be specified'))
5480 5480 targetphase = idx
5481 5481
5482 5482 # look for specified revision
5483 5483 revs = list(revs)
5484 5484 revs.extend(opts['rev'])
5485 5485 if not revs:
5486 5486 # display both parents as the second parent phase can influence
5487 5487 # the phase of a merge commit
5488 5488 revs = [c.rev() for c in repo[None].parents()]
5489 5489
5490 5490 revs = scmutil.revrange(repo, revs)
5491 5491
5492 5492 lock = None
5493 5493 ret = 0
5494 5494 if targetphase is None:
5495 5495 # display
5496 5496 for r in revs:
5497 5497 ctx = repo[r]
5498 5498 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5499 5499 else:
5500 5500 tr = None
5501 5501 lock = repo.lock()
5502 5502 try:
5503 5503 tr = repo.transaction("phase")
5504 5504 # set phase
5505 5505 if not revs:
5506 5506 raise error.Abort(_('empty revision set'))
5507 5507 nodes = [repo[r].node() for r in revs]
5508 5508 # moving revision from public to draft may hide them
5509 5509 # We have to check result on an unfiltered repository
5510 5510 unfi = repo.unfiltered()
5511 5511 getphase = unfi._phasecache.phase
5512 5512 olddata = [getphase(unfi, r) for r in unfi]
5513 5513 phases.advanceboundary(repo, tr, targetphase, nodes)
5514 5514 if opts['force']:
5515 5515 phases.retractboundary(repo, tr, targetphase, nodes)
5516 5516 tr.close()
5517 5517 finally:
5518 5518 if tr is not None:
5519 5519 tr.release()
5520 5520 lock.release()
5521 5521 getphase = unfi._phasecache.phase
5522 5522 newdata = [getphase(unfi, r) for r in unfi]
5523 5523 changes = sum(newdata[r] != olddata[r] for r in unfi)
5524 5524 cl = unfi.changelog
5525 5525 rejected = [n for n in nodes
5526 5526 if newdata[cl.rev(n)] < targetphase]
5527 5527 if rejected:
5528 5528 ui.warn(_('cannot move %i changesets to a higher '
5529 5529 'phase, use --force\n') % len(rejected))
5530 5530 ret = 1
5531 5531 if changes:
5532 5532 msg = _('phase changed for %i changesets\n') % changes
5533 5533 if ret:
5534 5534 ui.status(msg)
5535 5535 else:
5536 5536 ui.note(msg)
5537 5537 else:
5538 5538 ui.warn(_('no phases changed\n'))
5539 5539 return ret
5540 5540
5541 5541 def postincoming(ui, repo, modheads, optupdate, checkout):
5542 5542 if modheads == 0:
5543 5543 return
5544 5544 if optupdate:
5545 5545 warndest = False
5546 5546 try:
5547 5547 brev = checkout
5548 5548 movemarkfrom = None
5549 5549 if not checkout:
5550 5550 warndest = True
5551 5551 updata = destutil.destupdate(repo)
5552 5552 checkout, movemarkfrom, brev = updata
5553 5553 ret = hg.update(repo, checkout)
5554 5554 if warndest:
5555 5555 destutil.statusotherdests(ui, repo)
5556 5556 except error.UpdateAbort as inst:
5557 5557 msg = _("not updating: %s") % str(inst)
5558 5558 hint = inst.hint
5559 5559 raise error.UpdateAbort(msg, hint=hint)
5560 5560 if not ret and movemarkfrom:
5561 5561 if movemarkfrom == repo['.'].node():
5562 5562 pass # no-op update
5563 5563 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5564 5564 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5565 5565 return ret
5566 5566 if modheads > 1:
5567 5567 currentbranchheads = len(repo.branchheads())
5568 5568 if currentbranchheads == modheads:
5569 5569 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5570 5570 elif currentbranchheads > 1:
5571 5571 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5572 5572 "merge)\n"))
5573 5573 else:
5574 5574 ui.status(_("(run 'hg heads' to see heads)\n"))
5575 5575 else:
5576 5576 ui.status(_("(run 'hg update' to get a working copy)\n"))
5577 5577
5578 5578 @command('^pull',
5579 5579 [('u', 'update', None,
5580 5580 _('update to new branch head if changesets were pulled')),
5581 5581 ('f', 'force', None, _('run even when remote repository is unrelated')),
5582 5582 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5583 5583 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5584 5584 ('b', 'branch', [], _('a specific branch you would like to pull'),
5585 5585 _('BRANCH')),
5586 5586 ] + remoteopts,
5587 5587 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5588 5588 def pull(ui, repo, source="default", **opts):
5589 5589 """pull changes from the specified source
5590 5590
5591 5591 Pull changes from a remote repository to a local one.
5592 5592
5593 5593 This finds all changes from the repository at the specified path
5594 5594 or URL and adds them to a local repository (the current one unless
5595 5595 -R is specified). By default, this does not update the copy of the
5596 5596 project in the working directory.
5597 5597
5598 5598 Use :hg:`incoming` if you want to see what would have been added
5599 5599 by a pull at the time you issued this command. If you then decide
5600 5600 to add those changes to the repository, you should use :hg:`pull
5601 5601 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5602 5602
5603 5603 If SOURCE is omitted, the 'default' path will be used.
5604 5604 See :hg:`help urls` for more information.
5605 5605
5606 5606 Returns 0 on success, 1 if an update had unresolved files.
5607 5607 """
5608 5608 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5609 5609 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5610 5610 other = hg.peer(repo, opts, source)
5611 5611 try:
5612 5612 revs, checkout = hg.addbranchrevs(repo, other, branches,
5613 5613 opts.get('rev'))
5614 5614
5615 5615
5616 5616 pullopargs = {}
5617 5617 if opts.get('bookmark'):
5618 5618 if not revs:
5619 5619 revs = []
5620 5620 # The list of bookmark used here is not the one used to actually
5621 5621 # update the bookmark name. This can result in the revision pulled
5622 5622 # not ending up with the name of the bookmark because of a race
5623 5623 # condition on the server. (See issue 4689 for details)
5624 5624 remotebookmarks = other.listkeys('bookmarks')
5625 5625 pullopargs['remotebookmarks'] = remotebookmarks
5626 5626 for b in opts['bookmark']:
5627 5627 if b not in remotebookmarks:
5628 5628 raise error.Abort(_('remote bookmark %s not found!') % b)
5629 5629 revs.append(remotebookmarks[b])
5630 5630
5631 5631 if revs:
5632 5632 try:
5633 5633 # When 'rev' is a bookmark name, we cannot guarantee that it
5634 5634 # will be updated with that name because of a race condition
5635 5635 # server side. (See issue 4689 for details)
5636 5636 oldrevs = revs
5637 5637 revs = [] # actually, nodes
5638 5638 for r in oldrevs:
5639 5639 node = other.lookup(r)
5640 5640 revs.append(node)
5641 5641 if r == checkout:
5642 5642 checkout = node
5643 5643 except error.CapabilityError:
5644 5644 err = _("other repository doesn't support revision lookup, "
5645 5645 "so a rev cannot be specified.")
5646 5646 raise error.Abort(err)
5647 5647
5648 5648 pullopargs.update(opts.get('opargs', {}))
5649 5649 modheads = exchange.pull(repo, other, heads=revs,
5650 5650 force=opts.get('force'),
5651 5651 bookmarks=opts.get('bookmark', ()),
5652 5652 opargs=pullopargs).cgresult
5653 5653 if checkout:
5654 5654 checkout = str(repo.changelog.rev(checkout))
5655 5655 repo._subtoppath = source
5656 5656 try:
5657 5657 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5658 5658
5659 5659 finally:
5660 5660 del repo._subtoppath
5661 5661
5662 5662 finally:
5663 5663 other.close()
5664 5664 return ret
5665 5665
5666 5666 @command('^push',
5667 5667 [('f', 'force', None, _('force push')),
5668 5668 ('r', 'rev', [],
5669 5669 _('a changeset intended to be included in the destination'),
5670 5670 _('REV')),
5671 5671 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5672 5672 ('b', 'branch', [],
5673 5673 _('a specific branch you would like to push'), _('BRANCH')),
5674 5674 ('', 'new-branch', False, _('allow pushing a new branch')),
5675 5675 ] + remoteopts,
5676 5676 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5677 5677 def push(ui, repo, dest=None, **opts):
5678 5678 """push changes to the specified destination
5679 5679
5680 5680 Push changesets from the local repository to the specified
5681 5681 destination.
5682 5682
5683 5683 This operation is symmetrical to pull: it is identical to a pull
5684 5684 in the destination repository from the current one.
5685 5685
5686 5686 By default, push will not allow creation of new heads at the
5687 5687 destination, since multiple heads would make it unclear which head
5688 5688 to use. In this situation, it is recommended to pull and merge
5689 5689 before pushing.
5690 5690
5691 5691 Use --new-branch if you want to allow push to create a new named
5692 5692 branch that is not present at the destination. This allows you to
5693 5693 only create a new branch without forcing other changes.
5694 5694
5695 5695 .. note::
5696 5696
5697 5697 Extra care should be taken with the -f/--force option,
5698 5698 which will push all new heads on all branches, an action which will
5699 5699 almost always cause confusion for collaborators.
5700 5700
5701 5701 If -r/--rev is used, the specified revision and all its ancestors
5702 5702 will be pushed to the remote repository.
5703 5703
5704 5704 If -B/--bookmark is used, the specified bookmarked revision, its
5705 5705 ancestors, and the bookmark will be pushed to the remote
5706 5706 repository.
5707 5707
5708 5708 Please see :hg:`help urls` for important details about ``ssh://``
5709 5709 URLs. If DESTINATION is omitted, a default path will be used.
5710 5710
5711 5711 Returns 0 if push was successful, 1 if nothing to push.
5712 5712 """
5713 5713
5714 5714 if opts.get('bookmark'):
5715 5715 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5716 5716 for b in opts['bookmark']:
5717 5717 # translate -B options to -r so changesets get pushed
5718 5718 if b in repo._bookmarks:
5719 5719 opts.setdefault('rev', []).append(b)
5720 5720 else:
5721 5721 # if we try to push a deleted bookmark, translate it to null
5722 5722 # this lets simultaneous -r, -b options continue working
5723 5723 opts.setdefault('rev', []).append("null")
5724 5724
5725 5725 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5726 5726 if not path:
5727 5727 raise error.Abort(_('default repository not configured!'),
5728 5728 hint=_('see the "path" section in "hg help config"'))
5729 5729 dest = path.pushloc or path.loc
5730 5730 branches = (path.branch, opts.get('branch') or [])
5731 5731 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5732 5732 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5733 5733 other = hg.peer(repo, opts, dest)
5734 5734
5735 5735 if revs:
5736 5736 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5737 5737 if not revs:
5738 5738 raise error.Abort(_("specified revisions evaluate to an empty set"),
5739 5739 hint=_("use different revision arguments"))
5740 5740
5741 5741 repo._subtoppath = dest
5742 5742 try:
5743 5743 # push subrepos depth-first for coherent ordering
5744 5744 c = repo['']
5745 5745 subs = c.substate # only repos that are committed
5746 5746 for s in sorted(subs):
5747 5747 result = c.sub(s).push(opts)
5748 5748 if result == 0:
5749 5749 return not result
5750 5750 finally:
5751 5751 del repo._subtoppath
5752 5752 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5753 5753 newbranch=opts.get('new_branch'),
5754 5754 bookmarks=opts.get('bookmark', ()),
5755 5755 opargs=opts.get('opargs'))
5756 5756
5757 5757 result = not pushop.cgresult
5758 5758
5759 5759 if pushop.bkresult is not None:
5760 5760 if pushop.bkresult == 2:
5761 5761 result = 2
5762 5762 elif not result and pushop.bkresult:
5763 5763 result = 2
5764 5764
5765 5765 return result
5766 5766
5767 5767 @command('recover', [])
5768 5768 def recover(ui, repo):
5769 5769 """roll back an interrupted transaction
5770 5770
5771 5771 Recover from an interrupted commit or pull.
5772 5772
5773 5773 This command tries to fix the repository status after an
5774 5774 interrupted operation. It should only be necessary when Mercurial
5775 5775 suggests it.
5776 5776
5777 5777 Returns 0 if successful, 1 if nothing to recover or verify fails.
5778 5778 """
5779 5779 if repo.recover():
5780 5780 return hg.verify(repo)
5781 5781 return 1
5782 5782
5783 5783 @command('^remove|rm',
5784 5784 [('A', 'after', None, _('record delete for missing files')),
5785 5785 ('f', 'force', None,
5786 5786 _('remove (and delete) file even if added or modified')),
5787 5787 ] + subrepoopts + walkopts,
5788 5788 _('[OPTION]... FILE...'),
5789 5789 inferrepo=True)
5790 5790 def remove(ui, repo, *pats, **opts):
5791 5791 """remove the specified files on the next commit
5792 5792
5793 5793 Schedule the indicated files for removal from the current branch.
5794 5794
5795 5795 This command schedules the files to be removed at the next commit.
5796 5796 To undo a remove before that, see :hg:`revert`. To undo added
5797 5797 files, see :hg:`forget`.
5798 5798
5799 5799 .. container:: verbose
5800 5800
5801 5801 -A/--after can be used to remove only files that have already
5802 5802 been deleted, -f/--force can be used to force deletion, and -Af
5803 5803 can be used to remove files from the next revision without
5804 5804 deleting them from the working directory.
5805 5805
5806 5806 The following table details the behavior of remove for different
5807 5807 file states (columns) and option combinations (rows). The file
5808 5808 states are Added [A], Clean [C], Modified [M] and Missing [!]
5809 5809 (as reported by :hg:`status`). The actions are Warn, Remove
5810 5810 (from branch) and Delete (from disk):
5811 5811
5812 5812 ========= == == == ==
5813 5813 opt/state A C M !
5814 5814 ========= == == == ==
5815 5815 none W RD W R
5816 5816 -f R RD RD R
5817 5817 -A W W W R
5818 5818 -Af R R R R
5819 5819 ========= == == == ==
5820 5820
5821 5821 .. note::
5822 5822
5823 5823 :hg:`remove` never deletes files in Added [A] state from the
5824 5824 working directory, not even if ``--force`` is specified.
5825 5825
5826 5826 Returns 0 on success, 1 if any warnings encountered.
5827 5827 """
5828 5828
5829 5829 after, force = opts.get('after'), opts.get('force')
5830 5830 if not pats and not after:
5831 5831 raise error.Abort(_('no files specified'))
5832 5832
5833 5833 m = scmutil.match(repo[None], pats, opts)
5834 5834 subrepos = opts.get('subrepos')
5835 5835 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5836 5836
5837 5837 @command('rename|move|mv',
5838 5838 [('A', 'after', None, _('record a rename that has already occurred')),
5839 5839 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5840 5840 ] + walkopts + dryrunopts,
5841 5841 _('[OPTION]... SOURCE... DEST'))
5842 5842 def rename(ui, repo, *pats, **opts):
5843 5843 """rename files; equivalent of copy + remove
5844 5844
5845 5845 Mark dest as copies of sources; mark sources for deletion. If dest
5846 5846 is a directory, copies are put in that directory. If dest is a
5847 5847 file, there can only be one source.
5848 5848
5849 5849 By default, this command copies the contents of files as they
5850 5850 exist in the working directory. If invoked with -A/--after, the
5851 5851 operation is recorded, but no copying is performed.
5852 5852
5853 5853 This command takes effect at the next commit. To undo a rename
5854 5854 before that, see :hg:`revert`.
5855 5855
5856 5856 Returns 0 on success, 1 if errors are encountered.
5857 5857 """
5858 5858 with repo.wlock(False):
5859 5859 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5860 5860
5861 5861 @command('resolve',
5862 5862 [('a', 'all', None, _('select all unresolved files')),
5863 5863 ('l', 'list', None, _('list state of files needing merge')),
5864 5864 ('m', 'mark', None, _('mark files as resolved')),
5865 5865 ('u', 'unmark', None, _('mark files as unresolved')),
5866 5866 ('n', 'no-status', None, _('hide status prefix'))]
5867 5867 + mergetoolopts + walkopts + formatteropts,
5868 5868 _('[OPTION]... [FILE]...'),
5869 5869 inferrepo=True)
5870 5870 def resolve(ui, repo, *pats, **opts):
5871 5871 """redo merges or set/view the merge status of files
5872 5872
5873 5873 Merges with unresolved conflicts are often the result of
5874 5874 non-interactive merging using the ``internal:merge`` configuration
5875 5875 setting, or a command-line merge tool like ``diff3``. The resolve
5876 5876 command is used to manage the files involved in a merge, after
5877 5877 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5878 5878 working directory must have two parents). See :hg:`help
5879 5879 merge-tools` for information on configuring merge tools.
5880 5880
5881 5881 The resolve command can be used in the following ways:
5882 5882
5883 5883 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5884 5884 files, discarding any previous merge attempts. Re-merging is not
5885 5885 performed for files already marked as resolved. Use ``--all/-a``
5886 5886 to select all unresolved files. ``--tool`` can be used to specify
5887 5887 the merge tool used for the given files. It overrides the HGMERGE
5888 5888 environment variable and your configuration files. Previous file
5889 5889 contents are saved with a ``.orig`` suffix.
5890 5890
5891 5891 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5892 5892 (e.g. after having manually fixed-up the files). The default is
5893 5893 to mark all unresolved files.
5894 5894
5895 5895 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5896 5896 default is to mark all resolved files.
5897 5897
5898 5898 - :hg:`resolve -l`: list files which had or still have conflicts.
5899 5899 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5900 5900
5901 5901 .. note::
5902 5902
5903 5903 Mercurial will not let you commit files with unresolved merge
5904 5904 conflicts. You must use :hg:`resolve -m ...` before you can
5905 5905 commit after a conflicting merge.
5906 5906
5907 5907 Returns 0 on success, 1 if any files fail a resolve attempt.
5908 5908 """
5909 5909
5910 5910 all, mark, unmark, show, nostatus = \
5911 5911 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5912 5912
5913 5913 if (show and (mark or unmark)) or (mark and unmark):
5914 5914 raise error.Abort(_("too many options specified"))
5915 5915 if pats and all:
5916 5916 raise error.Abort(_("can't specify --all and patterns"))
5917 5917 if not (all or pats or show or mark or unmark):
5918 5918 raise error.Abort(_('no files or directories specified'),
5919 5919 hint=('use --all to re-merge all unresolved files'))
5920 5920
5921 5921 if show:
5922 5922 fm = ui.formatter('resolve', opts)
5923 5923 ms = mergemod.mergestate.read(repo)
5924 5924 m = scmutil.match(repo[None], pats, opts)
5925 5925 for f in ms:
5926 5926 if not m(f):
5927 5927 continue
5928 5928 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5929 5929 'd': 'driverresolved'}[ms[f]]
5930 5930 fm.startitem()
5931 5931 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5932 5932 fm.write('path', '%s\n', f, label=l)
5933 5933 fm.end()
5934 5934 return 0
5935 5935
5936 5936 with repo.wlock():
5937 5937 ms = mergemod.mergestate.read(repo)
5938 5938
5939 5939 if not (ms.active() or repo.dirstate.p2() != nullid):
5940 5940 raise error.Abort(
5941 5941 _('resolve command not applicable when not merging'))
5942 5942
5943 5943 wctx = repo[None]
5944 5944
5945 5945 if ms.mergedriver and ms.mdstate() == 'u':
5946 5946 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5947 5947 ms.commit()
5948 5948 # allow mark and unmark to go through
5949 5949 if not mark and not unmark and not proceed:
5950 5950 return 1
5951 5951
5952 5952 m = scmutil.match(wctx, pats, opts)
5953 5953 ret = 0
5954 5954 didwork = False
5955 5955 runconclude = False
5956 5956
5957 5957 tocomplete = []
5958 5958 for f in ms:
5959 5959 if not m(f):
5960 5960 continue
5961 5961
5962 5962 didwork = True
5963 5963
5964 5964 # don't let driver-resolved files be marked, and run the conclude
5965 5965 # step if asked to resolve
5966 5966 if ms[f] == "d":
5967 5967 exact = m.exact(f)
5968 5968 if mark:
5969 5969 if exact:
5970 5970 ui.warn(_('not marking %s as it is driver-resolved\n')
5971 5971 % f)
5972 5972 elif unmark:
5973 5973 if exact:
5974 5974 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5975 5975 % f)
5976 5976 else:
5977 5977 runconclude = True
5978 5978 continue
5979 5979
5980 5980 if mark:
5981 5981 ms.mark(f, "r")
5982 5982 elif unmark:
5983 5983 ms.mark(f, "u")
5984 5984 else:
5985 5985 # backup pre-resolve (merge uses .orig for its own purposes)
5986 5986 a = repo.wjoin(f)
5987 5987 try:
5988 5988 util.copyfile(a, a + ".resolve")
5989 5989 except (IOError, OSError) as inst:
5990 5990 if inst.errno != errno.ENOENT:
5991 5991 raise
5992 5992
5993 5993 try:
5994 5994 # preresolve file
5995 5995 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5996 5996 'resolve')
5997 5997 complete, r = ms.preresolve(f, wctx)
5998 5998 if not complete:
5999 5999 tocomplete.append(f)
6000 6000 elif r:
6001 6001 ret = 1
6002 6002 finally:
6003 6003 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6004 6004 ms.commit()
6005 6005
6006 6006 # replace filemerge's .orig file with our resolve file, but only
6007 6007 # for merges that are complete
6008 6008 if complete:
6009 6009 try:
6010 6010 util.rename(a + ".resolve",
6011 6011 scmutil.origpath(ui, repo, a))
6012 6012 except OSError as inst:
6013 6013 if inst.errno != errno.ENOENT:
6014 6014 raise
6015 6015
6016 6016 for f in tocomplete:
6017 6017 try:
6018 6018 # resolve file
6019 6019 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6020 6020 'resolve')
6021 6021 r = ms.resolve(f, wctx)
6022 6022 if r:
6023 6023 ret = 1
6024 6024 finally:
6025 6025 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6026 6026 ms.commit()
6027 6027
6028 6028 # replace filemerge's .orig file with our resolve file
6029 6029 a = repo.wjoin(f)
6030 6030 try:
6031 6031 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6032 6032 except OSError as inst:
6033 6033 if inst.errno != errno.ENOENT:
6034 6034 raise
6035 6035
6036 6036 ms.commit()
6037 6037 ms.recordactions()
6038 6038
6039 6039 if not didwork and pats:
6040 6040 ui.warn(_("arguments do not match paths that need resolving\n"))
6041 6041 elif ms.mergedriver and ms.mdstate() != 's':
6042 6042 # run conclude step when either a driver-resolved file is requested
6043 6043 # or there are no driver-resolved files
6044 6044 # we can't use 'ret' to determine whether any files are unresolved
6045 6045 # because we might not have tried to resolve some
6046 6046 if ((runconclude or not list(ms.driverresolved()))
6047 6047 and not list(ms.unresolved())):
6048 6048 proceed = mergemod.driverconclude(repo, ms, wctx)
6049 6049 ms.commit()
6050 6050 if not proceed:
6051 6051 return 1
6052 6052
6053 6053 # Nudge users into finishing an unfinished operation
6054 6054 unresolvedf = list(ms.unresolved())
6055 6055 driverresolvedf = list(ms.driverresolved())
6056 6056 if not unresolvedf and not driverresolvedf:
6057 6057 ui.status(_('(no more unresolved files)\n'))
6058 6058 cmdutil.checkafterresolved(repo)
6059 6059 elif not unresolvedf:
6060 6060 ui.status(_('(no more unresolved files -- '
6061 6061 'run "hg resolve --all" to conclude)\n'))
6062 6062
6063 6063 return ret
6064 6064
6065 6065 @command('revert',
6066 6066 [('a', 'all', None, _('revert all changes when no arguments given')),
6067 6067 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6068 6068 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6069 6069 ('C', 'no-backup', None, _('do not save backup copies of files')),
6070 6070 ('i', 'interactive', None,
6071 6071 _('interactively select the changes (EXPERIMENTAL)')),
6072 6072 ] + walkopts + dryrunopts,
6073 6073 _('[OPTION]... [-r REV] [NAME]...'))
6074 6074 def revert(ui, repo, *pats, **opts):
6075 6075 """restore files to their checkout state
6076 6076
6077 6077 .. note::
6078 6078
6079 6079 To check out earlier revisions, you should use :hg:`update REV`.
6080 6080 To cancel an uncommitted merge (and lose your changes),
6081 6081 use :hg:`update --clean .`.
6082 6082
6083 6083 With no revision specified, revert the specified files or directories
6084 6084 to the contents they had in the parent of the working directory.
6085 6085 This restores the contents of files to an unmodified
6086 6086 state and unschedules adds, removes, copies, and renames. If the
6087 6087 working directory has two parents, you must explicitly specify a
6088 6088 revision.
6089 6089
6090 6090 Using the -r/--rev or -d/--date options, revert the given files or
6091 6091 directories to their states as of a specific revision. Because
6092 6092 revert does not change the working directory parents, this will
6093 6093 cause these files to appear modified. This can be helpful to "back
6094 6094 out" some or all of an earlier change. See :hg:`backout` for a
6095 6095 related method.
6096 6096
6097 6097 Modified files are saved with a .orig suffix before reverting.
6098 6098 To disable these backups, use --no-backup.
6099 6099
6100 6100 See :hg:`help dates` for a list of formats valid for -d/--date.
6101 6101
6102 6102 See :hg:`help backout` for a way to reverse the effect of an
6103 6103 earlier changeset.
6104 6104
6105 6105 Returns 0 on success.
6106 6106 """
6107 6107
6108 6108 if opts.get("date"):
6109 6109 if opts.get("rev"):
6110 6110 raise error.Abort(_("you can't specify a revision and a date"))
6111 6111 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6112 6112
6113 6113 parent, p2 = repo.dirstate.parents()
6114 6114 if not opts.get('rev') and p2 != nullid:
6115 6115 # revert after merge is a trap for new users (issue2915)
6116 6116 raise error.Abort(_('uncommitted merge with no revision specified'),
6117 6117 hint=_('use "hg update" or see "hg help revert"'))
6118 6118
6119 6119 ctx = scmutil.revsingle(repo, opts.get('rev'))
6120 6120
6121 6121 if (not (pats or opts.get('include') or opts.get('exclude') or
6122 6122 opts.get('all') or opts.get('interactive'))):
6123 6123 msg = _("no files or directories specified")
6124 6124 if p2 != nullid:
6125 6125 hint = _("uncommitted merge, use --all to discard all changes,"
6126 6126 " or 'hg update -C .' to abort the merge")
6127 6127 raise error.Abort(msg, hint=hint)
6128 6128 dirty = any(repo.status())
6129 6129 node = ctx.node()
6130 6130 if node != parent:
6131 6131 if dirty:
6132 6132 hint = _("uncommitted changes, use --all to discard all"
6133 6133 " changes, or 'hg update %s' to update") % ctx.rev()
6134 6134 else:
6135 6135 hint = _("use --all to revert all files,"
6136 6136 " or 'hg update %s' to update") % ctx.rev()
6137 6137 elif dirty:
6138 6138 hint = _("uncommitted changes, use --all to discard all changes")
6139 6139 else:
6140 6140 hint = _("use --all to revert all files")
6141 6141 raise error.Abort(msg, hint=hint)
6142 6142
6143 6143 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6144 6144
6145 6145 @command('rollback', dryrunopts +
6146 6146 [('f', 'force', False, _('ignore safety measures'))])
6147 6147 def rollback(ui, repo, **opts):
6148 6148 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6149 6149
6150 6150 Please use :hg:`commit --amend` instead of rollback to correct
6151 6151 mistakes in the last commit.
6152 6152
6153 6153 This command should be used with care. There is only one level of
6154 6154 rollback, and there is no way to undo a rollback. It will also
6155 6155 restore the dirstate at the time of the last transaction, losing
6156 6156 any dirstate changes since that time. This command does not alter
6157 6157 the working directory.
6158 6158
6159 6159 Transactions are used to encapsulate the effects of all commands
6160 6160 that create new changesets or propagate existing changesets into a
6161 6161 repository.
6162 6162
6163 6163 .. container:: verbose
6164 6164
6165 6165 For example, the following commands are transactional, and their
6166 6166 effects can be rolled back:
6167 6167
6168 6168 - commit
6169 6169 - import
6170 6170 - pull
6171 6171 - push (with this repository as the destination)
6172 6172 - unbundle
6173 6173
6174 6174 To avoid permanent data loss, rollback will refuse to rollback a
6175 6175 commit transaction if it isn't checked out. Use --force to
6176 6176 override this protection.
6177 6177
6178 6178 This command is not intended for use on public repositories. Once
6179 6179 changes are visible for pull by other users, rolling a transaction
6180 6180 back locally is ineffective (someone else may already have pulled
6181 6181 the changes). Furthermore, a race is possible with readers of the
6182 6182 repository; for example an in-progress pull from the repository
6183 6183 may fail if a rollback is performed.
6184 6184
6185 6185 Returns 0 on success, 1 if no rollback data is available.
6186 6186 """
6187 6187 return repo.rollback(dryrun=opts.get('dry_run'),
6188 6188 force=opts.get('force'))
6189 6189
6190 6190 @command('root', [])
6191 6191 def root(ui, repo):
6192 6192 """print the root (top) of the current working directory
6193 6193
6194 6194 Print the root directory of the current repository.
6195 6195
6196 6196 Returns 0 on success.
6197 6197 """
6198 6198 ui.write(repo.root + "\n")
6199 6199
6200 6200 @command('^serve',
6201 6201 [('A', 'accesslog', '', _('name of access log file to write to'),
6202 6202 _('FILE')),
6203 6203 ('d', 'daemon', None, _('run server in background')),
6204 6204 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6205 6205 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6206 6206 # use string type, then we can check if something was passed
6207 6207 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6208 6208 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6209 6209 _('ADDR')),
6210 6210 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6211 6211 _('PREFIX')),
6212 6212 ('n', 'name', '',
6213 6213 _('name to show in web pages (default: working directory)'), _('NAME')),
6214 6214 ('', 'web-conf', '',
6215 6215 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6216 6216 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6217 6217 _('FILE')),
6218 6218 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6219 6219 ('', 'stdio', None, _('for remote clients')),
6220 6220 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6221 6221 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6222 6222 ('', 'style', '', _('template style to use'), _('STYLE')),
6223 6223 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6224 6224 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6225 6225 _('[OPTION]...'),
6226 6226 optionalrepo=True)
6227 6227 def serve(ui, repo, **opts):
6228 6228 """start stand-alone webserver
6229 6229
6230 6230 Start a local HTTP repository browser and pull server. You can use
6231 6231 this for ad-hoc sharing and browsing of repositories. It is
6232 6232 recommended to use a real web server to serve a repository for
6233 6233 longer periods of time.
6234 6234
6235 6235 Please note that the server does not implement access control.
6236 6236 This means that, by default, anybody can read from the server and
6237 6237 nobody can write to it by default. Set the ``web.allow_push``
6238 6238 option to ``*`` to allow everybody to push to the server. You
6239 6239 should use a real web server if you need to authenticate users.
6240 6240
6241 6241 By default, the server logs accesses to stdout and errors to
6242 6242 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6243 6243 files.
6244 6244
6245 6245 To have the server choose a free port number to listen on, specify
6246 6246 a port number of 0; in this case, the server will print the port
6247 6247 number it uses.
6248 6248
6249 6249 Returns 0 on success.
6250 6250 """
6251 6251
6252 6252 if opts["stdio"] and opts["cmdserver"]:
6253 6253 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6254 6254
6255 6255 if opts["stdio"]:
6256 6256 if repo is None:
6257 6257 raise error.RepoError(_("there is no Mercurial repository here"
6258 6258 " (.hg not found)"))
6259 6259 s = sshserver.sshserver(ui, repo)
6260 6260 s.serve_forever()
6261 6261
6262 6262 if opts["cmdserver"]:
6263 6263 service = commandserver.createservice(ui, repo, opts)
6264 6264 else:
6265 6265 service = hgweb.createservice(ui, repo, opts)
6266 6266 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6267 6267
6268 6268 @command('^status|st',
6269 6269 [('A', 'all', None, _('show status of all files')),
6270 6270 ('m', 'modified', None, _('show only modified files')),
6271 6271 ('a', 'added', None, _('show only added files')),
6272 6272 ('r', 'removed', None, _('show only removed files')),
6273 6273 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6274 6274 ('c', 'clean', None, _('show only files without changes')),
6275 6275 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6276 6276 ('i', 'ignored', None, _('show only ignored files')),
6277 6277 ('n', 'no-status', None, _('hide status prefix')),
6278 6278 ('C', 'copies', None, _('show source of copied files')),
6279 6279 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6280 6280 ('', 'rev', [], _('show difference from revision'), _('REV')),
6281 6281 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6282 6282 ] + walkopts + subrepoopts + formatteropts,
6283 6283 _('[OPTION]... [FILE]...'),
6284 6284 inferrepo=True)
6285 6285 def status(ui, repo, *pats, **opts):
6286 6286 """show changed files in the working directory
6287 6287
6288 6288 Show status of files in the repository. If names are given, only
6289 6289 files that match are shown. Files that are clean or ignored or
6290 6290 the source of a copy/move operation, are not listed unless
6291 6291 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6292 6292 Unless options described with "show only ..." are given, the
6293 6293 options -mardu are used.
6294 6294
6295 6295 Option -q/--quiet hides untracked (unknown and ignored) files
6296 6296 unless explicitly requested with -u/--unknown or -i/--ignored.
6297 6297
6298 6298 .. note::
6299 6299
6300 6300 :hg:`status` may appear to disagree with diff if permissions have
6301 6301 changed or a merge has occurred. The standard diff format does
6302 6302 not report permission changes and diff only reports changes
6303 6303 relative to one merge parent.
6304 6304
6305 6305 If one revision is given, it is used as the base revision.
6306 6306 If two revisions are given, the differences between them are
6307 6307 shown. The --change option can also be used as a shortcut to list
6308 6308 the changed files of a revision from its first parent.
6309 6309
6310 6310 The codes used to show the status of files are::
6311 6311
6312 6312 M = modified
6313 6313 A = added
6314 6314 R = removed
6315 6315 C = clean
6316 6316 ! = missing (deleted by non-hg command, but still tracked)
6317 6317 ? = not tracked
6318 6318 I = ignored
6319 6319 = origin of the previous file (with --copies)
6320 6320
6321 6321 .. container:: verbose
6322 6322
6323 6323 Examples:
6324 6324
6325 6325 - show changes in the working directory relative to a
6326 6326 changeset::
6327 6327
6328 6328 hg status --rev 9353
6329 6329
6330 6330 - show changes in the working directory relative to the
6331 6331 current directory (see :hg:`help patterns` for more information)::
6332 6332
6333 6333 hg status re:
6334 6334
6335 6335 - show all changes including copies in an existing changeset::
6336 6336
6337 6337 hg status --copies --change 9353
6338 6338
6339 6339 - get a NUL separated list of added files, suitable for xargs::
6340 6340
6341 6341 hg status -an0
6342 6342
6343 6343 Returns 0 on success.
6344 6344 """
6345 6345
6346 6346 revs = opts.get('rev')
6347 6347 change = opts.get('change')
6348 6348
6349 6349 if revs and change:
6350 6350 msg = _('cannot specify --rev and --change at the same time')
6351 6351 raise error.Abort(msg)
6352 6352 elif change:
6353 6353 node2 = scmutil.revsingle(repo, change, None).node()
6354 6354 node1 = repo[node2].p1().node()
6355 6355 else:
6356 6356 node1, node2 = scmutil.revpair(repo, revs)
6357 6357
6358 6358 if pats:
6359 6359 cwd = repo.getcwd()
6360 6360 else:
6361 6361 cwd = ''
6362 6362
6363 6363 if opts.get('print0'):
6364 6364 end = '\0'
6365 6365 else:
6366 6366 end = '\n'
6367 6367 copy = {}
6368 6368 states = 'modified added removed deleted unknown ignored clean'.split()
6369 6369 show = [k for k in states if opts.get(k)]
6370 6370 if opts.get('all'):
6371 6371 show += ui.quiet and (states[:4] + ['clean']) or states
6372 6372 if not show:
6373 6373 if ui.quiet:
6374 6374 show = states[:4]
6375 6375 else:
6376 6376 show = states[:5]
6377 6377
6378 6378 m = scmutil.match(repo[node2], pats, opts)
6379 6379 stat = repo.status(node1, node2, m,
6380 6380 'ignored' in show, 'clean' in show, 'unknown' in show,
6381 6381 opts.get('subrepos'))
6382 6382 changestates = zip(states, 'MAR!?IC', stat)
6383 6383
6384 6384 if (opts.get('all') or opts.get('copies')
6385 6385 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6386 6386 copy = copies.pathcopies(repo[node1], repo[node2], m)
6387 6387
6388 6388 fm = ui.formatter('status', opts)
6389 6389 fmt = '%s' + end
6390 6390 showchar = not opts.get('no_status')
6391 6391
6392 6392 for state, char, files in changestates:
6393 6393 if state in show:
6394 6394 label = 'status.' + state
6395 6395 for f in files:
6396 6396 fm.startitem()
6397 6397 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6398 6398 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6399 6399 if f in copy:
6400 6400 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6401 6401 label='status.copied')
6402 6402 fm.end()
6403 6403
6404 6404 @command('^summary|sum',
6405 6405 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6406 6406 def summary(ui, repo, **opts):
6407 6407 """summarize working directory state
6408 6408
6409 6409 This generates a brief summary of the working directory state,
6410 6410 including parents, branch, commit status, phase and available updates.
6411 6411
6412 6412 With the --remote option, this will check the default paths for
6413 6413 incoming and outgoing changes. This can be time-consuming.
6414 6414
6415 6415 Returns 0 on success.
6416 6416 """
6417 6417
6418 6418 ctx = repo[None]
6419 6419 parents = ctx.parents()
6420 6420 pnode = parents[0].node()
6421 6421 marks = []
6422 6422
6423 6423 for p in parents:
6424 6424 # label with log.changeset (instead of log.parent) since this
6425 6425 # shows a working directory parent *changeset*:
6426 6426 # i18n: column positioning for "hg summary"
6427 6427 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6428 6428 label='log.changeset changeset.%s' % p.phasestr())
6429 6429 ui.write(' '.join(p.tags()), label='log.tag')
6430 6430 if p.bookmarks():
6431 6431 marks.extend(p.bookmarks())
6432 6432 if p.rev() == -1:
6433 6433 if not len(repo):
6434 6434 ui.write(_(' (empty repository)'))
6435 6435 else:
6436 6436 ui.write(_(' (no revision checked out)'))
6437 6437 ui.write('\n')
6438 6438 if p.description():
6439 6439 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6440 6440 label='log.summary')
6441 6441
6442 6442 branch = ctx.branch()
6443 6443 bheads = repo.branchheads(branch)
6444 6444 # i18n: column positioning for "hg summary"
6445 6445 m = _('branch: %s\n') % branch
6446 6446 if branch != 'default':
6447 6447 ui.write(m, label='log.branch')
6448 6448 else:
6449 6449 ui.status(m, label='log.branch')
6450 6450
6451 6451 if marks:
6452 6452 active = repo._activebookmark
6453 6453 # i18n: column positioning for "hg summary"
6454 6454 ui.write(_('bookmarks:'), label='log.bookmark')
6455 6455 if active is not None:
6456 6456 if active in marks:
6457 6457 ui.write(' *' + active, label=activebookmarklabel)
6458 6458 marks.remove(active)
6459 6459 else:
6460 6460 ui.write(' [%s]' % active, label=activebookmarklabel)
6461 6461 for m in marks:
6462 6462 ui.write(' ' + m, label='log.bookmark')
6463 6463 ui.write('\n', label='log.bookmark')
6464 6464
6465 6465 status = repo.status(unknown=True)
6466 6466
6467 6467 c = repo.dirstate.copies()
6468 6468 copied, renamed = [], []
6469 6469 for d, s in c.iteritems():
6470 6470 if s in status.removed:
6471 6471 status.removed.remove(s)
6472 6472 renamed.append(d)
6473 6473 else:
6474 6474 copied.append(d)
6475 6475 if d in status.added:
6476 6476 status.added.remove(d)
6477 6477
6478 6478 try:
6479 6479 ms = mergemod.mergestate.read(repo)
6480 6480 except error.UnsupportedMergeRecords as e:
6481 6481 s = ' '.join(e.recordtypes)
6482 6482 ui.warn(
6483 6483 _('warning: merge state has unsupported record types: %s\n') % s)
6484 6484 unresolved = 0
6485 6485 else:
6486 6486 unresolved = [f for f in ms if ms[f] == 'u']
6487 6487
6488 6488 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6489 6489
6490 6490 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6491 6491 (ui.label(_('%d added'), 'status.added'), status.added),
6492 6492 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6493 6493 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6494 6494 (ui.label(_('%d copied'), 'status.copied'), copied),
6495 6495 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6496 6496 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6497 6497 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6498 6498 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6499 6499 t = []
6500 6500 for l, s in labels:
6501 6501 if s:
6502 6502 t.append(l % len(s))
6503 6503
6504 6504 t = ', '.join(t)
6505 6505 cleanworkdir = False
6506 6506
6507 6507 if repo.vfs.exists('graftstate'):
6508 6508 t += _(' (graft in progress)')
6509 6509 if repo.vfs.exists('updatestate'):
6510 6510 t += _(' (interrupted update)')
6511 6511 elif len(parents) > 1:
6512 6512 t += _(' (merge)')
6513 6513 elif branch != parents[0].branch():
6514 6514 t += _(' (new branch)')
6515 6515 elif (parents[0].closesbranch() and
6516 6516 pnode in repo.branchheads(branch, closed=True)):
6517 6517 t += _(' (head closed)')
6518 6518 elif not (status.modified or status.added or status.removed or renamed or
6519 6519 copied or subs):
6520 6520 t += _(' (clean)')
6521 6521 cleanworkdir = True
6522 6522 elif pnode not in bheads:
6523 6523 t += _(' (new branch head)')
6524 6524
6525 6525 if parents:
6526 6526 pendingphase = max(p.phase() for p in parents)
6527 6527 else:
6528 6528 pendingphase = phases.public
6529 6529
6530 6530 if pendingphase > phases.newcommitphase(ui):
6531 6531 t += ' (%s)' % phases.phasenames[pendingphase]
6532 6532
6533 6533 if cleanworkdir:
6534 6534 # i18n: column positioning for "hg summary"
6535 6535 ui.status(_('commit: %s\n') % t.strip())
6536 6536 else:
6537 6537 # i18n: column positioning for "hg summary"
6538 6538 ui.write(_('commit: %s\n') % t.strip())
6539 6539
6540 6540 # all ancestors of branch heads - all ancestors of parent = new csets
6541 6541 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6542 6542 bheads))
6543 6543
6544 6544 if new == 0:
6545 6545 # i18n: column positioning for "hg summary"
6546 6546 ui.status(_('update: (current)\n'))
6547 6547 elif pnode not in bheads:
6548 6548 # i18n: column positioning for "hg summary"
6549 6549 ui.write(_('update: %d new changesets (update)\n') % new)
6550 6550 else:
6551 6551 # i18n: column positioning for "hg summary"
6552 6552 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6553 6553 (new, len(bheads)))
6554 6554
6555 6555 t = []
6556 6556 draft = len(repo.revs('draft()'))
6557 6557 if draft:
6558 6558 t.append(_('%d draft') % draft)
6559 6559 secret = len(repo.revs('secret()'))
6560 6560 if secret:
6561 6561 t.append(_('%d secret') % secret)
6562 6562
6563 6563 if draft or secret:
6564 6564 ui.status(_('phases: %s\n') % ', '.join(t))
6565 6565
6566 6566 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6567 6567 for trouble in ("unstable", "divergent", "bumped"):
6568 6568 numtrouble = len(repo.revs(trouble + "()"))
6569 6569 # We write all the possibilities to ease translation
6570 6570 troublemsg = {
6571 6571 "unstable": _("unstable: %d changesets"),
6572 6572 "divergent": _("divergent: %d changesets"),
6573 6573 "bumped": _("bumped: %d changesets"),
6574 6574 }
6575 6575 if numtrouble > 0:
6576 6576 ui.status(troublemsg[trouble] % numtrouble + "\n")
6577 6577
6578 6578 cmdutil.summaryhooks(ui, repo)
6579 6579
6580 6580 if opts.get('remote'):
6581 6581 needsincoming, needsoutgoing = True, True
6582 6582 else:
6583 6583 needsincoming, needsoutgoing = False, False
6584 6584 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6585 6585 if i:
6586 6586 needsincoming = True
6587 6587 if o:
6588 6588 needsoutgoing = True
6589 6589 if not needsincoming and not needsoutgoing:
6590 6590 return
6591 6591
6592 6592 def getincoming():
6593 6593 source, branches = hg.parseurl(ui.expandpath('default'))
6594 6594 sbranch = branches[0]
6595 6595 try:
6596 6596 other = hg.peer(repo, {}, source)
6597 6597 except error.RepoError:
6598 6598 if opts.get('remote'):
6599 6599 raise
6600 6600 return source, sbranch, None, None, None
6601 6601 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6602 6602 if revs:
6603 6603 revs = [other.lookup(rev) for rev in revs]
6604 6604 ui.debug('comparing with %s\n' % util.hidepassword(source))
6605 6605 repo.ui.pushbuffer()
6606 6606 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6607 6607 repo.ui.popbuffer()
6608 6608 return source, sbranch, other, commoninc, commoninc[1]
6609 6609
6610 6610 if needsincoming:
6611 6611 source, sbranch, sother, commoninc, incoming = getincoming()
6612 6612 else:
6613 6613 source = sbranch = sother = commoninc = incoming = None
6614 6614
6615 6615 def getoutgoing():
6616 6616 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6617 6617 dbranch = branches[0]
6618 6618 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6619 6619 if source != dest:
6620 6620 try:
6621 6621 dother = hg.peer(repo, {}, dest)
6622 6622 except error.RepoError:
6623 6623 if opts.get('remote'):
6624 6624 raise
6625 6625 return dest, dbranch, None, None
6626 6626 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6627 6627 elif sother is None:
6628 6628 # there is no explicit destination peer, but source one is invalid
6629 6629 return dest, dbranch, None, None
6630 6630 else:
6631 6631 dother = sother
6632 6632 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6633 6633 common = None
6634 6634 else:
6635 6635 common = commoninc
6636 6636 if revs:
6637 6637 revs = [repo.lookup(rev) for rev in revs]
6638 6638 repo.ui.pushbuffer()
6639 6639 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6640 6640 commoninc=common)
6641 6641 repo.ui.popbuffer()
6642 6642 return dest, dbranch, dother, outgoing
6643 6643
6644 6644 if needsoutgoing:
6645 6645 dest, dbranch, dother, outgoing = getoutgoing()
6646 6646 else:
6647 6647 dest = dbranch = dother = outgoing = None
6648 6648
6649 6649 if opts.get('remote'):
6650 6650 t = []
6651 6651 if incoming:
6652 6652 t.append(_('1 or more incoming'))
6653 6653 o = outgoing.missing
6654 6654 if o:
6655 6655 t.append(_('%d outgoing') % len(o))
6656 6656 other = dother or sother
6657 6657 if 'bookmarks' in other.listkeys('namespaces'):
6658 6658 counts = bookmarks.summary(repo, other)
6659 6659 if counts[0] > 0:
6660 6660 t.append(_('%d incoming bookmarks') % counts[0])
6661 6661 if counts[1] > 0:
6662 6662 t.append(_('%d outgoing bookmarks') % counts[1])
6663 6663
6664 6664 if t:
6665 6665 # i18n: column positioning for "hg summary"
6666 6666 ui.write(_('remote: %s\n') % (', '.join(t)))
6667 6667 else:
6668 6668 # i18n: column positioning for "hg summary"
6669 6669 ui.status(_('remote: (synced)\n'))
6670 6670
6671 6671 cmdutil.summaryremotehooks(ui, repo, opts,
6672 6672 ((source, sbranch, sother, commoninc),
6673 6673 (dest, dbranch, dother, outgoing)))
6674 6674
6675 6675 @command('tag',
6676 6676 [('f', 'force', None, _('force tag')),
6677 6677 ('l', 'local', None, _('make the tag local')),
6678 6678 ('r', 'rev', '', _('revision to tag'), _('REV')),
6679 6679 ('', 'remove', None, _('remove a tag')),
6680 6680 # -l/--local is already there, commitopts cannot be used
6681 6681 ('e', 'edit', None, _('invoke editor on commit messages')),
6682 6682 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6683 6683 ] + commitopts2,
6684 6684 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6685 6685 def tag(ui, repo, name1, *names, **opts):
6686 6686 """add one or more tags for the current or given revision
6687 6687
6688 6688 Name a particular revision using <name>.
6689 6689
6690 6690 Tags are used to name particular revisions of the repository and are
6691 6691 very useful to compare different revisions, to go back to significant
6692 6692 earlier versions or to mark branch points as releases, etc. Changing
6693 6693 an existing tag is normally disallowed; use -f/--force to override.
6694 6694
6695 6695 If no revision is given, the parent of the working directory is
6696 6696 used.
6697 6697
6698 6698 To facilitate version control, distribution, and merging of tags,
6699 6699 they are stored as a file named ".hgtags" which is managed similarly
6700 6700 to other project files and can be hand-edited if necessary. This
6701 6701 also means that tagging creates a new commit. The file
6702 6702 ".hg/localtags" is used for local tags (not shared among
6703 6703 repositories).
6704 6704
6705 6705 Tag commits are usually made at the head of a branch. If the parent
6706 6706 of the working directory is not a branch head, :hg:`tag` aborts; use
6707 6707 -f/--force to force the tag commit to be based on a non-head
6708 6708 changeset.
6709 6709
6710 6710 See :hg:`help dates` for a list of formats valid for -d/--date.
6711 6711
6712 6712 Since tag names have priority over branch names during revision
6713 6713 lookup, using an existing branch name as a tag name is discouraged.
6714 6714
6715 6715 Returns 0 on success.
6716 6716 """
6717 6717 wlock = lock = None
6718 6718 try:
6719 6719 wlock = repo.wlock()
6720 6720 lock = repo.lock()
6721 6721 rev_ = "."
6722 6722 names = [t.strip() for t in (name1,) + names]
6723 6723 if len(names) != len(set(names)):
6724 6724 raise error.Abort(_('tag names must be unique'))
6725 6725 for n in names:
6726 6726 scmutil.checknewlabel(repo, n, 'tag')
6727 6727 if not n:
6728 6728 raise error.Abort(_('tag names cannot consist entirely of '
6729 6729 'whitespace'))
6730 6730 if opts.get('rev') and opts.get('remove'):
6731 6731 raise error.Abort(_("--rev and --remove are incompatible"))
6732 6732 if opts.get('rev'):
6733 6733 rev_ = opts['rev']
6734 6734 message = opts.get('message')
6735 6735 if opts.get('remove'):
6736 6736 if opts.get('local'):
6737 6737 expectedtype = 'local'
6738 6738 else:
6739 6739 expectedtype = 'global'
6740 6740
6741 6741 for n in names:
6742 6742 if not repo.tagtype(n):
6743 6743 raise error.Abort(_("tag '%s' does not exist") % n)
6744 6744 if repo.tagtype(n) != expectedtype:
6745 6745 if expectedtype == 'global':
6746 6746 raise error.Abort(_("tag '%s' is not a global tag") % n)
6747 6747 else:
6748 6748 raise error.Abort(_("tag '%s' is not a local tag") % n)
6749 6749 rev_ = 'null'
6750 6750 if not message:
6751 6751 # we don't translate commit messages
6752 6752 message = 'Removed tag %s' % ', '.join(names)
6753 6753 elif not opts.get('force'):
6754 6754 for n in names:
6755 6755 if n in repo.tags():
6756 6756 raise error.Abort(_("tag '%s' already exists "
6757 6757 "(use -f to force)") % n)
6758 6758 if not opts.get('local'):
6759 6759 p1, p2 = repo.dirstate.parents()
6760 6760 if p2 != nullid:
6761 6761 raise error.Abort(_('uncommitted merge'))
6762 6762 bheads = repo.branchheads()
6763 6763 if not opts.get('force') and bheads and p1 not in bheads:
6764 6764 raise error.Abort(_('not at a branch head (use -f to force)'))
6765 6765 r = scmutil.revsingle(repo, rev_).node()
6766 6766
6767 6767 if not message:
6768 6768 # we don't translate commit messages
6769 6769 message = ('Added tag %s for changeset %s' %
6770 6770 (', '.join(names), short(r)))
6771 6771
6772 6772 date = opts.get('date')
6773 6773 if date:
6774 6774 date = util.parsedate(date)
6775 6775
6776 6776 if opts.get('remove'):
6777 6777 editform = 'tag.remove'
6778 6778 else:
6779 6779 editform = 'tag.add'
6780 6780 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6781 6781
6782 6782 # don't allow tagging the null rev
6783 6783 if (not opts.get('remove') and
6784 6784 scmutil.revsingle(repo, rev_).rev() == nullrev):
6785 6785 raise error.Abort(_("cannot tag null revision"))
6786 6786
6787 6787 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6788 6788 editor=editor)
6789 6789 finally:
6790 6790 release(lock, wlock)
6791 6791
6792 6792 @command('tags', formatteropts, '')
6793 6793 def tags(ui, repo, **opts):
6794 6794 """list repository tags
6795 6795
6796 6796 This lists both regular and local tags. When the -v/--verbose
6797 6797 switch is used, a third column "local" is printed for local tags.
6798 6798 When the -q/--quiet switch is used, only the tag name is printed.
6799 6799
6800 6800 Returns 0 on success.
6801 6801 """
6802 6802
6803 6803 fm = ui.formatter('tags', opts)
6804 6804 hexfunc = fm.hexfunc
6805 6805 tagtype = ""
6806 6806
6807 6807 for t, n in reversed(repo.tagslist()):
6808 6808 hn = hexfunc(n)
6809 6809 label = 'tags.normal'
6810 6810 tagtype = ''
6811 6811 if repo.tagtype(t) == 'local':
6812 6812 label = 'tags.local'
6813 6813 tagtype = 'local'
6814 6814
6815 6815 fm.startitem()
6816 6816 fm.write('tag', '%s', t, label=label)
6817 6817 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6818 6818 fm.condwrite(not ui.quiet, 'rev node', fmt,
6819 6819 repo.changelog.rev(n), hn, label=label)
6820 6820 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6821 6821 tagtype, label=label)
6822 6822 fm.plain('\n')
6823 6823 fm.end()
6824 6824
6825 6825 @command('tip',
6826 6826 [('p', 'patch', None, _('show patch')),
6827 6827 ('g', 'git', None, _('use git extended diff format')),
6828 6828 ] + templateopts,
6829 6829 _('[-p] [-g]'))
6830 6830 def tip(ui, repo, **opts):
6831 6831 """show the tip revision (DEPRECATED)
6832 6832
6833 6833 The tip revision (usually just called the tip) is the changeset
6834 6834 most recently added to the repository (and therefore the most
6835 6835 recently changed head).
6836 6836
6837 6837 If you have just made a commit, that commit will be the tip. If
6838 6838 you have just pulled changes from another repository, the tip of
6839 6839 that repository becomes the current tip. The "tip" tag is special
6840 6840 and cannot be renamed or assigned to a different changeset.
6841 6841
6842 6842 This command is deprecated, please use :hg:`heads` instead.
6843 6843
6844 6844 Returns 0 on success.
6845 6845 """
6846 6846 displayer = cmdutil.show_changeset(ui, repo, opts)
6847 6847 displayer.show(repo['tip'])
6848 6848 displayer.close()
6849 6849
6850 6850 @command('unbundle',
6851 6851 [('u', 'update', None,
6852 6852 _('update to new branch head if changesets were unbundled'))],
6853 6853 _('[-u] FILE...'))
6854 6854 def unbundle(ui, repo, fname1, *fnames, **opts):
6855 6855 """apply one or more changegroup files
6856 6856
6857 6857 Apply one or more compressed changegroup files generated by the
6858 6858 bundle command.
6859 6859
6860 6860 Returns 0 on success, 1 if an update has unresolved files.
6861 6861 """
6862 6862 fnames = (fname1,) + fnames
6863 6863
6864 6864 with repo.lock():
6865 6865 for fname in fnames:
6866 6866 f = hg.openpath(ui, fname)
6867 6867 gen = exchange.readbundle(ui, f, fname)
6868 6868 if isinstance(gen, bundle2.unbundle20):
6869 6869 tr = repo.transaction('unbundle')
6870 6870 try:
6871 6871 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6872 6872 url='bundle:' + fname)
6873 6873 tr.close()
6874 6874 except error.BundleUnknownFeatureError as exc:
6875 6875 raise error.Abort(_('%s: unknown bundle feature, %s')
6876 6876 % (fname, exc),
6877 6877 hint=_("see https://mercurial-scm.org/"
6878 6878 "wiki/BundleFeature for more "
6879 6879 "information"))
6880 6880 finally:
6881 6881 if tr:
6882 6882 tr.release()
6883 6883 changes = [r.get('return', 0)
6884 6884 for r in op.records['changegroup']]
6885 6885 modheads = changegroup.combineresults(changes)
6886 6886 elif isinstance(gen, streamclone.streamcloneapplier):
6887 6887 raise error.Abort(
6888 6888 _('packed bundles cannot be applied with '
6889 6889 '"hg unbundle"'),
6890 6890 hint=_('use "hg debugapplystreamclonebundle"'))
6891 6891 else:
6892 6892 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6893 6893
6894 6894 return postincoming(ui, repo, modheads, opts.get('update'), None)
6895 6895
6896 6896 @command('^update|up|checkout|co',
6897 6897 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6898 6898 ('c', 'check', None,
6899 6899 _('update across branches if no uncommitted changes')),
6900 6900 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6901 6901 ('r', 'rev', '', _('revision'), _('REV'))
6902 6902 ] + mergetoolopts,
6903 6903 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6904 6904 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6905 6905 tool=None):
6906 6906 """update working directory (or switch revisions)
6907 6907
6908 6908 Update the repository's working directory to the specified
6909 6909 changeset. If no changeset is specified, update to the tip of the
6910 6910 current named branch and move the active bookmark (see :hg:`help
6911 6911 bookmarks`).
6912 6912
6913 6913 Update sets the working directory's parent revision to the specified
6914 6914 changeset (see :hg:`help parents`).
6915 6915
6916 6916 If the changeset is not a descendant or ancestor of the working
6917 6917 directory's parent, the update is aborted. With the -c/--check
6918 6918 option, the working directory is checked for uncommitted changes; if
6919 6919 none are found, the working directory is updated to the specified
6920 6920 changeset.
6921 6921
6922 6922 .. container:: verbose
6923 6923
6924 6924 The following rules apply when the working directory contains
6925 6925 uncommitted changes:
6926 6926
6927 6927 1. If neither -c/--check nor -C/--clean is specified, and if
6928 6928 the requested changeset is an ancestor or descendant of
6929 6929 the working directory's parent, the uncommitted changes
6930 6930 are merged into the requested changeset and the merged
6931 6931 result is left uncommitted. If the requested changeset is
6932 6932 not an ancestor or descendant (that is, it is on another
6933 6933 branch), the update is aborted and the uncommitted changes
6934 6934 are preserved.
6935 6935
6936 6936 2. With the -c/--check option, the update is aborted and the
6937 6937 uncommitted changes are preserved.
6938 6938
6939 6939 3. With the -C/--clean option, uncommitted changes are discarded and
6940 6940 the working directory is updated to the requested changeset.
6941 6941
6942 6942 To cancel an uncommitted merge (and lose your changes), use
6943 6943 :hg:`update --clean .`.
6944 6944
6945 6945 Use null as the changeset to remove the working directory (like
6946 6946 :hg:`clone -U`).
6947 6947
6948 6948 If you want to revert just one file to an older revision, use
6949 6949 :hg:`revert [-r REV] NAME`.
6950 6950
6951 6951 See :hg:`help dates` for a list of formats valid for -d/--date.
6952 6952
6953 6953 Returns 0 on success, 1 if there are unresolved files.
6954 6954 """
6955 6955 movemarkfrom = None
6956 6956 if rev and node:
6957 6957 raise error.Abort(_("please specify just one revision"))
6958 6958
6959 6959 if rev is None or rev == '':
6960 6960 rev = node
6961 6961
6962 if date and rev is not None:
6963 raise error.Abort(_("you can't specify a revision and a date"))
6964
6965 if check and clean:
6966 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
6967
6962 6968 warndest = False
6963 6969
6964 6970 with repo.wlock():
6965 6971 cmdutil.clearunfinished(repo)
6966 6972
6967 6973 if date:
6968 if rev is not None:
6969 raise error.Abort(_("you can't specify a revision and a date"))
6970 6974 rev = cmdutil.finddate(ui, repo, date)
6971 6975
6972 6976 # if we defined a bookmark, we have to remember the original name
6973 6977 brev = rev
6974 6978 rev = scmutil.revsingle(repo, rev, rev).rev()
6975 6979
6976 if check and clean:
6977 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6978 )
6979
6980 6980 if check:
6981 6981 cmdutil.bailifchanged(repo, merge=False)
6982 6982 if rev is None:
6983 6983 updata = destutil.destupdate(repo, clean=clean, check=check)
6984 6984 rev, movemarkfrom, brev = updata
6985 6985 warndest = True
6986 6986
6987 6987 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6988 6988
6989 6989 if clean:
6990 6990 ret = hg.clean(repo, rev)
6991 6991 else:
6992 6992 ret = hg.update(repo, rev)
6993 6993
6994 6994 if not ret and movemarkfrom:
6995 6995 if movemarkfrom == repo['.'].node():
6996 6996 pass # no-op update
6997 6997 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6998 6998 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6999 6999 else:
7000 7000 # this can happen with a non-linear update
7001 7001 ui.status(_("(leaving bookmark %s)\n") %
7002 7002 repo._activebookmark)
7003 7003 bookmarks.deactivate(repo)
7004 7004 elif brev in repo._bookmarks:
7005 7005 bookmarks.activate(repo, brev)
7006 7006 ui.status(_("(activating bookmark %s)\n") % brev)
7007 7007 elif brev:
7008 7008 if repo._activebookmark:
7009 7009 ui.status(_("(leaving bookmark %s)\n") %
7010 7010 repo._activebookmark)
7011 7011 bookmarks.deactivate(repo)
7012 7012 if warndest:
7013 7013 destutil.statusotherdests(ui, repo)
7014 7014 return ret
7015 7015
7016 7016 @command('verify', [])
7017 7017 def verify(ui, repo):
7018 7018 """verify the integrity of the repository
7019 7019
7020 7020 Verify the integrity of the current repository.
7021 7021
7022 7022 This will perform an extensive check of the repository's
7023 7023 integrity, validating the hashes and checksums of each entry in
7024 7024 the changelog, manifest, and tracked files, as well as the
7025 7025 integrity of their crosslinks and indices.
7026 7026
7027 7027 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7028 7028 for more information about recovery from corruption of the
7029 7029 repository.
7030 7030
7031 7031 Returns 0 on success, 1 if errors are encountered.
7032 7032 """
7033 7033 return hg.verify(repo)
7034 7034
7035 7035 @command('version', [], norepo=True)
7036 7036 def version_(ui):
7037 7037 """output version and copyright information"""
7038 7038 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7039 7039 % util.version())
7040 7040 ui.status(_(
7041 7041 "(see https://mercurial-scm.org for more information)\n"
7042 7042 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7043 7043 "This is free software; see the source for copying conditions. "
7044 7044 "There is NO\nwarranty; "
7045 7045 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7046 7046 ))
7047 7047
7048 7048 ui.note(_("\nEnabled extensions:\n\n"))
7049 7049 if ui.verbose:
7050 7050 # format names and versions into columns
7051 7051 names = []
7052 7052 vers = []
7053 7053 place = []
7054 7054 for name, module in extensions.extensions():
7055 7055 names.append(name)
7056 7056 vers.append(extensions.moduleversion(module))
7057 7057 if extensions.ismoduleinternal(module):
7058 7058 place.append(_("internal"))
7059 7059 else:
7060 7060 place.append(_("external"))
7061 7061 if names:
7062 7062 maxnamelen = max(len(n) for n in names)
7063 7063 for i, name in enumerate(names):
7064 7064 ui.write(" %-*s %s %s\n" %
7065 7065 (maxnamelen, name, place[i], vers[i]))
General Comments 0
You need to be logged in to leave comments. Login now