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