##// END OF EJS Templates
add: mention .hgignore in help
timeless -
r27424:c2854c41 default
parent child Browse files
Show More
@@ -1,7001 +1,7002 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, bin, nullhex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _
11 11 import os, re, difflib, time, tempfile, errno, shlex
12 12 import sys, socket
13 13 import hg, scmutil, util, revlog, copies, error, bookmarks
14 14 import patch, help, encoding, templatekw, discovery
15 15 import archival, changegroup, cmdutil, hbisect
16 16 import sshserver, hgweb
17 17 import extensions
18 18 import merge as mergemod
19 19 import minirst, revset, fileset
20 20 import dagparser, context, simplemerge, graphmod, copies
21 21 import random, operator
22 22 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
23 23 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
24 24 import ui as uimod
25 25 import streamclone
26 26 import commandserver
27 27
28 28 table = {}
29 29
30 30 command = cmdutil.command(table)
31 31
32 32 # Space delimited list of commands that don't require local repositories.
33 33 # This should be populated by passing norepo=True into the @command decorator.
34 34 norepo = ''
35 35 # Space delimited list of commands that optionally require local repositories.
36 36 # This should be populated by passing optionalrepo=True into the @command
37 37 # decorator.
38 38 optionalrepo = ''
39 39 # Space delimited list of commands that will examine arguments looking for
40 40 # a repository. This should be populated by passing inferrepo=True into the
41 41 # @command decorator.
42 42 inferrepo = ''
43 43
44 44 # label constants
45 45 # until 3.5, bookmarks.current was the advertised name, not
46 46 # bookmarks.active, so we must use both to avoid breaking old
47 47 # custom styles
48 48 activebookmarklabel = 'bookmarks.active bookmarks.current'
49 49
50 50 # common command options
51 51
52 52 globalopts = [
53 53 ('R', 'repository', '',
54 54 _('repository root directory or name of overlay bundle file'),
55 55 _('REPO')),
56 56 ('', 'cwd', '',
57 57 _('change working directory'), _('DIR')),
58 58 ('y', 'noninteractive', None,
59 59 _('do not prompt, automatically pick the first choice for all prompts')),
60 60 ('q', 'quiet', None, _('suppress output')),
61 61 ('v', 'verbose', None, _('enable additional output')),
62 62 ('', 'config', [],
63 63 _('set/override config option (use \'section.name=value\')'),
64 64 _('CONFIG')),
65 65 ('', 'debug', None, _('enable debugging output')),
66 66 ('', 'debugger', None, _('start debugger')),
67 67 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
68 68 _('ENCODE')),
69 69 ('', 'encodingmode', encoding.encodingmode,
70 70 _('set the charset encoding mode'), _('MODE')),
71 71 ('', 'traceback', None, _('always print a traceback on exception')),
72 72 ('', 'time', None, _('time how long the command takes')),
73 73 ('', 'profile', None, _('print command execution profile')),
74 74 ('', 'version', None, _('output version information and exit')),
75 75 ('h', 'help', None, _('display help and exit')),
76 76 ('', 'hidden', False, _('consider hidden changesets')),
77 77 ]
78 78
79 79 dryrunopts = [('n', 'dry-run', None,
80 80 _('do not perform actions, just print output'))]
81 81
82 82 remoteopts = [
83 83 ('e', 'ssh', '',
84 84 _('specify ssh command to use'), _('CMD')),
85 85 ('', 'remotecmd', '',
86 86 _('specify hg command to run on the remote side'), _('CMD')),
87 87 ('', 'insecure', None,
88 88 _('do not verify server certificate (ignoring web.cacerts config)')),
89 89 ]
90 90
91 91 walkopts = [
92 92 ('I', 'include', [],
93 93 _('include names matching the given patterns'), _('PATTERN')),
94 94 ('X', 'exclude', [],
95 95 _('exclude names matching the given patterns'), _('PATTERN')),
96 96 ]
97 97
98 98 commitopts = [
99 99 ('m', 'message', '',
100 100 _('use text as commit message'), _('TEXT')),
101 101 ('l', 'logfile', '',
102 102 _('read commit message from file'), _('FILE')),
103 103 ]
104 104
105 105 commitopts2 = [
106 106 ('d', 'date', '',
107 107 _('record the specified date as commit date'), _('DATE')),
108 108 ('u', 'user', '',
109 109 _('record the specified user as committer'), _('USER')),
110 110 ]
111 111
112 112 # hidden for now
113 113 formatteropts = [
114 114 ('T', 'template', '',
115 115 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
116 116 ]
117 117
118 118 templateopts = [
119 119 ('', 'style', '',
120 120 _('display using template map file (DEPRECATED)'), _('STYLE')),
121 121 ('T', 'template', '',
122 122 _('display with template'), _('TEMPLATE')),
123 123 ]
124 124
125 125 logopts = [
126 126 ('p', 'patch', None, _('show patch')),
127 127 ('g', 'git', None, _('use git extended diff format')),
128 128 ('l', 'limit', '',
129 129 _('limit number of changes displayed'), _('NUM')),
130 130 ('M', 'no-merges', None, _('do not show merges')),
131 131 ('', 'stat', None, _('output diffstat-style summary of changes')),
132 132 ('G', 'graph', None, _("show the revision DAG")),
133 133 ] + templateopts
134 134
135 135 diffopts = [
136 136 ('a', 'text', None, _('treat all files as text')),
137 137 ('g', 'git', None, _('use git extended diff format')),
138 138 ('', 'nodates', None, _('omit dates from diff headers'))
139 139 ]
140 140
141 141 diffwsopts = [
142 142 ('w', 'ignore-all-space', None,
143 143 _('ignore white space when comparing lines')),
144 144 ('b', 'ignore-space-change', None,
145 145 _('ignore changes in the amount of white space')),
146 146 ('B', 'ignore-blank-lines', None,
147 147 _('ignore changes whose lines are all blank')),
148 148 ]
149 149
150 150 diffopts2 = [
151 151 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
152 152 ('p', 'show-function', None, _('show which function each change is in')),
153 153 ('', 'reverse', None, _('produce a diff that undoes the changes')),
154 154 ] + diffwsopts + [
155 155 ('U', 'unified', '',
156 156 _('number of lines of context to show'), _('NUM')),
157 157 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 158 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
159 159 ]
160 160
161 161 mergetoolopts = [
162 162 ('t', 'tool', '', _('specify merge tool')),
163 163 ]
164 164
165 165 similarityopts = [
166 166 ('s', 'similarity', '',
167 167 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
168 168 ]
169 169
170 170 subrepoopts = [
171 171 ('S', 'subrepos', None,
172 172 _('recurse into subrepositories'))
173 173 ]
174 174
175 175 debugrevlogopts = [
176 176 ('c', 'changelog', False, _('open changelog')),
177 177 ('m', 'manifest', False, _('open manifest')),
178 178 ('', 'dir', False, _('open directory manifest')),
179 179 ]
180 180
181 181 # Commands start here, listed alphabetically
182 182
183 183 @command('^add',
184 184 walkopts + subrepoopts + dryrunopts,
185 185 _('[OPTION]... [FILE]...'),
186 186 inferrepo=True)
187 187 def add(ui, repo, *pats, **opts):
188 188 """add the specified files on the next commit
189 189
190 190 Schedule files to be version controlled and added to the
191 191 repository.
192 192
193 193 The files will be added to the repository at the next commit. To
194 194 undo an add before that, see :hg:`forget`.
195 195
196 If no names are given, add all files to the repository.
196 If no names are given, add all files to the repository (except
197 files matching ``.hgignore``).
197 198
198 199 .. container:: verbose
199 200
200 201 Examples:
201 202
202 203 - New (unknown) files are added
203 204 automatically by :hg:`add`::
204 205
205 206 $ ls
206 207 foo.c
207 208 $ hg status
208 209 ? foo.c
209 210 $ hg add
210 211 adding foo.c
211 212 $ hg status
212 213 A foo.c
213 214
214 215 - Specific files to be added can be specified::
215 216
216 217 $ ls
217 218 bar.c foo.c
218 219 $ hg status
219 220 ? bar.c
220 221 ? foo.c
221 222 $ hg add bar.c
222 223 $ hg status
223 224 A bar.c
224 225 ? foo.c
225 226
226 227 Returns 0 if all files are successfully added.
227 228 """
228 229
229 230 m = scmutil.match(repo[None], pats, opts)
230 231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
231 232 return rejected and 1 or 0
232 233
233 234 @command('addremove',
234 235 similarityopts + subrepoopts + walkopts + dryrunopts,
235 236 _('[OPTION]... [FILE]...'),
236 237 inferrepo=True)
237 238 def addremove(ui, repo, *pats, **opts):
238 239 """add all new files, delete all missing files
239 240
240 241 Add all new files and remove all missing files from the
241 242 repository.
242 243
243 244 New files are ignored if they match any of the patterns in
244 245 ``.hgignore``. As with add, these changes take effect at the next
245 246 commit.
246 247
247 248 Use the -s/--similarity option to detect renamed files. This
248 249 option takes a percentage between 0 (disabled) and 100 (files must
249 250 be identical) as its parameter. With a parameter greater than 0,
250 251 this compares every removed file with every added file and records
251 252 those similar enough as renames. Detecting renamed files this way
252 253 can be expensive. After using this option, :hg:`status -C` can be
253 254 used to check which files were identified as moved or renamed. If
254 255 not specified, -s/--similarity defaults to 100 and only renames of
255 256 identical files are detected.
256 257
257 258 .. container:: verbose
258 259
259 260 Examples:
260 261
261 262 - A number of files (bar.c and foo.c) are new,
262 263 while foobar.c has been removed (without using :hg:`remove`)
263 264 from the repository::
264 265
265 266 $ ls
266 267 bar.c foo.c
267 268 $ hg status
268 269 ! foobar.c
269 270 ? bar.c
270 271 ? foo.c
271 272 $ hg addremove
272 273 adding bar.c
273 274 adding foo.c
274 275 removing foobar.c
275 276 $ hg status
276 277 A bar.c
277 278 A foo.c
278 279 R foobar.c
279 280
280 281 - A file foobar.c was moved to foo.c without using :hg:`rename`.
281 282 Afterwards, it was edited slightly::
282 283
283 284 $ ls
284 285 foo.c
285 286 $ hg status
286 287 ! foobar.c
287 288 ? foo.c
288 289 $ hg addremove --similarity 90
289 290 removing foobar.c
290 291 adding foo.c
291 292 recording removal of foobar.c as rename to foo.c (94% similar)
292 293 $ hg status -C
293 294 A foo.c
294 295 foobar.c
295 296 R foobar.c
296 297
297 298 Returns 0 if all files are successfully added.
298 299 """
299 300 try:
300 301 sim = float(opts.get('similarity') or 100)
301 302 except ValueError:
302 303 raise error.Abort(_('similarity must be a number'))
303 304 if sim < 0 or sim > 100:
304 305 raise error.Abort(_('similarity must be between 0 and 100'))
305 306 matcher = scmutil.match(repo[None], pats, opts)
306 307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
307 308
308 309 @command('^annotate|blame',
309 310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
310 311 ('', 'follow', None,
311 312 _('follow copies/renames and list the filename (DEPRECATED)')),
312 313 ('', 'no-follow', None, _("don't follow copies and renames")),
313 314 ('a', 'text', None, _('treat all files as text')),
314 315 ('u', 'user', None, _('list the author (long with -v)')),
315 316 ('f', 'file', None, _('list the filename')),
316 317 ('d', 'date', None, _('list the date (short with -q)')),
317 318 ('n', 'number', None, _('list the revision number (default)')),
318 319 ('c', 'changeset', None, _('list the changeset')),
319 320 ('l', 'line-number', None, _('show line number at the first appearance'))
320 321 ] + diffwsopts + walkopts + formatteropts,
321 322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
322 323 inferrepo=True)
323 324 def annotate(ui, repo, *pats, **opts):
324 325 """show changeset information by line for each file
325 326
326 327 List changes in files, showing the revision id responsible for
327 328 each line
328 329
329 330 This command is useful for discovering when a change was made and
330 331 by whom.
331 332
332 333 Without the -a/--text option, annotate will avoid processing files
333 334 it detects as binary. With -a, annotate will annotate the file
334 335 anyway, although the results will probably be neither useful
335 336 nor desirable.
336 337
337 338 Returns 0 on success.
338 339 """
339 340 if not pats:
340 341 raise error.Abort(_('at least one filename or pattern is required'))
341 342
342 343 if opts.get('follow'):
343 344 # --follow is deprecated and now just an alias for -f/--file
344 345 # to mimic the behavior of Mercurial before version 1.5
345 346 opts['file'] = True
346 347
347 348 ctx = scmutil.revsingle(repo, opts.get('rev'))
348 349
349 350 fm = ui.formatter('annotate', opts)
350 351 if ui.quiet:
351 352 datefunc = util.shortdate
352 353 else:
353 354 datefunc = util.datestr
354 355 if ctx.rev() is None:
355 356 def hexfn(node):
356 357 if node is None:
357 358 return None
358 359 else:
359 360 return fm.hexfunc(node)
360 361 if opts.get('changeset'):
361 362 # omit "+" suffix which is appended to node hex
362 363 def formatrev(rev):
363 364 if rev is None:
364 365 return '%d' % ctx.p1().rev()
365 366 else:
366 367 return '%d' % rev
367 368 else:
368 369 def formatrev(rev):
369 370 if rev is None:
370 371 return '%d+' % ctx.p1().rev()
371 372 else:
372 373 return '%d ' % rev
373 374 def formathex(hex):
374 375 if hex is None:
375 376 return '%s+' % fm.hexfunc(ctx.p1().node())
376 377 else:
377 378 return '%s ' % hex
378 379 else:
379 380 hexfn = fm.hexfunc
380 381 formatrev = formathex = str
381 382
382 383 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
383 384 ('number', ' ', lambda x: x[0].rev(), formatrev),
384 385 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
385 386 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
386 387 ('file', ' ', lambda x: x[0].path(), str),
387 388 ('line_number', ':', lambda x: x[1], str),
388 389 ]
389 390 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
390 391
391 392 if (not opts.get('user') and not opts.get('changeset')
392 393 and not opts.get('date') and not opts.get('file')):
393 394 opts['number'] = True
394 395
395 396 linenumber = opts.get('line_number') is not None
396 397 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
397 398 raise error.Abort(_('at least one of -n/-c is required for -l'))
398 399
399 400 if fm:
400 401 def makefunc(get, fmt):
401 402 return get
402 403 else:
403 404 def makefunc(get, fmt):
404 405 return lambda x: fmt(get(x))
405 406 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
406 407 if opts.get(op)]
407 408 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
408 409 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
409 410 if opts.get(op))
410 411
411 412 def bad(x, y):
412 413 raise error.Abort("%s: %s" % (x, y))
413 414
414 415 m = scmutil.match(ctx, pats, opts, badfn=bad)
415 416
416 417 follow = not opts.get('no_follow')
417 418 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
418 419 whitespace=True)
419 420 for abs in ctx.walk(m):
420 421 fctx = ctx[abs]
421 422 if not opts.get('text') and util.binary(fctx.data()):
422 423 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
423 424 continue
424 425
425 426 lines = fctx.annotate(follow=follow, linenumber=linenumber,
426 427 diffopts=diffopts)
427 428 formats = []
428 429 pieces = []
429 430
430 431 for f, sep in funcmap:
431 432 l = [f(n) for n, dummy in lines]
432 433 if l:
433 434 if fm:
434 435 formats.append(['%s' for x in l])
435 436 else:
436 437 sizes = [encoding.colwidth(x) for x in l]
437 438 ml = max(sizes)
438 439 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
439 440 pieces.append(l)
440 441
441 442 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
442 443 fm.startitem()
443 444 fm.write(fields, "".join(f), *p)
444 445 fm.write('line', ": %s", l[1])
445 446
446 447 if lines and not lines[-1][1].endswith('\n'):
447 448 fm.plain('\n')
448 449
449 450 fm.end()
450 451
451 452 @command('archive',
452 453 [('', 'no-decode', None, _('do not pass files through decoders')),
453 454 ('p', 'prefix', '', _('directory prefix for files in archive'),
454 455 _('PREFIX')),
455 456 ('r', 'rev', '', _('revision to distribute'), _('REV')),
456 457 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
457 458 ] + subrepoopts + walkopts,
458 459 _('[OPTION]... DEST'))
459 460 def archive(ui, repo, dest, **opts):
460 461 '''create an unversioned archive of a repository revision
461 462
462 463 By default, the revision used is the parent of the working
463 464 directory; use -r/--rev to specify a different revision.
464 465
465 466 The archive type is automatically detected based on file
466 467 extension (or override using -t/--type).
467 468
468 469 .. container:: verbose
469 470
470 471 Examples:
471 472
472 473 - create a zip file containing the 1.0 release::
473 474
474 475 hg archive -r 1.0 project-1.0.zip
475 476
476 477 - create a tarball excluding .hg files::
477 478
478 479 hg archive project.tar.gz -X ".hg*"
479 480
480 481 Valid types are:
481 482
482 483 :``files``: a directory full of files (default)
483 484 :``tar``: tar archive, uncompressed
484 485 :``tbz2``: tar archive, compressed using bzip2
485 486 :``tgz``: tar archive, compressed using gzip
486 487 :``uzip``: zip archive, uncompressed
487 488 :``zip``: zip archive, compressed using deflate
488 489
489 490 The exact name of the destination archive or directory is given
490 491 using a format string; see :hg:`help export` for details.
491 492
492 493 Each member added to an archive file has a directory prefix
493 494 prepended. Use -p/--prefix to specify a format string for the
494 495 prefix. The default is the basename of the archive, with suffixes
495 496 removed.
496 497
497 498 Returns 0 on success.
498 499 '''
499 500
500 501 ctx = scmutil.revsingle(repo, opts.get('rev'))
501 502 if not ctx:
502 503 raise error.Abort(_('no working directory: please specify a revision'))
503 504 node = ctx.node()
504 505 dest = cmdutil.makefilename(repo, dest, node)
505 506 if os.path.realpath(dest) == repo.root:
506 507 raise error.Abort(_('repository root cannot be destination'))
507 508
508 509 kind = opts.get('type') or archival.guesskind(dest) or 'files'
509 510 prefix = opts.get('prefix')
510 511
511 512 if dest == '-':
512 513 if kind == 'files':
513 514 raise error.Abort(_('cannot archive plain files to stdout'))
514 515 dest = cmdutil.makefileobj(repo, dest)
515 516 if not prefix:
516 517 prefix = os.path.basename(repo.root) + '-%h'
517 518
518 519 prefix = cmdutil.makefilename(repo, prefix, node)
519 520 matchfn = scmutil.match(ctx, [], opts)
520 521 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
521 522 matchfn, prefix, subrepos=opts.get('subrepos'))
522 523
523 524 @command('backout',
524 525 [('', 'merge', None, _('merge with old dirstate parent after backout')),
525 526 ('', 'commit', None, _('commit if no conflicts were encountered')),
526 527 ('', 'parent', '',
527 528 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
528 529 ('r', 'rev', '', _('revision to backout'), _('REV')),
529 530 ('e', 'edit', False, _('invoke editor on commit messages')),
530 531 ] + mergetoolopts + walkopts + commitopts + commitopts2,
531 532 _('[OPTION]... [-r] REV'))
532 533 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
533 534 '''reverse effect of earlier changeset
534 535
535 536 Prepare a new changeset with the effect of REV undone in the
536 537 current working directory.
537 538
538 539 If REV is the parent of the working directory, then this new changeset
539 540 is committed automatically. Otherwise, hg needs to merge the
540 541 changes and the merged result is left uncommitted.
541 542
542 543 .. note::
543 544
544 545 backout cannot be used to fix either an unwanted or
545 546 incorrect merge.
546 547
547 548 .. container:: verbose
548 549
549 550 Examples:
550 551
551 552 - Reverse the effect of the parent of the working directory.
552 553 This backout will be committed immediately::
553 554
554 555 hg backout -r .
555 556
556 557 - Reverse the effect of previous bad revision 23::
557 558
558 559 hg backout -r 23
559 560 hg commit -m "Backout revision 23"
560 561
561 562 - Reverse the effect of previous bad revision 23 and
562 563 commit the backout immediately::
563 564
564 565 hg backout -r 23 --commit
565 566
566 567 By default, the pending changeset will have one parent,
567 568 maintaining a linear history. With --merge, the pending
568 569 changeset will instead have two parents: the old parent of the
569 570 working directory and a new child of REV that simply undoes REV.
570 571
571 572 Before version 1.7, the behavior without --merge was equivalent
572 573 to specifying --merge followed by :hg:`update --clean .` to
573 574 cancel the merge and leave the child of REV as a head to be
574 575 merged separately.
575 576
576 577 See :hg:`help dates` for a list of formats valid for -d/--date.
577 578
578 579 See :hg:`help revert` for a way to restore files to the state
579 580 of another revision.
580 581
581 582 Returns 0 on success, 1 if nothing to backout or there are unresolved
582 583 files.
583 584 '''
584 585 wlock = lock = None
585 586 try:
586 587 wlock = repo.wlock()
587 588 lock = repo.lock()
588 589 return _dobackout(ui, repo, node, rev, commit, **opts)
589 590 finally:
590 591 release(lock, wlock)
591 592
592 593 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
593 594 if rev and node:
594 595 raise error.Abort(_("please specify just one revision"))
595 596
596 597 if not rev:
597 598 rev = node
598 599
599 600 if not rev:
600 601 raise error.Abort(_("please specify a revision to backout"))
601 602
602 603 date = opts.get('date')
603 604 if date:
604 605 opts['date'] = util.parsedate(date)
605 606
606 607 cmdutil.checkunfinished(repo)
607 608 cmdutil.bailifchanged(repo)
608 609 node = scmutil.revsingle(repo, rev).node()
609 610
610 611 op1, op2 = repo.dirstate.parents()
611 612 if not repo.changelog.isancestor(node, op1):
612 613 raise error.Abort(_('cannot backout change that is not an ancestor'))
613 614
614 615 p1, p2 = repo.changelog.parents(node)
615 616 if p1 == nullid:
616 617 raise error.Abort(_('cannot backout a change with no parents'))
617 618 if p2 != nullid:
618 619 if not opts.get('parent'):
619 620 raise error.Abort(_('cannot backout a merge changeset'))
620 621 p = repo.lookup(opts['parent'])
621 622 if p not in (p1, p2):
622 623 raise error.Abort(_('%s is not a parent of %s') %
623 624 (short(p), short(node)))
624 625 parent = p
625 626 else:
626 627 if opts.get('parent'):
627 628 raise error.Abort(_('cannot use --parent on non-merge changeset'))
628 629 parent = p1
629 630
630 631 # the backout should appear on the same branch
631 632 try:
632 633 branch = repo.dirstate.branch()
633 634 bheads = repo.branchheads(branch)
634 635 rctx = scmutil.revsingle(repo, hex(parent))
635 636 if not opts.get('merge') and op1 != node:
636 637 dsguard = cmdutil.dirstateguard(repo, 'backout')
637 638 try:
638 639 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
639 640 'backout')
640 641 stats = mergemod.update(repo, parent, True, True, node, False)
641 642 repo.setparents(op1, op2)
642 643 dsguard.close()
643 644 hg._showstats(repo, stats)
644 645 if stats[3]:
645 646 repo.ui.status(_("use 'hg resolve' to retry unresolved "
646 647 "file merges\n"))
647 648 return 1
648 649 elif not commit:
649 650 msg = _("changeset %s backed out, "
650 651 "don't forget to commit.\n")
651 652 ui.status(msg % short(node))
652 653 return 0
653 654 finally:
654 655 ui.setconfig('ui', 'forcemerge', '', '')
655 656 lockmod.release(dsguard)
656 657 else:
657 658 hg.clean(repo, node, show_stats=False)
658 659 repo.dirstate.setbranch(branch)
659 660 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
660 661
661 662
662 663 def commitfunc(ui, repo, message, match, opts):
663 664 editform = 'backout'
664 665 e = cmdutil.getcommiteditor(editform=editform, **opts)
665 666 if not message:
666 667 # we don't translate commit messages
667 668 message = "Backed out changeset %s" % short(node)
668 669 e = cmdutil.getcommiteditor(edit=True, editform=editform)
669 670 return repo.commit(message, opts.get('user'), opts.get('date'),
670 671 match, editor=e)
671 672 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
672 673 if not newnode:
673 674 ui.status(_("nothing changed\n"))
674 675 return 1
675 676 cmdutil.commitstatus(repo, newnode, branch, bheads)
676 677
677 678 def nice(node):
678 679 return '%d:%s' % (repo.changelog.rev(node), short(node))
679 680 ui.status(_('changeset %s backs out changeset %s\n') %
680 681 (nice(repo.changelog.tip()), nice(node)))
681 682 if opts.get('merge') and op1 != node:
682 683 hg.clean(repo, op1, show_stats=False)
683 684 ui.status(_('merging with changeset %s\n')
684 685 % nice(repo.changelog.tip()))
685 686 try:
686 687 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 688 'backout')
688 689 return hg.merge(repo, hex(repo.changelog.tip()))
689 690 finally:
690 691 ui.setconfig('ui', 'forcemerge', '', '')
691 692 finally:
692 693 # TODO: get rid of this meaningless try/finally enclosing.
693 694 # this is kept only to reduce changes in a patch.
694 695 pass
695 696 return 0
696 697
697 698 @command('bisect',
698 699 [('r', 'reset', False, _('reset bisect state')),
699 700 ('g', 'good', False, _('mark changeset good')),
700 701 ('b', 'bad', False, _('mark changeset bad')),
701 702 ('s', 'skip', False, _('skip testing changeset')),
702 703 ('e', 'extend', False, _('extend the bisect range')),
703 704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 705 ('U', 'noupdate', False, _('do not update to target'))],
705 706 _("[-gbsr] [-U] [-c CMD] [REV]"))
706 707 def bisect(ui, repo, rev=None, extra=None, command=None,
707 708 reset=None, good=None, bad=None, skip=None, extend=None,
708 709 noupdate=None):
709 710 """subdivision search of changesets
710 711
711 712 This command helps to find changesets which introduce problems. To
712 713 use, mark the earliest changeset you know exhibits the problem as
713 714 bad, then mark the latest changeset which is free from the problem
714 715 as good. Bisect will update your working directory to a revision
715 716 for testing (unless the -U/--noupdate option is specified). Once
716 717 you have performed tests, mark the working directory as good or
717 718 bad, and bisect will either update to another candidate changeset
718 719 or announce that it has found the bad revision.
719 720
720 721 As a shortcut, you can also use the revision argument to mark a
721 722 revision as good or bad without checking it out first.
722 723
723 724 If you supply a command, it will be used for automatic bisection.
724 725 The environment variable HG_NODE will contain the ID of the
725 726 changeset being tested. The exit status of the command will be
726 727 used to mark revisions as good or bad: status 0 means good, 125
727 728 means to skip the revision, 127 (command not found) will abort the
728 729 bisection, and any other non-zero exit status means the revision
729 730 is bad.
730 731
731 732 .. container:: verbose
732 733
733 734 Some examples:
734 735
735 736 - start a bisection with known bad revision 34, and good revision 12::
736 737
737 738 hg bisect --bad 34
738 739 hg bisect --good 12
739 740
740 741 - advance the current bisection by marking current revision as good or
741 742 bad::
742 743
743 744 hg bisect --good
744 745 hg bisect --bad
745 746
746 747 - mark the current revision, or a known revision, to be skipped (e.g. if
747 748 that revision is not usable because of another issue)::
748 749
749 750 hg bisect --skip
750 751 hg bisect --skip 23
751 752
752 753 - skip all revisions that do not touch directories ``foo`` or ``bar``::
753 754
754 755 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
755 756
756 757 - forget the current bisection::
757 758
758 759 hg bisect --reset
759 760
760 761 - use 'make && make tests' to automatically find the first broken
761 762 revision::
762 763
763 764 hg bisect --reset
764 765 hg bisect --bad 34
765 766 hg bisect --good 12
766 767 hg bisect --command "make && make tests"
767 768
768 769 - see all changesets whose states are already known in the current
769 770 bisection::
770 771
771 772 hg log -r "bisect(pruned)"
772 773
773 774 - see the changeset currently being bisected (especially useful
774 775 if running with -U/--noupdate)::
775 776
776 777 hg log -r "bisect(current)"
777 778
778 779 - see all changesets that took part in the current bisection::
779 780
780 781 hg log -r "bisect(range)"
781 782
782 783 - you can even get a nice graph::
783 784
784 785 hg log --graph -r "bisect(range)"
785 786
786 787 See :hg:`help revsets` for more about the `bisect()` keyword.
787 788
788 789 Returns 0 on success.
789 790 """
790 791 def extendbisectrange(nodes, good):
791 792 # bisect is incomplete when it ends on a merge node and
792 793 # one of the parent was not checked.
793 794 parents = repo[nodes[0]].parents()
794 795 if len(parents) > 1:
795 796 if good:
796 797 side = state['bad']
797 798 else:
798 799 side = state['good']
799 800 num = len(set(i.node() for i in parents) & set(side))
800 801 if num == 1:
801 802 return parents[0].ancestor(parents[1])
802 803 return None
803 804
804 805 def print_result(nodes, good):
805 806 displayer = cmdutil.show_changeset(ui, repo, {})
806 807 if len(nodes) == 1:
807 808 # narrowed it down to a single revision
808 809 if good:
809 810 ui.write(_("The first good revision is:\n"))
810 811 else:
811 812 ui.write(_("The first bad revision is:\n"))
812 813 displayer.show(repo[nodes[0]])
813 814 extendnode = extendbisectrange(nodes, good)
814 815 if extendnode is not None:
815 816 ui.write(_('Not all ancestors of this changeset have been'
816 817 ' checked.\nUse bisect --extend to continue the '
817 818 'bisection from\nthe common ancestor, %s.\n')
818 819 % extendnode)
819 820 else:
820 821 # multiple possible revisions
821 822 if good:
822 823 ui.write(_("Due to skipped revisions, the first "
823 824 "good revision could be any of:\n"))
824 825 else:
825 826 ui.write(_("Due to skipped revisions, the first "
826 827 "bad revision could be any of:\n"))
827 828 for n in nodes:
828 829 displayer.show(repo[n])
829 830 displayer.close()
830 831
831 832 def check_state(state, interactive=True):
832 833 if not state['good'] or not state['bad']:
833 834 if (good or bad or skip or reset) and interactive:
834 835 return
835 836 if not state['good']:
836 837 raise error.Abort(_('cannot bisect (no known good revisions)'))
837 838 else:
838 839 raise error.Abort(_('cannot bisect (no known bad revisions)'))
839 840 return True
840 841
841 842 # backward compatibility
842 843 if rev in "good bad reset init".split():
843 844 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
844 845 cmd, rev, extra = rev, extra, None
845 846 if cmd == "good":
846 847 good = True
847 848 elif cmd == "bad":
848 849 bad = True
849 850 else:
850 851 reset = True
851 852 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
852 853 raise error.Abort(_('incompatible arguments'))
853 854
854 855 cmdutil.checkunfinished(repo)
855 856
856 857 if reset:
857 858 p = repo.join("bisect.state")
858 859 if os.path.exists(p):
859 860 os.unlink(p)
860 861 return
861 862
862 863 state = hbisect.load_state(repo)
863 864
864 865 if command:
865 866 changesets = 1
866 867 if noupdate:
867 868 try:
868 869 node = state['current'][0]
869 870 except LookupError:
870 871 raise error.Abort(_('current bisect revision is unknown - '
871 872 'start a new bisect to fix'))
872 873 else:
873 874 node, p2 = repo.dirstate.parents()
874 875 if p2 != nullid:
875 876 raise error.Abort(_('current bisect revision is a merge'))
876 877 try:
877 878 while changesets:
878 879 # update state
879 880 state['current'] = [node]
880 881 hbisect.save_state(repo, state)
881 882 status = ui.system(command, environ={'HG_NODE': hex(node)})
882 883 if status == 125:
883 884 transition = "skip"
884 885 elif status == 0:
885 886 transition = "good"
886 887 # status < 0 means process was killed
887 888 elif status == 127:
888 889 raise error.Abort(_("failed to execute %s") % command)
889 890 elif status < 0:
890 891 raise error.Abort(_("%s killed") % command)
891 892 else:
892 893 transition = "bad"
893 894 ctx = scmutil.revsingle(repo, rev, node)
894 895 rev = None # clear for future iterations
895 896 state[transition].append(ctx.node())
896 897 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
897 898 check_state(state, interactive=False)
898 899 # bisect
899 900 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
900 901 # update to next check
901 902 node = nodes[0]
902 903 if not noupdate:
903 904 cmdutil.bailifchanged(repo)
904 905 hg.clean(repo, node, show_stats=False)
905 906 finally:
906 907 state['current'] = [node]
907 908 hbisect.save_state(repo, state)
908 909 print_result(nodes, bgood)
909 910 return
910 911
911 912 # update state
912 913
913 914 if rev:
914 915 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
915 916 else:
916 917 nodes = [repo.lookup('.')]
917 918
918 919 if good or bad or skip:
919 920 if good:
920 921 state['good'] += nodes
921 922 elif bad:
922 923 state['bad'] += nodes
923 924 elif skip:
924 925 state['skip'] += nodes
925 926 hbisect.save_state(repo, state)
926 927
927 928 if not check_state(state):
928 929 return
929 930
930 931 # actually bisect
931 932 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
932 933 if extend:
933 934 if not changesets:
934 935 extendnode = extendbisectrange(nodes, good)
935 936 if extendnode is not None:
936 937 ui.write(_("Extending search to changeset %d:%s\n")
937 938 % (extendnode.rev(), extendnode))
938 939 state['current'] = [extendnode.node()]
939 940 hbisect.save_state(repo, state)
940 941 if noupdate:
941 942 return
942 943 cmdutil.bailifchanged(repo)
943 944 return hg.clean(repo, extendnode.node())
944 945 raise error.Abort(_("nothing to extend"))
945 946
946 947 if changesets == 0:
947 948 print_result(nodes, good)
948 949 else:
949 950 assert len(nodes) == 1 # only a single node can be tested next
950 951 node = nodes[0]
951 952 # compute the approximate number of remaining tests
952 953 tests, size = 0, 2
953 954 while size <= changesets:
954 955 tests, size = tests + 1, size * 2
955 956 rev = repo.changelog.rev(node)
956 957 ui.write(_("Testing changeset %d:%s "
957 958 "(%d changesets remaining, ~%d tests)\n")
958 959 % (rev, short(node), changesets, tests))
959 960 state['current'] = [node]
960 961 hbisect.save_state(repo, state)
961 962 if not noupdate:
962 963 cmdutil.bailifchanged(repo)
963 964 return hg.clean(repo, node)
964 965
965 966 @command('bookmarks|bookmark',
966 967 [('f', 'force', False, _('force')),
967 968 ('r', 'rev', '', _('revision'), _('REV')),
968 969 ('d', 'delete', False, _('delete a given bookmark')),
969 970 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
970 971 ('i', 'inactive', False, _('mark a bookmark inactive')),
971 972 ] + formatteropts,
972 973 _('hg bookmarks [OPTIONS]... [NAME]...'))
973 974 def bookmark(ui, repo, *names, **opts):
974 975 '''create a new bookmark or list existing bookmarks
975 976
976 977 Bookmarks are labels on changesets to help track lines of development.
977 978 Bookmarks are unversioned and can be moved, renamed and deleted.
978 979 Deleting or moving a bookmark has no effect on the associated changesets.
979 980
980 981 Creating or updating to a bookmark causes it to be marked as 'active'.
981 982 The active bookmark is indicated with a '*'.
982 983 When a commit is made, the active bookmark will advance to the new commit.
983 984 A plain :hg:`update` will also advance an active bookmark, if possible.
984 985 Updating away from a bookmark will cause it to be deactivated.
985 986
986 987 Bookmarks can be pushed and pulled between repositories (see
987 988 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
988 989 diverged, a new 'divergent bookmark' of the form 'name@path' will
989 990 be created. Using :hg:`merge` will resolve the divergence.
990 991
991 992 A bookmark named '@' has the special property that :hg:`clone` will
992 993 check it out by default if it exists.
993 994
994 995 .. container:: verbose
995 996
996 997 Examples:
997 998
998 999 - create an active bookmark for a new line of development::
999 1000
1000 1001 hg book new-feature
1001 1002
1002 1003 - create an inactive bookmark as a place marker::
1003 1004
1004 1005 hg book -i reviewed
1005 1006
1006 1007 - create an inactive bookmark on another changeset::
1007 1008
1008 1009 hg book -r .^ tested
1009 1010
1010 1011 - rename bookmark turkey to dinner::
1011 1012
1012 1013 hg book -m turkey dinner
1013 1014
1014 1015 - move the '@' bookmark from another branch::
1015 1016
1016 1017 hg book -f @
1017 1018 '''
1018 1019 force = opts.get('force')
1019 1020 rev = opts.get('rev')
1020 1021 delete = opts.get('delete')
1021 1022 rename = opts.get('rename')
1022 1023 inactive = opts.get('inactive')
1023 1024
1024 1025 def checkformat(mark):
1025 1026 mark = mark.strip()
1026 1027 if not mark:
1027 1028 raise error.Abort(_("bookmark names cannot consist entirely of "
1028 1029 "whitespace"))
1029 1030 scmutil.checknewlabel(repo, mark, 'bookmark')
1030 1031 return mark
1031 1032
1032 1033 def checkconflict(repo, mark, cur, force=False, target=None):
1033 1034 if mark in marks and not force:
1034 1035 if target:
1035 1036 if marks[mark] == target and target == cur:
1036 1037 # re-activating a bookmark
1037 1038 return
1038 1039 anc = repo.changelog.ancestors([repo[target].rev()])
1039 1040 bmctx = repo[marks[mark]]
1040 1041 divs = [repo[b].node() for b in marks
1041 1042 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1042 1043
1043 1044 # allow resolving a single divergent bookmark even if moving
1044 1045 # the bookmark across branches when a revision is specified
1045 1046 # that contains a divergent bookmark
1046 1047 if bmctx.rev() not in anc and target in divs:
1047 1048 bookmarks.deletedivergent(repo, [target], mark)
1048 1049 return
1049 1050
1050 1051 deletefrom = [b for b in divs
1051 1052 if repo[b].rev() in anc or b == target]
1052 1053 bookmarks.deletedivergent(repo, deletefrom, mark)
1053 1054 if bookmarks.validdest(repo, bmctx, repo[target]):
1054 1055 ui.status(_("moving bookmark '%s' forward from %s\n") %
1055 1056 (mark, short(bmctx.node())))
1056 1057 return
1057 1058 raise error.Abort(_("bookmark '%s' already exists "
1058 1059 "(use -f to force)") % mark)
1059 1060 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1060 1061 and not force):
1061 1062 raise error.Abort(
1062 1063 _("a bookmark cannot have the name of an existing branch"))
1063 1064
1064 1065 if delete and rename:
1065 1066 raise error.Abort(_("--delete and --rename are incompatible"))
1066 1067 if delete and rev:
1067 1068 raise error.Abort(_("--rev is incompatible with --delete"))
1068 1069 if rename and rev:
1069 1070 raise error.Abort(_("--rev is incompatible with --rename"))
1070 1071 if not names and (delete or rev):
1071 1072 raise error.Abort(_("bookmark name required"))
1072 1073
1073 1074 if delete or rename or names or inactive:
1074 1075 wlock = lock = tr = None
1075 1076 try:
1076 1077 wlock = repo.wlock()
1077 1078 lock = repo.lock()
1078 1079 cur = repo.changectx('.').node()
1079 1080 marks = repo._bookmarks
1080 1081 if delete:
1081 1082 tr = repo.transaction('bookmark')
1082 1083 for mark in names:
1083 1084 if mark not in marks:
1084 1085 raise error.Abort(_("bookmark '%s' does not exist") %
1085 1086 mark)
1086 1087 if mark == repo._activebookmark:
1087 1088 bookmarks.deactivate(repo)
1088 1089 del marks[mark]
1089 1090
1090 1091 elif rename:
1091 1092 tr = repo.transaction('bookmark')
1092 1093 if not names:
1093 1094 raise error.Abort(_("new bookmark name required"))
1094 1095 elif len(names) > 1:
1095 1096 raise error.Abort(_("only one new bookmark name allowed"))
1096 1097 mark = checkformat(names[0])
1097 1098 if rename not in marks:
1098 1099 raise error.Abort(_("bookmark '%s' does not exist")
1099 1100 % rename)
1100 1101 checkconflict(repo, mark, cur, force)
1101 1102 marks[mark] = marks[rename]
1102 1103 if repo._activebookmark == rename and not inactive:
1103 1104 bookmarks.activate(repo, mark)
1104 1105 del marks[rename]
1105 1106 elif names:
1106 1107 tr = repo.transaction('bookmark')
1107 1108 newact = None
1108 1109 for mark in names:
1109 1110 mark = checkformat(mark)
1110 1111 if newact is None:
1111 1112 newact = mark
1112 1113 if inactive and mark == repo._activebookmark:
1113 1114 bookmarks.deactivate(repo)
1114 1115 return
1115 1116 tgt = cur
1116 1117 if rev:
1117 1118 tgt = scmutil.revsingle(repo, rev).node()
1118 1119 checkconflict(repo, mark, cur, force, tgt)
1119 1120 marks[mark] = tgt
1120 1121 if not inactive and cur == marks[newact] and not rev:
1121 1122 bookmarks.activate(repo, newact)
1122 1123 elif cur != tgt and newact == repo._activebookmark:
1123 1124 bookmarks.deactivate(repo)
1124 1125 elif inactive:
1125 1126 if len(marks) == 0:
1126 1127 ui.status(_("no bookmarks set\n"))
1127 1128 elif not repo._activebookmark:
1128 1129 ui.status(_("no active bookmark\n"))
1129 1130 else:
1130 1131 bookmarks.deactivate(repo)
1131 1132 if tr is not None:
1132 1133 marks.recordchange(tr)
1133 1134 tr.close()
1134 1135 finally:
1135 1136 lockmod.release(tr, lock, wlock)
1136 1137 else: # show bookmarks
1137 1138 fm = ui.formatter('bookmarks', opts)
1138 1139 hexfn = fm.hexfunc
1139 1140 marks = repo._bookmarks
1140 1141 if len(marks) == 0 and not fm:
1141 1142 ui.status(_("no bookmarks set\n"))
1142 1143 for bmark, n in sorted(marks.iteritems()):
1143 1144 active = repo._activebookmark
1144 1145 if bmark == active:
1145 1146 prefix, label = '*', activebookmarklabel
1146 1147 else:
1147 1148 prefix, label = ' ', ''
1148 1149
1149 1150 fm.startitem()
1150 1151 if not ui.quiet:
1151 1152 fm.plain(' %s ' % prefix, label=label)
1152 1153 fm.write('bookmark', '%s', bmark, label=label)
1153 1154 pad = " " * (25 - encoding.colwidth(bmark))
1154 1155 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1155 1156 repo.changelog.rev(n), hexfn(n), label=label)
1156 1157 fm.data(active=(bmark == active))
1157 1158 fm.plain('\n')
1158 1159 fm.end()
1159 1160
1160 1161 @command('branch',
1161 1162 [('f', 'force', None,
1162 1163 _('set branch name even if it shadows an existing branch')),
1163 1164 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1164 1165 _('[-fC] [NAME]'))
1165 1166 def branch(ui, repo, label=None, **opts):
1166 1167 """set or show the current branch name
1167 1168
1168 1169 .. note::
1169 1170
1170 1171 Branch names are permanent and global. Use :hg:`bookmark` to create a
1171 1172 light-weight bookmark instead. See :hg:`help glossary` for more
1172 1173 information about named branches and bookmarks.
1173 1174
1174 1175 With no argument, show the current branch name. With one argument,
1175 1176 set the working directory branch name (the branch will not exist
1176 1177 in the repository until the next commit). Standard practice
1177 1178 recommends that primary development take place on the 'default'
1178 1179 branch.
1179 1180
1180 1181 Unless -f/--force is specified, branch will not let you set a
1181 1182 branch name that already exists.
1182 1183
1183 1184 Use -C/--clean to reset the working directory branch to that of
1184 1185 the parent of the working directory, negating a previous branch
1185 1186 change.
1186 1187
1187 1188 Use the command :hg:`update` to switch to an existing branch. Use
1188 1189 :hg:`commit --close-branch` to mark this branch head as closed.
1189 1190 When all heads of the branch are closed, the branch will be
1190 1191 considered closed.
1191 1192
1192 1193 Returns 0 on success.
1193 1194 """
1194 1195 if label:
1195 1196 label = label.strip()
1196 1197
1197 1198 if not opts.get('clean') and not label:
1198 1199 ui.write("%s\n" % repo.dirstate.branch())
1199 1200 return
1200 1201
1201 1202 wlock = repo.wlock()
1202 1203 try:
1203 1204 if opts.get('clean'):
1204 1205 label = repo[None].p1().branch()
1205 1206 repo.dirstate.setbranch(label)
1206 1207 ui.status(_('reset working directory to branch %s\n') % label)
1207 1208 elif label:
1208 1209 if not opts.get('force') and label in repo.branchmap():
1209 1210 if label not in [p.branch() for p in repo[None].parents()]:
1210 1211 raise error.Abort(_('a branch of the same name already'
1211 1212 ' exists'),
1212 1213 # i18n: "it" refers to an existing branch
1213 1214 hint=_("use 'hg update' to switch to it"))
1214 1215 scmutil.checknewlabel(repo, label, 'branch')
1215 1216 repo.dirstate.setbranch(label)
1216 1217 ui.status(_('marked working directory as branch %s\n') % label)
1217 1218
1218 1219 # find any open named branches aside from default
1219 1220 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1220 1221 if n != "default" and not c]
1221 1222 if not others:
1222 1223 ui.status(_('(branches are permanent and global, '
1223 1224 'did you want a bookmark?)\n'))
1224 1225 finally:
1225 1226 wlock.release()
1226 1227
1227 1228 @command('branches',
1228 1229 [('a', 'active', False,
1229 1230 _('show only branches that have unmerged heads (DEPRECATED)')),
1230 1231 ('c', 'closed', False, _('show normal and closed branches')),
1231 1232 ] + formatteropts,
1232 1233 _('[-ac]'))
1233 1234 def branches(ui, repo, active=False, closed=False, **opts):
1234 1235 """list repository named branches
1235 1236
1236 1237 List the repository's named branches, indicating which ones are
1237 1238 inactive. If -c/--closed is specified, also list branches which have
1238 1239 been marked closed (see :hg:`commit --close-branch`).
1239 1240
1240 1241 Use the command :hg:`update` to switch to an existing branch.
1241 1242
1242 1243 Returns 0.
1243 1244 """
1244 1245
1245 1246 fm = ui.formatter('branches', opts)
1246 1247 hexfunc = fm.hexfunc
1247 1248
1248 1249 allheads = set(repo.heads())
1249 1250 branches = []
1250 1251 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1251 1252 isactive = not isclosed and bool(set(heads) & allheads)
1252 1253 branches.append((tag, repo[tip], isactive, not isclosed))
1253 1254 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1254 1255 reverse=True)
1255 1256
1256 1257 for tag, ctx, isactive, isopen in branches:
1257 1258 if active and not isactive:
1258 1259 continue
1259 1260 if isactive:
1260 1261 label = 'branches.active'
1261 1262 notice = ''
1262 1263 elif not isopen:
1263 1264 if not closed:
1264 1265 continue
1265 1266 label = 'branches.closed'
1266 1267 notice = _(' (closed)')
1267 1268 else:
1268 1269 label = 'branches.inactive'
1269 1270 notice = _(' (inactive)')
1270 1271 current = (tag == repo.dirstate.branch())
1271 1272 if current:
1272 1273 label = 'branches.current'
1273 1274
1274 1275 fm.startitem()
1275 1276 fm.write('branch', '%s', tag, label=label)
1276 1277 rev = ctx.rev()
1277 1278 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1278 1279 fmt = ' ' * padsize + ' %d:%s'
1279 1280 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1280 1281 label='log.changeset changeset.%s' % ctx.phasestr())
1281 1282 fm.data(active=isactive, closed=not isopen, current=current)
1282 1283 if not ui.quiet:
1283 1284 fm.plain(notice)
1284 1285 fm.plain('\n')
1285 1286 fm.end()
1286 1287
1287 1288 @command('bundle',
1288 1289 [('f', 'force', None, _('run even when the destination is unrelated')),
1289 1290 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1290 1291 _('REV')),
1291 1292 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1292 1293 _('BRANCH')),
1293 1294 ('', 'base', [],
1294 1295 _('a base changeset assumed to be available at the destination'),
1295 1296 _('REV')),
1296 1297 ('a', 'all', None, _('bundle all changesets in the repository')),
1297 1298 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1298 1299 ] + remoteopts,
1299 1300 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1300 1301 def bundle(ui, repo, fname, dest=None, **opts):
1301 1302 """create a changegroup file
1302 1303
1303 1304 Generate a changegroup file collecting changesets to be added
1304 1305 to a repository.
1305 1306
1306 1307 To create a bundle containing all changesets, use -a/--all
1307 1308 (or --base null). Otherwise, hg assumes the destination will have
1308 1309 all the nodes you specify with --base parameters. Otherwise, hg
1309 1310 will assume the repository has all the nodes in destination, or
1310 1311 default-push/default if no destination is specified.
1311 1312
1312 1313 You can change bundle format with the -t/--type option. You can
1313 1314 specify a compression, a bundle version or both using a dash
1314 1315 (comp-version). The available compression methods are: none, bzip2,
1315 1316 and gzip (by default, bundles are compressed using bzip2). The
1316 1317 available formats are: v1, v2 (default to most suitable).
1317 1318
1318 1319 The bundle file can then be transferred using conventional means
1319 1320 and applied to another repository with the unbundle or pull
1320 1321 command. This is useful when direct push and pull are not
1321 1322 available or when exporting an entire repository is undesirable.
1322 1323
1323 1324 Applying bundles preserves all changeset contents including
1324 1325 permissions, copy/rename information, and revision history.
1325 1326
1326 1327 Returns 0 on success, 1 if no changes found.
1327 1328 """
1328 1329 revs = None
1329 1330 if 'rev' in opts:
1330 1331 revs = scmutil.revrange(repo, opts['rev'])
1331 1332
1332 1333 bundletype = opts.get('type', 'bzip2').lower()
1333 1334 try:
1334 1335 bcompression, cgversion, params = exchange.parsebundlespec(
1335 1336 repo, bundletype, strict=False)
1336 1337 except error.UnsupportedBundleSpecification as e:
1337 1338 raise error.Abort(str(e),
1338 1339 hint=_('see "hg help bundle" for supported '
1339 1340 'values for --type'))
1340 1341
1341 1342 # Packed bundles are a pseudo bundle format for now.
1342 1343 if cgversion == 's1':
1343 1344 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1344 1345 hint=_('use "hg debugcreatestreamclonebundle"'))
1345 1346
1346 1347 if opts.get('all'):
1347 1348 if dest:
1348 1349 raise error.Abort(_("--all is incompatible with specifying "
1349 1350 "a destination"))
1350 1351 if opts.get('base'):
1351 1352 ui.warn(_("ignoring --base because --all was specified\n"))
1352 1353 base = ['null']
1353 1354 else:
1354 1355 base = scmutil.revrange(repo, opts.get('base'))
1355 1356 # TODO: get desired bundlecaps from command line.
1356 1357 bundlecaps = None
1357 1358 if base:
1358 1359 if dest:
1359 1360 raise error.Abort(_("--base is incompatible with specifying "
1360 1361 "a destination"))
1361 1362 common = [repo.lookup(rev) for rev in base]
1362 1363 heads = revs and map(repo.lookup, revs) or revs
1363 1364 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1364 1365 common=common, bundlecaps=bundlecaps,
1365 1366 version=cgversion)
1366 1367 outgoing = None
1367 1368 else:
1368 1369 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1369 1370 dest, branches = hg.parseurl(dest, opts.get('branch'))
1370 1371 other = hg.peer(repo, opts, dest)
1371 1372 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1372 1373 heads = revs and map(repo.lookup, revs) or revs
1373 1374 outgoing = discovery.findcommonoutgoing(repo, other,
1374 1375 onlyheads=heads,
1375 1376 force=opts.get('force'),
1376 1377 portable=True)
1377 1378 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1378 1379 bundlecaps, version=cgversion)
1379 1380 if not cg:
1380 1381 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1381 1382 return 1
1382 1383
1383 1384 if cgversion == '01': #bundle1
1384 1385 if bcompression is None:
1385 1386 bcompression = 'UN'
1386 1387 bversion = 'HG10' + bcompression
1387 1388 bcompression = None
1388 1389 else:
1389 1390 assert cgversion == '02'
1390 1391 bversion = 'HG20'
1391 1392
1392 1393
1393 1394 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1394 1395
1395 1396 @command('cat',
1396 1397 [('o', 'output', '',
1397 1398 _('print output to file with formatted name'), _('FORMAT')),
1398 1399 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 1400 ('', 'decode', None, _('apply any matching decode filter')),
1400 1401 ] + walkopts,
1401 1402 _('[OPTION]... FILE...'),
1402 1403 inferrepo=True)
1403 1404 def cat(ui, repo, file1, *pats, **opts):
1404 1405 """output the current or given revision of files
1405 1406
1406 1407 Print the specified files as they were at the given revision. If
1407 1408 no revision is given, the parent of the working directory is used.
1408 1409
1409 1410 Output may be to a file, in which case the name of the file is
1410 1411 given using a format string. The formatting rules as follows:
1411 1412
1412 1413 :``%%``: literal "%" character
1413 1414 :``%s``: basename of file being printed
1414 1415 :``%d``: dirname of file being printed, or '.' if in repository root
1415 1416 :``%p``: root-relative path name of file being printed
1416 1417 :``%H``: changeset hash (40 hexadecimal digits)
1417 1418 :``%R``: changeset revision number
1418 1419 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 1420 :``%r``: zero-padded changeset revision number
1420 1421 :``%b``: basename of the exporting repository
1421 1422
1422 1423 Returns 0 on success.
1423 1424 """
1424 1425 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 1426 m = scmutil.match(ctx, (file1,) + pats, opts)
1426 1427
1427 1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428 1429
1429 1430 @command('^clone',
1430 1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 1432 'directory (only a repository)')),
1432 1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 1434 _('REV')),
1434 1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 1439 ] + remoteopts,
1439 1440 _('[OPTION]... SOURCE [DEST]'),
1440 1441 norepo=True)
1441 1442 def clone(ui, source, dest=None, **opts):
1442 1443 """make a copy of an existing repository
1443 1444
1444 1445 Create a copy of an existing repository in a new directory.
1445 1446
1446 1447 If no destination directory name is specified, it defaults to the
1447 1448 basename of the source.
1448 1449
1449 1450 The location of the source is added to the new repository's
1450 1451 ``.hg/hgrc`` file, as the default to be used for future pulls.
1451 1452
1452 1453 Only local paths and ``ssh://`` URLs are supported as
1453 1454 destinations. For ``ssh://`` destinations, no working directory or
1454 1455 ``.hg/hgrc`` will be created on the remote side.
1455 1456
1456 1457 To pull only a subset of changesets, specify one or more revisions
1457 1458 identifiers with -r/--rev or branches with -b/--branch. The
1458 1459 resulting clone will contain only the specified changesets and
1459 1460 their ancestors. These options (or 'clone src#rev dest') imply
1460 1461 --pull, even for local source repositories. Note that specifying a
1461 1462 tag will include the tagged changeset but not the changeset
1462 1463 containing the tag.
1463 1464
1464 1465 If the source repository has a bookmark called '@' set, that
1465 1466 revision will be checked out in the new repository by default.
1466 1467
1467 1468 To check out a particular version, use -u/--update, or
1468 1469 -U/--noupdate to create a clone with no working directory.
1469 1470
1470 1471 .. container:: verbose
1471 1472
1472 1473 For efficiency, hardlinks are used for cloning whenever the
1473 1474 source and destination are on the same filesystem (note this
1474 1475 applies only to the repository data, not to the working
1475 1476 directory). Some filesystems, such as AFS, implement hardlinking
1476 1477 incorrectly, but do not report errors. In these cases, use the
1477 1478 --pull option to avoid hardlinking.
1478 1479
1479 1480 In some cases, you can clone repositories and the working
1480 1481 directory using full hardlinks with ::
1481 1482
1482 1483 $ cp -al REPO REPOCLONE
1483 1484
1484 1485 This is the fastest way to clone, but it is not always safe. The
1485 1486 operation is not atomic (making sure REPO is not modified during
1486 1487 the operation is up to you) and you have to make sure your
1487 1488 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1488 1489 so). Also, this is not compatible with certain extensions that
1489 1490 place their metadata under the .hg directory, such as mq.
1490 1491
1491 1492 Mercurial will update the working directory to the first applicable
1492 1493 revision from this list:
1493 1494
1494 1495 a) null if -U or the source repository has no changesets
1495 1496 b) if -u . and the source repository is local, the first parent of
1496 1497 the source repository's working directory
1497 1498 c) the changeset specified with -u (if a branch name, this means the
1498 1499 latest head of that branch)
1499 1500 d) the changeset specified with -r
1500 1501 e) the tipmost head specified with -b
1501 1502 f) the tipmost head specified with the url#branch source syntax
1502 1503 g) the revision marked with the '@' bookmark, if present
1503 1504 h) the tipmost head of the default branch
1504 1505 i) tip
1505 1506
1506 1507 Examples:
1507 1508
1508 1509 - clone a remote repository to a new directory named hg/::
1509 1510
1510 1511 hg clone http://selenic.com/hg
1511 1512
1512 1513 - create a lightweight local clone::
1513 1514
1514 1515 hg clone project/ project-feature/
1515 1516
1516 1517 - clone from an absolute path on an ssh server (note double-slash)::
1517 1518
1518 1519 hg clone ssh://user@server//home/projects/alpha/
1519 1520
1520 1521 - do a high-speed clone over a LAN while checking out a
1521 1522 specified version::
1522 1523
1523 1524 hg clone --uncompressed http://server/repo -u 1.5
1524 1525
1525 1526 - create a repository without changesets after a particular revision::
1526 1527
1527 1528 hg clone -r 04e544 experimental/ good/
1528 1529
1529 1530 - clone (and track) a particular named branch::
1530 1531
1531 1532 hg clone http://selenic.com/hg#stable
1532 1533
1533 1534 See :hg:`help urls` for details on specifying URLs.
1534 1535
1535 1536 Returns 0 on success.
1536 1537 """
1537 1538 if opts.get('noupdate') and opts.get('updaterev'):
1538 1539 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1539 1540
1540 1541 r = hg.clone(ui, opts, source, dest,
1541 1542 pull=opts.get('pull'),
1542 1543 stream=opts.get('uncompressed'),
1543 1544 rev=opts.get('rev'),
1544 1545 update=opts.get('updaterev') or not opts.get('noupdate'),
1545 1546 branch=opts.get('branch'),
1546 1547 shareopts=opts.get('shareopts'))
1547 1548
1548 1549 return r is None
1549 1550
1550 1551 @command('^commit|ci',
1551 1552 [('A', 'addremove', None,
1552 1553 _('mark new/missing files as added/removed before committing')),
1553 1554 ('', 'close-branch', None,
1554 1555 _('mark a branch head as closed')),
1555 1556 ('', 'amend', None, _('amend the parent of the working directory')),
1556 1557 ('s', 'secret', None, _('use the secret phase for committing')),
1557 1558 ('e', 'edit', None, _('invoke editor on commit messages')),
1558 1559 ('i', 'interactive', None, _('use interactive mode')),
1559 1560 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1560 1561 _('[OPTION]... [FILE]...'),
1561 1562 inferrepo=True)
1562 1563 def commit(ui, repo, *pats, **opts):
1563 1564 """commit the specified files or all outstanding changes
1564 1565
1565 1566 Commit changes to the given files into the repository. Unlike a
1566 1567 centralized SCM, this operation is a local operation. See
1567 1568 :hg:`push` for a way to actively distribute your changes.
1568 1569
1569 1570 If a list of files is omitted, all changes reported by :hg:`status`
1570 1571 will be committed.
1571 1572
1572 1573 If you are committing the result of a merge, do not provide any
1573 1574 filenames or -I/-X filters.
1574 1575
1575 1576 If no commit message is specified, Mercurial starts your
1576 1577 configured editor where you can enter a message. In case your
1577 1578 commit fails, you will find a backup of your message in
1578 1579 ``.hg/last-message.txt``.
1579 1580
1580 1581 The --close-branch flag can be used to mark the current branch
1581 1582 head closed. When all heads of a branch are closed, the branch
1582 1583 will be considered closed and no longer listed.
1583 1584
1584 1585 The --amend flag can be used to amend the parent of the
1585 1586 working directory with a new commit that contains the changes
1586 1587 in the parent in addition to those currently reported by :hg:`status`,
1587 1588 if there are any. The old commit is stored in a backup bundle in
1588 1589 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1589 1590 on how to restore it).
1590 1591
1591 1592 Message, user and date are taken from the amended commit unless
1592 1593 specified. When a message isn't specified on the command line,
1593 1594 the editor will open with the message of the amended commit.
1594 1595
1595 1596 It is not possible to amend public changesets (see :hg:`help phases`)
1596 1597 or changesets that have children.
1597 1598
1598 1599 See :hg:`help dates` for a list of formats valid for -d/--date.
1599 1600
1600 1601 Returns 0 on success, 1 if nothing changed.
1601 1602
1602 1603 .. container:: verbose
1603 1604
1604 1605 Examples:
1605 1606
1606 1607 - commit all files ending in .py::
1607 1608
1608 1609 hg commit --include "set:**.py"
1609 1610
1610 1611 - commit all non-binary files::
1611 1612
1612 1613 hg commit --exclude "set:binary()"
1613 1614
1614 1615 - amend the current commit and set the date to now::
1615 1616
1616 1617 hg commit --amend --date now
1617 1618 """
1618 1619 wlock = lock = None
1619 1620 try:
1620 1621 wlock = repo.wlock()
1621 1622 lock = repo.lock()
1622 1623 return _docommit(ui, repo, *pats, **opts)
1623 1624 finally:
1624 1625 release(lock, wlock)
1625 1626
1626 1627 def _docommit(ui, repo, *pats, **opts):
1627 1628 if opts.get('interactive'):
1628 1629 opts.pop('interactive')
1629 1630 cmdutil.dorecord(ui, repo, commit, None, False,
1630 1631 cmdutil.recordfilter, *pats, **opts)
1631 1632 return
1632 1633
1633 1634 if opts.get('subrepos'):
1634 1635 if opts.get('amend'):
1635 1636 raise error.Abort(_('cannot amend with --subrepos'))
1636 1637 # Let --subrepos on the command line override config setting.
1637 1638 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1638 1639
1639 1640 cmdutil.checkunfinished(repo, commit=True)
1640 1641
1641 1642 branch = repo[None].branch()
1642 1643 bheads = repo.branchheads(branch)
1643 1644
1644 1645 extra = {}
1645 1646 if opts.get('close_branch'):
1646 1647 extra['close'] = 1
1647 1648
1648 1649 if not bheads:
1649 1650 raise error.Abort(_('can only close branch heads'))
1650 1651 elif opts.get('amend'):
1651 1652 if repo[None].parents()[0].p1().branch() != branch and \
1652 1653 repo[None].parents()[0].p2().branch() != branch:
1653 1654 raise error.Abort(_('can only close branch heads'))
1654 1655
1655 1656 if opts.get('amend'):
1656 1657 if ui.configbool('ui', 'commitsubrepos'):
1657 1658 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1658 1659
1659 1660 old = repo['.']
1660 1661 if not old.mutable():
1661 1662 raise error.Abort(_('cannot amend public changesets'))
1662 1663 if len(repo[None].parents()) > 1:
1663 1664 raise error.Abort(_('cannot amend while merging'))
1664 1665 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1665 1666 if not allowunstable and old.children():
1666 1667 raise error.Abort(_('cannot amend changeset with children'))
1667 1668
1668 1669 newextra = extra.copy()
1669 1670 newextra['branch'] = branch
1670 1671 extra = newextra
1671 1672 # commitfunc is used only for temporary amend commit by cmdutil.amend
1672 1673 def commitfunc(ui, repo, message, match, opts):
1673 1674 return repo.commit(message,
1674 1675 opts.get('user') or old.user(),
1675 1676 opts.get('date') or old.date(),
1676 1677 match,
1677 1678 extra=extra)
1678 1679
1679 1680 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1680 1681 if node == old.node():
1681 1682 ui.status(_("nothing changed\n"))
1682 1683 return 1
1683 1684 else:
1684 1685 def commitfunc(ui, repo, message, match, opts):
1685 1686 backup = ui.backupconfig('phases', 'new-commit')
1686 1687 baseui = repo.baseui
1687 1688 basebackup = baseui.backupconfig('phases', 'new-commit')
1688 1689 try:
1689 1690 if opts.get('secret'):
1690 1691 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1691 1692 # Propagate to subrepos
1692 1693 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1693 1694
1694 1695 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1695 1696 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1696 1697 return repo.commit(message, opts.get('user'), opts.get('date'),
1697 1698 match,
1698 1699 editor=editor,
1699 1700 extra=extra)
1700 1701 finally:
1701 1702 ui.restoreconfig(backup)
1702 1703 repo.baseui.restoreconfig(basebackup)
1703 1704
1704 1705
1705 1706 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1706 1707
1707 1708 if not node:
1708 1709 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1709 1710 if stat[3]:
1710 1711 ui.status(_("nothing changed (%d missing files, see "
1711 1712 "'hg status')\n") % len(stat[3]))
1712 1713 else:
1713 1714 ui.status(_("nothing changed\n"))
1714 1715 return 1
1715 1716
1716 1717 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1717 1718
1718 1719 @command('config|showconfig|debugconfig',
1719 1720 [('u', 'untrusted', None, _('show untrusted configuration options')),
1720 1721 ('e', 'edit', None, _('edit user config')),
1721 1722 ('l', 'local', None, _('edit repository config')),
1722 1723 ('g', 'global', None, _('edit global config'))],
1723 1724 _('[-u] [NAME]...'),
1724 1725 optionalrepo=True)
1725 1726 def config(ui, repo, *values, **opts):
1726 1727 """show combined config settings from all hgrc files
1727 1728
1728 1729 With no arguments, print names and values of all config items.
1729 1730
1730 1731 With one argument of the form section.name, print just the value
1731 1732 of that config item.
1732 1733
1733 1734 With multiple arguments, print names and values of all config
1734 1735 items with matching section names.
1735 1736
1736 1737 With --edit, start an editor on the user-level config file. With
1737 1738 --global, edit the system-wide config file. With --local, edit the
1738 1739 repository-level config file.
1739 1740
1740 1741 With --debug, the source (filename and line number) is printed
1741 1742 for each config item.
1742 1743
1743 1744 See :hg:`help config` for more information about config files.
1744 1745
1745 1746 Returns 0 on success, 1 if NAME does not exist.
1746 1747
1747 1748 """
1748 1749
1749 1750 if opts.get('edit') or opts.get('local') or opts.get('global'):
1750 1751 if opts.get('local') and opts.get('global'):
1751 1752 raise error.Abort(_("can't use --local and --global together"))
1752 1753
1753 1754 if opts.get('local'):
1754 1755 if not repo:
1755 1756 raise error.Abort(_("can't use --local outside a repository"))
1756 1757 paths = [repo.join('hgrc')]
1757 1758 elif opts.get('global'):
1758 1759 paths = scmutil.systemrcpath()
1759 1760 else:
1760 1761 paths = scmutil.userrcpath()
1761 1762
1762 1763 for f in paths:
1763 1764 if os.path.exists(f):
1764 1765 break
1765 1766 else:
1766 1767 if opts.get('global'):
1767 1768 samplehgrc = uimod.samplehgrcs['global']
1768 1769 elif opts.get('local'):
1769 1770 samplehgrc = uimod.samplehgrcs['local']
1770 1771 else:
1771 1772 samplehgrc = uimod.samplehgrcs['user']
1772 1773
1773 1774 f = paths[0]
1774 1775 fp = open(f, "w")
1775 1776 fp.write(samplehgrc)
1776 1777 fp.close()
1777 1778
1778 1779 editor = ui.geteditor()
1779 1780 ui.system("%s \"%s\"" % (editor, f),
1780 1781 onerr=error.Abort, errprefix=_("edit failed"))
1781 1782 return
1782 1783
1783 1784 for f in scmutil.rcpath():
1784 1785 ui.debug('read config from: %s\n' % f)
1785 1786 untrusted = bool(opts.get('untrusted'))
1786 1787 if values:
1787 1788 sections = [v for v in values if '.' not in v]
1788 1789 items = [v for v in values if '.' in v]
1789 1790 if len(items) > 1 or items and sections:
1790 1791 raise error.Abort(_('only one config item permitted'))
1791 1792 matched = False
1792 1793 for section, name, value in ui.walkconfig(untrusted=untrusted):
1793 1794 value = str(value).replace('\n', '\\n')
1794 1795 sectname = section + '.' + name
1795 1796 if values:
1796 1797 for v in values:
1797 1798 if v == section:
1798 1799 ui.debug('%s: ' %
1799 1800 ui.configsource(section, name, untrusted))
1800 1801 ui.write('%s=%s\n' % (sectname, value))
1801 1802 matched = True
1802 1803 elif v == sectname:
1803 1804 ui.debug('%s: ' %
1804 1805 ui.configsource(section, name, untrusted))
1805 1806 ui.write(value, '\n')
1806 1807 matched = True
1807 1808 else:
1808 1809 ui.debug('%s: ' %
1809 1810 ui.configsource(section, name, untrusted))
1810 1811 ui.write('%s=%s\n' % (sectname, value))
1811 1812 matched = True
1812 1813 if matched:
1813 1814 return 0
1814 1815 return 1
1815 1816
1816 1817 @command('copy|cp',
1817 1818 [('A', 'after', None, _('record a copy that has already occurred')),
1818 1819 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1819 1820 ] + walkopts + dryrunopts,
1820 1821 _('[OPTION]... [SOURCE]... DEST'))
1821 1822 def copy(ui, repo, *pats, **opts):
1822 1823 """mark files as copied for the next commit
1823 1824
1824 1825 Mark dest as having copies of source files. If dest is a
1825 1826 directory, copies are put in that directory. If dest is a file,
1826 1827 the source must be a single file.
1827 1828
1828 1829 By default, this command copies the contents of files as they
1829 1830 exist in the working directory. If invoked with -A/--after, the
1830 1831 operation is recorded, but no copying is performed.
1831 1832
1832 1833 This command takes effect with the next commit. To undo a copy
1833 1834 before that, see :hg:`revert`.
1834 1835
1835 1836 Returns 0 on success, 1 if errors are encountered.
1836 1837 """
1837 1838 wlock = repo.wlock(False)
1838 1839 try:
1839 1840 return cmdutil.copy(ui, repo, pats, opts)
1840 1841 finally:
1841 1842 wlock.release()
1842 1843
1843 1844 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1844 1845 def debugancestor(ui, repo, *args):
1845 1846 """find the ancestor revision of two revisions in a given index"""
1846 1847 if len(args) == 3:
1847 1848 index, rev1, rev2 = args
1848 1849 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1849 1850 lookup = r.lookup
1850 1851 elif len(args) == 2:
1851 1852 if not repo:
1852 1853 raise error.Abort(_("there is no Mercurial repository here "
1853 1854 "(.hg not found)"))
1854 1855 rev1, rev2 = args
1855 1856 r = repo.changelog
1856 1857 lookup = repo.lookup
1857 1858 else:
1858 1859 raise error.Abort(_('either two or three arguments required'))
1859 1860 a = r.ancestor(lookup(rev1), lookup(rev2))
1860 1861 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1861 1862
1862 1863 @command('debugbuilddag',
1863 1864 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1864 1865 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1865 1866 ('n', 'new-file', None, _('add new file at each rev'))],
1866 1867 _('[OPTION]... [TEXT]'))
1867 1868 def debugbuilddag(ui, repo, text=None,
1868 1869 mergeable_file=False,
1869 1870 overwritten_file=False,
1870 1871 new_file=False):
1871 1872 """builds a repo with a given DAG from scratch in the current empty repo
1872 1873
1873 1874 The description of the DAG is read from stdin if not given on the
1874 1875 command line.
1875 1876
1876 1877 Elements:
1877 1878
1878 1879 - "+n" is a linear run of n nodes based on the current default parent
1879 1880 - "." is a single node based on the current default parent
1880 1881 - "$" resets the default parent to null (implied at the start);
1881 1882 otherwise the default parent is always the last node created
1882 1883 - "<p" sets the default parent to the backref p
1883 1884 - "*p" is a fork at parent p, which is a backref
1884 1885 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1885 1886 - "/p2" is a merge of the preceding node and p2
1886 1887 - ":tag" defines a local tag for the preceding node
1887 1888 - "@branch" sets the named branch for subsequent nodes
1888 1889 - "#...\\n" is a comment up to the end of the line
1889 1890
1890 1891 Whitespace between the above elements is ignored.
1891 1892
1892 1893 A backref is either
1893 1894
1894 1895 - a number n, which references the node curr-n, where curr is the current
1895 1896 node, or
1896 1897 - the name of a local tag you placed earlier using ":tag", or
1897 1898 - empty to denote the default parent.
1898 1899
1899 1900 All string valued-elements are either strictly alphanumeric, or must
1900 1901 be enclosed in double quotes ("..."), with "\\" as escape character.
1901 1902 """
1902 1903
1903 1904 if text is None:
1904 1905 ui.status(_("reading DAG from stdin\n"))
1905 1906 text = ui.fin.read()
1906 1907
1907 1908 cl = repo.changelog
1908 1909 if len(cl) > 0:
1909 1910 raise error.Abort(_('repository is not empty'))
1910 1911
1911 1912 # determine number of revs in DAG
1912 1913 total = 0
1913 1914 for type, data in dagparser.parsedag(text):
1914 1915 if type == 'n':
1915 1916 total += 1
1916 1917
1917 1918 if mergeable_file:
1918 1919 linesperrev = 2
1919 1920 # make a file with k lines per rev
1920 1921 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1921 1922 initialmergedlines.append("")
1922 1923
1923 1924 tags = []
1924 1925
1925 1926 lock = tr = None
1926 1927 try:
1927 1928 lock = repo.lock()
1928 1929 tr = repo.transaction("builddag")
1929 1930
1930 1931 at = -1
1931 1932 atbranch = 'default'
1932 1933 nodeids = []
1933 1934 id = 0
1934 1935 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1935 1936 for type, data in dagparser.parsedag(text):
1936 1937 if type == 'n':
1937 1938 ui.note(('node %s\n' % str(data)))
1938 1939 id, ps = data
1939 1940
1940 1941 files = []
1941 1942 fctxs = {}
1942 1943
1943 1944 p2 = None
1944 1945 if mergeable_file:
1945 1946 fn = "mf"
1946 1947 p1 = repo[ps[0]]
1947 1948 if len(ps) > 1:
1948 1949 p2 = repo[ps[1]]
1949 1950 pa = p1.ancestor(p2)
1950 1951 base, local, other = [x[fn].data() for x in (pa, p1,
1951 1952 p2)]
1952 1953 m3 = simplemerge.Merge3Text(base, local, other)
1953 1954 ml = [l.strip() for l in m3.merge_lines()]
1954 1955 ml.append("")
1955 1956 elif at > 0:
1956 1957 ml = p1[fn].data().split("\n")
1957 1958 else:
1958 1959 ml = initialmergedlines
1959 1960 ml[id * linesperrev] += " r%i" % id
1960 1961 mergedtext = "\n".join(ml)
1961 1962 files.append(fn)
1962 1963 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1963 1964
1964 1965 if overwritten_file:
1965 1966 fn = "of"
1966 1967 files.append(fn)
1967 1968 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1968 1969
1969 1970 if new_file:
1970 1971 fn = "nf%i" % id
1971 1972 files.append(fn)
1972 1973 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1973 1974 if len(ps) > 1:
1974 1975 if not p2:
1975 1976 p2 = repo[ps[1]]
1976 1977 for fn in p2:
1977 1978 if fn.startswith("nf"):
1978 1979 files.append(fn)
1979 1980 fctxs[fn] = p2[fn]
1980 1981
1981 1982 def fctxfn(repo, cx, path):
1982 1983 return fctxs.get(path)
1983 1984
1984 1985 if len(ps) == 0 or ps[0] < 0:
1985 1986 pars = [None, None]
1986 1987 elif len(ps) == 1:
1987 1988 pars = [nodeids[ps[0]], None]
1988 1989 else:
1989 1990 pars = [nodeids[p] for p in ps]
1990 1991 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1991 1992 date=(id, 0),
1992 1993 user="debugbuilddag",
1993 1994 extra={'branch': atbranch})
1994 1995 nodeid = repo.commitctx(cx)
1995 1996 nodeids.append(nodeid)
1996 1997 at = id
1997 1998 elif type == 'l':
1998 1999 id, name = data
1999 2000 ui.note(('tag %s\n' % name))
2000 2001 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2001 2002 elif type == 'a':
2002 2003 ui.note(('branch %s\n' % data))
2003 2004 atbranch = data
2004 2005 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2005 2006 tr.close()
2006 2007
2007 2008 if tags:
2008 2009 repo.vfs.write("localtags", "".join(tags))
2009 2010 finally:
2010 2011 ui.progress(_('building'), None)
2011 2012 release(tr, lock)
2012 2013
2013 2014 @command('debugbundle',
2014 2015 [('a', 'all', None, _('show all details'))],
2015 2016 _('FILE'),
2016 2017 norepo=True)
2017 2018 def debugbundle(ui, bundlepath, all=None, **opts):
2018 2019 """lists the contents of a bundle"""
2019 2020 f = hg.openpath(ui, bundlepath)
2020 2021 try:
2021 2022 gen = exchange.readbundle(ui, f, bundlepath)
2022 2023 if isinstance(gen, bundle2.unbundle20):
2023 2024 return _debugbundle2(ui, gen, all=all, **opts)
2024 2025 if all:
2025 2026 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2026 2027
2027 2028 def showchunks(named):
2028 2029 ui.write("\n%s\n" % named)
2029 2030 chain = None
2030 2031 while True:
2031 2032 chunkdata = gen.deltachunk(chain)
2032 2033 if not chunkdata:
2033 2034 break
2034 2035 node = chunkdata['node']
2035 2036 p1 = chunkdata['p1']
2036 2037 p2 = chunkdata['p2']
2037 2038 cs = chunkdata['cs']
2038 2039 deltabase = chunkdata['deltabase']
2039 2040 delta = chunkdata['delta']
2040 2041 ui.write("%s %s %s %s %s %s\n" %
2041 2042 (hex(node), hex(p1), hex(p2),
2042 2043 hex(cs), hex(deltabase), len(delta)))
2043 2044 chain = node
2044 2045
2045 2046 chunkdata = gen.changelogheader()
2046 2047 showchunks("changelog")
2047 2048 chunkdata = gen.manifestheader()
2048 2049 showchunks("manifest")
2049 2050 while True:
2050 2051 chunkdata = gen.filelogheader()
2051 2052 if not chunkdata:
2052 2053 break
2053 2054 fname = chunkdata['filename']
2054 2055 showchunks(fname)
2055 2056 else:
2056 2057 if isinstance(gen, bundle2.unbundle20):
2057 2058 raise error.Abort(_('use debugbundle2 for this file'))
2058 2059 chunkdata = gen.changelogheader()
2059 2060 chain = None
2060 2061 while True:
2061 2062 chunkdata = gen.deltachunk(chain)
2062 2063 if not chunkdata:
2063 2064 break
2064 2065 node = chunkdata['node']
2065 2066 ui.write("%s\n" % hex(node))
2066 2067 chain = node
2067 2068 finally:
2068 2069 f.close()
2069 2070
2070 2071 def _debugbundle2(ui, gen, **opts):
2071 2072 """lists the contents of a bundle2"""
2072 2073 if not isinstance(gen, bundle2.unbundle20):
2073 2074 raise error.Abort(_('not a bundle2 file'))
2074 2075 ui.write(('Stream params: %s\n' % repr(gen.params)))
2075 2076 for part in gen.iterparts():
2076 2077 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2077 2078 if part.type == 'changegroup':
2078 2079 version = part.params.get('version', '01')
2079 2080 cg = changegroup.packermap[version][1](part, 'UN')
2080 2081 chunkdata = cg.changelogheader()
2081 2082 chain = None
2082 2083 while True:
2083 2084 chunkdata = cg.deltachunk(chain)
2084 2085 if not chunkdata:
2085 2086 break
2086 2087 node = chunkdata['node']
2087 2088 ui.write(" %s\n" % hex(node))
2088 2089 chain = node
2089 2090
2090 2091 @command('debugcreatestreamclonebundle', [], 'FILE')
2091 2092 def debugcreatestreamclonebundle(ui, repo, fname):
2092 2093 """create a stream clone bundle file
2093 2094
2094 2095 Stream bundles are special bundles that are essentially archives of
2095 2096 revlog files. They are commonly used for cloning very quickly.
2096 2097 """
2097 2098 requirements, gen = streamclone.generatebundlev1(repo)
2098 2099 changegroup.writechunks(ui, gen, fname)
2099 2100
2100 2101 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2101 2102
2102 2103 @command('debugapplystreamclonebundle', [], 'FILE')
2103 2104 def debugapplystreamclonebundle(ui, repo, fname):
2104 2105 """apply a stream clone bundle file"""
2105 2106 f = hg.openpath(ui, fname)
2106 2107 gen = exchange.readbundle(ui, f, fname)
2107 2108 gen.apply(repo)
2108 2109
2109 2110 @command('debugcheckstate', [], '')
2110 2111 def debugcheckstate(ui, repo):
2111 2112 """validate the correctness of the current dirstate"""
2112 2113 parent1, parent2 = repo.dirstate.parents()
2113 2114 m1 = repo[parent1].manifest()
2114 2115 m2 = repo[parent2].manifest()
2115 2116 errors = 0
2116 2117 for f in repo.dirstate:
2117 2118 state = repo.dirstate[f]
2118 2119 if state in "nr" and f not in m1:
2119 2120 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2120 2121 errors += 1
2121 2122 if state in "a" and f in m1:
2122 2123 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2123 2124 errors += 1
2124 2125 if state in "m" and f not in m1 and f not in m2:
2125 2126 ui.warn(_("%s in state %s, but not in either manifest\n") %
2126 2127 (f, state))
2127 2128 errors += 1
2128 2129 for f in m1:
2129 2130 state = repo.dirstate[f]
2130 2131 if state not in "nrm":
2131 2132 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2132 2133 errors += 1
2133 2134 if errors:
2134 2135 error = _(".hg/dirstate inconsistent with current parent's manifest")
2135 2136 raise error.Abort(error)
2136 2137
2137 2138 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2138 2139 def debugcommands(ui, cmd='', *args):
2139 2140 """list all available commands and options"""
2140 2141 for cmd, vals in sorted(table.iteritems()):
2141 2142 cmd = cmd.split('|')[0].strip('^')
2142 2143 opts = ', '.join([i[1] for i in vals[1]])
2143 2144 ui.write('%s: %s\n' % (cmd, opts))
2144 2145
2145 2146 @command('debugcomplete',
2146 2147 [('o', 'options', None, _('show the command options'))],
2147 2148 _('[-o] CMD'),
2148 2149 norepo=True)
2149 2150 def debugcomplete(ui, cmd='', **opts):
2150 2151 """returns the completion list associated with the given command"""
2151 2152
2152 2153 if opts.get('options'):
2153 2154 options = []
2154 2155 otables = [globalopts]
2155 2156 if cmd:
2156 2157 aliases, entry = cmdutil.findcmd(cmd, table, False)
2157 2158 otables.append(entry[1])
2158 2159 for t in otables:
2159 2160 for o in t:
2160 2161 if "(DEPRECATED)" in o[3]:
2161 2162 continue
2162 2163 if o[0]:
2163 2164 options.append('-%s' % o[0])
2164 2165 options.append('--%s' % o[1])
2165 2166 ui.write("%s\n" % "\n".join(options))
2166 2167 return
2167 2168
2168 2169 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2169 2170 if ui.verbose:
2170 2171 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2171 2172 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2172 2173
2173 2174 @command('debugdag',
2174 2175 [('t', 'tags', None, _('use tags as labels')),
2175 2176 ('b', 'branches', None, _('annotate with branch names')),
2176 2177 ('', 'dots', None, _('use dots for runs')),
2177 2178 ('s', 'spaces', None, _('separate elements by spaces'))],
2178 2179 _('[OPTION]... [FILE [REV]...]'),
2179 2180 optionalrepo=True)
2180 2181 def debugdag(ui, repo, file_=None, *revs, **opts):
2181 2182 """format the changelog or an index DAG as a concise textual description
2182 2183
2183 2184 If you pass a revlog index, the revlog's DAG is emitted. If you list
2184 2185 revision numbers, they get labeled in the output as rN.
2185 2186
2186 2187 Otherwise, the changelog DAG of the current repo is emitted.
2187 2188 """
2188 2189 spaces = opts.get('spaces')
2189 2190 dots = opts.get('dots')
2190 2191 if file_:
2191 2192 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2192 2193 revs = set((int(r) for r in revs))
2193 2194 def events():
2194 2195 for r in rlog:
2195 2196 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2196 2197 if p != -1))
2197 2198 if r in revs:
2198 2199 yield 'l', (r, "r%i" % r)
2199 2200 elif repo:
2200 2201 cl = repo.changelog
2201 2202 tags = opts.get('tags')
2202 2203 branches = opts.get('branches')
2203 2204 if tags:
2204 2205 labels = {}
2205 2206 for l, n in repo.tags().items():
2206 2207 labels.setdefault(cl.rev(n), []).append(l)
2207 2208 def events():
2208 2209 b = "default"
2209 2210 for r in cl:
2210 2211 if branches:
2211 2212 newb = cl.read(cl.node(r))[5]['branch']
2212 2213 if newb != b:
2213 2214 yield 'a', newb
2214 2215 b = newb
2215 2216 yield 'n', (r, list(p for p in cl.parentrevs(r)
2216 2217 if p != -1))
2217 2218 if tags:
2218 2219 ls = labels.get(r)
2219 2220 if ls:
2220 2221 for l in ls:
2221 2222 yield 'l', (r, l)
2222 2223 else:
2223 2224 raise error.Abort(_('need repo for changelog dag'))
2224 2225
2225 2226 for line in dagparser.dagtextlines(events(),
2226 2227 addspaces=spaces,
2227 2228 wraplabels=True,
2228 2229 wrapannotations=True,
2229 2230 wrapnonlinear=dots,
2230 2231 usedots=dots,
2231 2232 maxlinewidth=70):
2232 2233 ui.write(line)
2233 2234 ui.write("\n")
2234 2235
2235 2236 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2236 2237 def debugdata(ui, repo, file_, rev=None, **opts):
2237 2238 """dump the contents of a data file revision"""
2238 2239 if opts.get('changelog') or opts.get('manifest'):
2239 2240 file_, rev = None, file_
2240 2241 elif rev is None:
2241 2242 raise error.CommandError('debugdata', _('invalid arguments'))
2242 2243 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2243 2244 try:
2244 2245 ui.write(r.revision(r.lookup(rev)))
2245 2246 except KeyError:
2246 2247 raise error.Abort(_('invalid revision identifier %s') % rev)
2247 2248
2248 2249 @command('debugdate',
2249 2250 [('e', 'extended', None, _('try extended date formats'))],
2250 2251 _('[-e] DATE [RANGE]'),
2251 2252 norepo=True, optionalrepo=True)
2252 2253 def debugdate(ui, date, range=None, **opts):
2253 2254 """parse and display a date"""
2254 2255 if opts["extended"]:
2255 2256 d = util.parsedate(date, util.extendeddateformats)
2256 2257 else:
2257 2258 d = util.parsedate(date)
2258 2259 ui.write(("internal: %s %s\n") % d)
2259 2260 ui.write(("standard: %s\n") % util.datestr(d))
2260 2261 if range:
2261 2262 m = util.matchdate(range)
2262 2263 ui.write(("match: %s\n") % m(d[0]))
2263 2264
2264 2265 @command('debugdiscovery',
2265 2266 [('', 'old', None, _('use old-style discovery')),
2266 2267 ('', 'nonheads', None,
2267 2268 _('use old-style discovery with non-heads included')),
2268 2269 ] + remoteopts,
2269 2270 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2270 2271 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2271 2272 """runs the changeset discovery protocol in isolation"""
2272 2273 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2273 2274 opts.get('branch'))
2274 2275 remote = hg.peer(repo, opts, remoteurl)
2275 2276 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2276 2277
2277 2278 # make sure tests are repeatable
2278 2279 random.seed(12323)
2279 2280
2280 2281 def doit(localheads, remoteheads, remote=remote):
2281 2282 if opts.get('old'):
2282 2283 if localheads:
2283 2284 raise error.Abort('cannot use localheads with old style '
2284 2285 'discovery')
2285 2286 if not util.safehasattr(remote, 'branches'):
2286 2287 # enable in-client legacy support
2287 2288 remote = localrepo.locallegacypeer(remote.local())
2288 2289 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2289 2290 force=True)
2290 2291 common = set(common)
2291 2292 if not opts.get('nonheads'):
2292 2293 ui.write(("unpruned common: %s\n") %
2293 2294 " ".join(sorted(short(n) for n in common)))
2294 2295 dag = dagutil.revlogdag(repo.changelog)
2295 2296 all = dag.ancestorset(dag.internalizeall(common))
2296 2297 common = dag.externalizeall(dag.headsetofconnecteds(all))
2297 2298 else:
2298 2299 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2299 2300 common = set(common)
2300 2301 rheads = set(hds)
2301 2302 lheads = set(repo.heads())
2302 2303 ui.write(("common heads: %s\n") %
2303 2304 " ".join(sorted(short(n) for n in common)))
2304 2305 if lheads <= common:
2305 2306 ui.write(("local is subset\n"))
2306 2307 elif rheads <= common:
2307 2308 ui.write(("remote is subset\n"))
2308 2309
2309 2310 serverlogs = opts.get('serverlog')
2310 2311 if serverlogs:
2311 2312 for filename in serverlogs:
2312 2313 logfile = open(filename, 'r')
2313 2314 try:
2314 2315 line = logfile.readline()
2315 2316 while line:
2316 2317 parts = line.strip().split(';')
2317 2318 op = parts[1]
2318 2319 if op == 'cg':
2319 2320 pass
2320 2321 elif op == 'cgss':
2321 2322 doit(parts[2].split(' '), parts[3].split(' '))
2322 2323 elif op == 'unb':
2323 2324 doit(parts[3].split(' '), parts[2].split(' '))
2324 2325 line = logfile.readline()
2325 2326 finally:
2326 2327 logfile.close()
2327 2328
2328 2329 else:
2329 2330 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2330 2331 opts.get('remote_head'))
2331 2332 localrevs = opts.get('local_head')
2332 2333 doit(localrevs, remoterevs)
2333 2334
2334 2335 @command('debugextensions', formatteropts, [], norepo=True)
2335 2336 def debugextensions(ui, **opts):
2336 2337 '''show information about active extensions'''
2337 2338 exts = extensions.extensions(ui)
2338 2339 fm = ui.formatter('debugextensions', opts)
2339 2340 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2340 2341 extsource = extmod.__file__
2341 2342 exttestedwith = getattr(extmod, 'testedwith', None)
2342 2343 if exttestedwith is not None:
2343 2344 exttestedwith = exttestedwith.split()
2344 2345 extbuglink = getattr(extmod, 'buglink', None)
2345 2346
2346 2347 fm.startitem()
2347 2348
2348 2349 if ui.quiet or ui.verbose:
2349 2350 fm.write('name', '%s\n', extname)
2350 2351 else:
2351 2352 fm.write('name', '%s', extname)
2352 2353 if not exttestedwith:
2353 2354 fm.plain(_(' (untested!)\n'))
2354 2355 else:
2355 2356 if exttestedwith == ['internal'] or \
2356 2357 util.version() in exttestedwith:
2357 2358 fm.plain('\n')
2358 2359 else:
2359 2360 lasttestedversion = exttestedwith[-1]
2360 2361 fm.plain(' (%s!)\n' % lasttestedversion)
2361 2362
2362 2363 fm.condwrite(ui.verbose and extsource, 'source',
2363 2364 _(' location: %s\n'), extsource or "")
2364 2365
2365 2366 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2366 2367 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2367 2368
2368 2369 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2369 2370 _(' bug reporting: %s\n'), extbuglink or "")
2370 2371
2371 2372 fm.end()
2372 2373
2373 2374 @command('debugfileset',
2374 2375 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2375 2376 _('[-r REV] FILESPEC'))
2376 2377 def debugfileset(ui, repo, expr, **opts):
2377 2378 '''parse and apply a fileset specification'''
2378 2379 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2379 2380 if ui.verbose:
2380 2381 tree = fileset.parse(expr)
2381 2382 ui.note(fileset.prettyformat(tree), "\n")
2382 2383
2383 2384 for f in ctx.getfileset(expr):
2384 2385 ui.write("%s\n" % f)
2385 2386
2386 2387 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2387 2388 def debugfsinfo(ui, path="."):
2388 2389 """show information detected about current filesystem"""
2389 2390 util.writefile('.debugfsinfo', '')
2390 2391 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2391 2392 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2392 2393 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2393 2394 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2394 2395 and 'yes' or 'no'))
2395 2396 os.unlink('.debugfsinfo')
2396 2397
2397 2398 @command('debuggetbundle',
2398 2399 [('H', 'head', [], _('id of head node'), _('ID')),
2399 2400 ('C', 'common', [], _('id of common node'), _('ID')),
2400 2401 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2401 2402 _('REPO FILE [-H|-C ID]...'),
2402 2403 norepo=True)
2403 2404 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2404 2405 """retrieves a bundle from a repo
2405 2406
2406 2407 Every ID must be a full-length hex node id string. Saves the bundle to the
2407 2408 given file.
2408 2409 """
2409 2410 repo = hg.peer(ui, opts, repopath)
2410 2411 if not repo.capable('getbundle'):
2411 2412 raise error.Abort("getbundle() not supported by target repository")
2412 2413 args = {}
2413 2414 if common:
2414 2415 args['common'] = [bin(s) for s in common]
2415 2416 if head:
2416 2417 args['heads'] = [bin(s) for s in head]
2417 2418 # TODO: get desired bundlecaps from command line.
2418 2419 args['bundlecaps'] = None
2419 2420 bundle = repo.getbundle('debug', **args)
2420 2421
2421 2422 bundletype = opts.get('type', 'bzip2').lower()
2422 2423 btypes = {'none': 'HG10UN',
2423 2424 'bzip2': 'HG10BZ',
2424 2425 'gzip': 'HG10GZ',
2425 2426 'bundle2': 'HG20'}
2426 2427 bundletype = btypes.get(bundletype)
2427 2428 if bundletype not in changegroup.bundletypes:
2428 2429 raise error.Abort(_('unknown bundle type specified with --type'))
2429 2430 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2430 2431
2431 2432 @command('debugignore', [], '')
2432 2433 def debugignore(ui, repo, *values, **opts):
2433 2434 """display the combined ignore pattern"""
2434 2435 ignore = repo.dirstate._ignore
2435 2436 includepat = getattr(ignore, 'includepat', None)
2436 2437 if includepat is not None:
2437 2438 ui.write("%s\n" % includepat)
2438 2439 else:
2439 2440 raise error.Abort(_("no ignore patterns found"))
2440 2441
2441 2442 @command('debugindex', debugrevlogopts +
2442 2443 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2443 2444 _('[-f FORMAT] -c|-m|FILE'),
2444 2445 optionalrepo=True)
2445 2446 def debugindex(ui, repo, file_=None, **opts):
2446 2447 """dump the contents of an index file"""
2447 2448 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2448 2449 format = opts.get('format', 0)
2449 2450 if format not in (0, 1):
2450 2451 raise error.Abort(_("unknown format %d") % format)
2451 2452
2452 2453 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2453 2454 if generaldelta:
2454 2455 basehdr = ' delta'
2455 2456 else:
2456 2457 basehdr = ' base'
2457 2458
2458 2459 if ui.debugflag:
2459 2460 shortfn = hex
2460 2461 else:
2461 2462 shortfn = short
2462 2463
2463 2464 # There might not be anything in r, so have a sane default
2464 2465 idlen = 12
2465 2466 for i in r:
2466 2467 idlen = len(shortfn(r.node(i)))
2467 2468 break
2468 2469
2469 2470 if format == 0:
2470 2471 ui.write(" rev offset length " + basehdr + " linkrev"
2471 2472 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2472 2473 elif format == 1:
2473 2474 ui.write(" rev flag offset length"
2474 2475 " size " + basehdr + " link p1 p2"
2475 2476 " %s\n" % "nodeid".rjust(idlen))
2476 2477
2477 2478 for i in r:
2478 2479 node = r.node(i)
2479 2480 if generaldelta:
2480 2481 base = r.deltaparent(i)
2481 2482 else:
2482 2483 base = r.chainbase(i)
2483 2484 if format == 0:
2484 2485 try:
2485 2486 pp = r.parents(node)
2486 2487 except Exception:
2487 2488 pp = [nullid, nullid]
2488 2489 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2489 2490 i, r.start(i), r.length(i), base, r.linkrev(i),
2490 2491 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2491 2492 elif format == 1:
2492 2493 pr = r.parentrevs(i)
2493 2494 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2494 2495 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2495 2496 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2496 2497
2497 2498 @command('debugindexdot', debugrevlogopts,
2498 2499 _('-c|-m|FILE'), optionalrepo=True)
2499 2500 def debugindexdot(ui, repo, file_=None, **opts):
2500 2501 """dump an index DAG as a graphviz dot file"""
2501 2502 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2502 2503 ui.write(("digraph G {\n"))
2503 2504 for i in r:
2504 2505 node = r.node(i)
2505 2506 pp = r.parents(node)
2506 2507 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2507 2508 if pp[1] != nullid:
2508 2509 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2509 2510 ui.write("}\n")
2510 2511
2511 2512 @command('debugdeltachain',
2512 2513 debugrevlogopts + formatteropts,
2513 2514 _('-c|-m|FILE'),
2514 2515 optionalrepo=True)
2515 2516 def debugdeltachain(ui, repo, file_=None, **opts):
2516 2517 """dump information about delta chains in a revlog
2517 2518
2518 2519 Output can be templatized. Available template keywords are:
2519 2520
2520 2521 rev revision number
2521 2522 chainid delta chain identifier (numbered by unique base)
2522 2523 chainlen delta chain length to this revision
2523 2524 prevrev previous revision in delta chain
2524 2525 deltatype role of delta / how it was computed
2525 2526 compsize compressed size of revision
2526 2527 uncompsize uncompressed size of revision
2527 2528 chainsize total size of compressed revisions in chain
2528 2529 chainratio total chain size divided by uncompressed revision size
2529 2530 (new delta chains typically start at ratio 2.00)
2530 2531 lindist linear distance from base revision in delta chain to end
2531 2532 of this revision
2532 2533 extradist total size of revisions not part of this delta chain from
2533 2534 base of delta chain to end of this revision; a measurement
2534 2535 of how much extra data we need to read/seek across to read
2535 2536 the delta chain for this revision
2536 2537 extraratio extradist divided by chainsize; another representation of
2537 2538 how much unrelated data is needed to load this delta chain
2538 2539 """
2539 2540 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2540 2541 index = r.index
2541 2542 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2542 2543
2543 2544 def revinfo(rev):
2544 2545 iterrev = rev
2545 2546 e = index[iterrev]
2546 2547 chain = []
2547 2548 compsize = e[1]
2548 2549 uncompsize = e[2]
2549 2550 chainsize = 0
2550 2551
2551 2552 if generaldelta:
2552 2553 if e[3] == e[5]:
2553 2554 deltatype = 'p1'
2554 2555 elif e[3] == e[6]:
2555 2556 deltatype = 'p2'
2556 2557 elif e[3] == rev - 1:
2557 2558 deltatype = 'prev'
2558 2559 elif e[3] == rev:
2559 2560 deltatype = 'base'
2560 2561 else:
2561 2562 deltatype = 'other'
2562 2563 else:
2563 2564 if e[3] == rev:
2564 2565 deltatype = 'base'
2565 2566 else:
2566 2567 deltatype = 'prev'
2567 2568
2568 2569 while iterrev != e[3]:
2569 2570 chain.append(iterrev)
2570 2571 chainsize += e[1]
2571 2572 if generaldelta:
2572 2573 iterrev = e[3]
2573 2574 else:
2574 2575 iterrev -= 1
2575 2576 e = index[iterrev]
2576 2577 else:
2577 2578 chainsize += e[1]
2578 2579 chain.append(iterrev)
2579 2580
2580 2581 chain.reverse()
2581 2582 return compsize, uncompsize, deltatype, chain, chainsize
2582 2583
2583 2584 fm = ui.formatter('debugdeltachain', opts)
2584 2585
2585 2586 fm.plain(' rev chain# chainlen prev delta '
2586 2587 'size rawsize chainsize ratio lindist extradist '
2587 2588 'extraratio\n')
2588 2589
2589 2590 chainbases = {}
2590 2591 for rev in r:
2591 2592 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2592 2593 chainbase = chain[0]
2593 2594 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2594 2595 basestart = r.start(chainbase)
2595 2596 revstart = r.start(rev)
2596 2597 lineardist = revstart + comp - basestart
2597 2598 extradist = lineardist - chainsize
2598 2599 try:
2599 2600 prevrev = chain[-2]
2600 2601 except IndexError:
2601 2602 prevrev = -1
2602 2603
2603 2604 chainratio = float(chainsize) / float(uncomp)
2604 2605 extraratio = float(extradist) / float(chainsize)
2605 2606
2606 2607 fm.startitem()
2607 2608 fm.write('rev chainid chainlen prevrev deltatype compsize '
2608 2609 'uncompsize chainsize chainratio lindist extradist '
2609 2610 'extraratio',
2610 2611 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2611 2612 rev, chainid, len(chain), prevrev, deltatype, comp,
2612 2613 uncomp, chainsize, chainratio, lineardist, extradist,
2613 2614 extraratio,
2614 2615 rev=rev, chainid=chainid, chainlen=len(chain),
2615 2616 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2616 2617 uncompsize=uncomp, chainsize=chainsize,
2617 2618 chainratio=chainratio, lindist=lineardist,
2618 2619 extradist=extradist, extraratio=extraratio)
2619 2620
2620 2621 fm.end()
2621 2622
2622 2623 @command('debuginstall', [], '', norepo=True)
2623 2624 def debuginstall(ui):
2624 2625 '''test Mercurial installation
2625 2626
2626 2627 Returns 0 on success.
2627 2628 '''
2628 2629
2629 2630 def writetemp(contents):
2630 2631 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2631 2632 f = os.fdopen(fd, "wb")
2632 2633 f.write(contents)
2633 2634 f.close()
2634 2635 return name
2635 2636
2636 2637 problems = 0
2637 2638
2638 2639 # encoding
2639 2640 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2640 2641 try:
2641 2642 encoding.fromlocal("test")
2642 2643 except error.Abort as inst:
2643 2644 ui.write(" %s\n" % inst)
2644 2645 ui.write(_(" (check that your locale is properly set)\n"))
2645 2646 problems += 1
2646 2647
2647 2648 # Python
2648 2649 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2649 2650 ui.status(_("checking Python version (%s)\n")
2650 2651 % ("%s.%s.%s" % sys.version_info[:3]))
2651 2652 ui.status(_("checking Python lib (%s)...\n")
2652 2653 % os.path.dirname(os.__file__))
2653 2654
2654 2655 # compiled modules
2655 2656 ui.status(_("checking installed modules (%s)...\n")
2656 2657 % os.path.dirname(__file__))
2657 2658 try:
2658 2659 import bdiff, mpatch, base85, osutil
2659 2660 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2660 2661 except Exception as inst:
2661 2662 ui.write(" %s\n" % inst)
2662 2663 ui.write(_(" One or more extensions could not be found"))
2663 2664 ui.write(_(" (check that you compiled the extensions)\n"))
2664 2665 problems += 1
2665 2666
2666 2667 # templates
2667 2668 import templater
2668 2669 p = templater.templatepaths()
2669 2670 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2670 2671 if p:
2671 2672 m = templater.templatepath("map-cmdline.default")
2672 2673 if m:
2673 2674 # template found, check if it is working
2674 2675 try:
2675 2676 templater.templater(m)
2676 2677 except Exception as inst:
2677 2678 ui.write(" %s\n" % inst)
2678 2679 p = None
2679 2680 else:
2680 2681 ui.write(_(" template 'default' not found\n"))
2681 2682 p = None
2682 2683 else:
2683 2684 ui.write(_(" no template directories found\n"))
2684 2685 if not p:
2685 2686 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2686 2687 problems += 1
2687 2688
2688 2689 # editor
2689 2690 ui.status(_("checking commit editor...\n"))
2690 2691 editor = ui.geteditor()
2691 2692 editor = util.expandpath(editor)
2692 2693 cmdpath = util.findexe(shlex.split(editor)[0])
2693 2694 if not cmdpath:
2694 2695 if editor == 'vi':
2695 2696 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2696 2697 ui.write(_(" (specify a commit editor in your configuration"
2697 2698 " file)\n"))
2698 2699 else:
2699 2700 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2700 2701 ui.write(_(" (specify a commit editor in your configuration"
2701 2702 " file)\n"))
2702 2703 problems += 1
2703 2704
2704 2705 # check username
2705 2706 ui.status(_("checking username...\n"))
2706 2707 try:
2707 2708 ui.username()
2708 2709 except error.Abort as e:
2709 2710 ui.write(" %s\n" % e)
2710 2711 ui.write(_(" (specify a username in your configuration file)\n"))
2711 2712 problems += 1
2712 2713
2713 2714 if not problems:
2714 2715 ui.status(_("no problems detected\n"))
2715 2716 else:
2716 2717 ui.write(_("%s problems detected,"
2717 2718 " please check your install!\n") % problems)
2718 2719
2719 2720 return problems
2720 2721
2721 2722 @command('debugknown', [], _('REPO ID...'), norepo=True)
2722 2723 def debugknown(ui, repopath, *ids, **opts):
2723 2724 """test whether node ids are known to a repo
2724 2725
2725 2726 Every ID must be a full-length hex node id string. Returns a list of 0s
2726 2727 and 1s indicating unknown/known.
2727 2728 """
2728 2729 repo = hg.peer(ui, opts, repopath)
2729 2730 if not repo.capable('known'):
2730 2731 raise error.Abort("known() not supported by target repository")
2731 2732 flags = repo.known([bin(s) for s in ids])
2732 2733 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2733 2734
2734 2735 @command('debuglabelcomplete', [], _('LABEL...'))
2735 2736 def debuglabelcomplete(ui, repo, *args):
2736 2737 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2737 2738 debugnamecomplete(ui, repo, *args)
2738 2739
2739 2740 @command('debugmergestate', [], '')
2740 2741 def debugmergestate(ui, repo, *args):
2741 2742 """print merge state
2742 2743
2743 2744 Use --verbose to print out information about whether v1 or v2 merge state
2744 2745 was chosen."""
2745 2746 def _hashornull(h):
2746 2747 if h == nullhex:
2747 2748 return 'null'
2748 2749 else:
2749 2750 return h
2750 2751
2751 2752 def printrecords(version):
2752 2753 ui.write(('* version %s records\n') % version)
2753 2754 if version == 1:
2754 2755 records = v1records
2755 2756 else:
2756 2757 records = v2records
2757 2758
2758 2759 for rtype, record in records:
2759 2760 # pretty print some record types
2760 2761 if rtype == 'L':
2761 2762 ui.write(('local: %s\n') % record)
2762 2763 elif rtype == 'O':
2763 2764 ui.write(('other: %s\n') % record)
2764 2765 elif rtype == 'm':
2765 2766 driver, mdstate = record.split('\0', 1)
2766 2767 ui.write(('merge driver: %s (state "%s")\n')
2767 2768 % (driver, mdstate))
2768 2769 elif rtype in 'FDC':
2769 2770 r = record.split('\0')
2770 2771 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2771 2772 if version == 1:
2772 2773 onode = 'not stored in v1 format'
2773 2774 flags = r[7]
2774 2775 else:
2775 2776 onode, flags = r[7:9]
2776 2777 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2777 2778 % (f, rtype, state, _hashornull(hash)))
2778 2779 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2779 2780 ui.write((' ancestor path: %s (node %s)\n')
2780 2781 % (afile, _hashornull(anode)))
2781 2782 ui.write((' other path: %s (node %s)\n')
2782 2783 % (ofile, _hashornull(onode)))
2783 2784 else:
2784 2785 ui.write(('unrecognized entry: %s\t%s\n')
2785 2786 % (rtype, record.replace('\0', '\t')))
2786 2787
2787 2788 # Avoid mergestate.read() since it may raise an exception for unsupported
2788 2789 # merge state records. We shouldn't be doing this, but this is OK since this
2789 2790 # command is pretty low-level.
2790 2791 ms = mergemod.mergestate(repo)
2791 2792
2792 2793 # sort so that reasonable information is on top
2793 2794 v1records = ms._readrecordsv1()
2794 2795 v2records = ms._readrecordsv2()
2795 2796 order = 'LOm'
2796 2797 def key(r):
2797 2798 idx = order.find(r[0])
2798 2799 if idx == -1:
2799 2800 return (1, r[1])
2800 2801 else:
2801 2802 return (0, idx)
2802 2803 v1records.sort(key=key)
2803 2804 v2records.sort(key=key)
2804 2805
2805 2806 if not v1records and not v2records:
2806 2807 ui.write(('no merge state found\n'))
2807 2808 elif not v2records:
2808 2809 ui.note(('no version 2 merge state\n'))
2809 2810 printrecords(1)
2810 2811 elif ms._v1v2match(v1records, v2records):
2811 2812 ui.note(('v1 and v2 states match: using v2\n'))
2812 2813 printrecords(2)
2813 2814 else:
2814 2815 ui.note(('v1 and v2 states mismatch: using v1\n'))
2815 2816 printrecords(1)
2816 2817 if ui.verbose:
2817 2818 printrecords(2)
2818 2819
2819 2820 @command('debugnamecomplete', [], _('NAME...'))
2820 2821 def debugnamecomplete(ui, repo, *args):
2821 2822 '''complete "names" - tags, open branch names, bookmark names'''
2822 2823
2823 2824 names = set()
2824 2825 # since we previously only listed open branches, we will handle that
2825 2826 # specially (after this for loop)
2826 2827 for name, ns in repo.names.iteritems():
2827 2828 if name != 'branches':
2828 2829 names.update(ns.listnames(repo))
2829 2830 names.update(tag for (tag, heads, tip, closed)
2830 2831 in repo.branchmap().iterbranches() if not closed)
2831 2832 completions = set()
2832 2833 if not args:
2833 2834 args = ['']
2834 2835 for a in args:
2835 2836 completions.update(n for n in names if n.startswith(a))
2836 2837 ui.write('\n'.join(sorted(completions)))
2837 2838 ui.write('\n')
2838 2839
2839 2840 @command('debuglocks',
2840 2841 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2841 2842 ('W', 'force-wlock', None,
2842 2843 _('free the working state lock (DANGEROUS)'))],
2843 2844 _('[OPTION]...'))
2844 2845 def debuglocks(ui, repo, **opts):
2845 2846 """show or modify state of locks
2846 2847
2847 2848 By default, this command will show which locks are held. This
2848 2849 includes the user and process holding the lock, the amount of time
2849 2850 the lock has been held, and the machine name where the process is
2850 2851 running if it's not local.
2851 2852
2852 2853 Locks protect the integrity of Mercurial's data, so should be
2853 2854 treated with care. System crashes or other interruptions may cause
2854 2855 locks to not be properly released, though Mercurial will usually
2855 2856 detect and remove such stale locks automatically.
2856 2857
2857 2858 However, detecting stale locks may not always be possible (for
2858 2859 instance, on a shared filesystem). Removing locks may also be
2859 2860 blocked by filesystem permissions.
2860 2861
2861 2862 Returns 0 if no locks are held.
2862 2863
2863 2864 """
2864 2865
2865 2866 if opts.get('force_lock'):
2866 2867 repo.svfs.unlink('lock')
2867 2868 if opts.get('force_wlock'):
2868 2869 repo.vfs.unlink('wlock')
2869 2870 if opts.get('force_lock') or opts.get('force_lock'):
2870 2871 return 0
2871 2872
2872 2873 now = time.time()
2873 2874 held = 0
2874 2875
2875 2876 def report(vfs, name, method):
2876 2877 # this causes stale locks to get reaped for more accurate reporting
2877 2878 try:
2878 2879 l = method(False)
2879 2880 except error.LockHeld:
2880 2881 l = None
2881 2882
2882 2883 if l:
2883 2884 l.release()
2884 2885 else:
2885 2886 try:
2886 2887 stat = vfs.lstat(name)
2887 2888 age = now - stat.st_mtime
2888 2889 user = util.username(stat.st_uid)
2889 2890 locker = vfs.readlock(name)
2890 2891 if ":" in locker:
2891 2892 host, pid = locker.split(':')
2892 2893 if host == socket.gethostname():
2893 2894 locker = 'user %s, process %s' % (user, pid)
2894 2895 else:
2895 2896 locker = 'user %s, process %s, host %s' \
2896 2897 % (user, pid, host)
2897 2898 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2898 2899 return 1
2899 2900 except OSError as e:
2900 2901 if e.errno != errno.ENOENT:
2901 2902 raise
2902 2903
2903 2904 ui.write("%-6s free\n" % (name + ":"))
2904 2905 return 0
2905 2906
2906 2907 held += report(repo.svfs, "lock", repo.lock)
2907 2908 held += report(repo.vfs, "wlock", repo.wlock)
2908 2909
2909 2910 return held
2910 2911
2911 2912 @command('debugobsolete',
2912 2913 [('', 'flags', 0, _('markers flag')),
2913 2914 ('', 'record-parents', False,
2914 2915 _('record parent information for the precursor')),
2915 2916 ('r', 'rev', [], _('display markers relevant to REV')),
2916 2917 ] + commitopts2,
2917 2918 _('[OBSOLETED [REPLACEMENT ...]]'))
2918 2919 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2919 2920 """create arbitrary obsolete marker
2920 2921
2921 2922 With no arguments, displays the list of obsolescence markers."""
2922 2923
2923 2924 def parsenodeid(s):
2924 2925 try:
2925 2926 # We do not use revsingle/revrange functions here to accept
2926 2927 # arbitrary node identifiers, possibly not present in the
2927 2928 # local repository.
2928 2929 n = bin(s)
2929 2930 if len(n) != len(nullid):
2930 2931 raise TypeError()
2931 2932 return n
2932 2933 except TypeError:
2933 2934 raise error.Abort('changeset references must be full hexadecimal '
2934 2935 'node identifiers')
2935 2936
2936 2937 if precursor is not None:
2937 2938 if opts['rev']:
2938 2939 raise error.Abort('cannot select revision when creating marker')
2939 2940 metadata = {}
2940 2941 metadata['user'] = opts['user'] or ui.username()
2941 2942 succs = tuple(parsenodeid(succ) for succ in successors)
2942 2943 l = repo.lock()
2943 2944 try:
2944 2945 tr = repo.transaction('debugobsolete')
2945 2946 try:
2946 2947 date = opts.get('date')
2947 2948 if date:
2948 2949 date = util.parsedate(date)
2949 2950 else:
2950 2951 date = None
2951 2952 prec = parsenodeid(precursor)
2952 2953 parents = None
2953 2954 if opts['record_parents']:
2954 2955 if prec not in repo.unfiltered():
2955 2956 raise error.Abort('cannot used --record-parents on '
2956 2957 'unknown changesets')
2957 2958 parents = repo.unfiltered()[prec].parents()
2958 2959 parents = tuple(p.node() for p in parents)
2959 2960 repo.obsstore.create(tr, prec, succs, opts['flags'],
2960 2961 parents=parents, date=date,
2961 2962 metadata=metadata)
2962 2963 tr.close()
2963 2964 except ValueError as exc:
2964 2965 raise error.Abort(_('bad obsmarker input: %s') % exc)
2965 2966 finally:
2966 2967 tr.release()
2967 2968 finally:
2968 2969 l.release()
2969 2970 else:
2970 2971 if opts['rev']:
2971 2972 revs = scmutil.revrange(repo, opts['rev'])
2972 2973 nodes = [repo[r].node() for r in revs]
2973 2974 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2974 2975 markers.sort(key=lambda x: x._data)
2975 2976 else:
2976 2977 markers = obsolete.getmarkers(repo)
2977 2978
2978 2979 for m in markers:
2979 2980 cmdutil.showmarker(ui, m)
2980 2981
2981 2982 @command('debugpathcomplete',
2982 2983 [('f', 'full', None, _('complete an entire path')),
2983 2984 ('n', 'normal', None, _('show only normal files')),
2984 2985 ('a', 'added', None, _('show only added files')),
2985 2986 ('r', 'removed', None, _('show only removed files'))],
2986 2987 _('FILESPEC...'))
2987 2988 def debugpathcomplete(ui, repo, *specs, **opts):
2988 2989 '''complete part or all of a tracked path
2989 2990
2990 2991 This command supports shells that offer path name completion. It
2991 2992 currently completes only files already known to the dirstate.
2992 2993
2993 2994 Completion extends only to the next path segment unless
2994 2995 --full is specified, in which case entire paths are used.'''
2995 2996
2996 2997 def complete(path, acceptable):
2997 2998 dirstate = repo.dirstate
2998 2999 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2999 3000 rootdir = repo.root + os.sep
3000 3001 if spec != repo.root and not spec.startswith(rootdir):
3001 3002 return [], []
3002 3003 if os.path.isdir(spec):
3003 3004 spec += '/'
3004 3005 spec = spec[len(rootdir):]
3005 3006 fixpaths = os.sep != '/'
3006 3007 if fixpaths:
3007 3008 spec = spec.replace(os.sep, '/')
3008 3009 speclen = len(spec)
3009 3010 fullpaths = opts['full']
3010 3011 files, dirs = set(), set()
3011 3012 adddir, addfile = dirs.add, files.add
3012 3013 for f, st in dirstate.iteritems():
3013 3014 if f.startswith(spec) and st[0] in acceptable:
3014 3015 if fixpaths:
3015 3016 f = f.replace('/', os.sep)
3016 3017 if fullpaths:
3017 3018 addfile(f)
3018 3019 continue
3019 3020 s = f.find(os.sep, speclen)
3020 3021 if s >= 0:
3021 3022 adddir(f[:s])
3022 3023 else:
3023 3024 addfile(f)
3024 3025 return files, dirs
3025 3026
3026 3027 acceptable = ''
3027 3028 if opts['normal']:
3028 3029 acceptable += 'nm'
3029 3030 if opts['added']:
3030 3031 acceptable += 'a'
3031 3032 if opts['removed']:
3032 3033 acceptable += 'r'
3033 3034 cwd = repo.getcwd()
3034 3035 if not specs:
3035 3036 specs = ['.']
3036 3037
3037 3038 files, dirs = set(), set()
3038 3039 for spec in specs:
3039 3040 f, d = complete(spec, acceptable or 'nmar')
3040 3041 files.update(f)
3041 3042 dirs.update(d)
3042 3043 files.update(dirs)
3043 3044 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3044 3045 ui.write('\n')
3045 3046
3046 3047 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3047 3048 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3048 3049 '''access the pushkey key/value protocol
3049 3050
3050 3051 With two args, list the keys in the given namespace.
3051 3052
3052 3053 With five args, set a key to new if it currently is set to old.
3053 3054 Reports success or failure.
3054 3055 '''
3055 3056
3056 3057 target = hg.peer(ui, {}, repopath)
3057 3058 if keyinfo:
3058 3059 key, old, new = keyinfo
3059 3060 r = target.pushkey(namespace, key, old, new)
3060 3061 ui.status(str(r) + '\n')
3061 3062 return not r
3062 3063 else:
3063 3064 for k, v in sorted(target.listkeys(namespace).iteritems()):
3064 3065 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3065 3066 v.encode('string-escape')))
3066 3067
3067 3068 @command('debugpvec', [], _('A B'))
3068 3069 def debugpvec(ui, repo, a, b=None):
3069 3070 ca = scmutil.revsingle(repo, a)
3070 3071 cb = scmutil.revsingle(repo, b)
3071 3072 pa = pvec.ctxpvec(ca)
3072 3073 pb = pvec.ctxpvec(cb)
3073 3074 if pa == pb:
3074 3075 rel = "="
3075 3076 elif pa > pb:
3076 3077 rel = ">"
3077 3078 elif pa < pb:
3078 3079 rel = "<"
3079 3080 elif pa | pb:
3080 3081 rel = "|"
3081 3082 ui.write(_("a: %s\n") % pa)
3082 3083 ui.write(_("b: %s\n") % pb)
3083 3084 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3084 3085 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3085 3086 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3086 3087 pa.distance(pb), rel))
3087 3088
3088 3089 @command('debugrebuilddirstate|debugrebuildstate',
3089 3090 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3090 3091 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3091 3092 'the working copy parent')),
3092 3093 ],
3093 3094 _('[-r REV]'))
3094 3095 def debugrebuilddirstate(ui, repo, rev, **opts):
3095 3096 """rebuild the dirstate as it would look like for the given revision
3096 3097
3097 3098 If no revision is specified the first current parent will be used.
3098 3099
3099 3100 The dirstate will be set to the files of the given revision.
3100 3101 The actual working directory content or existing dirstate
3101 3102 information such as adds or removes is not considered.
3102 3103
3103 3104 ``minimal`` will only rebuild the dirstate status for files that claim to be
3104 3105 tracked but are not in the parent manifest, or that exist in the parent
3105 3106 manifest but are not in the dirstate. It will not change adds, removes, or
3106 3107 modified files that are in the working copy parent.
3107 3108
3108 3109 One use of this command is to make the next :hg:`status` invocation
3109 3110 check the actual file content.
3110 3111 """
3111 3112 ctx = scmutil.revsingle(repo, rev)
3112 3113 wlock = repo.wlock()
3113 3114 try:
3114 3115 dirstate = repo.dirstate
3115 3116 changedfiles = None
3116 3117 # See command doc for what minimal does.
3117 3118 if opts.get('minimal'):
3118 3119 manifestfiles = set(ctx.manifest().keys())
3119 3120 dirstatefiles = set(dirstate)
3120 3121 manifestonly = manifestfiles - dirstatefiles
3121 3122 dsonly = dirstatefiles - manifestfiles
3122 3123 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3123 3124 changedfiles = manifestonly | dsnotadded
3124 3125
3125 3126 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3126 3127 finally:
3127 3128 wlock.release()
3128 3129
3129 3130 @command('debugrebuildfncache', [], '')
3130 3131 def debugrebuildfncache(ui, repo):
3131 3132 """rebuild the fncache file"""
3132 3133 repair.rebuildfncache(ui, repo)
3133 3134
3134 3135 @command('debugrename',
3135 3136 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3136 3137 _('[-r REV] FILE'))
3137 3138 def debugrename(ui, repo, file1, *pats, **opts):
3138 3139 """dump rename information"""
3139 3140
3140 3141 ctx = scmutil.revsingle(repo, opts.get('rev'))
3141 3142 m = scmutil.match(ctx, (file1,) + pats, opts)
3142 3143 for abs in ctx.walk(m):
3143 3144 fctx = ctx[abs]
3144 3145 o = fctx.filelog().renamed(fctx.filenode())
3145 3146 rel = m.rel(abs)
3146 3147 if o:
3147 3148 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3148 3149 else:
3149 3150 ui.write(_("%s not renamed\n") % rel)
3150 3151
3151 3152 @command('debugrevlog', debugrevlogopts +
3152 3153 [('d', 'dump', False, _('dump index data'))],
3153 3154 _('-c|-m|FILE'),
3154 3155 optionalrepo=True)
3155 3156 def debugrevlog(ui, repo, file_=None, **opts):
3156 3157 """show data and statistics about a revlog"""
3157 3158 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3158 3159
3159 3160 if opts.get("dump"):
3160 3161 numrevs = len(r)
3161 3162 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3162 3163 " rawsize totalsize compression heads chainlen\n")
3163 3164 ts = 0
3164 3165 heads = set()
3165 3166
3166 3167 for rev in xrange(numrevs):
3167 3168 dbase = r.deltaparent(rev)
3168 3169 if dbase == -1:
3169 3170 dbase = rev
3170 3171 cbase = r.chainbase(rev)
3171 3172 clen = r.chainlen(rev)
3172 3173 p1, p2 = r.parentrevs(rev)
3173 3174 rs = r.rawsize(rev)
3174 3175 ts = ts + rs
3175 3176 heads -= set(r.parentrevs(rev))
3176 3177 heads.add(rev)
3177 3178 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3178 3179 "%11d %5d %8d\n" %
3179 3180 (rev, p1, p2, r.start(rev), r.end(rev),
3180 3181 r.start(dbase), r.start(cbase),
3181 3182 r.start(p1), r.start(p2),
3182 3183 rs, ts, ts / r.end(rev), len(heads), clen))
3183 3184 return 0
3184 3185
3185 3186 v = r.version
3186 3187 format = v & 0xFFFF
3187 3188 flags = []
3188 3189 gdelta = False
3189 3190 if v & revlog.REVLOGNGINLINEDATA:
3190 3191 flags.append('inline')
3191 3192 if v & revlog.REVLOGGENERALDELTA:
3192 3193 gdelta = True
3193 3194 flags.append('generaldelta')
3194 3195 if not flags:
3195 3196 flags = ['(none)']
3196 3197
3197 3198 nummerges = 0
3198 3199 numfull = 0
3199 3200 numprev = 0
3200 3201 nump1 = 0
3201 3202 nump2 = 0
3202 3203 numother = 0
3203 3204 nump1prev = 0
3204 3205 nump2prev = 0
3205 3206 chainlengths = []
3206 3207
3207 3208 datasize = [None, 0, 0L]
3208 3209 fullsize = [None, 0, 0L]
3209 3210 deltasize = [None, 0, 0L]
3210 3211
3211 3212 def addsize(size, l):
3212 3213 if l[0] is None or size < l[0]:
3213 3214 l[0] = size
3214 3215 if size > l[1]:
3215 3216 l[1] = size
3216 3217 l[2] += size
3217 3218
3218 3219 numrevs = len(r)
3219 3220 for rev in xrange(numrevs):
3220 3221 p1, p2 = r.parentrevs(rev)
3221 3222 delta = r.deltaparent(rev)
3222 3223 if format > 0:
3223 3224 addsize(r.rawsize(rev), datasize)
3224 3225 if p2 != nullrev:
3225 3226 nummerges += 1
3226 3227 size = r.length(rev)
3227 3228 if delta == nullrev:
3228 3229 chainlengths.append(0)
3229 3230 numfull += 1
3230 3231 addsize(size, fullsize)
3231 3232 else:
3232 3233 chainlengths.append(chainlengths[delta] + 1)
3233 3234 addsize(size, deltasize)
3234 3235 if delta == rev - 1:
3235 3236 numprev += 1
3236 3237 if delta == p1:
3237 3238 nump1prev += 1
3238 3239 elif delta == p2:
3239 3240 nump2prev += 1
3240 3241 elif delta == p1:
3241 3242 nump1 += 1
3242 3243 elif delta == p2:
3243 3244 nump2 += 1
3244 3245 elif delta != nullrev:
3245 3246 numother += 1
3246 3247
3247 3248 # Adjust size min value for empty cases
3248 3249 for size in (datasize, fullsize, deltasize):
3249 3250 if size[0] is None:
3250 3251 size[0] = 0
3251 3252
3252 3253 numdeltas = numrevs - numfull
3253 3254 numoprev = numprev - nump1prev - nump2prev
3254 3255 totalrawsize = datasize[2]
3255 3256 datasize[2] /= numrevs
3256 3257 fulltotal = fullsize[2]
3257 3258 fullsize[2] /= numfull
3258 3259 deltatotal = deltasize[2]
3259 3260 if numrevs - numfull > 0:
3260 3261 deltasize[2] /= numrevs - numfull
3261 3262 totalsize = fulltotal + deltatotal
3262 3263 avgchainlen = sum(chainlengths) / numrevs
3263 3264 maxchainlen = max(chainlengths)
3264 3265 compratio = 1
3265 3266 if totalsize:
3266 3267 compratio = totalrawsize / totalsize
3267 3268
3268 3269 basedfmtstr = '%%%dd\n'
3269 3270 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3270 3271
3271 3272 def dfmtstr(max):
3272 3273 return basedfmtstr % len(str(max))
3273 3274 def pcfmtstr(max, padding=0):
3274 3275 return basepcfmtstr % (len(str(max)), ' ' * padding)
3275 3276
3276 3277 def pcfmt(value, total):
3277 3278 if total:
3278 3279 return (value, 100 * float(value) / total)
3279 3280 else:
3280 3281 return value, 100.0
3281 3282
3282 3283 ui.write(('format : %d\n') % format)
3283 3284 ui.write(('flags : %s\n') % ', '.join(flags))
3284 3285
3285 3286 ui.write('\n')
3286 3287 fmt = pcfmtstr(totalsize)
3287 3288 fmt2 = dfmtstr(totalsize)
3288 3289 ui.write(('revisions : ') + fmt2 % numrevs)
3289 3290 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3290 3291 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3291 3292 ui.write(('revisions : ') + fmt2 % numrevs)
3292 3293 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3293 3294 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3294 3295 ui.write(('revision size : ') + fmt2 % totalsize)
3295 3296 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3296 3297 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3297 3298
3298 3299 ui.write('\n')
3299 3300 fmt = dfmtstr(max(avgchainlen, compratio))
3300 3301 ui.write(('avg chain length : ') + fmt % avgchainlen)
3301 3302 ui.write(('max chain length : ') + fmt % maxchainlen)
3302 3303 ui.write(('compression ratio : ') + fmt % compratio)
3303 3304
3304 3305 if format > 0:
3305 3306 ui.write('\n')
3306 3307 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3307 3308 % tuple(datasize))
3308 3309 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3309 3310 % tuple(fullsize))
3310 3311 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3311 3312 % tuple(deltasize))
3312 3313
3313 3314 if numdeltas > 0:
3314 3315 ui.write('\n')
3315 3316 fmt = pcfmtstr(numdeltas)
3316 3317 fmt2 = pcfmtstr(numdeltas, 4)
3317 3318 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3318 3319 if numprev > 0:
3319 3320 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3320 3321 numprev))
3321 3322 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3322 3323 numprev))
3323 3324 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3324 3325 numprev))
3325 3326 if gdelta:
3326 3327 ui.write(('deltas against p1 : ')
3327 3328 + fmt % pcfmt(nump1, numdeltas))
3328 3329 ui.write(('deltas against p2 : ')
3329 3330 + fmt % pcfmt(nump2, numdeltas))
3330 3331 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3331 3332 numdeltas))
3332 3333
3333 3334 @command('debugrevspec',
3334 3335 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3335 3336 ('REVSPEC'))
3336 3337 def debugrevspec(ui, repo, expr, **opts):
3337 3338 """parse and apply a revision specification
3338 3339
3339 3340 Use --verbose to print the parsed tree before and after aliases
3340 3341 expansion.
3341 3342 """
3342 3343 if ui.verbose:
3343 3344 tree = revset.parse(expr, lookup=repo.__contains__)
3344 3345 ui.note(revset.prettyformat(tree), "\n")
3345 3346 newtree = revset.findaliases(ui, tree)
3346 3347 if newtree != tree:
3347 3348 ui.note(revset.prettyformat(newtree), "\n")
3348 3349 tree = newtree
3349 3350 newtree = revset.foldconcat(tree)
3350 3351 if newtree != tree:
3351 3352 ui.note(revset.prettyformat(newtree), "\n")
3352 3353 if opts["optimize"]:
3353 3354 weight, optimizedtree = revset.optimize(newtree, True)
3354 3355 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3355 3356 func = revset.match(ui, expr, repo)
3356 3357 revs = func(repo)
3357 3358 if ui.verbose:
3358 3359 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3359 3360 for c in revs:
3360 3361 ui.write("%s\n" % c)
3361 3362
3362 3363 @command('debugsetparents', [], _('REV1 [REV2]'))
3363 3364 def debugsetparents(ui, repo, rev1, rev2=None):
3364 3365 """manually set the parents of the current working directory
3365 3366
3366 3367 This is useful for writing repository conversion tools, but should
3367 3368 be used with care. For example, neither the working directory nor the
3368 3369 dirstate is updated, so file status may be incorrect after running this
3369 3370 command.
3370 3371
3371 3372 Returns 0 on success.
3372 3373 """
3373 3374
3374 3375 r1 = scmutil.revsingle(repo, rev1).node()
3375 3376 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3376 3377
3377 3378 wlock = repo.wlock()
3378 3379 try:
3379 3380 repo.dirstate.beginparentchange()
3380 3381 repo.setparents(r1, r2)
3381 3382 repo.dirstate.endparentchange()
3382 3383 finally:
3383 3384 wlock.release()
3384 3385
3385 3386 @command('debugdirstate|debugstate',
3386 3387 [('', 'nodates', None, _('do not display the saved mtime')),
3387 3388 ('', 'datesort', None, _('sort by saved mtime'))],
3388 3389 _('[OPTION]...'))
3389 3390 def debugstate(ui, repo, **opts):
3390 3391 """show the contents of the current dirstate"""
3391 3392
3392 3393 nodates = opts.get('nodates')
3393 3394 datesort = opts.get('datesort')
3394 3395
3395 3396 timestr = ""
3396 3397 if datesort:
3397 3398 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3398 3399 else:
3399 3400 keyfunc = None # sort by filename
3400 3401 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3401 3402 if ent[3] == -1:
3402 3403 timestr = 'unset '
3403 3404 elif nodates:
3404 3405 timestr = 'set '
3405 3406 else:
3406 3407 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3407 3408 time.localtime(ent[3]))
3408 3409 if ent[1] & 0o20000:
3409 3410 mode = 'lnk'
3410 3411 else:
3411 3412 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3412 3413 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3413 3414 for f in repo.dirstate.copies():
3414 3415 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3415 3416
3416 3417 @command('debugsub',
3417 3418 [('r', 'rev', '',
3418 3419 _('revision to check'), _('REV'))],
3419 3420 _('[-r REV] [REV]'))
3420 3421 def debugsub(ui, repo, rev=None):
3421 3422 ctx = scmutil.revsingle(repo, rev, None)
3422 3423 for k, v in sorted(ctx.substate.items()):
3423 3424 ui.write(('path %s\n') % k)
3424 3425 ui.write((' source %s\n') % v[0])
3425 3426 ui.write((' revision %s\n') % v[1])
3426 3427
3427 3428 @command('debugsuccessorssets',
3428 3429 [],
3429 3430 _('[REV]'))
3430 3431 def debugsuccessorssets(ui, repo, *revs):
3431 3432 """show set of successors for revision
3432 3433
3433 3434 A successors set of changeset A is a consistent group of revisions that
3434 3435 succeed A. It contains non-obsolete changesets only.
3435 3436
3436 3437 In most cases a changeset A has a single successors set containing a single
3437 3438 successor (changeset A replaced by A').
3438 3439
3439 3440 A changeset that is made obsolete with no successors are called "pruned".
3440 3441 Such changesets have no successors sets at all.
3441 3442
3442 3443 A changeset that has been "split" will have a successors set containing
3443 3444 more than one successor.
3444 3445
3445 3446 A changeset that has been rewritten in multiple different ways is called
3446 3447 "divergent". Such changesets have multiple successor sets (each of which
3447 3448 may also be split, i.e. have multiple successors).
3448 3449
3449 3450 Results are displayed as follows::
3450 3451
3451 3452 <rev1>
3452 3453 <successors-1A>
3453 3454 <rev2>
3454 3455 <successors-2A>
3455 3456 <successors-2B1> <successors-2B2> <successors-2B3>
3456 3457
3457 3458 Here rev2 has two possible (i.e. divergent) successors sets. The first
3458 3459 holds one element, whereas the second holds three (i.e. the changeset has
3459 3460 been split).
3460 3461 """
3461 3462 # passed to successorssets caching computation from one call to another
3462 3463 cache = {}
3463 3464 ctx2str = str
3464 3465 node2str = short
3465 3466 if ui.debug():
3466 3467 def ctx2str(ctx):
3467 3468 return ctx.hex()
3468 3469 node2str = hex
3469 3470 for rev in scmutil.revrange(repo, revs):
3470 3471 ctx = repo[rev]
3471 3472 ui.write('%s\n'% ctx2str(ctx))
3472 3473 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3473 3474 if succsset:
3474 3475 ui.write(' ')
3475 3476 ui.write(node2str(succsset[0]))
3476 3477 for node in succsset[1:]:
3477 3478 ui.write(' ')
3478 3479 ui.write(node2str(node))
3479 3480 ui.write('\n')
3480 3481
3481 3482 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3482 3483 def debugwalk(ui, repo, *pats, **opts):
3483 3484 """show how files match on given patterns"""
3484 3485 m = scmutil.match(repo[None], pats, opts)
3485 3486 items = list(repo.walk(m))
3486 3487 if not items:
3487 3488 return
3488 3489 f = lambda fn: fn
3489 3490 if ui.configbool('ui', 'slash') and os.sep != '/':
3490 3491 f = lambda fn: util.normpath(fn)
3491 3492 fmt = 'f %%-%ds %%-%ds %%s' % (
3492 3493 max([len(abs) for abs in items]),
3493 3494 max([len(m.rel(abs)) for abs in items]))
3494 3495 for abs in items:
3495 3496 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3496 3497 ui.write("%s\n" % line.rstrip())
3497 3498
3498 3499 @command('debugwireargs',
3499 3500 [('', 'three', '', 'three'),
3500 3501 ('', 'four', '', 'four'),
3501 3502 ('', 'five', '', 'five'),
3502 3503 ] + remoteopts,
3503 3504 _('REPO [OPTIONS]... [ONE [TWO]]'),
3504 3505 norepo=True)
3505 3506 def debugwireargs(ui, repopath, *vals, **opts):
3506 3507 repo = hg.peer(ui, opts, repopath)
3507 3508 for opt in remoteopts:
3508 3509 del opts[opt[1]]
3509 3510 args = {}
3510 3511 for k, v in opts.iteritems():
3511 3512 if v:
3512 3513 args[k] = v
3513 3514 # run twice to check that we don't mess up the stream for the next command
3514 3515 res1 = repo.debugwireargs(*vals, **args)
3515 3516 res2 = repo.debugwireargs(*vals, **args)
3516 3517 ui.write("%s\n" % res1)
3517 3518 if res1 != res2:
3518 3519 ui.warn("%s\n" % res2)
3519 3520
3520 3521 @command('^diff',
3521 3522 [('r', 'rev', [], _('revision'), _('REV')),
3522 3523 ('c', 'change', '', _('change made by revision'), _('REV'))
3523 3524 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3524 3525 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3525 3526 inferrepo=True)
3526 3527 def diff(ui, repo, *pats, **opts):
3527 3528 """diff repository (or selected files)
3528 3529
3529 3530 Show differences between revisions for the specified files.
3530 3531
3531 3532 Differences between files are shown using the unified diff format.
3532 3533
3533 3534 .. note::
3534 3535
3535 3536 diff may generate unexpected results for merges, as it will
3536 3537 default to comparing against the working directory's first
3537 3538 parent changeset if no revisions are specified.
3538 3539
3539 3540 When two revision arguments are given, then changes are shown
3540 3541 between those revisions. If only one revision is specified then
3541 3542 that revision is compared to the working directory, and, when no
3542 3543 revisions are specified, the working directory files are compared
3543 3544 to its parent.
3544 3545
3545 3546 Alternatively you can specify -c/--change with a revision to see
3546 3547 the changes in that changeset relative to its first parent.
3547 3548
3548 3549 Without the -a/--text option, diff will avoid generating diffs of
3549 3550 files it detects as binary. With -a, diff will generate a diff
3550 3551 anyway, probably with undesirable results.
3551 3552
3552 3553 Use the -g/--git option to generate diffs in the git extended diff
3553 3554 format. For more information, read :hg:`help diffs`.
3554 3555
3555 3556 .. container:: verbose
3556 3557
3557 3558 Examples:
3558 3559
3559 3560 - compare a file in the current working directory to its parent::
3560 3561
3561 3562 hg diff foo.c
3562 3563
3563 3564 - compare two historical versions of a directory, with rename info::
3564 3565
3565 3566 hg diff --git -r 1.0:1.2 lib/
3566 3567
3567 3568 - get change stats relative to the last change on some date::
3568 3569
3569 3570 hg diff --stat -r "date('may 2')"
3570 3571
3571 3572 - diff all newly-added files that contain a keyword::
3572 3573
3573 3574 hg diff "set:added() and grep(GNU)"
3574 3575
3575 3576 - compare a revision and its parents::
3576 3577
3577 3578 hg diff -c 9353 # compare against first parent
3578 3579 hg diff -r 9353^:9353 # same using revset syntax
3579 3580 hg diff -r 9353^2:9353 # compare against the second parent
3580 3581
3581 3582 Returns 0 on success.
3582 3583 """
3583 3584
3584 3585 revs = opts.get('rev')
3585 3586 change = opts.get('change')
3586 3587 stat = opts.get('stat')
3587 3588 reverse = opts.get('reverse')
3588 3589
3589 3590 if revs and change:
3590 3591 msg = _('cannot specify --rev and --change at the same time')
3591 3592 raise error.Abort(msg)
3592 3593 elif change:
3593 3594 node2 = scmutil.revsingle(repo, change, None).node()
3594 3595 node1 = repo[node2].p1().node()
3595 3596 else:
3596 3597 node1, node2 = scmutil.revpair(repo, revs)
3597 3598
3598 3599 if reverse:
3599 3600 node1, node2 = node2, node1
3600 3601
3601 3602 diffopts = patch.diffallopts(ui, opts)
3602 3603 m = scmutil.match(repo[node2], pats, opts)
3603 3604 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3604 3605 listsubrepos=opts.get('subrepos'),
3605 3606 root=opts.get('root'))
3606 3607
3607 3608 @command('^export',
3608 3609 [('o', 'output', '',
3609 3610 _('print output to file with formatted name'), _('FORMAT')),
3610 3611 ('', 'switch-parent', None, _('diff against the second parent')),
3611 3612 ('r', 'rev', [], _('revisions to export'), _('REV')),
3612 3613 ] + diffopts,
3613 3614 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3614 3615 def export(ui, repo, *changesets, **opts):
3615 3616 """dump the header and diffs for one or more changesets
3616 3617
3617 3618 Print the changeset header and diffs for one or more revisions.
3618 3619 If no revision is given, the parent of the working directory is used.
3619 3620
3620 3621 The information shown in the changeset header is: author, date,
3621 3622 branch name (if non-default), changeset hash, parent(s) and commit
3622 3623 comment.
3623 3624
3624 3625 .. note::
3625 3626
3626 3627 export may generate unexpected diff output for merge
3627 3628 changesets, as it will compare the merge changeset against its
3628 3629 first parent only.
3629 3630
3630 3631 Output may be to a file, in which case the name of the file is
3631 3632 given using a format string. The formatting rules are as follows:
3632 3633
3633 3634 :``%%``: literal "%" character
3634 3635 :``%H``: changeset hash (40 hexadecimal digits)
3635 3636 :``%N``: number of patches being generated
3636 3637 :``%R``: changeset revision number
3637 3638 :``%b``: basename of the exporting repository
3638 3639 :``%h``: short-form changeset hash (12 hexadecimal digits)
3639 3640 :``%m``: first line of the commit message (only alphanumeric characters)
3640 3641 :``%n``: zero-padded sequence number, starting at 1
3641 3642 :``%r``: zero-padded changeset revision number
3642 3643
3643 3644 Without the -a/--text option, export will avoid generating diffs
3644 3645 of files it detects as binary. With -a, export will generate a
3645 3646 diff anyway, probably with undesirable results.
3646 3647
3647 3648 Use the -g/--git option to generate diffs in the git extended diff
3648 3649 format. See :hg:`help diffs` for more information.
3649 3650
3650 3651 With the --switch-parent option, the diff will be against the
3651 3652 second parent. It can be useful to review a merge.
3652 3653
3653 3654 .. container:: verbose
3654 3655
3655 3656 Examples:
3656 3657
3657 3658 - use export and import to transplant a bugfix to the current
3658 3659 branch::
3659 3660
3660 3661 hg export -r 9353 | hg import -
3661 3662
3662 3663 - export all the changesets between two revisions to a file with
3663 3664 rename information::
3664 3665
3665 3666 hg export --git -r 123:150 > changes.txt
3666 3667
3667 3668 - split outgoing changes into a series of patches with
3668 3669 descriptive names::
3669 3670
3670 3671 hg export -r "outgoing()" -o "%n-%m.patch"
3671 3672
3672 3673 Returns 0 on success.
3673 3674 """
3674 3675 changesets += tuple(opts.get('rev', []))
3675 3676 if not changesets:
3676 3677 changesets = ['.']
3677 3678 revs = scmutil.revrange(repo, changesets)
3678 3679 if not revs:
3679 3680 raise error.Abort(_("export requires at least one changeset"))
3680 3681 if len(revs) > 1:
3681 3682 ui.note(_('exporting patches:\n'))
3682 3683 else:
3683 3684 ui.note(_('exporting patch:\n'))
3684 3685 cmdutil.export(repo, revs, template=opts.get('output'),
3685 3686 switch_parent=opts.get('switch_parent'),
3686 3687 opts=patch.diffallopts(ui, opts))
3687 3688
3688 3689 @command('files',
3689 3690 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3690 3691 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3691 3692 ] + walkopts + formatteropts + subrepoopts,
3692 3693 _('[OPTION]... [PATTERN]...'))
3693 3694 def files(ui, repo, *pats, **opts):
3694 3695 """list tracked files
3695 3696
3696 3697 Print files under Mercurial control in the working directory or
3697 3698 specified revision whose names match the given patterns (excluding
3698 3699 removed files).
3699 3700
3700 3701 If no patterns are given to match, this command prints the names
3701 3702 of all files under Mercurial control in the working directory.
3702 3703
3703 3704 .. container:: verbose
3704 3705
3705 3706 Examples:
3706 3707
3707 3708 - list all files under the current directory::
3708 3709
3709 3710 hg files .
3710 3711
3711 3712 - shows sizes and flags for current revision::
3712 3713
3713 3714 hg files -vr .
3714 3715
3715 3716 - list all files named README::
3716 3717
3717 3718 hg files -I "**/README"
3718 3719
3719 3720 - list all binary files::
3720 3721
3721 3722 hg files "set:binary()"
3722 3723
3723 3724 - find files containing a regular expression::
3724 3725
3725 3726 hg files "set:grep('bob')"
3726 3727
3727 3728 - search tracked file contents with xargs and grep::
3728 3729
3729 3730 hg files -0 | xargs -0 grep foo
3730 3731
3731 3732 See :hg:`help patterns` and :hg:`help filesets` for more information
3732 3733 on specifying file patterns.
3733 3734
3734 3735 Returns 0 if a match is found, 1 otherwise.
3735 3736
3736 3737 """
3737 3738 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3738 3739
3739 3740 end = '\n'
3740 3741 if opts.get('print0'):
3741 3742 end = '\0'
3742 3743 fm = ui.formatter('files', opts)
3743 3744 fmt = '%s' + end
3744 3745
3745 3746 m = scmutil.match(ctx, pats, opts)
3746 3747 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3747 3748
3748 3749 fm.end()
3749 3750
3750 3751 return ret
3751 3752
3752 3753 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3753 3754 def forget(ui, repo, *pats, **opts):
3754 3755 """forget the specified files on the next commit
3755 3756
3756 3757 Mark the specified files so they will no longer be tracked
3757 3758 after the next commit.
3758 3759
3759 3760 This only removes files from the current branch, not from the
3760 3761 entire project history, and it does not delete them from the
3761 3762 working directory.
3762 3763
3763 3764 To delete the file from the working directory, see :hg:`remove`.
3764 3765
3765 3766 To undo a forget before the next commit, see :hg:`add`.
3766 3767
3767 3768 .. container:: verbose
3768 3769
3769 3770 Examples:
3770 3771
3771 3772 - forget newly-added binary files::
3772 3773
3773 3774 hg forget "set:added() and binary()"
3774 3775
3775 3776 - forget files that would be excluded by .hgignore::
3776 3777
3777 3778 hg forget "set:hgignore()"
3778 3779
3779 3780 Returns 0 on success.
3780 3781 """
3781 3782
3782 3783 if not pats:
3783 3784 raise error.Abort(_('no files specified'))
3784 3785
3785 3786 m = scmutil.match(repo[None], pats, opts)
3786 3787 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3787 3788 return rejected and 1 or 0
3788 3789
3789 3790 @command(
3790 3791 'graft',
3791 3792 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3792 3793 ('c', 'continue', False, _('resume interrupted graft')),
3793 3794 ('e', 'edit', False, _('invoke editor on commit messages')),
3794 3795 ('', 'log', None, _('append graft info to log message')),
3795 3796 ('f', 'force', False, _('force graft')),
3796 3797 ('D', 'currentdate', False,
3797 3798 _('record the current date as commit date')),
3798 3799 ('U', 'currentuser', False,
3799 3800 _('record the current user as committer'), _('DATE'))]
3800 3801 + commitopts2 + mergetoolopts + dryrunopts,
3801 3802 _('[OPTION]... [-r] REV...'))
3802 3803 def graft(ui, repo, *revs, **opts):
3803 3804 '''copy changes from other branches onto the current branch
3804 3805
3805 3806 This command uses Mercurial's merge logic to copy individual
3806 3807 changes from other branches without merging branches in the
3807 3808 history graph. This is sometimes known as 'backporting' or
3808 3809 'cherry-picking'. By default, graft will copy user, date, and
3809 3810 description from the source changesets.
3810 3811
3811 3812 Changesets that are ancestors of the current revision, that have
3812 3813 already been grafted, or that are merges will be skipped.
3813 3814
3814 3815 If --log is specified, log messages will have a comment appended
3815 3816 of the form::
3816 3817
3817 3818 (grafted from CHANGESETHASH)
3818 3819
3819 3820 If --force is specified, revisions will be grafted even if they
3820 3821 are already ancestors of or have been grafted to the destination.
3821 3822 This is useful when the revisions have since been backed out.
3822 3823
3823 3824 If a graft merge results in conflicts, the graft process is
3824 3825 interrupted so that the current merge can be manually resolved.
3825 3826 Once all conflicts are addressed, the graft process can be
3826 3827 continued with the -c/--continue option.
3827 3828
3828 3829 .. note::
3829 3830
3830 3831 The -c/--continue option does not reapply earlier options, except
3831 3832 for --force.
3832 3833
3833 3834 .. container:: verbose
3834 3835
3835 3836 Examples:
3836 3837
3837 3838 - copy a single change to the stable branch and edit its description::
3838 3839
3839 3840 hg update stable
3840 3841 hg graft --edit 9393
3841 3842
3842 3843 - graft a range of changesets with one exception, updating dates::
3843 3844
3844 3845 hg graft -D "2085::2093 and not 2091"
3845 3846
3846 3847 - continue a graft after resolving conflicts::
3847 3848
3848 3849 hg graft -c
3849 3850
3850 3851 - show the source of a grafted changeset::
3851 3852
3852 3853 hg log --debug -r .
3853 3854
3854 3855 See :hg:`help revisions` and :hg:`help revsets` for more about
3855 3856 specifying revisions.
3856 3857
3857 3858 Returns 0 on successful completion.
3858 3859 '''
3859 3860 wlock = None
3860 3861 try:
3861 3862 wlock = repo.wlock()
3862 3863 return _dograft(ui, repo, *revs, **opts)
3863 3864 finally:
3864 3865 release(wlock)
3865 3866
3866 3867 def _dograft(ui, repo, *revs, **opts):
3867 3868 revs = list(revs)
3868 3869 revs.extend(opts['rev'])
3869 3870
3870 3871 if not opts.get('user') and opts.get('currentuser'):
3871 3872 opts['user'] = ui.username()
3872 3873 if not opts.get('date') and opts.get('currentdate'):
3873 3874 opts['date'] = "%d %d" % util.makedate()
3874 3875
3875 3876 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3876 3877
3877 3878 cont = False
3878 3879 if opts['continue']:
3879 3880 cont = True
3880 3881 if revs:
3881 3882 raise error.Abort(_("can't specify --continue and revisions"))
3882 3883 # read in unfinished revisions
3883 3884 try:
3884 3885 nodes = repo.vfs.read('graftstate').splitlines()
3885 3886 revs = [repo[node].rev() for node in nodes]
3886 3887 except IOError as inst:
3887 3888 if inst.errno != errno.ENOENT:
3888 3889 raise
3889 3890 raise error.Abort(_("no graft state found, can't continue"))
3890 3891 else:
3891 3892 cmdutil.checkunfinished(repo)
3892 3893 cmdutil.bailifchanged(repo)
3893 3894 if not revs:
3894 3895 raise error.Abort(_('no revisions specified'))
3895 3896 revs = scmutil.revrange(repo, revs)
3896 3897
3897 3898 skipped = set()
3898 3899 # check for merges
3899 3900 for rev in repo.revs('%ld and merge()', revs):
3900 3901 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3901 3902 skipped.add(rev)
3902 3903 revs = [r for r in revs if r not in skipped]
3903 3904 if not revs:
3904 3905 return -1
3905 3906
3906 3907 # Don't check in the --continue case, in effect retaining --force across
3907 3908 # --continues. That's because without --force, any revisions we decided to
3908 3909 # skip would have been filtered out here, so they wouldn't have made their
3909 3910 # way to the graftstate. With --force, any revisions we would have otherwise
3910 3911 # skipped would not have been filtered out, and if they hadn't been applied
3911 3912 # already, they'd have been in the graftstate.
3912 3913 if not (cont or opts.get('force')):
3913 3914 # check for ancestors of dest branch
3914 3915 crev = repo['.'].rev()
3915 3916 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3916 3917 # Cannot use x.remove(y) on smart set, this has to be a list.
3917 3918 # XXX make this lazy in the future
3918 3919 revs = list(revs)
3919 3920 # don't mutate while iterating, create a copy
3920 3921 for rev in list(revs):
3921 3922 if rev in ancestors:
3922 3923 ui.warn(_('skipping ancestor revision %d:%s\n') %
3923 3924 (rev, repo[rev]))
3924 3925 # XXX remove on list is slow
3925 3926 revs.remove(rev)
3926 3927 if not revs:
3927 3928 return -1
3928 3929
3929 3930 # analyze revs for earlier grafts
3930 3931 ids = {}
3931 3932 for ctx in repo.set("%ld", revs):
3932 3933 ids[ctx.hex()] = ctx.rev()
3933 3934 n = ctx.extra().get('source')
3934 3935 if n:
3935 3936 ids[n] = ctx.rev()
3936 3937
3937 3938 # check ancestors for earlier grafts
3938 3939 ui.debug('scanning for duplicate grafts\n')
3939 3940
3940 3941 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3941 3942 ctx = repo[rev]
3942 3943 n = ctx.extra().get('source')
3943 3944 if n in ids:
3944 3945 try:
3945 3946 r = repo[n].rev()
3946 3947 except error.RepoLookupError:
3947 3948 r = None
3948 3949 if r in revs:
3949 3950 ui.warn(_('skipping revision %d:%s '
3950 3951 '(already grafted to %d:%s)\n')
3951 3952 % (r, repo[r], rev, ctx))
3952 3953 revs.remove(r)
3953 3954 elif ids[n] in revs:
3954 3955 if r is None:
3955 3956 ui.warn(_('skipping already grafted revision %d:%s '
3956 3957 '(%d:%s also has unknown origin %s)\n')
3957 3958 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3958 3959 else:
3959 3960 ui.warn(_('skipping already grafted revision %d:%s '
3960 3961 '(%d:%s also has origin %d:%s)\n')
3961 3962 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3962 3963 revs.remove(ids[n])
3963 3964 elif ctx.hex() in ids:
3964 3965 r = ids[ctx.hex()]
3965 3966 ui.warn(_('skipping already grafted revision %d:%s '
3966 3967 '(was grafted from %d:%s)\n') %
3967 3968 (r, repo[r], rev, ctx))
3968 3969 revs.remove(r)
3969 3970 if not revs:
3970 3971 return -1
3971 3972
3972 3973 try:
3973 3974 for pos, ctx in enumerate(repo.set("%ld", revs)):
3974 3975 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3975 3976 ctx.description().split('\n', 1)[0])
3976 3977 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3977 3978 if names:
3978 3979 desc += ' (%s)' % ' '.join(names)
3979 3980 ui.status(_('grafting %s\n') % desc)
3980 3981 if opts.get('dry_run'):
3981 3982 continue
3982 3983
3983 3984 extra = ctx.extra().copy()
3984 3985 del extra['branch']
3985 3986 source = extra.get('source')
3986 3987 if source:
3987 3988 extra['intermediate-source'] = ctx.hex()
3988 3989 else:
3989 3990 extra['source'] = ctx.hex()
3990 3991 user = ctx.user()
3991 3992 if opts.get('user'):
3992 3993 user = opts['user']
3993 3994 date = ctx.date()
3994 3995 if opts.get('date'):
3995 3996 date = opts['date']
3996 3997 message = ctx.description()
3997 3998 if opts.get('log'):
3998 3999 message += '\n(grafted from %s)' % ctx.hex()
3999 4000
4000 4001 # we don't merge the first commit when continuing
4001 4002 if not cont:
4002 4003 # perform the graft merge with p1(rev) as 'ancestor'
4003 4004 try:
4004 4005 # ui.forcemerge is an internal variable, do not document
4005 4006 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4006 4007 'graft')
4007 4008 stats = mergemod.graft(repo, ctx, ctx.p1(),
4008 4009 ['local', 'graft'])
4009 4010 finally:
4010 4011 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4011 4012 # report any conflicts
4012 4013 if stats and stats[3] > 0:
4013 4014 # write out state for --continue
4014 4015 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4015 4016 repo.vfs.write('graftstate', ''.join(nodelines))
4016 4017 extra = ''
4017 4018 if opts.get('user'):
4018 4019 extra += ' --user %s' % opts['user']
4019 4020 if opts.get('date'):
4020 4021 extra += ' --date %s' % opts['date']
4021 4022 if opts.get('log'):
4022 4023 extra += ' --log'
4023 4024 hint=_('use hg resolve and hg graft --continue%s') % extra
4024 4025 raise error.Abort(
4025 4026 _("unresolved conflicts, can't continue"),
4026 4027 hint=hint)
4027 4028 else:
4028 4029 cont = False
4029 4030
4030 4031 # commit
4031 4032 node = repo.commit(text=message, user=user,
4032 4033 date=date, extra=extra, editor=editor)
4033 4034 if node is None:
4034 4035 ui.warn(
4035 4036 _('note: graft of %d:%s created no changes to commit\n') %
4036 4037 (ctx.rev(), ctx))
4037 4038 finally:
4038 4039 # TODO: get rid of this meaningless try/finally enclosing.
4039 4040 # this is kept only to reduce changes in a patch.
4040 4041 pass
4041 4042
4042 4043 # remove state when we complete successfully
4043 4044 if not opts.get('dry_run'):
4044 4045 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4045 4046
4046 4047 return 0
4047 4048
4048 4049 @command('grep',
4049 4050 [('0', 'print0', None, _('end fields with NUL')),
4050 4051 ('', 'all', None, _('print all revisions that match')),
4051 4052 ('a', 'text', None, _('treat all files as text')),
4052 4053 ('f', 'follow', None,
4053 4054 _('follow changeset history,'
4054 4055 ' or file history across copies and renames')),
4055 4056 ('i', 'ignore-case', None, _('ignore case when matching')),
4056 4057 ('l', 'files-with-matches', None,
4057 4058 _('print only filenames and revisions that match')),
4058 4059 ('n', 'line-number', None, _('print matching line numbers')),
4059 4060 ('r', 'rev', [],
4060 4061 _('only search files changed within revision range'), _('REV')),
4061 4062 ('u', 'user', None, _('list the author (long with -v)')),
4062 4063 ('d', 'date', None, _('list the date (short with -q)')),
4063 4064 ] + walkopts,
4064 4065 _('[OPTION]... PATTERN [FILE]...'),
4065 4066 inferrepo=True)
4066 4067 def grep(ui, repo, pattern, *pats, **opts):
4067 4068 """search for a pattern in specified files and revisions
4068 4069
4069 4070 Search revisions of files for a regular expression.
4070 4071
4071 4072 This command behaves differently than Unix grep. It only accepts
4072 4073 Python/Perl regexps. It searches repository history, not the
4073 4074 working directory. It always prints the revision number in which a
4074 4075 match appears.
4075 4076
4076 4077 By default, grep only prints output for the first revision of a
4077 4078 file in which it finds a match. To get it to print every revision
4078 4079 that contains a change in match status ("-" for a match that
4079 4080 becomes a non-match, or "+" for a non-match that becomes a match),
4080 4081 use the --all flag.
4081 4082
4082 4083 Returns 0 if a match is found, 1 otherwise.
4083 4084 """
4084 4085 reflags = re.M
4085 4086 if opts.get('ignore_case'):
4086 4087 reflags |= re.I
4087 4088 try:
4088 4089 regexp = util.re.compile(pattern, reflags)
4089 4090 except re.error as inst:
4090 4091 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4091 4092 return 1
4092 4093 sep, eol = ':', '\n'
4093 4094 if opts.get('print0'):
4094 4095 sep = eol = '\0'
4095 4096
4096 4097 getfile = util.lrucachefunc(repo.file)
4097 4098
4098 4099 def matchlines(body):
4099 4100 begin = 0
4100 4101 linenum = 0
4101 4102 while begin < len(body):
4102 4103 match = regexp.search(body, begin)
4103 4104 if not match:
4104 4105 break
4105 4106 mstart, mend = match.span()
4106 4107 linenum += body.count('\n', begin, mstart) + 1
4107 4108 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4108 4109 begin = body.find('\n', mend) + 1 or len(body) + 1
4109 4110 lend = begin - 1
4110 4111 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4111 4112
4112 4113 class linestate(object):
4113 4114 def __init__(self, line, linenum, colstart, colend):
4114 4115 self.line = line
4115 4116 self.linenum = linenum
4116 4117 self.colstart = colstart
4117 4118 self.colend = colend
4118 4119
4119 4120 def __hash__(self):
4120 4121 return hash((self.linenum, self.line))
4121 4122
4122 4123 def __eq__(self, other):
4123 4124 return self.line == other.line
4124 4125
4125 4126 def __iter__(self):
4126 4127 yield (self.line[:self.colstart], '')
4127 4128 yield (self.line[self.colstart:self.colend], 'grep.match')
4128 4129 rest = self.line[self.colend:]
4129 4130 while rest != '':
4130 4131 match = regexp.search(rest)
4131 4132 if not match:
4132 4133 yield (rest, '')
4133 4134 break
4134 4135 mstart, mend = match.span()
4135 4136 yield (rest[:mstart], '')
4136 4137 yield (rest[mstart:mend], 'grep.match')
4137 4138 rest = rest[mend:]
4138 4139
4139 4140 matches = {}
4140 4141 copies = {}
4141 4142 def grepbody(fn, rev, body):
4142 4143 matches[rev].setdefault(fn, [])
4143 4144 m = matches[rev][fn]
4144 4145 for lnum, cstart, cend, line in matchlines(body):
4145 4146 s = linestate(line, lnum, cstart, cend)
4146 4147 m.append(s)
4147 4148
4148 4149 def difflinestates(a, b):
4149 4150 sm = difflib.SequenceMatcher(None, a, b)
4150 4151 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4151 4152 if tag == 'insert':
4152 4153 for i in xrange(blo, bhi):
4153 4154 yield ('+', b[i])
4154 4155 elif tag == 'delete':
4155 4156 for i in xrange(alo, ahi):
4156 4157 yield ('-', a[i])
4157 4158 elif tag == 'replace':
4158 4159 for i in xrange(alo, ahi):
4159 4160 yield ('-', a[i])
4160 4161 for i in xrange(blo, bhi):
4161 4162 yield ('+', b[i])
4162 4163
4163 4164 def display(fn, ctx, pstates, states):
4164 4165 rev = ctx.rev()
4165 4166 if ui.quiet:
4166 4167 datefunc = util.shortdate
4167 4168 else:
4168 4169 datefunc = util.datestr
4169 4170 found = False
4170 4171 @util.cachefunc
4171 4172 def binary():
4172 4173 flog = getfile(fn)
4173 4174 return util.binary(flog.read(ctx.filenode(fn)))
4174 4175
4175 4176 if opts.get('all'):
4176 4177 iter = difflinestates(pstates, states)
4177 4178 else:
4178 4179 iter = [('', l) for l in states]
4179 4180 for change, l in iter:
4180 4181 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4181 4182
4182 4183 if opts.get('line_number'):
4183 4184 cols.append((str(l.linenum), 'grep.linenumber'))
4184 4185 if opts.get('all'):
4185 4186 cols.append((change, 'grep.change'))
4186 4187 if opts.get('user'):
4187 4188 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4188 4189 if opts.get('date'):
4189 4190 cols.append((datefunc(ctx.date()), 'grep.date'))
4190 4191 for col, label in cols[:-1]:
4191 4192 ui.write(col, label=label)
4192 4193 ui.write(sep, label='grep.sep')
4193 4194 ui.write(cols[-1][0], label=cols[-1][1])
4194 4195 if not opts.get('files_with_matches'):
4195 4196 ui.write(sep, label='grep.sep')
4196 4197 if not opts.get('text') and binary():
4197 4198 ui.write(" Binary file matches")
4198 4199 else:
4199 4200 for s, label in l:
4200 4201 ui.write(s, label=label)
4201 4202 ui.write(eol)
4202 4203 found = True
4203 4204 if opts.get('files_with_matches'):
4204 4205 break
4205 4206 return found
4206 4207
4207 4208 skip = {}
4208 4209 revfiles = {}
4209 4210 matchfn = scmutil.match(repo[None], pats, opts)
4210 4211 found = False
4211 4212 follow = opts.get('follow')
4212 4213
4213 4214 def prep(ctx, fns):
4214 4215 rev = ctx.rev()
4215 4216 pctx = ctx.p1()
4216 4217 parent = pctx.rev()
4217 4218 matches.setdefault(rev, {})
4218 4219 matches.setdefault(parent, {})
4219 4220 files = revfiles.setdefault(rev, [])
4220 4221 for fn in fns:
4221 4222 flog = getfile(fn)
4222 4223 try:
4223 4224 fnode = ctx.filenode(fn)
4224 4225 except error.LookupError:
4225 4226 continue
4226 4227
4227 4228 copied = flog.renamed(fnode)
4228 4229 copy = follow and copied and copied[0]
4229 4230 if copy:
4230 4231 copies.setdefault(rev, {})[fn] = copy
4231 4232 if fn in skip:
4232 4233 if copy:
4233 4234 skip[copy] = True
4234 4235 continue
4235 4236 files.append(fn)
4236 4237
4237 4238 if fn not in matches[rev]:
4238 4239 grepbody(fn, rev, flog.read(fnode))
4239 4240
4240 4241 pfn = copy or fn
4241 4242 if pfn not in matches[parent]:
4242 4243 try:
4243 4244 fnode = pctx.filenode(pfn)
4244 4245 grepbody(pfn, parent, flog.read(fnode))
4245 4246 except error.LookupError:
4246 4247 pass
4247 4248
4248 4249 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4249 4250 rev = ctx.rev()
4250 4251 parent = ctx.p1().rev()
4251 4252 for fn in sorted(revfiles.get(rev, [])):
4252 4253 states = matches[rev][fn]
4253 4254 copy = copies.get(rev, {}).get(fn)
4254 4255 if fn in skip:
4255 4256 if copy:
4256 4257 skip[copy] = True
4257 4258 continue
4258 4259 pstates = matches.get(parent, {}).get(copy or fn, [])
4259 4260 if pstates or states:
4260 4261 r = display(fn, ctx, pstates, states)
4261 4262 found = found or r
4262 4263 if r and not opts.get('all'):
4263 4264 skip[fn] = True
4264 4265 if copy:
4265 4266 skip[copy] = True
4266 4267 del matches[rev]
4267 4268 del revfiles[rev]
4268 4269
4269 4270 return not found
4270 4271
4271 4272 @command('heads',
4272 4273 [('r', 'rev', '',
4273 4274 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4274 4275 ('t', 'topo', False, _('show topological heads only')),
4275 4276 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4276 4277 ('c', 'closed', False, _('show normal and closed branch heads')),
4277 4278 ] + templateopts,
4278 4279 _('[-ct] [-r STARTREV] [REV]...'))
4279 4280 def heads(ui, repo, *branchrevs, **opts):
4280 4281 """show branch heads
4281 4282
4282 4283 With no arguments, show all open branch heads in the repository.
4283 4284 Branch heads are changesets that have no descendants on the
4284 4285 same branch. They are where development generally takes place and
4285 4286 are the usual targets for update and merge operations.
4286 4287
4287 4288 If one or more REVs are given, only open branch heads on the
4288 4289 branches associated with the specified changesets are shown. This
4289 4290 means that you can use :hg:`heads .` to see the heads on the
4290 4291 currently checked-out branch.
4291 4292
4292 4293 If -c/--closed is specified, also show branch heads marked closed
4293 4294 (see :hg:`commit --close-branch`).
4294 4295
4295 4296 If STARTREV is specified, only those heads that are descendants of
4296 4297 STARTREV will be displayed.
4297 4298
4298 4299 If -t/--topo is specified, named branch mechanics will be ignored and only
4299 4300 topological heads (changesets with no children) will be shown.
4300 4301
4301 4302 Returns 0 if matching heads are found, 1 if not.
4302 4303 """
4303 4304
4304 4305 start = None
4305 4306 if 'rev' in opts:
4306 4307 start = scmutil.revsingle(repo, opts['rev'], None).node()
4307 4308
4308 4309 if opts.get('topo'):
4309 4310 heads = [repo[h] for h in repo.heads(start)]
4310 4311 else:
4311 4312 heads = []
4312 4313 for branch in repo.branchmap():
4313 4314 heads += repo.branchheads(branch, start, opts.get('closed'))
4314 4315 heads = [repo[h] for h in heads]
4315 4316
4316 4317 if branchrevs:
4317 4318 branches = set(repo[br].branch() for br in branchrevs)
4318 4319 heads = [h for h in heads if h.branch() in branches]
4319 4320
4320 4321 if opts.get('active') and branchrevs:
4321 4322 dagheads = repo.heads(start)
4322 4323 heads = [h for h in heads if h.node() in dagheads]
4323 4324
4324 4325 if branchrevs:
4325 4326 haveheads = set(h.branch() for h in heads)
4326 4327 if branches - haveheads:
4327 4328 headless = ', '.join(b for b in branches - haveheads)
4328 4329 msg = _('no open branch heads found on branches %s')
4329 4330 if opts.get('rev'):
4330 4331 msg += _(' (started at %s)') % opts['rev']
4331 4332 ui.warn((msg + '\n') % headless)
4332 4333
4333 4334 if not heads:
4334 4335 return 1
4335 4336
4336 4337 heads = sorted(heads, key=lambda x: -x.rev())
4337 4338 displayer = cmdutil.show_changeset(ui, repo, opts)
4338 4339 for ctx in heads:
4339 4340 displayer.show(ctx)
4340 4341 displayer.close()
4341 4342
4342 4343 @command('help',
4343 4344 [('e', 'extension', None, _('show only help for extensions')),
4344 4345 ('c', 'command', None, _('show only help for commands')),
4345 4346 ('k', 'keyword', None, _('show topics matching keyword')),
4346 4347 ],
4347 4348 _('[-eck] [TOPIC]'),
4348 4349 norepo=True)
4349 4350 def help_(ui, name=None, **opts):
4350 4351 """show help for a given topic or a help overview
4351 4352
4352 4353 With no arguments, print a list of commands with short help messages.
4353 4354
4354 4355 Given a topic, extension, or command name, print help for that
4355 4356 topic.
4356 4357
4357 4358 Returns 0 if successful.
4358 4359 """
4359 4360
4360 4361 textwidth = min(ui.termwidth(), 80) - 2
4361 4362
4362 4363 keep = []
4363 4364 if ui.verbose:
4364 4365 keep.append('verbose')
4365 4366 if sys.platform.startswith('win'):
4366 4367 keep.append('windows')
4367 4368 elif sys.platform == 'OpenVMS':
4368 4369 keep.append('vms')
4369 4370 elif sys.platform == 'plan9':
4370 4371 keep.append('plan9')
4371 4372 else:
4372 4373 keep.append('unix')
4373 4374 keep.append(sys.platform.lower())
4374 4375
4375 4376 section = None
4376 4377 subtopic = None
4377 4378 if name and '.' in name:
4378 4379 name, section = name.split('.', 1)
4379 4380 section = section.lower()
4380 4381 if '.' in section:
4381 4382 subtopic, section = section.split('.', 1)
4382 4383 else:
4383 4384 subtopic = section
4384 4385
4385 4386 text = help.help_(ui, name, subtopic=subtopic, **opts)
4386 4387
4387 4388 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4388 4389 section=section)
4389 4390
4390 4391 # We could have been given a weird ".foo" section without a name
4391 4392 # to look for, or we could have simply failed to found "foo.bar"
4392 4393 # because bar isn't a section of foo
4393 4394 if section and not (formatted and name):
4394 4395 raise error.Abort(_("help section not found"))
4395 4396
4396 4397 if 'verbose' in pruned:
4397 4398 keep.append('omitted')
4398 4399 else:
4399 4400 keep.append('notomitted')
4400 4401 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4401 4402 section=section)
4402 4403 ui.write(formatted)
4403 4404
4404 4405
4405 4406 @command('identify|id',
4406 4407 [('r', 'rev', '',
4407 4408 _('identify the specified revision'), _('REV')),
4408 4409 ('n', 'num', None, _('show local revision number')),
4409 4410 ('i', 'id', None, _('show global revision id')),
4410 4411 ('b', 'branch', None, _('show branch')),
4411 4412 ('t', 'tags', None, _('show tags')),
4412 4413 ('B', 'bookmarks', None, _('show bookmarks')),
4413 4414 ] + remoteopts,
4414 4415 _('[-nibtB] [-r REV] [SOURCE]'),
4415 4416 optionalrepo=True)
4416 4417 def identify(ui, repo, source=None, rev=None,
4417 4418 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4418 4419 """identify the working directory or specified revision
4419 4420
4420 4421 Print a summary identifying the repository state at REV using one or
4421 4422 two parent hash identifiers, followed by a "+" if the working
4422 4423 directory has uncommitted changes, the branch name (if not default),
4423 4424 a list of tags, and a list of bookmarks.
4424 4425
4425 4426 When REV is not given, print a summary of the current state of the
4426 4427 repository.
4427 4428
4428 4429 Specifying a path to a repository root or Mercurial bundle will
4429 4430 cause lookup to operate on that repository/bundle.
4430 4431
4431 4432 .. container:: verbose
4432 4433
4433 4434 Examples:
4434 4435
4435 4436 - generate a build identifier for the working directory::
4436 4437
4437 4438 hg id --id > build-id.dat
4438 4439
4439 4440 - find the revision corresponding to a tag::
4440 4441
4441 4442 hg id -n -r 1.3
4442 4443
4443 4444 - check the most recent revision of a remote repository::
4444 4445
4445 4446 hg id -r tip http://selenic.com/hg/
4446 4447
4447 4448 See :hg:`log` for generating more information about specific revisions,
4448 4449 including full hash identifiers.
4449 4450
4450 4451 Returns 0 if successful.
4451 4452 """
4452 4453
4453 4454 if not repo and not source:
4454 4455 raise error.Abort(_("there is no Mercurial repository here "
4455 4456 "(.hg not found)"))
4456 4457
4457 4458 if ui.debugflag:
4458 4459 hexfunc = hex
4459 4460 else:
4460 4461 hexfunc = short
4461 4462 default = not (num or id or branch or tags or bookmarks)
4462 4463 output = []
4463 4464 revs = []
4464 4465
4465 4466 if source:
4466 4467 source, branches = hg.parseurl(ui.expandpath(source))
4467 4468 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4468 4469 repo = peer.local()
4469 4470 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4470 4471
4471 4472 if not repo:
4472 4473 if num or branch or tags:
4473 4474 raise error.Abort(
4474 4475 _("can't query remote revision number, branch, or tags"))
4475 4476 if not rev and revs:
4476 4477 rev = revs[0]
4477 4478 if not rev:
4478 4479 rev = "tip"
4479 4480
4480 4481 remoterev = peer.lookup(rev)
4481 4482 if default or id:
4482 4483 output = [hexfunc(remoterev)]
4483 4484
4484 4485 def getbms():
4485 4486 bms = []
4486 4487
4487 4488 if 'bookmarks' in peer.listkeys('namespaces'):
4488 4489 hexremoterev = hex(remoterev)
4489 4490 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4490 4491 if bmr == hexremoterev]
4491 4492
4492 4493 return sorted(bms)
4493 4494
4494 4495 if bookmarks:
4495 4496 output.extend(getbms())
4496 4497 elif default and not ui.quiet:
4497 4498 # multiple bookmarks for a single parent separated by '/'
4498 4499 bm = '/'.join(getbms())
4499 4500 if bm:
4500 4501 output.append(bm)
4501 4502 else:
4502 4503 ctx = scmutil.revsingle(repo, rev, None)
4503 4504
4504 4505 if ctx.rev() is None:
4505 4506 ctx = repo[None]
4506 4507 parents = ctx.parents()
4507 4508 taglist = []
4508 4509 for p in parents:
4509 4510 taglist.extend(p.tags())
4510 4511
4511 4512 changed = ""
4512 4513 if default or id or num:
4513 4514 if (any(repo.status())
4514 4515 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4515 4516 changed = '+'
4516 4517 if default or id:
4517 4518 output = ["%s%s" %
4518 4519 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4519 4520 if num:
4520 4521 output.append("%s%s" %
4521 4522 ('+'.join([str(p.rev()) for p in parents]), changed))
4522 4523 else:
4523 4524 if default or id:
4524 4525 output = [hexfunc(ctx.node())]
4525 4526 if num:
4526 4527 output.append(str(ctx.rev()))
4527 4528 taglist = ctx.tags()
4528 4529
4529 4530 if default and not ui.quiet:
4530 4531 b = ctx.branch()
4531 4532 if b != 'default':
4532 4533 output.append("(%s)" % b)
4533 4534
4534 4535 # multiple tags for a single parent separated by '/'
4535 4536 t = '/'.join(taglist)
4536 4537 if t:
4537 4538 output.append(t)
4538 4539
4539 4540 # multiple bookmarks for a single parent separated by '/'
4540 4541 bm = '/'.join(ctx.bookmarks())
4541 4542 if bm:
4542 4543 output.append(bm)
4543 4544 else:
4544 4545 if branch:
4545 4546 output.append(ctx.branch())
4546 4547
4547 4548 if tags:
4548 4549 output.extend(taglist)
4549 4550
4550 4551 if bookmarks:
4551 4552 output.extend(ctx.bookmarks())
4552 4553
4553 4554 ui.write("%s\n" % ' '.join(output))
4554 4555
4555 4556 @command('import|patch',
4556 4557 [('p', 'strip', 1,
4557 4558 _('directory strip option for patch. This has the same '
4558 4559 'meaning as the corresponding patch option'), _('NUM')),
4559 4560 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4560 4561 ('e', 'edit', False, _('invoke editor on commit messages')),
4561 4562 ('f', 'force', None,
4562 4563 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4563 4564 ('', 'no-commit', None,
4564 4565 _("don't commit, just update the working directory")),
4565 4566 ('', 'bypass', None,
4566 4567 _("apply patch without touching the working directory")),
4567 4568 ('', 'partial', None,
4568 4569 _('commit even if some hunks fail')),
4569 4570 ('', 'exact', None,
4570 4571 _('apply patch to the nodes from which it was generated')),
4571 4572 ('', 'prefix', '',
4572 4573 _('apply patch to subdirectory'), _('DIR')),
4573 4574 ('', 'import-branch', None,
4574 4575 _('use any branch information in patch (implied by --exact)'))] +
4575 4576 commitopts + commitopts2 + similarityopts,
4576 4577 _('[OPTION]... PATCH...'))
4577 4578 def import_(ui, repo, patch1=None, *patches, **opts):
4578 4579 """import an ordered set of patches
4579 4580
4580 4581 Import a list of patches and commit them individually (unless
4581 4582 --no-commit is specified).
4582 4583
4583 4584 To read a patch from standard input, use "-" as the patch name. If
4584 4585 a URL is specified, the patch will be downloaded from there.
4585 4586
4586 4587 Import first applies changes to the working directory (unless
4587 4588 --bypass is specified), import will abort if there are outstanding
4588 4589 changes.
4589 4590
4590 4591 Use --bypass to apply and commit patches directly to the
4591 4592 repository, without affecting the working directory. Without
4592 4593 --exact, patches will be applied on top of the working directory
4593 4594 parent revision.
4594 4595
4595 4596 You can import a patch straight from a mail message. Even patches
4596 4597 as attachments work (to use the body part, it must have type
4597 4598 text/plain or text/x-patch). From and Subject headers of email
4598 4599 message are used as default committer and commit message. All
4599 4600 text/plain body parts before first diff are added to the commit
4600 4601 message.
4601 4602
4602 4603 If the imported patch was generated by :hg:`export`, user and
4603 4604 description from patch override values from message headers and
4604 4605 body. Values given on command line with -m/--message and -u/--user
4605 4606 override these.
4606 4607
4607 4608 If --exact is specified, import will set the working directory to
4608 4609 the parent of each patch before applying it, and will abort if the
4609 4610 resulting changeset has a different ID than the one recorded in
4610 4611 the patch. This may happen due to character set problems or other
4611 4612 deficiencies in the text patch format.
4612 4613
4613 4614 Use --partial to ensure a changeset will be created from the patch
4614 4615 even if some hunks fail to apply. Hunks that fail to apply will be
4615 4616 written to a <target-file>.rej file. Conflicts can then be resolved
4616 4617 by hand before :hg:`commit --amend` is run to update the created
4617 4618 changeset. This flag exists to let people import patches that
4618 4619 partially apply without losing the associated metadata (author,
4619 4620 date, description, ...). Note that when none of the hunk applies
4620 4621 cleanly, :hg:`import --partial` will create an empty changeset,
4621 4622 importing only the patch metadata.
4622 4623
4623 4624 With -s/--similarity, hg will attempt to discover renames and
4624 4625 copies in the patch in the same way as :hg:`addremove`.
4625 4626
4626 4627 It is possible to use external patch programs to perform the patch
4627 4628 by setting the ``ui.patch`` configuration option. For the default
4628 4629 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4629 4630 See :hg:`help config` for more information about configuration
4630 4631 files and how to use these options.
4631 4632
4632 4633 See :hg:`help dates` for a list of formats valid for -d/--date.
4633 4634
4634 4635 .. container:: verbose
4635 4636
4636 4637 Examples:
4637 4638
4638 4639 - import a traditional patch from a website and detect renames::
4639 4640
4640 4641 hg import -s 80 http://example.com/bugfix.patch
4641 4642
4642 4643 - import a changeset from an hgweb server::
4643 4644
4644 4645 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4645 4646
4646 4647 - import all the patches in an Unix-style mbox::
4647 4648
4648 4649 hg import incoming-patches.mbox
4649 4650
4650 4651 - attempt to exactly restore an exported changeset (not always
4651 4652 possible)::
4652 4653
4653 4654 hg import --exact proposed-fix.patch
4654 4655
4655 4656 - use an external tool to apply a patch which is too fuzzy for
4656 4657 the default internal tool.
4657 4658
4658 4659 hg import --config ui.patch="patch --merge" fuzzy.patch
4659 4660
4660 4661 - change the default fuzzing from 2 to a less strict 7
4661 4662
4662 4663 hg import --config ui.fuzz=7 fuzz.patch
4663 4664
4664 4665 Returns 0 on success, 1 on partial success (see --partial).
4665 4666 """
4666 4667
4667 4668 if not patch1:
4668 4669 raise error.Abort(_('need at least one patch to import'))
4669 4670
4670 4671 patches = (patch1,) + patches
4671 4672
4672 4673 date = opts.get('date')
4673 4674 if date:
4674 4675 opts['date'] = util.parsedate(date)
4675 4676
4676 4677 exact = opts.get('exact')
4677 4678 update = not opts.get('bypass')
4678 4679 if not update and opts.get('no_commit'):
4679 4680 raise error.Abort(_('cannot use --no-commit with --bypass'))
4680 4681 try:
4681 4682 sim = float(opts.get('similarity') or 0)
4682 4683 except ValueError:
4683 4684 raise error.Abort(_('similarity must be a number'))
4684 4685 if sim < 0 or sim > 100:
4685 4686 raise error.Abort(_('similarity must be between 0 and 100'))
4686 4687 if sim and not update:
4687 4688 raise error.Abort(_('cannot use --similarity with --bypass'))
4688 4689 if exact:
4689 4690 if opts.get('edit'):
4690 4691 raise error.Abort(_('cannot use --exact with --edit'))
4691 4692 if opts.get('prefix'):
4692 4693 raise error.Abort(_('cannot use --exact with --prefix'))
4693 4694
4694 4695 base = opts["base"]
4695 4696 wlock = dsguard = lock = tr = None
4696 4697 msgs = []
4697 4698 ret = 0
4698 4699
4699 4700
4700 4701 try:
4701 4702 try:
4702 4703 wlock = repo.wlock()
4703 4704
4704 4705 if update:
4705 4706 cmdutil.checkunfinished(repo)
4706 4707 if (exact or not opts.get('force')):
4707 4708 cmdutil.bailifchanged(repo)
4708 4709
4709 4710 if not opts.get('no_commit'):
4710 4711 lock = repo.lock()
4711 4712 tr = repo.transaction('import')
4712 4713 else:
4713 4714 dsguard = cmdutil.dirstateguard(repo, 'import')
4714 4715 parents = repo[None].parents()
4715 4716 for patchurl in patches:
4716 4717 if patchurl == '-':
4717 4718 ui.status(_('applying patch from stdin\n'))
4718 4719 patchfile = ui.fin
4719 4720 patchurl = 'stdin' # for error message
4720 4721 else:
4721 4722 patchurl = os.path.join(base, patchurl)
4722 4723 ui.status(_('applying %s\n') % patchurl)
4723 4724 patchfile = hg.openpath(ui, patchurl)
4724 4725
4725 4726 haspatch = False
4726 4727 for hunk in patch.split(patchfile):
4727 4728 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4728 4729 parents, opts,
4729 4730 msgs, hg.clean)
4730 4731 if msg:
4731 4732 haspatch = True
4732 4733 ui.note(msg + '\n')
4733 4734 if update or exact:
4734 4735 parents = repo[None].parents()
4735 4736 else:
4736 4737 parents = [repo[node]]
4737 4738 if rej:
4738 4739 ui.write_err(_("patch applied partially\n"))
4739 4740 ui.write_err(_("(fix the .rej files and run "
4740 4741 "`hg commit --amend`)\n"))
4741 4742 ret = 1
4742 4743 break
4743 4744
4744 4745 if not haspatch:
4745 4746 raise error.Abort(_('%s: no diffs found') % patchurl)
4746 4747
4747 4748 if tr:
4748 4749 tr.close()
4749 4750 if msgs:
4750 4751 repo.savecommitmessage('\n* * *\n'.join(msgs))
4751 4752 if dsguard:
4752 4753 dsguard.close()
4753 4754 return ret
4754 4755 finally:
4755 4756 # TODO: get rid of this meaningless try/finally enclosing.
4756 4757 # this is kept only to reduce changes in a patch.
4757 4758 pass
4758 4759 finally:
4759 4760 if tr:
4760 4761 tr.release()
4761 4762 release(lock, dsguard, wlock)
4762 4763
4763 4764 @command('incoming|in',
4764 4765 [('f', 'force', None,
4765 4766 _('run even if remote repository is unrelated')),
4766 4767 ('n', 'newest-first', None, _('show newest record first')),
4767 4768 ('', 'bundle', '',
4768 4769 _('file to store the bundles into'), _('FILE')),
4769 4770 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4770 4771 ('B', 'bookmarks', False, _("compare bookmarks")),
4771 4772 ('b', 'branch', [],
4772 4773 _('a specific branch you would like to pull'), _('BRANCH')),
4773 4774 ] + logopts + remoteopts + subrepoopts,
4774 4775 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4775 4776 def incoming(ui, repo, source="default", **opts):
4776 4777 """show new changesets found in source
4777 4778
4778 4779 Show new changesets found in the specified path/URL or the default
4779 4780 pull location. These are the changesets that would have been pulled
4780 4781 if a pull at the time you issued this command.
4781 4782
4782 4783 See pull for valid source format details.
4783 4784
4784 4785 .. container:: verbose
4785 4786
4786 4787 With -B/--bookmarks, the result of bookmark comparison between
4787 4788 local and remote repositories is displayed. With -v/--verbose,
4788 4789 status is also displayed for each bookmark like below::
4789 4790
4790 4791 BM1 01234567890a added
4791 4792 BM2 1234567890ab advanced
4792 4793 BM3 234567890abc diverged
4793 4794 BM4 34567890abcd changed
4794 4795
4795 4796 The action taken locally when pulling depends on the
4796 4797 status of each bookmark:
4797 4798
4798 4799 :``added``: pull will create it
4799 4800 :``advanced``: pull will update it
4800 4801 :``diverged``: pull will create a divergent bookmark
4801 4802 :``changed``: result depends on remote changesets
4802 4803
4803 4804 From the point of view of pulling behavior, bookmark
4804 4805 existing only in the remote repository are treated as ``added``,
4805 4806 even if it is in fact locally deleted.
4806 4807
4807 4808 .. container:: verbose
4808 4809
4809 4810 For remote repository, using --bundle avoids downloading the
4810 4811 changesets twice if the incoming is followed by a pull.
4811 4812
4812 4813 Examples:
4813 4814
4814 4815 - show incoming changes with patches and full description::
4815 4816
4816 4817 hg incoming -vp
4817 4818
4818 4819 - show incoming changes excluding merges, store a bundle::
4819 4820
4820 4821 hg in -vpM --bundle incoming.hg
4821 4822 hg pull incoming.hg
4822 4823
4823 4824 - briefly list changes inside a bundle::
4824 4825
4825 4826 hg in changes.hg -T "{desc|firstline}\\n"
4826 4827
4827 4828 Returns 0 if there are incoming changes, 1 otherwise.
4828 4829 """
4829 4830 if opts.get('graph'):
4830 4831 cmdutil.checkunsupportedgraphflags([], opts)
4831 4832 def display(other, chlist, displayer):
4832 4833 revdag = cmdutil.graphrevs(other, chlist, opts)
4833 4834 cmdutil.displaygraph(ui, repo, revdag, displayer,
4834 4835 graphmod.asciiedges)
4835 4836
4836 4837 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4837 4838 return 0
4838 4839
4839 4840 if opts.get('bundle') and opts.get('subrepos'):
4840 4841 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4841 4842
4842 4843 if opts.get('bookmarks'):
4843 4844 source, branches = hg.parseurl(ui.expandpath(source),
4844 4845 opts.get('branch'))
4845 4846 other = hg.peer(repo, opts, source)
4846 4847 if 'bookmarks' not in other.listkeys('namespaces'):
4847 4848 ui.warn(_("remote doesn't support bookmarks\n"))
4848 4849 return 0
4849 4850 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4850 4851 return bookmarks.incoming(ui, repo, other)
4851 4852
4852 4853 repo._subtoppath = ui.expandpath(source)
4853 4854 try:
4854 4855 return hg.incoming(ui, repo, source, opts)
4855 4856 finally:
4856 4857 del repo._subtoppath
4857 4858
4858 4859
4859 4860 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4860 4861 norepo=True)
4861 4862 def init(ui, dest=".", **opts):
4862 4863 """create a new repository in the given directory
4863 4864
4864 4865 Initialize a new repository in the given directory. If the given
4865 4866 directory does not exist, it will be created.
4866 4867
4867 4868 If no directory is given, the current directory is used.
4868 4869
4869 4870 It is possible to specify an ``ssh://`` URL as the destination.
4870 4871 See :hg:`help urls` for more information.
4871 4872
4872 4873 Returns 0 on success.
4873 4874 """
4874 4875 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4875 4876
4876 4877 @command('locate',
4877 4878 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4878 4879 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4879 4880 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4880 4881 ] + walkopts,
4881 4882 _('[OPTION]... [PATTERN]...'))
4882 4883 def locate(ui, repo, *pats, **opts):
4883 4884 """locate files matching specific patterns (DEPRECATED)
4884 4885
4885 4886 Print files under Mercurial control in the working directory whose
4886 4887 names match the given patterns.
4887 4888
4888 4889 By default, this command searches all directories in the working
4889 4890 directory. To search just the current directory and its
4890 4891 subdirectories, use "--include .".
4891 4892
4892 4893 If no patterns are given to match, this command prints the names
4893 4894 of all files under Mercurial control in the working directory.
4894 4895
4895 4896 If you want to feed the output of this command into the "xargs"
4896 4897 command, use the -0 option to both this command and "xargs". This
4897 4898 will avoid the problem of "xargs" treating single filenames that
4898 4899 contain whitespace as multiple filenames.
4899 4900
4900 4901 See :hg:`help files` for a more versatile command.
4901 4902
4902 4903 Returns 0 if a match is found, 1 otherwise.
4903 4904 """
4904 4905 if opts.get('print0'):
4905 4906 end = '\0'
4906 4907 else:
4907 4908 end = '\n'
4908 4909 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4909 4910
4910 4911 ret = 1
4911 4912 ctx = repo[rev]
4912 4913 m = scmutil.match(ctx, pats, opts, default='relglob',
4913 4914 badfn=lambda x, y: False)
4914 4915
4915 4916 for abs in ctx.matches(m):
4916 4917 if opts.get('fullpath'):
4917 4918 ui.write(repo.wjoin(abs), end)
4918 4919 else:
4919 4920 ui.write(((pats and m.rel(abs)) or abs), end)
4920 4921 ret = 0
4921 4922
4922 4923 return ret
4923 4924
4924 4925 @command('^log|history',
4925 4926 [('f', 'follow', None,
4926 4927 _('follow changeset history, or file history across copies and renames')),
4927 4928 ('', 'follow-first', None,
4928 4929 _('only follow the first parent of merge changesets (DEPRECATED)')),
4929 4930 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4930 4931 ('C', 'copies', None, _('show copied files')),
4931 4932 ('k', 'keyword', [],
4932 4933 _('do case-insensitive search for a given text'), _('TEXT')),
4933 4934 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4934 4935 ('', 'removed', None, _('include revisions where files were removed')),
4935 4936 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4936 4937 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4937 4938 ('', 'only-branch', [],
4938 4939 _('show only changesets within the given named branch (DEPRECATED)'),
4939 4940 _('BRANCH')),
4940 4941 ('b', 'branch', [],
4941 4942 _('show changesets within the given named branch'), _('BRANCH')),
4942 4943 ('P', 'prune', [],
4943 4944 _('do not display revision or any of its ancestors'), _('REV')),
4944 4945 ] + logopts + walkopts,
4945 4946 _('[OPTION]... [FILE]'),
4946 4947 inferrepo=True)
4947 4948 def log(ui, repo, *pats, **opts):
4948 4949 """show revision history of entire repository or files
4949 4950
4950 4951 Print the revision history of the specified files or the entire
4951 4952 project.
4952 4953
4953 4954 If no revision range is specified, the default is ``tip:0`` unless
4954 4955 --follow is set, in which case the working directory parent is
4955 4956 used as the starting revision.
4956 4957
4957 4958 File history is shown without following rename or copy history of
4958 4959 files. Use -f/--follow with a filename to follow history across
4959 4960 renames and copies. --follow without a filename will only show
4960 4961 ancestors or descendants of the starting revision.
4961 4962
4962 4963 By default this command prints revision number and changeset id,
4963 4964 tags, non-trivial parents, user, date and time, and a summary for
4964 4965 each commit. When the -v/--verbose switch is used, the list of
4965 4966 changed files and full commit message are shown.
4966 4967
4967 4968 With --graph the revisions are shown as an ASCII art DAG with the most
4968 4969 recent changeset at the top.
4969 4970 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4970 4971 and '+' represents a fork where the changeset from the lines below is a
4971 4972 parent of the 'o' merge on the same line.
4972 4973
4973 4974 .. note::
4974 4975
4975 4976 log -p/--patch may generate unexpected diff output for merge
4976 4977 changesets, as it will only compare the merge changeset against
4977 4978 its first parent. Also, only files different from BOTH parents
4978 4979 will appear in files:.
4979 4980
4980 4981 .. note::
4981 4982
4982 4983 for performance reasons, log FILE may omit duplicate changes
4983 4984 made on branches and will not show removals or mode changes. To
4984 4985 see all such changes, use the --removed switch.
4985 4986
4986 4987 .. container:: verbose
4987 4988
4988 4989 Some examples:
4989 4990
4990 4991 - changesets with full descriptions and file lists::
4991 4992
4992 4993 hg log -v
4993 4994
4994 4995 - changesets ancestral to the working directory::
4995 4996
4996 4997 hg log -f
4997 4998
4998 4999 - last 10 commits on the current branch::
4999 5000
5000 5001 hg log -l 10 -b .
5001 5002
5002 5003 - changesets showing all modifications of a file, including removals::
5003 5004
5004 5005 hg log --removed file.c
5005 5006
5006 5007 - all changesets that touch a directory, with diffs, excluding merges::
5007 5008
5008 5009 hg log -Mp lib/
5009 5010
5010 5011 - all revision numbers that match a keyword::
5011 5012
5012 5013 hg log -k bug --template "{rev}\\n"
5013 5014
5014 5015 - the full hash identifier of the working directory parent::
5015 5016
5016 5017 hg log -r . --template "{node}\\n"
5017 5018
5018 5019 - list available log templates::
5019 5020
5020 5021 hg log -T list
5021 5022
5022 5023 - check if a given changeset is included in a tagged release::
5023 5024
5024 5025 hg log -r "a21ccf and ancestor(1.9)"
5025 5026
5026 5027 - find all changesets by some user in a date range::
5027 5028
5028 5029 hg log -k alice -d "may 2008 to jul 2008"
5029 5030
5030 5031 - summary of all changesets after the last tag::
5031 5032
5032 5033 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5033 5034
5034 5035 See :hg:`help dates` for a list of formats valid for -d/--date.
5035 5036
5036 5037 See :hg:`help revisions` and :hg:`help revsets` for more about
5037 5038 specifying revisions.
5038 5039
5039 5040 See :hg:`help templates` for more about pre-packaged styles and
5040 5041 specifying custom templates.
5041 5042
5042 5043 Returns 0 on success.
5043 5044
5044 5045 """
5045 5046 if opts.get('follow') and opts.get('rev'):
5046 5047 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5047 5048 del opts['follow']
5048 5049
5049 5050 if opts.get('graph'):
5050 5051 return cmdutil.graphlog(ui, repo, *pats, **opts)
5051 5052
5052 5053 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5053 5054 limit = cmdutil.loglimit(opts)
5054 5055 count = 0
5055 5056
5056 5057 getrenamed = None
5057 5058 if opts.get('copies'):
5058 5059 endrev = None
5059 5060 if opts.get('rev'):
5060 5061 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5061 5062 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5062 5063
5063 5064 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5064 5065 for rev in revs:
5065 5066 if count == limit:
5066 5067 break
5067 5068 ctx = repo[rev]
5068 5069 copies = None
5069 5070 if getrenamed is not None and rev:
5070 5071 copies = []
5071 5072 for fn in ctx.files():
5072 5073 rename = getrenamed(fn, rev)
5073 5074 if rename:
5074 5075 copies.append((fn, rename[0]))
5075 5076 if filematcher:
5076 5077 revmatchfn = filematcher(ctx.rev())
5077 5078 else:
5078 5079 revmatchfn = None
5079 5080 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5080 5081 if displayer.flush(ctx):
5081 5082 count += 1
5082 5083
5083 5084 displayer.close()
5084 5085
5085 5086 @command('manifest',
5086 5087 [('r', 'rev', '', _('revision to display'), _('REV')),
5087 5088 ('', 'all', False, _("list files from all revisions"))]
5088 5089 + formatteropts,
5089 5090 _('[-r REV]'))
5090 5091 def manifest(ui, repo, node=None, rev=None, **opts):
5091 5092 """output the current or given revision of the project manifest
5092 5093
5093 5094 Print a list of version controlled files for the given revision.
5094 5095 If no revision is given, the first parent of the working directory
5095 5096 is used, or the null revision if no revision is checked out.
5096 5097
5097 5098 With -v, print file permissions, symlink and executable bits.
5098 5099 With --debug, print file revision hashes.
5099 5100
5100 5101 If option --all is specified, the list of all files from all revisions
5101 5102 is printed. This includes deleted and renamed files.
5102 5103
5103 5104 Returns 0 on success.
5104 5105 """
5105 5106
5106 5107 fm = ui.formatter('manifest', opts)
5107 5108
5108 5109 if opts.get('all'):
5109 5110 if rev or node:
5110 5111 raise error.Abort(_("can't specify a revision with --all"))
5111 5112
5112 5113 res = []
5113 5114 prefix = "data/"
5114 5115 suffix = ".i"
5115 5116 plen = len(prefix)
5116 5117 slen = len(suffix)
5117 5118 lock = repo.lock()
5118 5119 try:
5119 5120 for fn, b, size in repo.store.datafiles():
5120 5121 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5121 5122 res.append(fn[plen:-slen])
5122 5123 finally:
5123 5124 lock.release()
5124 5125 for f in res:
5125 5126 fm.startitem()
5126 5127 fm.write("path", '%s\n', f)
5127 5128 fm.end()
5128 5129 return
5129 5130
5130 5131 if rev and node:
5131 5132 raise error.Abort(_("please specify just one revision"))
5132 5133
5133 5134 if not node:
5134 5135 node = rev
5135 5136
5136 5137 char = {'l': '@', 'x': '*', '': ''}
5137 5138 mode = {'l': '644', 'x': '755', '': '644'}
5138 5139 ctx = scmutil.revsingle(repo, node)
5139 5140 mf = ctx.manifest()
5140 5141 for f in ctx:
5141 5142 fm.startitem()
5142 5143 fl = ctx[f].flags()
5143 5144 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5144 5145 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5145 5146 fm.write('path', '%s\n', f)
5146 5147 fm.end()
5147 5148
5148 5149 @command('^merge',
5149 5150 [('f', 'force', None,
5150 5151 _('force a merge including outstanding changes (DEPRECATED)')),
5151 5152 ('r', 'rev', '', _('revision to merge'), _('REV')),
5152 5153 ('P', 'preview', None,
5153 5154 _('review revisions to merge (no merge is performed)'))
5154 5155 ] + mergetoolopts,
5155 5156 _('[-P] [-f] [[-r] REV]'))
5156 5157 def merge(ui, repo, node=None, **opts):
5157 5158 """merge another revision into working directory
5158 5159
5159 5160 The current working directory is updated with all changes made in
5160 5161 the requested revision since the last common predecessor revision.
5161 5162
5162 5163 Files that changed between either parent are marked as changed for
5163 5164 the next commit and a commit must be performed before any further
5164 5165 updates to the repository are allowed. The next commit will have
5165 5166 two parents.
5166 5167
5167 5168 ``--tool`` can be used to specify the merge tool used for file
5168 5169 merges. It overrides the HGMERGE environment variable and your
5169 5170 configuration files. See :hg:`help merge-tools` for options.
5170 5171
5171 5172 If no revision is specified, the working directory's parent is a
5172 5173 head revision, and the current branch contains exactly one other
5173 5174 head, the other head is merged with by default. Otherwise, an
5174 5175 explicit revision with which to merge with must be provided.
5175 5176
5176 5177 :hg:`resolve` must be used to resolve unresolved files.
5177 5178
5178 5179 To undo an uncommitted merge, use :hg:`update --clean .` which
5179 5180 will check out a clean copy of the original merge parent, losing
5180 5181 all changes.
5181 5182
5182 5183 Returns 0 on success, 1 if there are unresolved files.
5183 5184 """
5184 5185
5185 5186 if opts.get('rev') and node:
5186 5187 raise error.Abort(_("please specify just one revision"))
5187 5188 if not node:
5188 5189 node = opts.get('rev')
5189 5190
5190 5191 if node:
5191 5192 node = scmutil.revsingle(repo, node).node()
5192 5193
5193 5194 if not node:
5194 5195 node = repo[destutil.destmerge(repo)].node()
5195 5196
5196 5197 if opts.get('preview'):
5197 5198 # find nodes that are ancestors of p2 but not of p1
5198 5199 p1 = repo.lookup('.')
5199 5200 p2 = repo.lookup(node)
5200 5201 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5201 5202
5202 5203 displayer = cmdutil.show_changeset(ui, repo, opts)
5203 5204 for node in nodes:
5204 5205 displayer.show(repo[node])
5205 5206 displayer.close()
5206 5207 return 0
5207 5208
5208 5209 try:
5209 5210 # ui.forcemerge is an internal variable, do not document
5210 5211 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5211 5212 return hg.merge(repo, node, force=opts.get('force'))
5212 5213 finally:
5213 5214 ui.setconfig('ui', 'forcemerge', '', 'merge')
5214 5215
5215 5216 @command('outgoing|out',
5216 5217 [('f', 'force', None, _('run even when the destination is unrelated')),
5217 5218 ('r', 'rev', [],
5218 5219 _('a changeset intended to be included in the destination'), _('REV')),
5219 5220 ('n', 'newest-first', None, _('show newest record first')),
5220 5221 ('B', 'bookmarks', False, _('compare bookmarks')),
5221 5222 ('b', 'branch', [], _('a specific branch you would like to push'),
5222 5223 _('BRANCH')),
5223 5224 ] + logopts + remoteopts + subrepoopts,
5224 5225 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5225 5226 def outgoing(ui, repo, dest=None, **opts):
5226 5227 """show changesets not found in the destination
5227 5228
5228 5229 Show changesets not found in the specified destination repository
5229 5230 or the default push location. These are the changesets that would
5230 5231 be pushed if a push was requested.
5231 5232
5232 5233 See pull for details of valid destination formats.
5233 5234
5234 5235 .. container:: verbose
5235 5236
5236 5237 With -B/--bookmarks, the result of bookmark comparison between
5237 5238 local and remote repositories is displayed. With -v/--verbose,
5238 5239 status is also displayed for each bookmark like below::
5239 5240
5240 5241 BM1 01234567890a added
5241 5242 BM2 deleted
5242 5243 BM3 234567890abc advanced
5243 5244 BM4 34567890abcd diverged
5244 5245 BM5 4567890abcde changed
5245 5246
5246 5247 The action taken when pushing depends on the
5247 5248 status of each bookmark:
5248 5249
5249 5250 :``added``: push with ``-B`` will create it
5250 5251 :``deleted``: push with ``-B`` will delete it
5251 5252 :``advanced``: push will update it
5252 5253 :``diverged``: push with ``-B`` will update it
5253 5254 :``changed``: push with ``-B`` will update it
5254 5255
5255 5256 From the point of view of pushing behavior, bookmarks
5256 5257 existing only in the remote repository are treated as
5257 5258 ``deleted``, even if it is in fact added remotely.
5258 5259
5259 5260 Returns 0 if there are outgoing changes, 1 otherwise.
5260 5261 """
5261 5262 if opts.get('graph'):
5262 5263 cmdutil.checkunsupportedgraphflags([], opts)
5263 5264 o, other = hg._outgoing(ui, repo, dest, opts)
5264 5265 if not o:
5265 5266 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5266 5267 return
5267 5268
5268 5269 revdag = cmdutil.graphrevs(repo, o, opts)
5269 5270 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5270 5271 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5271 5272 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5272 5273 return 0
5273 5274
5274 5275 if opts.get('bookmarks'):
5275 5276 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5276 5277 dest, branches = hg.parseurl(dest, opts.get('branch'))
5277 5278 other = hg.peer(repo, opts, dest)
5278 5279 if 'bookmarks' not in other.listkeys('namespaces'):
5279 5280 ui.warn(_("remote doesn't support bookmarks\n"))
5280 5281 return 0
5281 5282 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5282 5283 return bookmarks.outgoing(ui, repo, other)
5283 5284
5284 5285 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5285 5286 try:
5286 5287 return hg.outgoing(ui, repo, dest, opts)
5287 5288 finally:
5288 5289 del repo._subtoppath
5289 5290
5290 5291 @command('parents',
5291 5292 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5292 5293 ] + templateopts,
5293 5294 _('[-r REV] [FILE]'),
5294 5295 inferrepo=True)
5295 5296 def parents(ui, repo, file_=None, **opts):
5296 5297 """show the parents of the working directory or revision (DEPRECATED)
5297 5298
5298 5299 Print the working directory's parent revisions. If a revision is
5299 5300 given via -r/--rev, the parent of that revision will be printed.
5300 5301 If a file argument is given, the revision in which the file was
5301 5302 last changed (before the working directory revision or the
5302 5303 argument to --rev if given) is printed.
5303 5304
5304 5305 This command is equivalent to::
5305 5306
5306 5307 hg log -r "parents()" or
5307 5308 hg log -r "parents(REV)" or
5308 5309 hg log -r "max(file(FILE))" or
5309 5310 hg log -r "max(::REV and file(FILE))"
5310 5311
5311 5312 See :hg:`summary` and :hg:`help revsets` for related information.
5312 5313
5313 5314 Returns 0 on success.
5314 5315 """
5315 5316
5316 5317 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5317 5318
5318 5319 if file_:
5319 5320 m = scmutil.match(ctx, (file_,), opts)
5320 5321 if m.anypats() or len(m.files()) != 1:
5321 5322 raise error.Abort(_('can only specify an explicit filename'))
5322 5323 file_ = m.files()[0]
5323 5324 filenodes = []
5324 5325 for cp in ctx.parents():
5325 5326 if not cp:
5326 5327 continue
5327 5328 try:
5328 5329 filenodes.append(cp.filenode(file_))
5329 5330 except error.LookupError:
5330 5331 pass
5331 5332 if not filenodes:
5332 5333 raise error.Abort(_("'%s' not found in manifest!") % file_)
5333 5334 p = []
5334 5335 for fn in filenodes:
5335 5336 fctx = repo.filectx(file_, fileid=fn)
5336 5337 p.append(fctx.node())
5337 5338 else:
5338 5339 p = [cp.node() for cp in ctx.parents()]
5339 5340
5340 5341 displayer = cmdutil.show_changeset(ui, repo, opts)
5341 5342 for n in p:
5342 5343 if n != nullid:
5343 5344 displayer.show(repo[n])
5344 5345 displayer.close()
5345 5346
5346 5347 @command('paths', [], _('[NAME]'), optionalrepo=True)
5347 5348 def paths(ui, repo, search=None):
5348 5349 """show aliases for remote repositories
5349 5350
5350 5351 Show definition of symbolic path name NAME. If no name is given,
5351 5352 show definition of all available names.
5352 5353
5353 5354 Option -q/--quiet suppresses all output when searching for NAME
5354 5355 and shows only the path names when listing all definitions.
5355 5356
5356 5357 Path names are defined in the [paths] section of your
5357 5358 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5358 5359 repository, ``.hg/hgrc`` is used, too.
5359 5360
5360 5361 The path names ``default`` and ``default-push`` have a special
5361 5362 meaning. When performing a push or pull operation, they are used
5362 5363 as fallbacks if no location is specified on the command-line.
5363 5364 When ``default-push`` is set, it will be used for push and
5364 5365 ``default`` will be used for pull; otherwise ``default`` is used
5365 5366 as the fallback for both. When cloning a repository, the clone
5366 5367 source is written as ``default`` in ``.hg/hgrc``. Note that
5367 5368 ``default`` and ``default-push`` apply to all inbound (e.g.
5368 5369 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5369 5370 :hg:`bundle`) operations.
5370 5371
5371 5372 See :hg:`help urls` for more information.
5372 5373
5373 5374 Returns 0 on success.
5374 5375 """
5375 5376 if search:
5376 5377 for name, path in sorted(ui.paths.iteritems()):
5377 5378 if name == search:
5378 5379 ui.status("%s\n" % util.hidepassword(path.rawloc))
5379 5380 return
5380 5381 if not ui.quiet:
5381 5382 ui.warn(_("not found!\n"))
5382 5383 return 1
5383 5384 else:
5384 5385 for name, path in sorted(ui.paths.iteritems()):
5385 5386 if ui.quiet:
5386 5387 ui.write("%s\n" % name)
5387 5388 else:
5388 5389 ui.write("%s = %s\n" % (name,
5389 5390 util.hidepassword(path.rawloc)))
5390 5391 for subopt, value in sorted(path.suboptions.items()):
5391 5392 ui.write('%s:%s = %s\n' % (name, subopt, value))
5392 5393
5393 5394 @command('phase',
5394 5395 [('p', 'public', False, _('set changeset phase to public')),
5395 5396 ('d', 'draft', False, _('set changeset phase to draft')),
5396 5397 ('s', 'secret', False, _('set changeset phase to secret')),
5397 5398 ('f', 'force', False, _('allow to move boundary backward')),
5398 5399 ('r', 'rev', [], _('target revision'), _('REV')),
5399 5400 ],
5400 5401 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5401 5402 def phase(ui, repo, *revs, **opts):
5402 5403 """set or show the current phase name
5403 5404
5404 5405 With no argument, show the phase name of the current revision(s).
5405 5406
5406 5407 With one of -p/--public, -d/--draft or -s/--secret, change the
5407 5408 phase value of the specified revisions.
5408 5409
5409 5410 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5410 5411 lower phase to an higher phase. Phases are ordered as follows::
5411 5412
5412 5413 public < draft < secret
5413 5414
5414 5415 Returns 0 on success, 1 if some phases could not be changed.
5415 5416
5416 5417 (For more information about the phases concept, see :hg:`help phases`.)
5417 5418 """
5418 5419 # search for a unique phase argument
5419 5420 targetphase = None
5420 5421 for idx, name in enumerate(phases.phasenames):
5421 5422 if opts[name]:
5422 5423 if targetphase is not None:
5423 5424 raise error.Abort(_('only one phase can be specified'))
5424 5425 targetphase = idx
5425 5426
5426 5427 # look for specified revision
5427 5428 revs = list(revs)
5428 5429 revs.extend(opts['rev'])
5429 5430 if not revs:
5430 5431 # display both parents as the second parent phase can influence
5431 5432 # the phase of a merge commit
5432 5433 revs = [c.rev() for c in repo[None].parents()]
5433 5434
5434 5435 revs = scmutil.revrange(repo, revs)
5435 5436
5436 5437 lock = None
5437 5438 ret = 0
5438 5439 if targetphase is None:
5439 5440 # display
5440 5441 for r in revs:
5441 5442 ctx = repo[r]
5442 5443 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5443 5444 else:
5444 5445 tr = None
5445 5446 lock = repo.lock()
5446 5447 try:
5447 5448 tr = repo.transaction("phase")
5448 5449 # set phase
5449 5450 if not revs:
5450 5451 raise error.Abort(_('empty revision set'))
5451 5452 nodes = [repo[r].node() for r in revs]
5452 5453 # moving revision from public to draft may hide them
5453 5454 # We have to check result on an unfiltered repository
5454 5455 unfi = repo.unfiltered()
5455 5456 getphase = unfi._phasecache.phase
5456 5457 olddata = [getphase(unfi, r) for r in unfi]
5457 5458 phases.advanceboundary(repo, tr, targetphase, nodes)
5458 5459 if opts['force']:
5459 5460 phases.retractboundary(repo, tr, targetphase, nodes)
5460 5461 tr.close()
5461 5462 finally:
5462 5463 if tr is not None:
5463 5464 tr.release()
5464 5465 lock.release()
5465 5466 getphase = unfi._phasecache.phase
5466 5467 newdata = [getphase(unfi, r) for r in unfi]
5467 5468 changes = sum(newdata[r] != olddata[r] for r in unfi)
5468 5469 cl = unfi.changelog
5469 5470 rejected = [n for n in nodes
5470 5471 if newdata[cl.rev(n)] < targetphase]
5471 5472 if rejected:
5472 5473 ui.warn(_('cannot move %i changesets to a higher '
5473 5474 'phase, use --force\n') % len(rejected))
5474 5475 ret = 1
5475 5476 if changes:
5476 5477 msg = _('phase changed for %i changesets\n') % changes
5477 5478 if ret:
5478 5479 ui.status(msg)
5479 5480 else:
5480 5481 ui.note(msg)
5481 5482 else:
5482 5483 ui.warn(_('no phases changed\n'))
5483 5484 return ret
5484 5485
5485 5486 def postincoming(ui, repo, modheads, optupdate, checkout):
5486 5487 if modheads == 0:
5487 5488 return
5488 5489 if optupdate:
5489 5490 try:
5490 5491 brev = checkout
5491 5492 movemarkfrom = None
5492 5493 if not checkout:
5493 5494 updata = destutil.destupdate(repo)
5494 5495 checkout, movemarkfrom, brev = updata
5495 5496 ret = hg.update(repo, checkout)
5496 5497 except error.UpdateAbort as inst:
5497 5498 msg = _("not updating: %s") % str(inst)
5498 5499 hint = inst.hint
5499 5500 raise error.UpdateAbort(msg, hint=hint)
5500 5501 if not ret and not checkout:
5501 5502 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5502 5503 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5503 5504 return ret
5504 5505 if modheads > 1:
5505 5506 currentbranchheads = len(repo.branchheads())
5506 5507 if currentbranchheads == modheads:
5507 5508 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5508 5509 elif currentbranchheads > 1:
5509 5510 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5510 5511 "merge)\n"))
5511 5512 else:
5512 5513 ui.status(_("(run 'hg heads' to see heads)\n"))
5513 5514 else:
5514 5515 ui.status(_("(run 'hg update' to get a working copy)\n"))
5515 5516
5516 5517 @command('^pull',
5517 5518 [('u', 'update', None,
5518 5519 _('update to new branch head if changesets were pulled')),
5519 5520 ('f', 'force', None, _('run even when remote repository is unrelated')),
5520 5521 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5521 5522 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5522 5523 ('b', 'branch', [], _('a specific branch you would like to pull'),
5523 5524 _('BRANCH')),
5524 5525 ] + remoteopts,
5525 5526 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5526 5527 def pull(ui, repo, source="default", **opts):
5527 5528 """pull changes from the specified source
5528 5529
5529 5530 Pull changes from a remote repository to a local one.
5530 5531
5531 5532 This finds all changes from the repository at the specified path
5532 5533 or URL and adds them to a local repository (the current one unless
5533 5534 -R is specified). By default, this does not update the copy of the
5534 5535 project in the working directory.
5535 5536
5536 5537 Use :hg:`incoming` if you want to see what would have been added
5537 5538 by a pull at the time you issued this command. If you then decide
5538 5539 to add those changes to the repository, you should use :hg:`pull
5539 5540 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5540 5541
5541 5542 If SOURCE is omitted, the 'default' path will be used.
5542 5543 See :hg:`help urls` for more information.
5543 5544
5544 5545 Returns 0 on success, 1 if an update had unresolved files.
5545 5546 """
5546 5547 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5547 5548 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5548 5549 other = hg.peer(repo, opts, source)
5549 5550 try:
5550 5551 revs, checkout = hg.addbranchrevs(repo, other, branches,
5551 5552 opts.get('rev'))
5552 5553
5553 5554
5554 5555 pullopargs = {}
5555 5556 if opts.get('bookmark'):
5556 5557 if not revs:
5557 5558 revs = []
5558 5559 # The list of bookmark used here is not the one used to actually
5559 5560 # update the bookmark name. This can result in the revision pulled
5560 5561 # not ending up with the name of the bookmark because of a race
5561 5562 # condition on the server. (See issue 4689 for details)
5562 5563 remotebookmarks = other.listkeys('bookmarks')
5563 5564 pullopargs['remotebookmarks'] = remotebookmarks
5564 5565 for b in opts['bookmark']:
5565 5566 if b not in remotebookmarks:
5566 5567 raise error.Abort(_('remote bookmark %s not found!') % b)
5567 5568 revs.append(remotebookmarks[b])
5568 5569
5569 5570 if revs:
5570 5571 try:
5571 5572 # When 'rev' is a bookmark name, we cannot guarantee that it
5572 5573 # will be updated with that name because of a race condition
5573 5574 # server side. (See issue 4689 for details)
5574 5575 oldrevs = revs
5575 5576 revs = [] # actually, nodes
5576 5577 for r in oldrevs:
5577 5578 node = other.lookup(r)
5578 5579 revs.append(node)
5579 5580 if r == checkout:
5580 5581 checkout = node
5581 5582 except error.CapabilityError:
5582 5583 err = _("other repository doesn't support revision lookup, "
5583 5584 "so a rev cannot be specified.")
5584 5585 raise error.Abort(err)
5585 5586
5586 5587 pullopargs.update(opts.get('opargs', {}))
5587 5588 modheads = exchange.pull(repo, other, heads=revs,
5588 5589 force=opts.get('force'),
5589 5590 bookmarks=opts.get('bookmark', ()),
5590 5591 opargs=pullopargs).cgresult
5591 5592 if checkout:
5592 5593 checkout = str(repo.changelog.rev(checkout))
5593 5594 repo._subtoppath = source
5594 5595 try:
5595 5596 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5596 5597
5597 5598 finally:
5598 5599 del repo._subtoppath
5599 5600
5600 5601 finally:
5601 5602 other.close()
5602 5603 return ret
5603 5604
5604 5605 @command('^push',
5605 5606 [('f', 'force', None, _('force push')),
5606 5607 ('r', 'rev', [],
5607 5608 _('a changeset intended to be included in the destination'),
5608 5609 _('REV')),
5609 5610 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5610 5611 ('b', 'branch', [],
5611 5612 _('a specific branch you would like to push'), _('BRANCH')),
5612 5613 ('', 'new-branch', False, _('allow pushing a new branch')),
5613 5614 ] + remoteopts,
5614 5615 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5615 5616 def push(ui, repo, dest=None, **opts):
5616 5617 """push changes to the specified destination
5617 5618
5618 5619 Push changesets from the local repository to the specified
5619 5620 destination.
5620 5621
5621 5622 This operation is symmetrical to pull: it is identical to a pull
5622 5623 in the destination repository from the current one.
5623 5624
5624 5625 By default, push will not allow creation of new heads at the
5625 5626 destination, since multiple heads would make it unclear which head
5626 5627 to use. In this situation, it is recommended to pull and merge
5627 5628 before pushing.
5628 5629
5629 5630 Use --new-branch if you want to allow push to create a new named
5630 5631 branch that is not present at the destination. This allows you to
5631 5632 only create a new branch without forcing other changes.
5632 5633
5633 5634 .. note::
5634 5635
5635 5636 Extra care should be taken with the -f/--force option,
5636 5637 which will push all new heads on all branches, an action which will
5637 5638 almost always cause confusion for collaborators.
5638 5639
5639 5640 If -r/--rev is used, the specified revision and all its ancestors
5640 5641 will be pushed to the remote repository.
5641 5642
5642 5643 If -B/--bookmark is used, the specified bookmarked revision, its
5643 5644 ancestors, and the bookmark will be pushed to the remote
5644 5645 repository.
5645 5646
5646 5647 Please see :hg:`help urls` for important details about ``ssh://``
5647 5648 URLs. If DESTINATION is omitted, a default path will be used.
5648 5649
5649 5650 Returns 0 if push was successful, 1 if nothing to push.
5650 5651 """
5651 5652
5652 5653 if opts.get('bookmark'):
5653 5654 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5654 5655 for b in opts['bookmark']:
5655 5656 # translate -B options to -r so changesets get pushed
5656 5657 if b in repo._bookmarks:
5657 5658 opts.setdefault('rev', []).append(b)
5658 5659 else:
5659 5660 # if we try to push a deleted bookmark, translate it to null
5660 5661 # this lets simultaneous -r, -b options continue working
5661 5662 opts.setdefault('rev', []).append("null")
5662 5663
5663 5664 path = ui.paths.getpath(dest, default='default')
5664 5665 if not path:
5665 5666 raise error.Abort(_('default repository not configured!'),
5666 5667 hint=_('see the "path" section in "hg help config"'))
5667 5668 dest = path.pushloc or path.loc
5668 5669 branches = (path.branch, opts.get('branch') or [])
5669 5670 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5670 5671 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5671 5672 other = hg.peer(repo, opts, dest)
5672 5673
5673 5674 if revs:
5674 5675 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5675 5676 if not revs:
5676 5677 raise error.Abort(_("specified revisions evaluate to an empty set"),
5677 5678 hint=_("use different revision arguments"))
5678 5679
5679 5680 repo._subtoppath = dest
5680 5681 try:
5681 5682 # push subrepos depth-first for coherent ordering
5682 5683 c = repo['']
5683 5684 subs = c.substate # only repos that are committed
5684 5685 for s in sorted(subs):
5685 5686 result = c.sub(s).push(opts)
5686 5687 if result == 0:
5687 5688 return not result
5688 5689 finally:
5689 5690 del repo._subtoppath
5690 5691 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5691 5692 newbranch=opts.get('new_branch'),
5692 5693 bookmarks=opts.get('bookmark', ()),
5693 5694 opargs=opts.get('opargs'))
5694 5695
5695 5696 result = not pushop.cgresult
5696 5697
5697 5698 if pushop.bkresult is not None:
5698 5699 if pushop.bkresult == 2:
5699 5700 result = 2
5700 5701 elif not result and pushop.bkresult:
5701 5702 result = 2
5702 5703
5703 5704 return result
5704 5705
5705 5706 @command('recover', [])
5706 5707 def recover(ui, repo):
5707 5708 """roll back an interrupted transaction
5708 5709
5709 5710 Recover from an interrupted commit or pull.
5710 5711
5711 5712 This command tries to fix the repository status after an
5712 5713 interrupted operation. It should only be necessary when Mercurial
5713 5714 suggests it.
5714 5715
5715 5716 Returns 0 if successful, 1 if nothing to recover or verify fails.
5716 5717 """
5717 5718 if repo.recover():
5718 5719 return hg.verify(repo)
5719 5720 return 1
5720 5721
5721 5722 @command('^remove|rm',
5722 5723 [('A', 'after', None, _('record delete for missing files')),
5723 5724 ('f', 'force', None,
5724 5725 _('remove (and delete) file even if added or modified')),
5725 5726 ] + subrepoopts + walkopts,
5726 5727 _('[OPTION]... FILE...'),
5727 5728 inferrepo=True)
5728 5729 def remove(ui, repo, *pats, **opts):
5729 5730 """remove the specified files on the next commit
5730 5731
5731 5732 Schedule the indicated files for removal from the current branch.
5732 5733
5733 5734 This command schedules the files to be removed at the next commit.
5734 5735 To undo a remove before that, see :hg:`revert`. To undo added
5735 5736 files, see :hg:`forget`.
5736 5737
5737 5738 .. container:: verbose
5738 5739
5739 5740 -A/--after can be used to remove only files that have already
5740 5741 been deleted, -f/--force can be used to force deletion, and -Af
5741 5742 can be used to remove files from the next revision without
5742 5743 deleting them from the working directory.
5743 5744
5744 5745 The following table details the behavior of remove for different
5745 5746 file states (columns) and option combinations (rows). The file
5746 5747 states are Added [A], Clean [C], Modified [M] and Missing [!]
5747 5748 (as reported by :hg:`status`). The actions are Warn, Remove
5748 5749 (from branch) and Delete (from disk):
5749 5750
5750 5751 ========= == == == ==
5751 5752 opt/state A C M !
5752 5753 ========= == == == ==
5753 5754 none W RD W R
5754 5755 -f R RD RD R
5755 5756 -A W W W R
5756 5757 -Af R R R R
5757 5758 ========= == == == ==
5758 5759
5759 5760 Note that remove never deletes files in Added [A] state from the
5760 5761 working directory, not even if option --force is specified.
5761 5762
5762 5763 Returns 0 on success, 1 if any warnings encountered.
5763 5764 """
5764 5765
5765 5766 after, force = opts.get('after'), opts.get('force')
5766 5767 if not pats and not after:
5767 5768 raise error.Abort(_('no files specified'))
5768 5769
5769 5770 m = scmutil.match(repo[None], pats, opts)
5770 5771 subrepos = opts.get('subrepos')
5771 5772 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5772 5773
5773 5774 @command('rename|move|mv',
5774 5775 [('A', 'after', None, _('record a rename that has already occurred')),
5775 5776 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5776 5777 ] + walkopts + dryrunopts,
5777 5778 _('[OPTION]... SOURCE... DEST'))
5778 5779 def rename(ui, repo, *pats, **opts):
5779 5780 """rename files; equivalent of copy + remove
5780 5781
5781 5782 Mark dest as copies of sources; mark sources for deletion. If dest
5782 5783 is a directory, copies are put in that directory. If dest is a
5783 5784 file, there can only be one source.
5784 5785
5785 5786 By default, this command copies the contents of files as they
5786 5787 exist in the working directory. If invoked with -A/--after, the
5787 5788 operation is recorded, but no copying is performed.
5788 5789
5789 5790 This command takes effect at the next commit. To undo a rename
5790 5791 before that, see :hg:`revert`.
5791 5792
5792 5793 Returns 0 on success, 1 if errors are encountered.
5793 5794 """
5794 5795 wlock = repo.wlock(False)
5795 5796 try:
5796 5797 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5797 5798 finally:
5798 5799 wlock.release()
5799 5800
5800 5801 @command('resolve',
5801 5802 [('a', 'all', None, _('select all unresolved files')),
5802 5803 ('l', 'list', None, _('list state of files needing merge')),
5803 5804 ('m', 'mark', None, _('mark files as resolved')),
5804 5805 ('u', 'unmark', None, _('mark files as unresolved')),
5805 5806 ('n', 'no-status', None, _('hide status prefix'))]
5806 5807 + mergetoolopts + walkopts + formatteropts,
5807 5808 _('[OPTION]... [FILE]...'),
5808 5809 inferrepo=True)
5809 5810 def resolve(ui, repo, *pats, **opts):
5810 5811 """redo merges or set/view the merge status of files
5811 5812
5812 5813 Merges with unresolved conflicts are often the result of
5813 5814 non-interactive merging using the ``internal:merge`` configuration
5814 5815 setting, or a command-line merge tool like ``diff3``. The resolve
5815 5816 command is used to manage the files involved in a merge, after
5816 5817 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5817 5818 working directory must have two parents). See :hg:`help
5818 5819 merge-tools` for information on configuring merge tools.
5819 5820
5820 5821 The resolve command can be used in the following ways:
5821 5822
5822 5823 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5823 5824 files, discarding any previous merge attempts. Re-merging is not
5824 5825 performed for files already marked as resolved. Use ``--all/-a``
5825 5826 to select all unresolved files. ``--tool`` can be used to specify
5826 5827 the merge tool used for the given files. It overrides the HGMERGE
5827 5828 environment variable and your configuration files. Previous file
5828 5829 contents are saved with a ``.orig`` suffix.
5829 5830
5830 5831 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5831 5832 (e.g. after having manually fixed-up the files). The default is
5832 5833 to mark all unresolved files.
5833 5834
5834 5835 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5835 5836 default is to mark all resolved files.
5836 5837
5837 5838 - :hg:`resolve -l`: list files which had or still have conflicts.
5838 5839 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5839 5840
5840 5841 Note that Mercurial will not let you commit files with unresolved
5841 5842 merge conflicts. You must use :hg:`resolve -m ...` before you can
5842 5843 commit after a conflicting merge.
5843 5844
5844 5845 Returns 0 on success, 1 if any files fail a resolve attempt.
5845 5846 """
5846 5847
5847 5848 all, mark, unmark, show, nostatus = \
5848 5849 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5849 5850
5850 5851 if (show and (mark or unmark)) or (mark and unmark):
5851 5852 raise error.Abort(_("too many options specified"))
5852 5853 if pats and all:
5853 5854 raise error.Abort(_("can't specify --all and patterns"))
5854 5855 if not (all or pats or show or mark or unmark):
5855 5856 raise error.Abort(_('no files or directories specified'),
5856 5857 hint=('use --all to re-merge all unresolved files'))
5857 5858
5858 5859 if show:
5859 5860 fm = ui.formatter('resolve', opts)
5860 5861 ms = mergemod.mergestate.read(repo)
5861 5862 m = scmutil.match(repo[None], pats, opts)
5862 5863 for f in ms:
5863 5864 if not m(f):
5864 5865 continue
5865 5866 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5866 5867 'd': 'driverresolved'}[ms[f]]
5867 5868 fm.startitem()
5868 5869 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5869 5870 fm.write('path', '%s\n', f, label=l)
5870 5871 fm.end()
5871 5872 return 0
5872 5873
5873 5874 wlock = repo.wlock()
5874 5875 try:
5875 5876 ms = mergemod.mergestate.read(repo)
5876 5877
5877 5878 if not (ms.active() or repo.dirstate.p2() != nullid):
5878 5879 raise error.Abort(
5879 5880 _('resolve command not applicable when not merging'))
5880 5881
5881 5882 wctx = repo[None]
5882 5883
5883 5884 if ms.mergedriver and ms.mdstate() == 'u':
5884 5885 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5885 5886 ms.commit()
5886 5887 # allow mark and unmark to go through
5887 5888 if not mark and not unmark and not proceed:
5888 5889 return 1
5889 5890
5890 5891 m = scmutil.match(wctx, pats, opts)
5891 5892 ret = 0
5892 5893 didwork = False
5893 5894 runconclude = False
5894 5895
5895 5896 tocomplete = []
5896 5897 for f in ms:
5897 5898 if not m(f):
5898 5899 continue
5899 5900
5900 5901 didwork = True
5901 5902
5902 5903 # don't let driver-resolved files be marked, and run the conclude
5903 5904 # step if asked to resolve
5904 5905 if ms[f] == "d":
5905 5906 exact = m.exact(f)
5906 5907 if mark:
5907 5908 if exact:
5908 5909 ui.warn(_('not marking %s as it is driver-resolved\n')
5909 5910 % f)
5910 5911 elif unmark:
5911 5912 if exact:
5912 5913 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5913 5914 % f)
5914 5915 else:
5915 5916 runconclude = True
5916 5917 continue
5917 5918
5918 5919 if mark:
5919 5920 ms.mark(f, "r")
5920 5921 elif unmark:
5921 5922 ms.mark(f, "u")
5922 5923 else:
5923 5924 # backup pre-resolve (merge uses .orig for its own purposes)
5924 5925 a = repo.wjoin(f)
5925 5926 try:
5926 5927 util.copyfile(a, a + ".resolve")
5927 5928 except (IOError, OSError) as inst:
5928 5929 if inst.errno != errno.ENOENT:
5929 5930 raise
5930 5931
5931 5932 try:
5932 5933 # preresolve file
5933 5934 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5934 5935 'resolve')
5935 5936 complete, r = ms.preresolve(f, wctx)
5936 5937 if not complete:
5937 5938 tocomplete.append(f)
5938 5939 elif r:
5939 5940 ret = 1
5940 5941 finally:
5941 5942 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5942 5943 ms.commit()
5943 5944
5944 5945 # replace filemerge's .orig file with our resolve file, but only
5945 5946 # for merges that are complete
5946 5947 if complete:
5947 5948 try:
5948 5949 util.rename(a + ".resolve",
5949 5950 cmdutil.origpath(ui, repo, a))
5950 5951 except OSError as inst:
5951 5952 if inst.errno != errno.ENOENT:
5952 5953 raise
5953 5954
5954 5955 for f in tocomplete:
5955 5956 try:
5956 5957 # resolve file
5957 5958 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5958 5959 'resolve')
5959 5960 r = ms.resolve(f, wctx)
5960 5961 if r:
5961 5962 ret = 1
5962 5963 finally:
5963 5964 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5964 5965 ms.commit()
5965 5966
5966 5967 # replace filemerge's .orig file with our resolve file
5967 5968 a = repo.wjoin(f)
5968 5969 try:
5969 5970 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5970 5971 except OSError as inst:
5971 5972 if inst.errno != errno.ENOENT:
5972 5973 raise
5973 5974
5974 5975 ms.commit()
5975 5976 ms.recordactions()
5976 5977
5977 5978 if not didwork and pats:
5978 5979 ui.warn(_("arguments do not match paths that need resolving\n"))
5979 5980 elif ms.mergedriver and ms.mdstate() != 's':
5980 5981 # run conclude step when either a driver-resolved file is requested
5981 5982 # or there are no driver-resolved files
5982 5983 # we can't use 'ret' to determine whether any files are unresolved
5983 5984 # because we might not have tried to resolve some
5984 5985 if ((runconclude or not list(ms.driverresolved()))
5985 5986 and not list(ms.unresolved())):
5986 5987 proceed = mergemod.driverconclude(repo, ms, wctx)
5987 5988 ms.commit()
5988 5989 if not proceed:
5989 5990 return 1
5990 5991
5991 5992 finally:
5992 5993 wlock.release()
5993 5994
5994 5995 # Nudge users into finishing an unfinished operation
5995 5996 unresolvedf = list(ms.unresolved())
5996 5997 driverresolvedf = list(ms.driverresolved())
5997 5998 if not unresolvedf and not driverresolvedf:
5998 5999 ui.status(_('(no more unresolved files)\n'))
5999 6000 elif not unresolvedf:
6000 6001 ui.status(_('(no more unresolved files -- '
6001 6002 'run "hg resolve --all" to conclude)\n'))
6002 6003
6003 6004 return ret
6004 6005
6005 6006 @command('revert',
6006 6007 [('a', 'all', None, _('revert all changes when no arguments given')),
6007 6008 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6008 6009 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6009 6010 ('C', 'no-backup', None, _('do not save backup copies of files')),
6010 6011 ('i', 'interactive', None,
6011 6012 _('interactively select the changes (EXPERIMENTAL)')),
6012 6013 ] + walkopts + dryrunopts,
6013 6014 _('[OPTION]... [-r REV] [NAME]...'))
6014 6015 def revert(ui, repo, *pats, **opts):
6015 6016 """restore files to their checkout state
6016 6017
6017 6018 .. note::
6018 6019
6019 6020 To check out earlier revisions, you should use :hg:`update REV`.
6020 6021 To cancel an uncommitted merge (and lose your changes),
6021 6022 use :hg:`update --clean .`.
6022 6023
6023 6024 With no revision specified, revert the specified files or directories
6024 6025 to the contents they had in the parent of the working directory.
6025 6026 This restores the contents of files to an unmodified
6026 6027 state and unschedules adds, removes, copies, and renames. If the
6027 6028 working directory has two parents, you must explicitly specify a
6028 6029 revision.
6029 6030
6030 6031 Using the -r/--rev or -d/--date options, revert the given files or
6031 6032 directories to their states as of a specific revision. Because
6032 6033 revert does not change the working directory parents, this will
6033 6034 cause these files to appear modified. This can be helpful to "back
6034 6035 out" some or all of an earlier change. See :hg:`backout` for a
6035 6036 related method.
6036 6037
6037 6038 Modified files are saved with a .orig suffix before reverting.
6038 6039 To disable these backups, use --no-backup.
6039 6040
6040 6041 See :hg:`help dates` for a list of formats valid for -d/--date.
6041 6042
6042 6043 See :hg:`help backout` for a way to reverse the effect of an
6043 6044 earlier changeset.
6044 6045
6045 6046 Returns 0 on success.
6046 6047 """
6047 6048
6048 6049 if opts.get("date"):
6049 6050 if opts.get("rev"):
6050 6051 raise error.Abort(_("you can't specify a revision and a date"))
6051 6052 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6052 6053
6053 6054 parent, p2 = repo.dirstate.parents()
6054 6055 if not opts.get('rev') and p2 != nullid:
6055 6056 # revert after merge is a trap for new users (issue2915)
6056 6057 raise error.Abort(_('uncommitted merge with no revision specified'),
6057 6058 hint=_('use "hg update" or see "hg help revert"'))
6058 6059
6059 6060 ctx = scmutil.revsingle(repo, opts.get('rev'))
6060 6061
6061 6062 if (not (pats or opts.get('include') or opts.get('exclude') or
6062 6063 opts.get('all') or opts.get('interactive'))):
6063 6064 msg = _("no files or directories specified")
6064 6065 if p2 != nullid:
6065 6066 hint = _("uncommitted merge, use --all to discard all changes,"
6066 6067 " or 'hg update -C .' to abort the merge")
6067 6068 raise error.Abort(msg, hint=hint)
6068 6069 dirty = any(repo.status())
6069 6070 node = ctx.node()
6070 6071 if node != parent:
6071 6072 if dirty:
6072 6073 hint = _("uncommitted changes, use --all to discard all"
6073 6074 " changes, or 'hg update %s' to update") % ctx.rev()
6074 6075 else:
6075 6076 hint = _("use --all to revert all files,"
6076 6077 " or 'hg update %s' to update") % ctx.rev()
6077 6078 elif dirty:
6078 6079 hint = _("uncommitted changes, use --all to discard all changes")
6079 6080 else:
6080 6081 hint = _("use --all to revert all files")
6081 6082 raise error.Abort(msg, hint=hint)
6082 6083
6083 6084 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6084 6085
6085 6086 @command('rollback', dryrunopts +
6086 6087 [('f', 'force', False, _('ignore safety measures'))])
6087 6088 def rollback(ui, repo, **opts):
6088 6089 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6089 6090
6090 6091 Please use :hg:`commit --amend` instead of rollback to correct
6091 6092 mistakes in the last commit.
6092 6093
6093 6094 This command should be used with care. There is only one level of
6094 6095 rollback, and there is no way to undo a rollback. It will also
6095 6096 restore the dirstate at the time of the last transaction, losing
6096 6097 any dirstate changes since that time. This command does not alter
6097 6098 the working directory.
6098 6099
6099 6100 Transactions are used to encapsulate the effects of all commands
6100 6101 that create new changesets or propagate existing changesets into a
6101 6102 repository.
6102 6103
6103 6104 .. container:: verbose
6104 6105
6105 6106 For example, the following commands are transactional, and their
6106 6107 effects can be rolled back:
6107 6108
6108 6109 - commit
6109 6110 - import
6110 6111 - pull
6111 6112 - push (with this repository as the destination)
6112 6113 - unbundle
6113 6114
6114 6115 To avoid permanent data loss, rollback will refuse to rollback a
6115 6116 commit transaction if it isn't checked out. Use --force to
6116 6117 override this protection.
6117 6118
6118 6119 This command is not intended for use on public repositories. Once
6119 6120 changes are visible for pull by other users, rolling a transaction
6120 6121 back locally is ineffective (someone else may already have pulled
6121 6122 the changes). Furthermore, a race is possible with readers of the
6122 6123 repository; for example an in-progress pull from the repository
6123 6124 may fail if a rollback is performed.
6124 6125
6125 6126 Returns 0 on success, 1 if no rollback data is available.
6126 6127 """
6127 6128 return repo.rollback(dryrun=opts.get('dry_run'),
6128 6129 force=opts.get('force'))
6129 6130
6130 6131 @command('root', [])
6131 6132 def root(ui, repo):
6132 6133 """print the root (top) of the current working directory
6133 6134
6134 6135 Print the root directory of the current repository.
6135 6136
6136 6137 Returns 0 on success.
6137 6138 """
6138 6139 ui.write(repo.root + "\n")
6139 6140
6140 6141 @command('^serve',
6141 6142 [('A', 'accesslog', '', _('name of access log file to write to'),
6142 6143 _('FILE')),
6143 6144 ('d', 'daemon', None, _('run server in background')),
6144 6145 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6145 6146 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6146 6147 # use string type, then we can check if something was passed
6147 6148 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6148 6149 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6149 6150 _('ADDR')),
6150 6151 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6151 6152 _('PREFIX')),
6152 6153 ('n', 'name', '',
6153 6154 _('name to show in web pages (default: working directory)'), _('NAME')),
6154 6155 ('', 'web-conf', '',
6155 6156 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6156 6157 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6157 6158 _('FILE')),
6158 6159 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6159 6160 ('', 'stdio', None, _('for remote clients')),
6160 6161 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6161 6162 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6162 6163 ('', 'style', '', _('template style to use'), _('STYLE')),
6163 6164 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6164 6165 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6165 6166 _('[OPTION]...'),
6166 6167 optionalrepo=True)
6167 6168 def serve(ui, repo, **opts):
6168 6169 """start stand-alone webserver
6169 6170
6170 6171 Start a local HTTP repository browser and pull server. You can use
6171 6172 this for ad-hoc sharing and browsing of repositories. It is
6172 6173 recommended to use a real web server to serve a repository for
6173 6174 longer periods of time.
6174 6175
6175 6176 Please note that the server does not implement access control.
6176 6177 This means that, by default, anybody can read from the server and
6177 6178 nobody can write to it by default. Set the ``web.allow_push``
6178 6179 option to ``*`` to allow everybody to push to the server. You
6179 6180 should use a real web server if you need to authenticate users.
6180 6181
6181 6182 By default, the server logs accesses to stdout and errors to
6182 6183 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6183 6184 files.
6184 6185
6185 6186 To have the server choose a free port number to listen on, specify
6186 6187 a port number of 0; in this case, the server will print the port
6187 6188 number it uses.
6188 6189
6189 6190 Returns 0 on success.
6190 6191 """
6191 6192
6192 6193 if opts["stdio"] and opts["cmdserver"]:
6193 6194 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6194 6195
6195 6196 if opts["stdio"]:
6196 6197 if repo is None:
6197 6198 raise error.RepoError(_("there is no Mercurial repository here"
6198 6199 " (.hg not found)"))
6199 6200 s = sshserver.sshserver(ui, repo)
6200 6201 s.serve_forever()
6201 6202
6202 6203 if opts["cmdserver"]:
6203 6204 service = commandserver.createservice(ui, repo, opts)
6204 6205 else:
6205 6206 service = hgweb.createservice(ui, repo, opts)
6206 6207 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6207 6208
6208 6209 @command('^status|st',
6209 6210 [('A', 'all', None, _('show status of all files')),
6210 6211 ('m', 'modified', None, _('show only modified files')),
6211 6212 ('a', 'added', None, _('show only added files')),
6212 6213 ('r', 'removed', None, _('show only removed files')),
6213 6214 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6214 6215 ('c', 'clean', None, _('show only files without changes')),
6215 6216 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6216 6217 ('i', 'ignored', None, _('show only ignored files')),
6217 6218 ('n', 'no-status', None, _('hide status prefix')),
6218 6219 ('C', 'copies', None, _('show source of copied files')),
6219 6220 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6220 6221 ('', 'rev', [], _('show difference from revision'), _('REV')),
6221 6222 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6222 6223 ] + walkopts + subrepoopts + formatteropts,
6223 6224 _('[OPTION]... [FILE]...'),
6224 6225 inferrepo=True)
6225 6226 def status(ui, repo, *pats, **opts):
6226 6227 """show changed files in the working directory
6227 6228
6228 6229 Show status of files in the repository. If names are given, only
6229 6230 files that match are shown. Files that are clean or ignored or
6230 6231 the source of a copy/move operation, are not listed unless
6231 6232 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6232 6233 Unless options described with "show only ..." are given, the
6233 6234 options -mardu are used.
6234 6235
6235 6236 Option -q/--quiet hides untracked (unknown and ignored) files
6236 6237 unless explicitly requested with -u/--unknown or -i/--ignored.
6237 6238
6238 6239 .. note::
6239 6240
6240 6241 status may appear to disagree with diff if permissions have
6241 6242 changed or a merge has occurred. The standard diff format does
6242 6243 not report permission changes and diff only reports changes
6243 6244 relative to one merge parent.
6244 6245
6245 6246 If one revision is given, it is used as the base revision.
6246 6247 If two revisions are given, the differences between them are
6247 6248 shown. The --change option can also be used as a shortcut to list
6248 6249 the changed files of a revision from its first parent.
6249 6250
6250 6251 The codes used to show the status of files are::
6251 6252
6252 6253 M = modified
6253 6254 A = added
6254 6255 R = removed
6255 6256 C = clean
6256 6257 ! = missing (deleted by non-hg command, but still tracked)
6257 6258 ? = not tracked
6258 6259 I = ignored
6259 6260 = origin of the previous file (with --copies)
6260 6261
6261 6262 .. container:: verbose
6262 6263
6263 6264 Examples:
6264 6265
6265 6266 - show changes in the working directory relative to a
6266 6267 changeset::
6267 6268
6268 6269 hg status --rev 9353
6269 6270
6270 6271 - show changes in the working directory relative to the
6271 6272 current directory (see :hg:`help patterns` for more information)::
6272 6273
6273 6274 hg status re:
6274 6275
6275 6276 - show all changes including copies in an existing changeset::
6276 6277
6277 6278 hg status --copies --change 9353
6278 6279
6279 6280 - get a NUL separated list of added files, suitable for xargs::
6280 6281
6281 6282 hg status -an0
6282 6283
6283 6284 Returns 0 on success.
6284 6285 """
6285 6286
6286 6287 revs = opts.get('rev')
6287 6288 change = opts.get('change')
6288 6289
6289 6290 if revs and change:
6290 6291 msg = _('cannot specify --rev and --change at the same time')
6291 6292 raise error.Abort(msg)
6292 6293 elif change:
6293 6294 node2 = scmutil.revsingle(repo, change, None).node()
6294 6295 node1 = repo[node2].p1().node()
6295 6296 else:
6296 6297 node1, node2 = scmutil.revpair(repo, revs)
6297 6298
6298 6299 if pats:
6299 6300 cwd = repo.getcwd()
6300 6301 else:
6301 6302 cwd = ''
6302 6303
6303 6304 if opts.get('print0'):
6304 6305 end = '\0'
6305 6306 else:
6306 6307 end = '\n'
6307 6308 copy = {}
6308 6309 states = 'modified added removed deleted unknown ignored clean'.split()
6309 6310 show = [k for k in states if opts.get(k)]
6310 6311 if opts.get('all'):
6311 6312 show += ui.quiet and (states[:4] + ['clean']) or states
6312 6313 if not show:
6313 6314 if ui.quiet:
6314 6315 show = states[:4]
6315 6316 else:
6316 6317 show = states[:5]
6317 6318
6318 6319 m = scmutil.match(repo[node2], pats, opts)
6319 6320 stat = repo.status(node1, node2, m,
6320 6321 'ignored' in show, 'clean' in show, 'unknown' in show,
6321 6322 opts.get('subrepos'))
6322 6323 changestates = zip(states, 'MAR!?IC', stat)
6323 6324
6324 6325 if (opts.get('all') or opts.get('copies')
6325 6326 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6326 6327 copy = copies.pathcopies(repo[node1], repo[node2], m)
6327 6328
6328 6329 fm = ui.formatter('status', opts)
6329 6330 fmt = '%s' + end
6330 6331 showchar = not opts.get('no_status')
6331 6332
6332 6333 for state, char, files in changestates:
6333 6334 if state in show:
6334 6335 label = 'status.' + state
6335 6336 for f in files:
6336 6337 fm.startitem()
6337 6338 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6338 6339 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6339 6340 if f in copy:
6340 6341 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6341 6342 label='status.copied')
6342 6343 fm.end()
6343 6344
6344 6345 @command('^summary|sum',
6345 6346 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6346 6347 def summary(ui, repo, **opts):
6347 6348 """summarize working directory state
6348 6349
6349 6350 This generates a brief summary of the working directory state,
6350 6351 including parents, branch, commit status, phase and available updates.
6351 6352
6352 6353 With the --remote option, this will check the default paths for
6353 6354 incoming and outgoing changes. This can be time-consuming.
6354 6355
6355 6356 Returns 0 on success.
6356 6357 """
6357 6358
6358 6359 ctx = repo[None]
6359 6360 parents = ctx.parents()
6360 6361 pnode = parents[0].node()
6361 6362 marks = []
6362 6363
6363 6364 for p in parents:
6364 6365 # label with log.changeset (instead of log.parent) since this
6365 6366 # shows a working directory parent *changeset*:
6366 6367 # i18n: column positioning for "hg summary"
6367 6368 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6368 6369 label='log.changeset changeset.%s' % p.phasestr())
6369 6370 ui.write(' '.join(p.tags()), label='log.tag')
6370 6371 if p.bookmarks():
6371 6372 marks.extend(p.bookmarks())
6372 6373 if p.rev() == -1:
6373 6374 if not len(repo):
6374 6375 ui.write(_(' (empty repository)'))
6375 6376 else:
6376 6377 ui.write(_(' (no revision checked out)'))
6377 6378 ui.write('\n')
6378 6379 if p.description():
6379 6380 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6380 6381 label='log.summary')
6381 6382
6382 6383 branch = ctx.branch()
6383 6384 bheads = repo.branchheads(branch)
6384 6385 # i18n: column positioning for "hg summary"
6385 6386 m = _('branch: %s\n') % branch
6386 6387 if branch != 'default':
6387 6388 ui.write(m, label='log.branch')
6388 6389 else:
6389 6390 ui.status(m, label='log.branch')
6390 6391
6391 6392 if marks:
6392 6393 active = repo._activebookmark
6393 6394 # i18n: column positioning for "hg summary"
6394 6395 ui.write(_('bookmarks:'), label='log.bookmark')
6395 6396 if active is not None:
6396 6397 if active in marks:
6397 6398 ui.write(' *' + active, label=activebookmarklabel)
6398 6399 marks.remove(active)
6399 6400 else:
6400 6401 ui.write(' [%s]' % active, label=activebookmarklabel)
6401 6402 for m in marks:
6402 6403 ui.write(' ' + m, label='log.bookmark')
6403 6404 ui.write('\n', label='log.bookmark')
6404 6405
6405 6406 status = repo.status(unknown=True)
6406 6407
6407 6408 c = repo.dirstate.copies()
6408 6409 copied, renamed = [], []
6409 6410 for d, s in c.iteritems():
6410 6411 if s in status.removed:
6411 6412 status.removed.remove(s)
6412 6413 renamed.append(d)
6413 6414 else:
6414 6415 copied.append(d)
6415 6416 if d in status.added:
6416 6417 status.added.remove(d)
6417 6418
6418 6419 try:
6419 6420 ms = mergemod.mergestate.read(repo)
6420 6421 except error.UnsupportedMergeRecords as e:
6421 6422 s = ' '.join(e.recordtypes)
6422 6423 ui.warn(
6423 6424 _('warning: merge state has unsupported record types: %s\n') % s)
6424 6425 unresolved = 0
6425 6426 else:
6426 6427 unresolved = [f for f in ms if ms[f] == 'u']
6427 6428
6428 6429 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6429 6430
6430 6431 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6431 6432 (ui.label(_('%d added'), 'status.added'), status.added),
6432 6433 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6433 6434 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6434 6435 (ui.label(_('%d copied'), 'status.copied'), copied),
6435 6436 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6436 6437 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6437 6438 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6438 6439 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6439 6440 t = []
6440 6441 for l, s in labels:
6441 6442 if s:
6442 6443 t.append(l % len(s))
6443 6444
6444 6445 t = ', '.join(t)
6445 6446 cleanworkdir = False
6446 6447
6447 6448 if repo.vfs.exists('graftstate'):
6448 6449 t += _(' (graft in progress)')
6449 6450 if repo.vfs.exists('updatestate'):
6450 6451 t += _(' (interrupted update)')
6451 6452 elif len(parents) > 1:
6452 6453 t += _(' (merge)')
6453 6454 elif branch != parents[0].branch():
6454 6455 t += _(' (new branch)')
6455 6456 elif (parents[0].closesbranch() and
6456 6457 pnode in repo.branchheads(branch, closed=True)):
6457 6458 t += _(' (head closed)')
6458 6459 elif not (status.modified or status.added or status.removed or renamed or
6459 6460 copied or subs):
6460 6461 t += _(' (clean)')
6461 6462 cleanworkdir = True
6462 6463 elif pnode not in bheads:
6463 6464 t += _(' (new branch head)')
6464 6465
6465 6466 if parents:
6466 6467 pendingphase = max(p.phase() for p in parents)
6467 6468 else:
6468 6469 pendingphase = phases.public
6469 6470
6470 6471 if pendingphase > phases.newcommitphase(ui):
6471 6472 t += ' (%s)' % phases.phasenames[pendingphase]
6472 6473
6473 6474 if cleanworkdir:
6474 6475 # i18n: column positioning for "hg summary"
6475 6476 ui.status(_('commit: %s\n') % t.strip())
6476 6477 else:
6477 6478 # i18n: column positioning for "hg summary"
6478 6479 ui.write(_('commit: %s\n') % t.strip())
6479 6480
6480 6481 # all ancestors of branch heads - all ancestors of parent = new csets
6481 6482 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6482 6483 bheads))
6483 6484
6484 6485 if new == 0:
6485 6486 # i18n: column positioning for "hg summary"
6486 6487 ui.status(_('update: (current)\n'))
6487 6488 elif pnode not in bheads:
6488 6489 # i18n: column positioning for "hg summary"
6489 6490 ui.write(_('update: %d new changesets (update)\n') % new)
6490 6491 else:
6491 6492 # i18n: column positioning for "hg summary"
6492 6493 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6493 6494 (new, len(bheads)))
6494 6495
6495 6496 t = []
6496 6497 draft = len(repo.revs('draft()'))
6497 6498 if draft:
6498 6499 t.append(_('%d draft') % draft)
6499 6500 secret = len(repo.revs('secret()'))
6500 6501 if secret:
6501 6502 t.append(_('%d secret') % secret)
6502 6503
6503 6504 if draft or secret:
6504 6505 ui.status(_('phases: %s\n') % ', '.join(t))
6505 6506
6506 6507 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6507 6508 for trouble in ("unstable", "divergent", "bumped"):
6508 6509 numtrouble = len(repo.revs(trouble + "()"))
6509 6510 # We write all the possibilities to ease translation
6510 6511 troublemsg = {
6511 6512 "unstable": _("unstable: %d changeset"),
6512 6513 "divergent": _("divergent: %d changeset"),
6513 6514 "bumped": _("bumped: %d changeset"),
6514 6515 }
6515 6516 if numtrouble > 0:
6516 6517 ui.status(troublemsg[trouble] % numtrouble + "\n")
6517 6518
6518 6519 cmdutil.summaryhooks(ui, repo)
6519 6520
6520 6521 if opts.get('remote'):
6521 6522 needsincoming, needsoutgoing = True, True
6522 6523 else:
6523 6524 needsincoming, needsoutgoing = False, False
6524 6525 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6525 6526 if i:
6526 6527 needsincoming = True
6527 6528 if o:
6528 6529 needsoutgoing = True
6529 6530 if not needsincoming and not needsoutgoing:
6530 6531 return
6531 6532
6532 6533 def getincoming():
6533 6534 source, branches = hg.parseurl(ui.expandpath('default'))
6534 6535 sbranch = branches[0]
6535 6536 try:
6536 6537 other = hg.peer(repo, {}, source)
6537 6538 except error.RepoError:
6538 6539 if opts.get('remote'):
6539 6540 raise
6540 6541 return source, sbranch, None, None, None
6541 6542 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6542 6543 if revs:
6543 6544 revs = [other.lookup(rev) for rev in revs]
6544 6545 ui.debug('comparing with %s\n' % util.hidepassword(source))
6545 6546 repo.ui.pushbuffer()
6546 6547 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6547 6548 repo.ui.popbuffer()
6548 6549 return source, sbranch, other, commoninc, commoninc[1]
6549 6550
6550 6551 if needsincoming:
6551 6552 source, sbranch, sother, commoninc, incoming = getincoming()
6552 6553 else:
6553 6554 source = sbranch = sother = commoninc = incoming = None
6554 6555
6555 6556 def getoutgoing():
6556 6557 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6557 6558 dbranch = branches[0]
6558 6559 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6559 6560 if source != dest:
6560 6561 try:
6561 6562 dother = hg.peer(repo, {}, dest)
6562 6563 except error.RepoError:
6563 6564 if opts.get('remote'):
6564 6565 raise
6565 6566 return dest, dbranch, None, None
6566 6567 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6567 6568 elif sother is None:
6568 6569 # there is no explicit destination peer, but source one is invalid
6569 6570 return dest, dbranch, None, None
6570 6571 else:
6571 6572 dother = sother
6572 6573 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6573 6574 common = None
6574 6575 else:
6575 6576 common = commoninc
6576 6577 if revs:
6577 6578 revs = [repo.lookup(rev) for rev in revs]
6578 6579 repo.ui.pushbuffer()
6579 6580 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6580 6581 commoninc=common)
6581 6582 repo.ui.popbuffer()
6582 6583 return dest, dbranch, dother, outgoing
6583 6584
6584 6585 if needsoutgoing:
6585 6586 dest, dbranch, dother, outgoing = getoutgoing()
6586 6587 else:
6587 6588 dest = dbranch = dother = outgoing = None
6588 6589
6589 6590 if opts.get('remote'):
6590 6591 t = []
6591 6592 if incoming:
6592 6593 t.append(_('1 or more incoming'))
6593 6594 o = outgoing.missing
6594 6595 if o:
6595 6596 t.append(_('%d outgoing') % len(o))
6596 6597 other = dother or sother
6597 6598 if 'bookmarks' in other.listkeys('namespaces'):
6598 6599 counts = bookmarks.summary(repo, other)
6599 6600 if counts[0] > 0:
6600 6601 t.append(_('%d incoming bookmarks') % counts[0])
6601 6602 if counts[1] > 0:
6602 6603 t.append(_('%d outgoing bookmarks') % counts[1])
6603 6604
6604 6605 if t:
6605 6606 # i18n: column positioning for "hg summary"
6606 6607 ui.write(_('remote: %s\n') % (', '.join(t)))
6607 6608 else:
6608 6609 # i18n: column positioning for "hg summary"
6609 6610 ui.status(_('remote: (synced)\n'))
6610 6611
6611 6612 cmdutil.summaryremotehooks(ui, repo, opts,
6612 6613 ((source, sbranch, sother, commoninc),
6613 6614 (dest, dbranch, dother, outgoing)))
6614 6615
6615 6616 @command('tag',
6616 6617 [('f', 'force', None, _('force tag')),
6617 6618 ('l', 'local', None, _('make the tag local')),
6618 6619 ('r', 'rev', '', _('revision to tag'), _('REV')),
6619 6620 ('', 'remove', None, _('remove a tag')),
6620 6621 # -l/--local is already there, commitopts cannot be used
6621 6622 ('e', 'edit', None, _('invoke editor on commit messages')),
6622 6623 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6623 6624 ] + commitopts2,
6624 6625 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6625 6626 def tag(ui, repo, name1, *names, **opts):
6626 6627 """add one or more tags for the current or given revision
6627 6628
6628 6629 Name a particular revision using <name>.
6629 6630
6630 6631 Tags are used to name particular revisions of the repository and are
6631 6632 very useful to compare different revisions, to go back to significant
6632 6633 earlier versions or to mark branch points as releases, etc. Changing
6633 6634 an existing tag is normally disallowed; use -f/--force to override.
6634 6635
6635 6636 If no revision is given, the parent of the working directory is
6636 6637 used.
6637 6638
6638 6639 To facilitate version control, distribution, and merging of tags,
6639 6640 they are stored as a file named ".hgtags" which is managed similarly
6640 6641 to other project files and can be hand-edited if necessary. This
6641 6642 also means that tagging creates a new commit. The file
6642 6643 ".hg/localtags" is used for local tags (not shared among
6643 6644 repositories).
6644 6645
6645 6646 Tag commits are usually made at the head of a branch. If the parent
6646 6647 of the working directory is not a branch head, :hg:`tag` aborts; use
6647 6648 -f/--force to force the tag commit to be based on a non-head
6648 6649 changeset.
6649 6650
6650 6651 See :hg:`help dates` for a list of formats valid for -d/--date.
6651 6652
6652 6653 Since tag names have priority over branch names during revision
6653 6654 lookup, using an existing branch name as a tag name is discouraged.
6654 6655
6655 6656 Returns 0 on success.
6656 6657 """
6657 6658 wlock = lock = None
6658 6659 try:
6659 6660 wlock = repo.wlock()
6660 6661 lock = repo.lock()
6661 6662 rev_ = "."
6662 6663 names = [t.strip() for t in (name1,) + names]
6663 6664 if len(names) != len(set(names)):
6664 6665 raise error.Abort(_('tag names must be unique'))
6665 6666 for n in names:
6666 6667 scmutil.checknewlabel(repo, n, 'tag')
6667 6668 if not n:
6668 6669 raise error.Abort(_('tag names cannot consist entirely of '
6669 6670 'whitespace'))
6670 6671 if opts.get('rev') and opts.get('remove'):
6671 6672 raise error.Abort(_("--rev and --remove are incompatible"))
6672 6673 if opts.get('rev'):
6673 6674 rev_ = opts['rev']
6674 6675 message = opts.get('message')
6675 6676 if opts.get('remove'):
6676 6677 if opts.get('local'):
6677 6678 expectedtype = 'local'
6678 6679 else:
6679 6680 expectedtype = 'global'
6680 6681
6681 6682 for n in names:
6682 6683 if not repo.tagtype(n):
6683 6684 raise error.Abort(_("tag '%s' does not exist") % n)
6684 6685 if repo.tagtype(n) != expectedtype:
6685 6686 if expectedtype == 'global':
6686 6687 raise error.Abort(_("tag '%s' is not a global tag") % n)
6687 6688 else:
6688 6689 raise error.Abort(_("tag '%s' is not a local tag") % n)
6689 6690 rev_ = 'null'
6690 6691 if not message:
6691 6692 # we don't translate commit messages
6692 6693 message = 'Removed tag %s' % ', '.join(names)
6693 6694 elif not opts.get('force'):
6694 6695 for n in names:
6695 6696 if n in repo.tags():
6696 6697 raise error.Abort(_("tag '%s' already exists "
6697 6698 "(use -f to force)") % n)
6698 6699 if not opts.get('local'):
6699 6700 p1, p2 = repo.dirstate.parents()
6700 6701 if p2 != nullid:
6701 6702 raise error.Abort(_('uncommitted merge'))
6702 6703 bheads = repo.branchheads()
6703 6704 if not opts.get('force') and bheads and p1 not in bheads:
6704 6705 raise error.Abort(_('not at a branch head (use -f to force)'))
6705 6706 r = scmutil.revsingle(repo, rev_).node()
6706 6707
6707 6708 if not message:
6708 6709 # we don't translate commit messages
6709 6710 message = ('Added tag %s for changeset %s' %
6710 6711 (', '.join(names), short(r)))
6711 6712
6712 6713 date = opts.get('date')
6713 6714 if date:
6714 6715 date = util.parsedate(date)
6715 6716
6716 6717 if opts.get('remove'):
6717 6718 editform = 'tag.remove'
6718 6719 else:
6719 6720 editform = 'tag.add'
6720 6721 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6721 6722
6722 6723 # don't allow tagging the null rev
6723 6724 if (not opts.get('remove') and
6724 6725 scmutil.revsingle(repo, rev_).rev() == nullrev):
6725 6726 raise error.Abort(_("cannot tag null revision"))
6726 6727
6727 6728 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6728 6729 editor=editor)
6729 6730 finally:
6730 6731 release(lock, wlock)
6731 6732
6732 6733 @command('tags', formatteropts, '')
6733 6734 def tags(ui, repo, **opts):
6734 6735 """list repository tags
6735 6736
6736 6737 This lists both regular and local tags. When the -v/--verbose
6737 6738 switch is used, a third column "local" is printed for local tags.
6738 6739 When the -q/--quiet switch is used, only the tag name is printed.
6739 6740
6740 6741 Returns 0 on success.
6741 6742 """
6742 6743
6743 6744 fm = ui.formatter('tags', opts)
6744 6745 hexfunc = fm.hexfunc
6745 6746 tagtype = ""
6746 6747
6747 6748 for t, n in reversed(repo.tagslist()):
6748 6749 hn = hexfunc(n)
6749 6750 label = 'tags.normal'
6750 6751 tagtype = ''
6751 6752 if repo.tagtype(t) == 'local':
6752 6753 label = 'tags.local'
6753 6754 tagtype = 'local'
6754 6755
6755 6756 fm.startitem()
6756 6757 fm.write('tag', '%s', t, label=label)
6757 6758 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6758 6759 fm.condwrite(not ui.quiet, 'rev node', fmt,
6759 6760 repo.changelog.rev(n), hn, label=label)
6760 6761 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6761 6762 tagtype, label=label)
6762 6763 fm.plain('\n')
6763 6764 fm.end()
6764 6765
6765 6766 @command('tip',
6766 6767 [('p', 'patch', None, _('show patch')),
6767 6768 ('g', 'git', None, _('use git extended diff format')),
6768 6769 ] + templateopts,
6769 6770 _('[-p] [-g]'))
6770 6771 def tip(ui, repo, **opts):
6771 6772 """show the tip revision (DEPRECATED)
6772 6773
6773 6774 The tip revision (usually just called the tip) is the changeset
6774 6775 most recently added to the repository (and therefore the most
6775 6776 recently changed head).
6776 6777
6777 6778 If you have just made a commit, that commit will be the tip. If
6778 6779 you have just pulled changes from another repository, the tip of
6779 6780 that repository becomes the current tip. The "tip" tag is special
6780 6781 and cannot be renamed or assigned to a different changeset.
6781 6782
6782 6783 This command is deprecated, please use :hg:`heads` instead.
6783 6784
6784 6785 Returns 0 on success.
6785 6786 """
6786 6787 displayer = cmdutil.show_changeset(ui, repo, opts)
6787 6788 displayer.show(repo['tip'])
6788 6789 displayer.close()
6789 6790
6790 6791 @command('unbundle',
6791 6792 [('u', 'update', None,
6792 6793 _('update to new branch head if changesets were unbundled'))],
6793 6794 _('[-u] FILE...'))
6794 6795 def unbundle(ui, repo, fname1, *fnames, **opts):
6795 6796 """apply one or more changegroup files
6796 6797
6797 6798 Apply one or more compressed changegroup files generated by the
6798 6799 bundle command.
6799 6800
6800 6801 Returns 0 on success, 1 if an update has unresolved files.
6801 6802 """
6802 6803 fnames = (fname1,) + fnames
6803 6804
6804 6805 lock = repo.lock()
6805 6806 try:
6806 6807 for fname in fnames:
6807 6808 f = hg.openpath(ui, fname)
6808 6809 gen = exchange.readbundle(ui, f, fname)
6809 6810 if isinstance(gen, bundle2.unbundle20):
6810 6811 tr = repo.transaction('unbundle')
6811 6812 try:
6812 6813 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6813 6814 url='bundle:' + fname)
6814 6815 tr.close()
6815 6816 except error.BundleUnknownFeatureError as exc:
6816 6817 raise error.Abort(_('%s: unknown bundle feature, %s')
6817 6818 % (fname, exc),
6818 6819 hint=_("see https://mercurial-scm.org/"
6819 6820 "wiki/BundleFeature for more "
6820 6821 "information"))
6821 6822 finally:
6822 6823 if tr:
6823 6824 tr.release()
6824 6825 changes = [r.get('return', 0)
6825 6826 for r in op.records['changegroup']]
6826 6827 modheads = changegroup.combineresults(changes)
6827 6828 elif isinstance(gen, streamclone.streamcloneapplier):
6828 6829 raise error.Abort(
6829 6830 _('packed bundles cannot be applied with '
6830 6831 '"hg unbundle"'),
6831 6832 hint=_('use "hg debugapplystreamclonebundle"'))
6832 6833 else:
6833 6834 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6834 6835 finally:
6835 6836 lock.release()
6836 6837
6837 6838 return postincoming(ui, repo, modheads, opts.get('update'), None)
6838 6839
6839 6840 @command('^update|up|checkout|co',
6840 6841 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6841 6842 ('c', 'check', None,
6842 6843 _('update across branches if no uncommitted changes')),
6843 6844 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6844 6845 ('r', 'rev', '', _('revision'), _('REV'))
6845 6846 ] + mergetoolopts,
6846 6847 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6847 6848 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6848 6849 tool=None):
6849 6850 """update working directory (or switch revisions)
6850 6851
6851 6852 Update the repository's working directory to the specified
6852 6853 changeset. If no changeset is specified, update to the tip of the
6853 6854 current named branch and move the active bookmark (see :hg:`help
6854 6855 bookmarks`).
6855 6856
6856 6857 Update sets the working directory's parent revision to the specified
6857 6858 changeset (see :hg:`help parents`).
6858 6859
6859 6860 If the changeset is not a descendant or ancestor of the working
6860 6861 directory's parent, the update is aborted. With the -c/--check
6861 6862 option, the working directory is checked for uncommitted changes; if
6862 6863 none are found, the working directory is updated to the specified
6863 6864 changeset.
6864 6865
6865 6866 .. container:: verbose
6866 6867
6867 6868 The following rules apply when the working directory contains
6868 6869 uncommitted changes:
6869 6870
6870 6871 1. If neither -c/--check nor -C/--clean is specified, and if
6871 6872 the requested changeset is an ancestor or descendant of
6872 6873 the working directory's parent, the uncommitted changes
6873 6874 are merged into the requested changeset and the merged
6874 6875 result is left uncommitted. If the requested changeset is
6875 6876 not an ancestor or descendant (that is, it is on another
6876 6877 branch), the update is aborted and the uncommitted changes
6877 6878 are preserved.
6878 6879
6879 6880 2. With the -c/--check option, the update is aborted and the
6880 6881 uncommitted changes are preserved.
6881 6882
6882 6883 3. With the -C/--clean option, uncommitted changes are discarded and
6883 6884 the working directory is updated to the requested changeset.
6884 6885
6885 6886 To cancel an uncommitted merge (and lose your changes), use
6886 6887 :hg:`update --clean .`.
6887 6888
6888 6889 Use null as the changeset to remove the working directory (like
6889 6890 :hg:`clone -U`).
6890 6891
6891 6892 If you want to revert just one file to an older revision, use
6892 6893 :hg:`revert [-r REV] NAME`.
6893 6894
6894 6895 See :hg:`help dates` for a list of formats valid for -d/--date.
6895 6896
6896 6897 Returns 0 on success, 1 if there are unresolved files.
6897 6898 """
6898 6899 movemarkfrom = None
6899 6900 if rev and node:
6900 6901 raise error.Abort(_("please specify just one revision"))
6901 6902
6902 6903 if rev is None or rev == '':
6903 6904 rev = node
6904 6905
6905 6906 wlock = repo.wlock()
6906 6907 try:
6907 6908 cmdutil.clearunfinished(repo)
6908 6909
6909 6910 if date:
6910 6911 if rev is not None:
6911 6912 raise error.Abort(_("you can't specify a revision and a date"))
6912 6913 rev = cmdutil.finddate(ui, repo, date)
6913 6914
6914 6915 # if we defined a bookmark, we have to remember the original name
6915 6916 brev = rev
6916 6917 rev = scmutil.revsingle(repo, rev, rev).rev()
6917 6918
6918 6919 if check and clean:
6919 6920 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6920 6921 )
6921 6922
6922 6923 if check:
6923 6924 cmdutil.bailifchanged(repo, merge=False)
6924 6925 if rev is None:
6925 6926 updata = destutil.destupdate(repo, clean=clean, check=check)
6926 6927 rev, movemarkfrom, brev = updata
6927 6928
6928 6929 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6929 6930
6930 6931 if clean:
6931 6932 ret = hg.clean(repo, rev)
6932 6933 else:
6933 6934 ret = hg.update(repo, rev)
6934 6935
6935 6936 if not ret and movemarkfrom:
6936 6937 if movemarkfrom == repo['.'].node():
6937 6938 pass # no-op update
6938 6939 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6939 6940 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6940 6941 else:
6941 6942 # this can happen with a non-linear update
6942 6943 ui.status(_("(leaving bookmark %s)\n") %
6943 6944 repo._activebookmark)
6944 6945 bookmarks.deactivate(repo)
6945 6946 elif brev in repo._bookmarks:
6946 6947 bookmarks.activate(repo, brev)
6947 6948 ui.status(_("(activating bookmark %s)\n") % brev)
6948 6949 elif brev:
6949 6950 if repo._activebookmark:
6950 6951 ui.status(_("(leaving bookmark %s)\n") %
6951 6952 repo._activebookmark)
6952 6953 bookmarks.deactivate(repo)
6953 6954 finally:
6954 6955 wlock.release()
6955 6956
6956 6957 return ret
6957 6958
6958 6959 @command('verify', [])
6959 6960 def verify(ui, repo):
6960 6961 """verify the integrity of the repository
6961 6962
6962 6963 Verify the integrity of the current repository.
6963 6964
6964 6965 This will perform an extensive check of the repository's
6965 6966 integrity, validating the hashes and checksums of each entry in
6966 6967 the changelog, manifest, and tracked files, as well as the
6967 6968 integrity of their crosslinks and indices.
6968 6969
6969 6970 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6970 6971 for more information about recovery from corruption of the
6971 6972 repository.
6972 6973
6973 6974 Returns 0 on success, 1 if errors are encountered.
6974 6975 """
6975 6976 return hg.verify(repo)
6976 6977
6977 6978 @command('version', [], norepo=True)
6978 6979 def version_(ui):
6979 6980 """output version and copyright information"""
6980 6981 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6981 6982 % util.version())
6982 6983 ui.status(_(
6983 6984 "(see https://mercurial-scm.org for more information)\n"
6984 6985 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6985 6986 "This is free software; see the source for copying conditions. "
6986 6987 "There is NO\nwarranty; "
6987 6988 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6988 6989 ))
6989 6990
6990 6991 ui.note(_("\nEnabled extensions:\n\n"))
6991 6992 if ui.verbose:
6992 6993 # format names and versions into columns
6993 6994 names = []
6994 6995 vers = []
6995 6996 for name, module in extensions.extensions():
6996 6997 names.append(name)
6997 6998 vers.append(extensions.moduleversion(module))
6998 6999 if names:
6999 7000 maxnamelen = max(len(n) for n in names)
7000 7001 for i, name in enumerate(names):
7001 7002 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
@@ -1,2610 +1,2613 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 internals Technical implementation topics
115 115 merge-tools Merge Tools
116 116 multirevs Specifying Multiple Revisions
117 117 patterns File Name Patterns
118 118 phases Working with Phases
119 119 revisions Specifying Single Revisions
120 120 revsets Specifying Revision Sets
121 121 scripting Using Mercurial from scripts and automation
122 122 subrepos Subrepositories
123 123 templating Template Usage
124 124 urls URL Paths
125 125
126 126 (use "hg help -v" to show built-in aliases and global options)
127 127
128 128 $ hg -q help
129 129 add add the specified files on the next commit
130 130 addremove add all new files, delete all missing files
131 131 annotate show changeset information by line for each file
132 132 archive create an unversioned archive of a repository revision
133 133 backout reverse effect of earlier changeset
134 134 bisect subdivision search of changesets
135 135 bookmarks create a new bookmark or list existing bookmarks
136 136 branch set or show the current branch name
137 137 branches list repository named branches
138 138 bundle create a changegroup file
139 139 cat output the current or given revision of files
140 140 clone make a copy of an existing repository
141 141 commit commit the specified files or all outstanding changes
142 142 config show combined config settings from all hgrc files
143 143 copy mark files as copied for the next commit
144 144 diff diff repository (or selected files)
145 145 export dump the header and diffs for one or more changesets
146 146 files list tracked files
147 147 forget forget the specified files on the next commit
148 148 graft copy changes from other branches onto the current branch
149 149 grep search for a pattern in specified files and revisions
150 150 heads show branch heads
151 151 help show help for a given topic or a help overview
152 152 identify identify the working directory or specified revision
153 153 import import an ordered set of patches
154 154 incoming show new changesets found in source
155 155 init create a new repository in the given directory
156 156 log show revision history of entire repository or files
157 157 manifest output the current or given revision of the project manifest
158 158 merge merge another revision into working directory
159 159 outgoing show changesets not found in the destination
160 160 paths show aliases for remote repositories
161 161 phase set or show the current phase name
162 162 pull pull changes from the specified source
163 163 push push changes to the specified destination
164 164 recover roll back an interrupted transaction
165 165 remove remove the specified files on the next commit
166 166 rename rename files; equivalent of copy + remove
167 167 resolve redo merges or set/view the merge status of files
168 168 revert restore files to their checkout state
169 169 root print the root (top) of the current working directory
170 170 serve start stand-alone webserver
171 171 status show changed files in the working directory
172 172 summary summarize working directory state
173 173 tag add one or more tags for the current or given revision
174 174 tags list repository tags
175 175 unbundle apply one or more changegroup files
176 176 update update working directory (or switch revisions)
177 177 verify verify the integrity of the repository
178 178 version output version and copyright information
179 179
180 180 additional help topics:
181 181
182 182 config Configuration Files
183 183 dates Date Formats
184 184 diffs Diff Formats
185 185 environment Environment Variables
186 186 extensions Using Additional Features
187 187 filesets Specifying File Sets
188 188 glossary Glossary
189 189 hgignore Syntax for Mercurial Ignore Files
190 190 hgweb Configuring hgweb
191 191 internals Technical implementation topics
192 192 merge-tools Merge Tools
193 193 multirevs Specifying Multiple Revisions
194 194 patterns File Name Patterns
195 195 phases Working with Phases
196 196 revisions Specifying Single Revisions
197 197 revsets Specifying Revision Sets
198 198 scripting Using Mercurial from scripts and automation
199 199 subrepos Subrepositories
200 200 templating Template Usage
201 201 urls URL Paths
202 202
203 203 Test extension help:
204 204 $ hg help extensions --config extensions.rebase= --config extensions.children=
205 205 Using Additional Features
206 206 """""""""""""""""""""""""
207 207
208 208 Mercurial has the ability to add new features through the use of
209 209 extensions. Extensions may add new commands, add options to existing
210 210 commands, change the default behavior of commands, or implement hooks.
211 211
212 212 To enable the "foo" extension, either shipped with Mercurial or in the
213 213 Python search path, create an entry for it in your configuration file,
214 214 like this:
215 215
216 216 [extensions]
217 217 foo =
218 218
219 219 You may also specify the full path to an extension:
220 220
221 221 [extensions]
222 222 myfeature = ~/.hgext/myfeature.py
223 223
224 224 See "hg help config" for more information on configuration files.
225 225
226 226 Extensions are not loaded by default for a variety of reasons: they can
227 227 increase startup overhead; they may be meant for advanced usage only; they
228 228 may provide potentially dangerous abilities (such as letting you destroy
229 229 or modify history); they might not be ready for prime time; or they may
230 230 alter some usual behaviors of stock Mercurial. It is thus up to the user
231 231 to activate extensions as needed.
232 232
233 233 To explicitly disable an extension enabled in a configuration file of
234 234 broader scope, prepend its path with !:
235 235
236 236 [extensions]
237 237 # disabling extension bar residing in /path/to/extension/bar.py
238 238 bar = !/path/to/extension/bar.py
239 239 # ditto, but no path was supplied for extension baz
240 240 baz = !
241 241
242 242 enabled extensions:
243 243
244 244 children command to display child changesets (DEPRECATED)
245 245 rebase command to move sets of revisions to a different ancestor
246 246
247 247 disabled extensions:
248 248
249 249 acl hooks for controlling repository access
250 250 blackbox log repository events to a blackbox for debugging
251 251 bugzilla hooks for integrating with the Bugzilla bug tracker
252 252 censor erase file content at a given revision
253 253 churn command to display statistics about repository history
254 254 clonebundles advertise pre-generated bundles to seed clones
255 255 (experimental)
256 256 color colorize output from some commands
257 257 convert import revisions from foreign VCS repositories into
258 258 Mercurial
259 259 eol automatically manage newlines in repository files
260 260 extdiff command to allow external programs to compare revisions
261 261 factotum http authentication with factotum
262 262 gpg commands to sign and verify changesets
263 263 hgcia hooks for integrating with the CIA.vc notification service
264 264 hgk browse the repository in a graphical way
265 265 highlight syntax highlighting for hgweb (requires Pygments)
266 266 histedit interactive history editing
267 267 keyword expand keywords in tracked files
268 268 largefiles track large binary files
269 269 mq manage a stack of patches
270 270 notify hooks for sending email push notifications
271 271 pager browse command output with an external pager
272 272 patchbomb command to send changesets as (a series of) patch emails
273 273 purge command to delete untracked files from the working
274 274 directory
275 275 record commands to interactively select changes for
276 276 commit/qrefresh
277 277 relink recreates hardlinks between repository clones
278 278 schemes extend schemes with shortcuts to repository swarms
279 279 share share a common history between several working directories
280 280 shelve save and restore changes to the working directory
281 281 strip strip changesets and their descendants from history
282 282 transplant command to transplant changesets from another branch
283 283 win32mbcs allow the use of MBCS paths with problematic encodings
284 284 zeroconf discover and advertise repositories on the local network
285 285
286 286 Verify that extension keywords appear in help templates
287 287
288 288 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
289 289
290 290 Test short command list with verbose option
291 291
292 292 $ hg -v help shortlist
293 293 Mercurial Distributed SCM
294 294
295 295 basic commands:
296 296
297 297 add add the specified files on the next commit
298 298 annotate, blame
299 299 show changeset information by line for each file
300 300 clone make a copy of an existing repository
301 301 commit, ci commit the specified files or all outstanding changes
302 302 diff diff repository (or selected files)
303 303 export dump the header and diffs for one or more changesets
304 304 forget forget the specified files on the next commit
305 305 init create a new repository in the given directory
306 306 log, history show revision history of entire repository or files
307 307 merge merge another revision into working directory
308 308 pull pull changes from the specified source
309 309 push push changes to the specified destination
310 310 remove, rm remove the specified files on the next commit
311 311 serve start stand-alone webserver
312 312 status, st show changed files in the working directory
313 313 summary, sum summarize working directory state
314 314 update, up, checkout, co
315 315 update working directory (or switch revisions)
316 316
317 317 global options ([+] can be repeated):
318 318
319 319 -R --repository REPO repository root directory or name of overlay bundle
320 320 file
321 321 --cwd DIR change working directory
322 322 -y --noninteractive do not prompt, automatically pick the first choice for
323 323 all prompts
324 324 -q --quiet suppress output
325 325 -v --verbose enable additional output
326 326 --config CONFIG [+] set/override config option (use 'section.name=value')
327 327 --debug enable debugging output
328 328 --debugger start debugger
329 329 --encoding ENCODE set the charset encoding (default: ascii)
330 330 --encodingmode MODE set the charset encoding mode (default: strict)
331 331 --traceback always print a traceback on exception
332 332 --time time how long the command takes
333 333 --profile print command execution profile
334 334 --version output version information and exit
335 335 -h --help display help and exit
336 336 --hidden consider hidden changesets
337 337
338 338 (use "hg help" for the full list of commands)
339 339
340 340 $ hg add -h
341 341 hg add [OPTION]... [FILE]...
342 342
343 343 add the specified files on the next commit
344 344
345 345 Schedule files to be version controlled and added to the repository.
346 346
347 347 The files will be added to the repository at the next commit. To undo an
348 348 add before that, see "hg forget".
349 349
350 If no names are given, add all files to the repository.
350 If no names are given, add all files to the repository (except files
351 matching ".hgignore").
351 352
352 353 Returns 0 if all files are successfully added.
353 354
354 355 options ([+] can be repeated):
355 356
356 357 -I --include PATTERN [+] include names matching the given patterns
357 358 -X --exclude PATTERN [+] exclude names matching the given patterns
358 359 -S --subrepos recurse into subrepositories
359 360 -n --dry-run do not perform actions, just print output
360 361
361 362 (some details hidden, use --verbose to show complete help)
362 363
363 364 Verbose help for add
364 365
365 366 $ hg add -hv
366 367 hg add [OPTION]... [FILE]...
367 368
368 369 add the specified files on the next commit
369 370
370 371 Schedule files to be version controlled and added to the repository.
371 372
372 373 The files will be added to the repository at the next commit. To undo an
373 374 add before that, see "hg forget".
374 375
375 If no names are given, add all files to the repository.
376 If no names are given, add all files to the repository (except files
377 matching ".hgignore").
376 378
377 379 Examples:
378 380
379 381 - New (unknown) files are added automatically by "hg add":
380 382
381 383 $ ls
382 384 foo.c
383 385 $ hg status
384 386 ? foo.c
385 387 $ hg add
386 388 adding foo.c
387 389 $ hg status
388 390 A foo.c
389 391
390 392 - Specific files to be added can be specified:
391 393
392 394 $ ls
393 395 bar.c foo.c
394 396 $ hg status
395 397 ? bar.c
396 398 ? foo.c
397 399 $ hg add bar.c
398 400 $ hg status
399 401 A bar.c
400 402 ? foo.c
401 403
402 404 Returns 0 if all files are successfully added.
403 405
404 406 options ([+] can be repeated):
405 407
406 408 -I --include PATTERN [+] include names matching the given patterns
407 409 -X --exclude PATTERN [+] exclude names matching the given patterns
408 410 -S --subrepos recurse into subrepositories
409 411 -n --dry-run do not perform actions, just print output
410 412
411 413 global options ([+] can be repeated):
412 414
413 415 -R --repository REPO repository root directory or name of overlay bundle
414 416 file
415 417 --cwd DIR change working directory
416 418 -y --noninteractive do not prompt, automatically pick the first choice for
417 419 all prompts
418 420 -q --quiet suppress output
419 421 -v --verbose enable additional output
420 422 --config CONFIG [+] set/override config option (use 'section.name=value')
421 423 --debug enable debugging output
422 424 --debugger start debugger
423 425 --encoding ENCODE set the charset encoding (default: ascii)
424 426 --encodingmode MODE set the charset encoding mode (default: strict)
425 427 --traceback always print a traceback on exception
426 428 --time time how long the command takes
427 429 --profile print command execution profile
428 430 --version output version information and exit
429 431 -h --help display help and exit
430 432 --hidden consider hidden changesets
431 433
432 434 Test help option with version option
433 435
434 436 $ hg add -h --version
435 437 Mercurial Distributed SCM (version *) (glob)
436 438 (see https://mercurial-scm.org for more information)
437 439
438 440 Copyright (C) 2005-2015 Matt Mackall and others
439 441 This is free software; see the source for copying conditions. There is NO
440 442 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
441 443
442 444 $ hg add --skjdfks
443 445 hg add: option --skjdfks not recognized
444 446 hg add [OPTION]... [FILE]...
445 447
446 448 add the specified files on the next commit
447 449
448 450 options ([+] can be repeated):
449 451
450 452 -I --include PATTERN [+] include names matching the given patterns
451 453 -X --exclude PATTERN [+] exclude names matching the given patterns
452 454 -S --subrepos recurse into subrepositories
453 455 -n --dry-run do not perform actions, just print output
454 456
455 457 (use "hg add -h" to show more help)
456 458 [255]
457 459
458 460 Test ambiguous command help
459 461
460 462 $ hg help ad
461 463 list of commands:
462 464
463 465 add add the specified files on the next commit
464 466 addremove add all new files, delete all missing files
465 467
466 468 (use "hg help -v ad" to show built-in aliases and global options)
467 469
468 470 Test command without options
469 471
470 472 $ hg help verify
471 473 hg verify
472 474
473 475 verify the integrity of the repository
474 476
475 477 Verify the integrity of the current repository.
476 478
477 479 This will perform an extensive check of the repository's integrity,
478 480 validating the hashes and checksums of each entry in the changelog,
479 481 manifest, and tracked files, as well as the integrity of their crosslinks
480 482 and indices.
481 483
482 484 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
483 485 information about recovery from corruption of the repository.
484 486
485 487 Returns 0 on success, 1 if errors are encountered.
486 488
487 489 (some details hidden, use --verbose to show complete help)
488 490
489 491 $ hg help diff
490 492 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
491 493
492 494 diff repository (or selected files)
493 495
494 496 Show differences between revisions for the specified files.
495 497
496 498 Differences between files are shown using the unified diff format.
497 499
498 500 Note:
499 501 diff may generate unexpected results for merges, as it will default to
500 502 comparing against the working directory's first parent changeset if no
501 503 revisions are specified.
502 504
503 505 When two revision arguments are given, then changes are shown between
504 506 those revisions. If only one revision is specified then that revision is
505 507 compared to the working directory, and, when no revisions are specified,
506 508 the working directory files are compared to its parent.
507 509
508 510 Alternatively you can specify -c/--change with a revision to see the
509 511 changes in that changeset relative to its first parent.
510 512
511 513 Without the -a/--text option, diff will avoid generating diffs of files it
512 514 detects as binary. With -a, diff will generate a diff anyway, probably
513 515 with undesirable results.
514 516
515 517 Use the -g/--git option to generate diffs in the git extended diff format.
516 518 For more information, read "hg help diffs".
517 519
518 520 Returns 0 on success.
519 521
520 522 options ([+] can be repeated):
521 523
522 524 -r --rev REV [+] revision
523 525 -c --change REV change made by revision
524 526 -a --text treat all files as text
525 527 -g --git use git extended diff format
526 528 --nodates omit dates from diff headers
527 529 --noprefix omit a/ and b/ prefixes from filenames
528 530 -p --show-function show which function each change is in
529 531 --reverse produce a diff that undoes the changes
530 532 -w --ignore-all-space ignore white space when comparing lines
531 533 -b --ignore-space-change ignore changes in the amount of white space
532 534 -B --ignore-blank-lines ignore changes whose lines are all blank
533 535 -U --unified NUM number of lines of context to show
534 536 --stat output diffstat-style summary of changes
535 537 --root DIR produce diffs relative to subdirectory
536 538 -I --include PATTERN [+] include names matching the given patterns
537 539 -X --exclude PATTERN [+] exclude names matching the given patterns
538 540 -S --subrepos recurse into subrepositories
539 541
540 542 (some details hidden, use --verbose to show complete help)
541 543
542 544 $ hg help status
543 545 hg status [OPTION]... [FILE]...
544 546
545 547 aliases: st
546 548
547 549 show changed files in the working directory
548 550
549 551 Show status of files in the repository. If names are given, only files
550 552 that match are shown. Files that are clean or ignored or the source of a
551 553 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
552 554 -C/--copies or -A/--all are given. Unless options described with "show
553 555 only ..." are given, the options -mardu are used.
554 556
555 557 Option -q/--quiet hides untracked (unknown and ignored) files unless
556 558 explicitly requested with -u/--unknown or -i/--ignored.
557 559
558 560 Note:
559 561 status may appear to disagree with diff if permissions have changed or
560 562 a merge has occurred. The standard diff format does not report
561 563 permission changes and diff only reports changes relative to one merge
562 564 parent.
563 565
564 566 If one revision is given, it is used as the base revision. If two
565 567 revisions are given, the differences between them are shown. The --change
566 568 option can also be used as a shortcut to list the changed files of a
567 569 revision from its first parent.
568 570
569 571 The codes used to show the status of files are:
570 572
571 573 M = modified
572 574 A = added
573 575 R = removed
574 576 C = clean
575 577 ! = missing (deleted by non-hg command, but still tracked)
576 578 ? = not tracked
577 579 I = ignored
578 580 = origin of the previous file (with --copies)
579 581
580 582 Returns 0 on success.
581 583
582 584 options ([+] can be repeated):
583 585
584 586 -A --all show status of all files
585 587 -m --modified show only modified files
586 588 -a --added show only added files
587 589 -r --removed show only removed files
588 590 -d --deleted show only deleted (but tracked) files
589 591 -c --clean show only files without changes
590 592 -u --unknown show only unknown (not tracked) files
591 593 -i --ignored show only ignored files
592 594 -n --no-status hide status prefix
593 595 -C --copies show source of copied files
594 596 -0 --print0 end filenames with NUL, for use with xargs
595 597 --rev REV [+] show difference from revision
596 598 --change REV list the changed files of a revision
597 599 -I --include PATTERN [+] include names matching the given patterns
598 600 -X --exclude PATTERN [+] exclude names matching the given patterns
599 601 -S --subrepos recurse into subrepositories
600 602
601 603 (some details hidden, use --verbose to show complete help)
602 604
603 605 $ hg -q help status
604 606 hg status [OPTION]... [FILE]...
605 607
606 608 show changed files in the working directory
607 609
608 610 $ hg help foo
609 611 abort: no such help topic: foo
610 612 (try "hg help --keyword foo")
611 613 [255]
612 614
613 615 $ hg skjdfks
614 616 hg: unknown command 'skjdfks'
615 617 Mercurial Distributed SCM
616 618
617 619 basic commands:
618 620
619 621 add add the specified files on the next commit
620 622 annotate show changeset information by line for each file
621 623 clone make a copy of an existing repository
622 624 commit commit the specified files or all outstanding changes
623 625 diff diff repository (or selected files)
624 626 export dump the header and diffs for one or more changesets
625 627 forget forget the specified files on the next commit
626 628 init create a new repository in the given directory
627 629 log show revision history of entire repository or files
628 630 merge merge another revision into working directory
629 631 pull pull changes from the specified source
630 632 push push changes to the specified destination
631 633 remove remove the specified files on the next commit
632 634 serve start stand-alone webserver
633 635 status show changed files in the working directory
634 636 summary summarize working directory state
635 637 update update working directory (or switch revisions)
636 638
637 639 (use "hg help" for the full list of commands or "hg -v" for details)
638 640 [255]
639 641
640 642
641 643 Make sure that we don't run afoul of the help system thinking that
642 644 this is a section and erroring out weirdly.
643 645
644 646 $ hg .log
645 647 hg: unknown command '.log'
646 648 (did you mean one of log?)
647 649 [255]
648 650
649 651 $ hg log.
650 652 hg: unknown command 'log.'
651 653 (did you mean one of log?)
652 654 [255]
653 655 $ hg pu.lh
654 656 hg: unknown command 'pu.lh'
655 657 (did you mean one of pull, push?)
656 658 [255]
657 659
658 660 $ cat > helpext.py <<EOF
659 661 > import os
660 662 > from mercurial import cmdutil, commands
661 663 >
662 664 > cmdtable = {}
663 665 > command = cmdutil.command(cmdtable)
664 666 >
665 667 > @command('nohelp',
666 668 > [('', 'longdesc', 3, 'x'*90),
667 669 > ('n', '', None, 'normal desc'),
668 670 > ('', 'newline', '', 'line1\nline2')],
669 671 > 'hg nohelp',
670 672 > norepo=True)
671 673 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
672 674 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
673 675 > def nohelp(ui, *args, **kwargs):
674 676 > pass
675 677 >
676 678 > EOF
677 679 $ echo '[extensions]' >> $HGRCPATH
678 680 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
679 681
680 682 Test command with no help text
681 683
682 684 $ hg help nohelp
683 685 hg nohelp
684 686
685 687 (no help text available)
686 688
687 689 options:
688 690
689 691 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
690 692 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
691 693 -n -- normal desc
692 694 --newline VALUE line1 line2
693 695
694 696 (some details hidden, use --verbose to show complete help)
695 697
696 698 $ hg help -k nohelp
697 699 Commands:
698 700
699 701 nohelp hg nohelp
700 702
701 703 Extension Commands:
702 704
703 705 nohelp (no help text available)
704 706
705 707 Test that default list of commands omits extension commands
706 708
707 709 $ hg help
708 710 Mercurial Distributed SCM
709 711
710 712 list of commands:
711 713
712 714 add add the specified files on the next commit
713 715 addremove add all new files, delete all missing files
714 716 annotate show changeset information by line for each file
715 717 archive create an unversioned archive of a repository revision
716 718 backout reverse effect of earlier changeset
717 719 bisect subdivision search of changesets
718 720 bookmarks create a new bookmark or list existing bookmarks
719 721 branch set or show the current branch name
720 722 branches list repository named branches
721 723 bundle create a changegroup file
722 724 cat output the current or given revision of files
723 725 clone make a copy of an existing repository
724 726 commit commit the specified files or all outstanding changes
725 727 config show combined config settings from all hgrc files
726 728 copy mark files as copied for the next commit
727 729 diff diff repository (or selected files)
728 730 export dump the header and diffs for one or more changesets
729 731 files list tracked files
730 732 forget forget the specified files on the next commit
731 733 graft copy changes from other branches onto the current branch
732 734 grep search for a pattern in specified files and revisions
733 735 heads show branch heads
734 736 help show help for a given topic or a help overview
735 737 identify identify the working directory or specified revision
736 738 import import an ordered set of patches
737 739 incoming show new changesets found in source
738 740 init create a new repository in the given directory
739 741 log show revision history of entire repository or files
740 742 manifest output the current or given revision of the project manifest
741 743 merge merge another revision into working directory
742 744 outgoing show changesets not found in the destination
743 745 paths show aliases for remote repositories
744 746 phase set or show the current phase name
745 747 pull pull changes from the specified source
746 748 push push changes to the specified destination
747 749 recover roll back an interrupted transaction
748 750 remove remove the specified files on the next commit
749 751 rename rename files; equivalent of copy + remove
750 752 resolve redo merges or set/view the merge status of files
751 753 revert restore files to their checkout state
752 754 root print the root (top) of the current working directory
753 755 serve start stand-alone webserver
754 756 status show changed files in the working directory
755 757 summary summarize working directory state
756 758 tag add one or more tags for the current or given revision
757 759 tags list repository tags
758 760 unbundle apply one or more changegroup files
759 761 update update working directory (or switch revisions)
760 762 verify verify the integrity of the repository
761 763 version output version and copyright information
762 764
763 765 enabled extensions:
764 766
765 767 helpext (no help text available)
766 768
767 769 additional help topics:
768 770
769 771 config Configuration Files
770 772 dates Date Formats
771 773 diffs Diff Formats
772 774 environment Environment Variables
773 775 extensions Using Additional Features
774 776 filesets Specifying File Sets
775 777 glossary Glossary
776 778 hgignore Syntax for Mercurial Ignore Files
777 779 hgweb Configuring hgweb
778 780 internals Technical implementation topics
779 781 merge-tools Merge Tools
780 782 multirevs Specifying Multiple Revisions
781 783 patterns File Name Patterns
782 784 phases Working with Phases
783 785 revisions Specifying Single Revisions
784 786 revsets Specifying Revision Sets
785 787 scripting Using Mercurial from scripts and automation
786 788 subrepos Subrepositories
787 789 templating Template Usage
788 790 urls URL Paths
789 791
790 792 (use "hg help -v" to show built-in aliases and global options)
791 793
792 794
793 795 Test list of internal help commands
794 796
795 797 $ hg help debug
796 798 debug commands (internal and unsupported):
797 799
798 800 debugancestor
799 801 find the ancestor revision of two revisions in a given index
800 802 debugapplystreamclonebundle
801 803 apply a stream clone bundle file
802 804 debugbuilddag
803 805 builds a repo with a given DAG from scratch in the current
804 806 empty repo
805 807 debugbundle lists the contents of a bundle
806 808 debugcheckstate
807 809 validate the correctness of the current dirstate
808 810 debugcommands
809 811 list all available commands and options
810 812 debugcomplete
811 813 returns the completion list associated with the given command
812 814 debugcreatestreamclonebundle
813 815 create a stream clone bundle file
814 816 debugdag format the changelog or an index DAG as a concise textual
815 817 description
816 818 debugdata dump the contents of a data file revision
817 819 debugdate parse and display a date
818 820 debugdeltachain
819 821 dump information about delta chains in a revlog
820 822 debugdirstate
821 823 show the contents of the current dirstate
822 824 debugdiscovery
823 825 runs the changeset discovery protocol in isolation
824 826 debugextensions
825 827 show information about active extensions
826 828 debugfileset parse and apply a fileset specification
827 829 debugfsinfo show information detected about current filesystem
828 830 debuggetbundle
829 831 retrieves a bundle from a repo
830 832 debugignore display the combined ignore pattern
831 833 debugindex dump the contents of an index file
832 834 debugindexdot
833 835 dump an index DAG as a graphviz dot file
834 836 debuginstall test Mercurial installation
835 837 debugknown test whether node ids are known to a repo
836 838 debuglocks show or modify state of locks
837 839 debugmergestate
838 840 print merge state
839 841 debugnamecomplete
840 842 complete "names" - tags, open branch names, bookmark names
841 843 debugobsolete
842 844 create arbitrary obsolete marker
843 845 debugoptDEP (no help text available)
844 846 debugoptEXP (no help text available)
845 847 debugpathcomplete
846 848 complete part or all of a tracked path
847 849 debugpushkey access the pushkey key/value protocol
848 850 debugpvec (no help text available)
849 851 debugrebuilddirstate
850 852 rebuild the dirstate as it would look like for the given
851 853 revision
852 854 debugrebuildfncache
853 855 rebuild the fncache file
854 856 debugrename dump rename information
855 857 debugrevlog show data and statistics about a revlog
856 858 debugrevspec parse and apply a revision specification
857 859 debugsetparents
858 860 manually set the parents of the current working directory
859 861 debugsub (no help text available)
860 862 debugsuccessorssets
861 863 show set of successors for revision
862 864 debugwalk show how files match on given patterns
863 865 debugwireargs
864 866 (no help text available)
865 867
866 868 (use "hg help -v debug" to show built-in aliases and global options)
867 869
868 870 internals topic renders index of available sub-topics
869 871
870 872 $ hg help internals
871 873 Technical implementation topics
872 874 """""""""""""""""""""""""""""""
873 875
874 876 bundles container for exchange of repository data
875 877 changegroups representation of revlog data
876 878
877 879 sub-topics can be accessed
878 880
879 881 $ hg help internals.changegroups
880 882 Changegroups
881 883 ============
882 884
883 885 Changegroups are representations of repository revlog data, specifically
884 886 the changelog, manifest, and filelogs.
885 887
886 888 There are 2 versions of changegroups: "1" and "2". From a high-level, they
887 889 are almost exactly the same, with the only difference being a header on
888 890 entries in the changeset segment.
889 891
890 892 Changegroups consists of 3 logical segments:
891 893
892 894 +---------------------------------+
893 895 | | | |
894 896 | changeset | manifest | filelogs |
895 897 | | | |
896 898 +---------------------------------+
897 899
898 900 The principle building block of each segment is a *chunk*. A *chunk* is a
899 901 framed piece of data:
900 902
901 903 +---------------------------------------+
902 904 | | |
903 905 | length | data |
904 906 | (32 bits) | <length> bytes |
905 907 | | |
906 908 +---------------------------------------+
907 909
908 910 Each chunk starts with a 32-bit big-endian signed integer indicating the
909 911 length of the raw data that follows.
910 912
911 913 There is a special case chunk that has 0 length ("0x00000000"). We call
912 914 this an *empty chunk*.
913 915
914 916 Delta Groups
915 917 ------------
916 918
917 919 A *delta group* expresses the content of a revlog as a series of deltas,
918 920 or patches against previous revisions.
919 921
920 922 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
921 923 to signal the end of the delta group:
922 924
923 925 +------------------------------------------------------------------------+
924 926 | | | | | |
925 927 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
926 928 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
927 929 | | | | | |
928 930 +------------------------------------------------------------+-----------+
929 931
930 932 Each *chunk*'s data consists of the following:
931 933
932 934 +-----------------------------------------+
933 935 | | | |
934 936 | delta header | mdiff header | delta |
935 937 | (various) | (12 bytes) | (various) |
936 938 | | | |
937 939 +-----------------------------------------+
938 940
939 941 The *length* field is the byte length of the remaining 3 logical pieces of
940 942 data. The *delta* is a diff from an existing entry in the changelog.
941 943
942 944 The *delta header* is different between versions "1" and "2" of the
943 945 changegroup format.
944 946
945 947 Version 1:
946 948
947 949 +------------------------------------------------------+
948 950 | | | | |
949 951 | node | p1 node | p2 node | link node |
950 952 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
951 953 | | | | |
952 954 +------------------------------------------------------+
953 955
954 956 Version 2:
955 957
956 958 +------------------------------------------------------------------+
957 959 | | | | | |
958 960 | node | p1 node | p2 node | base node | link node |
959 961 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
960 962 | | | | | |
961 963 +------------------------------------------------------------------+
962 964
963 965 The *mdiff header* consists of 3 32-bit big-endian signed integers
964 966 describing offsets at which to apply the following delta content:
965 967
966 968 +-------------------------------------+
967 969 | | | |
968 970 | offset | old length | new length |
969 971 | (32 bits) | (32 bits) | (32 bits) |
970 972 | | | |
971 973 +-------------------------------------+
972 974
973 975 In version 1, the delta is always applied against the previous node from
974 976 the changegroup or the first parent if this is the first entry in the
975 977 changegroup.
976 978
977 979 In version 2, the delta base node is encoded in the entry in the
978 980 changegroup. This allows the delta to be expressed against any parent,
979 981 which can result in smaller deltas and more efficient encoding of data.
980 982
981 983 Changeset Segment
982 984 -----------------
983 985
984 986 The *changeset segment* consists of a single *delta group* holding
985 987 changelog data. It is followed by an *empty chunk* to denote the boundary
986 988 to the *manifests segment*.
987 989
988 990 Manifest Segment
989 991 ----------------
990 992
991 993 The *manifest segment* consists of a single *delta group* holding manifest
992 994 data. It is followed by an *empty chunk* to denote the boundary to the
993 995 *filelogs segment*.
994 996
995 997 Filelogs Segment
996 998 ----------------
997 999
998 1000 The *filelogs* segment consists of multiple sub-segments, each
999 1001 corresponding to an individual file whose data is being described:
1000 1002
1001 1003 +--------------------------------------+
1002 1004 | | | | |
1003 1005 | filelog0 | filelog1 | filelog2 | ... |
1004 1006 | | | | |
1005 1007 +--------------------------------------+
1006 1008
1007 1009 The final filelog sub-segment is followed by an *empty chunk* to denote
1008 1010 the end of the segment and the overall changegroup.
1009 1011
1010 1012 Each filelog sub-segment consists of the following:
1011 1013
1012 1014 +------------------------------------------+
1013 1015 | | | |
1014 1016 | filename size | filename | delta group |
1015 1017 | (32 bits) | (various) | (various) |
1016 1018 | | | |
1017 1019 +------------------------------------------+
1018 1020
1019 1021 That is, a *chunk* consisting of the filename (not terminated or padded)
1020 1022 followed by N chunks constituting the *delta group* for this file.
1021 1023
1022 1024 Test list of commands with command with no help text
1023 1025
1024 1026 $ hg help helpext
1025 1027 helpext extension - no help text available
1026 1028
1027 1029 list of commands:
1028 1030
1029 1031 nohelp (no help text available)
1030 1032
1031 1033 (use "hg help -v helpext" to show built-in aliases and global options)
1032 1034
1033 1035
1034 1036 test deprecated and experimental options are hidden in command help
1035 1037 $ hg help debugoptDEP
1036 1038 hg debugoptDEP
1037 1039
1038 1040 (no help text available)
1039 1041
1040 1042 options:
1041 1043
1042 1044 (some details hidden, use --verbose to show complete help)
1043 1045
1044 1046 $ hg help debugoptEXP
1045 1047 hg debugoptEXP
1046 1048
1047 1049 (no help text available)
1048 1050
1049 1051 options:
1050 1052
1051 1053 (some details hidden, use --verbose to show complete help)
1052 1054
1053 1055 test deprecated and experimental options is shown with -v
1054 1056 $ hg help -v debugoptDEP | grep dopt
1055 1057 --dopt option is (DEPRECATED)
1056 1058 $ hg help -v debugoptEXP | grep eopt
1057 1059 --eopt option is (EXPERIMENTAL)
1058 1060
1059 1061 #if gettext
1060 1062 test deprecated option is hidden with translation with untranslated description
1061 1063 (use many globy for not failing on changed transaction)
1062 1064 $ LANGUAGE=sv hg help debugoptDEP
1063 1065 hg debugoptDEP
1064 1066
1065 1067 (*) (glob)
1066 1068
1067 1069 options:
1068 1070
1069 1071 (some details hidden, use --verbose to show complete help)
1070 1072 #endif
1071 1073
1072 1074 Test commands that collide with topics (issue4240)
1073 1075
1074 1076 $ hg config -hq
1075 1077 hg config [-u] [NAME]...
1076 1078
1077 1079 show combined config settings from all hgrc files
1078 1080 $ hg showconfig -hq
1079 1081 hg config [-u] [NAME]...
1080 1082
1081 1083 show combined config settings from all hgrc files
1082 1084
1083 1085 Test a help topic
1084 1086
1085 1087 $ hg help revs
1086 1088 Specifying Single Revisions
1087 1089 """""""""""""""""""""""""""
1088 1090
1089 1091 Mercurial supports several ways to specify individual revisions.
1090 1092
1091 1093 A plain integer is treated as a revision number. Negative integers are
1092 1094 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1093 1095 denoting the revision prior to the tip, and so forth.
1094 1096
1095 1097 A 40-digit hexadecimal string is treated as a unique revision identifier.
1096 1098
1097 1099 A hexadecimal string less than 40 characters long is treated as a unique
1098 1100 revision identifier and is referred to as a short-form identifier. A
1099 1101 short-form identifier is only valid if it is the prefix of exactly one
1100 1102 full-length identifier.
1101 1103
1102 1104 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1103 1105 is a movable pointer to a revision. A tag is a permanent name associated
1104 1106 with a revision. A branch name denotes the tipmost open branch head of
1105 1107 that branch - or if they are all closed, the tipmost closed head of the
1106 1108 branch. Bookmark, tag, and branch names must not contain the ":"
1107 1109 character.
1108 1110
1109 1111 The reserved name "tip" always identifies the most recent revision.
1110 1112
1111 1113 The reserved name "null" indicates the null revision. This is the revision
1112 1114 of an empty repository, and the parent of revision 0.
1113 1115
1114 1116 The reserved name "." indicates the working directory parent. If no
1115 1117 working directory is checked out, it is equivalent to null. If an
1116 1118 uncommitted merge is in progress, "." is the revision of the first parent.
1117 1119
1118 1120 Test repeated config section name
1119 1121
1120 1122 $ hg help config.host
1121 1123 "http_proxy.host"
1122 1124 Host name and (optional) port of the proxy server, for example
1123 1125 "myproxy:8000".
1124 1126
1125 1127 "smtp.host"
1126 1128 Host name of mail server, e.g. "mail.example.com".
1127 1129
1128 1130 Unrelated trailing paragraphs shouldn't be included
1129 1131
1130 1132 $ hg help config.extramsg | grep '^$'
1131 1133
1132 1134
1133 1135 Test capitalized section name
1134 1136
1135 1137 $ hg help scripting.HGPLAIN > /dev/null
1136 1138
1137 1139 Help subsection:
1138 1140
1139 1141 $ hg help config.charsets |grep "Email example:" > /dev/null
1140 1142 [1]
1141 1143
1142 1144 Show nested definitions
1143 1145 ("profiling.type"[break]"ls"[break]"stat"[break])
1144 1146
1145 1147 $ hg help config.type | egrep '^$'|wc -l
1146 1148 \s*3 (re)
1147 1149
1148 1150 Last item in help config.*:
1149 1151
1150 1152 $ hg help config.`hg help config|grep '^ "'| \
1151 1153 > tail -1|sed 's![ "]*!!g'`| \
1152 1154 > grep "hg help -c config" > /dev/null
1153 1155 [1]
1154 1156
1155 1157 note to use help -c for general hg help config:
1156 1158
1157 1159 $ hg help config |grep "hg help -c config" > /dev/null
1158 1160
1159 1161 Test templating help
1160 1162
1161 1163 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1162 1164 desc String. The text of the changeset description.
1163 1165 diffstat String. Statistics of changes with the following format:
1164 1166 firstline Any text. Returns the first line of text.
1165 1167 nonempty Any text. Returns '(none)' if the string is empty.
1166 1168
1167 1169 Test deprecated items
1168 1170
1169 1171 $ hg help -v templating | grep currentbookmark
1170 1172 currentbookmark
1171 1173 $ hg help templating | (grep currentbookmark || true)
1172 1174
1173 1175 Test help hooks
1174 1176
1175 1177 $ cat > helphook1.py <<EOF
1176 1178 > from mercurial import help
1177 1179 >
1178 1180 > def rewrite(ui, topic, doc):
1179 1181 > return doc + '\nhelphook1\n'
1180 1182 >
1181 1183 > def extsetup(ui):
1182 1184 > help.addtopichook('revsets', rewrite)
1183 1185 > EOF
1184 1186 $ cat > helphook2.py <<EOF
1185 1187 > from mercurial import help
1186 1188 >
1187 1189 > def rewrite(ui, topic, doc):
1188 1190 > return doc + '\nhelphook2\n'
1189 1191 >
1190 1192 > def extsetup(ui):
1191 1193 > help.addtopichook('revsets', rewrite)
1192 1194 > EOF
1193 1195 $ echo '[extensions]' >> $HGRCPATH
1194 1196 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1195 1197 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1196 1198 $ hg help revsets | grep helphook
1197 1199 helphook1
1198 1200 helphook2
1199 1201
1200 1202 help -c should only show debug --debug
1201 1203
1202 1204 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1203 1205 [1]
1204 1206
1205 1207 help -c should only show deprecated for -v
1206 1208
1207 1209 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1208 1210 [1]
1209 1211
1210 1212 Test -e / -c / -k combinations
1211 1213
1212 1214 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1213 1215 Commands:
1214 1216 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1215 1217 Extensions:
1216 1218 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1217 1219 Topics:
1218 1220 Commands:
1219 1221 Extensions:
1220 1222 Extension Commands:
1221 1223 $ hg help -c schemes
1222 1224 abort: no such help topic: schemes
1223 1225 (try "hg help --keyword schemes")
1224 1226 [255]
1225 1227 $ hg help -e schemes |head -1
1226 1228 schemes extension - extend schemes with shortcuts to repository swarms
1227 1229 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1228 1230 Commands:
1229 1231 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1230 1232 Extensions:
1231 1233 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1232 1234 Extensions:
1233 1235 Commands:
1234 1236 $ hg help -c commit > /dev/null
1235 1237 $ hg help -e -c commit > /dev/null
1236 1238 $ hg help -e commit > /dev/null
1237 1239 abort: no such help topic: commit
1238 1240 (try "hg help --keyword commit")
1239 1241 [255]
1240 1242
1241 1243 Test keyword search help
1242 1244
1243 1245 $ cat > prefixedname.py <<EOF
1244 1246 > '''matched against word "clone"
1245 1247 > '''
1246 1248 > EOF
1247 1249 $ echo '[extensions]' >> $HGRCPATH
1248 1250 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1249 1251 $ hg help -k clone
1250 1252 Topics:
1251 1253
1252 1254 config Configuration Files
1253 1255 extensions Using Additional Features
1254 1256 glossary Glossary
1255 1257 phases Working with Phases
1256 1258 subrepos Subrepositories
1257 1259 urls URL Paths
1258 1260
1259 1261 Commands:
1260 1262
1261 1263 bookmarks create a new bookmark or list existing bookmarks
1262 1264 clone make a copy of an existing repository
1263 1265 paths show aliases for remote repositories
1264 1266 update update working directory (or switch revisions)
1265 1267
1266 1268 Extensions:
1267 1269
1268 1270 clonebundles advertise pre-generated bundles to seed clones (experimental)
1269 1271 prefixedname matched against word "clone"
1270 1272 relink recreates hardlinks between repository clones
1271 1273
1272 1274 Extension Commands:
1273 1275
1274 1276 qclone clone main and patch repository at same time
1275 1277
1276 1278 Test unfound topic
1277 1279
1278 1280 $ hg help nonexistingtopicthatwillneverexisteverever
1279 1281 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1280 1282 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1281 1283 [255]
1282 1284
1283 1285 Test unfound keyword
1284 1286
1285 1287 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1286 1288 abort: no matches
1287 1289 (try "hg help" for a list of topics)
1288 1290 [255]
1289 1291
1290 1292 Test omit indicating for help
1291 1293
1292 1294 $ cat > addverboseitems.py <<EOF
1293 1295 > '''extension to test omit indicating.
1294 1296 >
1295 1297 > This paragraph is never omitted (for extension)
1296 1298 >
1297 1299 > .. container:: verbose
1298 1300 >
1299 1301 > This paragraph is omitted,
1300 1302 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1301 1303 >
1302 1304 > This paragraph is never omitted, too (for extension)
1303 1305 > '''
1304 1306 >
1305 1307 > from mercurial import help, commands
1306 1308 > testtopic = """This paragraph is never omitted (for topic).
1307 1309 >
1308 1310 > .. container:: verbose
1309 1311 >
1310 1312 > This paragraph is omitted,
1311 1313 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1312 1314 >
1313 1315 > This paragraph is never omitted, too (for topic)
1314 1316 > """
1315 1317 > def extsetup(ui):
1316 1318 > help.helptable.append((["topic-containing-verbose"],
1317 1319 > "This is the topic to test omit indicating.",
1318 1320 > lambda ui: testtopic))
1319 1321 > EOF
1320 1322 $ echo '[extensions]' >> $HGRCPATH
1321 1323 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1322 1324 $ hg help addverboseitems
1323 1325 addverboseitems extension - extension to test omit indicating.
1324 1326
1325 1327 This paragraph is never omitted (for extension)
1326 1328
1327 1329 This paragraph is never omitted, too (for extension)
1328 1330
1329 1331 (some details hidden, use --verbose to show complete help)
1330 1332
1331 1333 no commands defined
1332 1334 $ hg help -v addverboseitems
1333 1335 addverboseitems extension - extension to test omit indicating.
1334 1336
1335 1337 This paragraph is never omitted (for extension)
1336 1338
1337 1339 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1338 1340 extension)
1339 1341
1340 1342 This paragraph is never omitted, too (for extension)
1341 1343
1342 1344 no commands defined
1343 1345 $ hg help topic-containing-verbose
1344 1346 This is the topic to test omit indicating.
1345 1347 """"""""""""""""""""""""""""""""""""""""""
1346 1348
1347 1349 This paragraph is never omitted (for topic).
1348 1350
1349 1351 This paragraph is never omitted, too (for topic)
1350 1352
1351 1353 (some details hidden, use --verbose to show complete help)
1352 1354 $ hg help -v topic-containing-verbose
1353 1355 This is the topic to test omit indicating.
1354 1356 """"""""""""""""""""""""""""""""""""""""""
1355 1357
1356 1358 This paragraph is never omitted (for topic).
1357 1359
1358 1360 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1359 1361 topic)
1360 1362
1361 1363 This paragraph is never omitted, too (for topic)
1362 1364
1363 1365 Test section lookup
1364 1366
1365 1367 $ hg help revset.merge
1366 1368 "merge()"
1367 1369 Changeset is a merge changeset.
1368 1370
1369 1371 $ hg help glossary.dag
1370 1372 DAG
1371 1373 The repository of changesets of a distributed version control system
1372 1374 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1373 1375 of nodes and edges, where nodes correspond to changesets and edges
1374 1376 imply a parent -> child relation. This graph can be visualized by
1375 1377 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1376 1378 limited by the requirement for children to have at most two parents.
1377 1379
1378 1380
1379 1381 $ hg help hgrc.paths
1380 1382 "paths"
1381 1383 -------
1382 1384
1383 1385 Assigns symbolic names and behavior to repositories.
1384 1386
1385 1387 Options are symbolic names defining the URL or directory that is the
1386 1388 location of the repository. Example:
1387 1389
1388 1390 [paths]
1389 1391 my_server = https://example.com/my_repo
1390 1392 local_path = /home/me/repo
1391 1393
1392 1394 These symbolic names can be used from the command line. To pull from
1393 1395 "my_server": "hg pull my_server". To push to "local_path": "hg push
1394 1396 local_path".
1395 1397
1396 1398 Options containing colons (":") denote sub-options that can influence
1397 1399 behavior for that specific path. Example:
1398 1400
1399 1401 [paths]
1400 1402 my_server = https://example.com/my_path
1401 1403 my_server:pushurl = ssh://example.com/my_path
1402 1404
1403 1405 The following sub-options can be defined:
1404 1406
1405 1407 "pushurl"
1406 1408 The URL to use for push operations. If not defined, the location
1407 1409 defined by the path's main entry is used.
1408 1410
1409 1411 The following special named paths exist:
1410 1412
1411 1413 "default"
1412 1414 The URL or directory to use when no source or remote is specified.
1413 1415
1414 1416 "hg clone" will automatically define this path to the location the
1415 1417 repository was cloned from.
1416 1418
1417 1419 "default-push"
1418 1420 (deprecated) The URL or directory for the default "hg push" location.
1419 1421 "default:pushurl" should be used instead.
1420 1422
1421 1423 $ hg help glossary.mcguffin
1422 1424 abort: help section not found
1423 1425 [255]
1424 1426
1425 1427 $ hg help glossary.mc.guffin
1426 1428 abort: help section not found
1427 1429 [255]
1428 1430
1429 1431 $ hg help template.files
1430 1432 files List of strings. All files modified, added, or removed by
1431 1433 this changeset.
1432 1434
1433 1435 Test dynamic list of merge tools only shows up once
1434 1436 $ hg help merge-tools
1435 1437 Merge Tools
1436 1438 """""""""""
1437 1439
1438 1440 To merge files Mercurial uses merge tools.
1439 1441
1440 1442 A merge tool combines two different versions of a file into a merged file.
1441 1443 Merge tools are given the two files and the greatest common ancestor of
1442 1444 the two file versions, so they can determine the changes made on both
1443 1445 branches.
1444 1446
1445 1447 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1446 1448 backout" and in several extensions.
1447 1449
1448 1450 Usually, the merge tool tries to automatically reconcile the files by
1449 1451 combining all non-overlapping changes that occurred separately in the two
1450 1452 different evolutions of the same initial base file. Furthermore, some
1451 1453 interactive merge programs make it easier to manually resolve conflicting
1452 1454 merges, either in a graphical way, or by inserting some conflict markers.
1453 1455 Mercurial does not include any interactive merge programs but relies on
1454 1456 external tools for that.
1455 1457
1456 1458 Available merge tools
1457 1459 =====================
1458 1460
1459 1461 External merge tools and their properties are configured in the merge-
1460 1462 tools configuration section - see hgrc(5) - but they can often just be
1461 1463 named by their executable.
1462 1464
1463 1465 A merge tool is generally usable if its executable can be found on the
1464 1466 system and if it can handle the merge. The executable is found if it is an
1465 1467 absolute or relative executable path or the name of an application in the
1466 1468 executable search path. The tool is assumed to be able to handle the merge
1467 1469 if it can handle symlinks if the file is a symlink, if it can handle
1468 1470 binary files if the file is binary, and if a GUI is available if the tool
1469 1471 requires a GUI.
1470 1472
1471 1473 There are some internal merge tools which can be used. The internal merge
1472 1474 tools are:
1473 1475
1474 1476 ":dump"
1475 1477 Creates three versions of the files to merge, containing the contents of
1476 1478 local, other and base. These files can then be used to perform a merge
1477 1479 manually. If the file to be merged is named "a.txt", these files will
1478 1480 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1479 1481 they will be placed in the same directory as "a.txt".
1480 1482
1481 1483 ":fail"
1482 1484 Rather than attempting to merge files that were modified on both
1483 1485 branches, it marks them as unresolved. The resolve command must be used
1484 1486 to resolve these conflicts.
1485 1487
1486 1488 ":local"
1487 1489 Uses the local version of files as the merged version.
1488 1490
1489 1491 ":merge"
1490 1492 Uses the internal non-interactive simple merge algorithm for merging
1491 1493 files. It will fail if there are any conflicts and leave markers in the
1492 1494 partially merged file. Markers will have two sections, one for each side
1493 1495 of merge.
1494 1496
1495 1497 ":merge-local"
1496 1498 Like :merge, but resolve all conflicts non-interactively in favor of the
1497 1499 local changes.
1498 1500
1499 1501 ":merge-other"
1500 1502 Like :merge, but resolve all conflicts non-interactively in favor of the
1501 1503 other changes.
1502 1504
1503 1505 ":merge3"
1504 1506 Uses the internal non-interactive simple merge algorithm for merging
1505 1507 files. It will fail if there are any conflicts and leave markers in the
1506 1508 partially merged file. Marker will have three sections, one from each
1507 1509 side of the merge and one for the base content.
1508 1510
1509 1511 ":other"
1510 1512 Uses the other version of files as the merged version.
1511 1513
1512 1514 ":prompt"
1513 1515 Asks the user which of the local or the other version to keep as the
1514 1516 merged version.
1515 1517
1516 1518 ":tagmerge"
1517 1519 Uses the internal tag merge algorithm (experimental).
1518 1520
1519 1521 ":union"
1520 1522 Uses the internal non-interactive simple merge algorithm for merging
1521 1523 files. It will use both left and right sides for conflict regions. No
1522 1524 markers are inserted.
1523 1525
1524 1526 Internal tools are always available and do not require a GUI but will by
1525 1527 default not handle symlinks or binary files.
1526 1528
1527 1529 Choosing a merge tool
1528 1530 =====================
1529 1531
1530 1532 Mercurial uses these rules when deciding which merge tool to use:
1531 1533
1532 1534 1. If a tool has been specified with the --tool option to merge or
1533 1535 resolve, it is used. If it is the name of a tool in the merge-tools
1534 1536 configuration, its configuration is used. Otherwise the specified tool
1535 1537 must be executable by the shell.
1536 1538 2. If the "HGMERGE" environment variable is present, its value is used and
1537 1539 must be executable by the shell.
1538 1540 3. If the filename of the file to be merged matches any of the patterns in
1539 1541 the merge-patterns configuration section, the first usable merge tool
1540 1542 corresponding to a matching pattern is used. Here, binary capabilities
1541 1543 of the merge tool are not considered.
1542 1544 4. If ui.merge is set it will be considered next. If the value is not the
1543 1545 name of a configured tool, the specified value is used and must be
1544 1546 executable by the shell. Otherwise the named tool is used if it is
1545 1547 usable.
1546 1548 5. If any usable merge tools are present in the merge-tools configuration
1547 1549 section, the one with the highest priority is used.
1548 1550 6. If a program named "hgmerge" can be found on the system, it is used -
1549 1551 but it will by default not be used for symlinks and binary files.
1550 1552 7. If the file to be merged is not binary and is not a symlink, then
1551 1553 internal ":merge" is used.
1552 1554 8. The merge of the file fails and must be resolved before commit.
1553 1555
1554 1556 Note:
1555 1557 After selecting a merge program, Mercurial will by default attempt to
1556 1558 merge the files using a simple merge algorithm first. Only if it
1557 1559 doesn't succeed because of conflicting changes Mercurial will actually
1558 1560 execute the merge program. Whether to use the simple merge algorithm
1559 1561 first can be controlled by the premerge setting of the merge tool.
1560 1562 Premerge is enabled by default unless the file is binary or a symlink.
1561 1563
1562 1564 See the merge-tools and ui sections of hgrc(5) for details on the
1563 1565 configuration of merge tools.
1564 1566
1565 1567 Test usage of section marks in help documents
1566 1568
1567 1569 $ cd "$TESTDIR"/../doc
1568 1570 $ python check-seclevel.py
1569 1571 $ cd $TESTTMP
1570 1572
1571 1573 #if serve
1572 1574
1573 1575 Test the help pages in hgweb.
1574 1576
1575 1577 Dish up an empty repo; serve it cold.
1576 1578
1577 1579 $ hg init "$TESTTMP/test"
1578 1580 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1579 1581 $ cat hg.pid >> $DAEMON_PIDS
1580 1582
1581 1583 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1582 1584 200 Script output follows
1583 1585
1584 1586 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1585 1587 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1586 1588 <head>
1587 1589 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1588 1590 <meta name="robots" content="index, nofollow" />
1589 1591 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1590 1592 <script type="text/javascript" src="/static/mercurial.js"></script>
1591 1593
1592 1594 <title>Help: Index</title>
1593 1595 </head>
1594 1596 <body>
1595 1597
1596 1598 <div class="container">
1597 1599 <div class="menu">
1598 1600 <div class="logo">
1599 1601 <a href="https://mercurial-scm.org/">
1600 1602 <img src="/static/hglogo.png" alt="mercurial" /></a>
1601 1603 </div>
1602 1604 <ul>
1603 1605 <li><a href="/shortlog">log</a></li>
1604 1606 <li><a href="/graph">graph</a></li>
1605 1607 <li><a href="/tags">tags</a></li>
1606 1608 <li><a href="/bookmarks">bookmarks</a></li>
1607 1609 <li><a href="/branches">branches</a></li>
1608 1610 </ul>
1609 1611 <ul>
1610 1612 <li class="active">help</li>
1611 1613 </ul>
1612 1614 </div>
1613 1615
1614 1616 <div class="main">
1615 1617 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1616 1618 <form class="search" action="/log">
1617 1619
1618 1620 <p><input name="rev" id="search1" type="text" size="30" /></p>
1619 1621 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1620 1622 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1621 1623 </form>
1622 1624 <table class="bigtable">
1623 1625 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1624 1626
1625 1627 <tr><td>
1626 1628 <a href="/help/config">
1627 1629 config
1628 1630 </a>
1629 1631 </td><td>
1630 1632 Configuration Files
1631 1633 </td></tr>
1632 1634 <tr><td>
1633 1635 <a href="/help/dates">
1634 1636 dates
1635 1637 </a>
1636 1638 </td><td>
1637 1639 Date Formats
1638 1640 </td></tr>
1639 1641 <tr><td>
1640 1642 <a href="/help/diffs">
1641 1643 diffs
1642 1644 </a>
1643 1645 </td><td>
1644 1646 Diff Formats
1645 1647 </td></tr>
1646 1648 <tr><td>
1647 1649 <a href="/help/environment">
1648 1650 environment
1649 1651 </a>
1650 1652 </td><td>
1651 1653 Environment Variables
1652 1654 </td></tr>
1653 1655 <tr><td>
1654 1656 <a href="/help/extensions">
1655 1657 extensions
1656 1658 </a>
1657 1659 </td><td>
1658 1660 Using Additional Features
1659 1661 </td></tr>
1660 1662 <tr><td>
1661 1663 <a href="/help/filesets">
1662 1664 filesets
1663 1665 </a>
1664 1666 </td><td>
1665 1667 Specifying File Sets
1666 1668 </td></tr>
1667 1669 <tr><td>
1668 1670 <a href="/help/glossary">
1669 1671 glossary
1670 1672 </a>
1671 1673 </td><td>
1672 1674 Glossary
1673 1675 </td></tr>
1674 1676 <tr><td>
1675 1677 <a href="/help/hgignore">
1676 1678 hgignore
1677 1679 </a>
1678 1680 </td><td>
1679 1681 Syntax for Mercurial Ignore Files
1680 1682 </td></tr>
1681 1683 <tr><td>
1682 1684 <a href="/help/hgweb">
1683 1685 hgweb
1684 1686 </a>
1685 1687 </td><td>
1686 1688 Configuring hgweb
1687 1689 </td></tr>
1688 1690 <tr><td>
1689 1691 <a href="/help/internals">
1690 1692 internals
1691 1693 </a>
1692 1694 </td><td>
1693 1695 Technical implementation topics
1694 1696 </td></tr>
1695 1697 <tr><td>
1696 1698 <a href="/help/merge-tools">
1697 1699 merge-tools
1698 1700 </a>
1699 1701 </td><td>
1700 1702 Merge Tools
1701 1703 </td></tr>
1702 1704 <tr><td>
1703 1705 <a href="/help/multirevs">
1704 1706 multirevs
1705 1707 </a>
1706 1708 </td><td>
1707 1709 Specifying Multiple Revisions
1708 1710 </td></tr>
1709 1711 <tr><td>
1710 1712 <a href="/help/patterns">
1711 1713 patterns
1712 1714 </a>
1713 1715 </td><td>
1714 1716 File Name Patterns
1715 1717 </td></tr>
1716 1718 <tr><td>
1717 1719 <a href="/help/phases">
1718 1720 phases
1719 1721 </a>
1720 1722 </td><td>
1721 1723 Working with Phases
1722 1724 </td></tr>
1723 1725 <tr><td>
1724 1726 <a href="/help/revisions">
1725 1727 revisions
1726 1728 </a>
1727 1729 </td><td>
1728 1730 Specifying Single Revisions
1729 1731 </td></tr>
1730 1732 <tr><td>
1731 1733 <a href="/help/revsets">
1732 1734 revsets
1733 1735 </a>
1734 1736 </td><td>
1735 1737 Specifying Revision Sets
1736 1738 </td></tr>
1737 1739 <tr><td>
1738 1740 <a href="/help/scripting">
1739 1741 scripting
1740 1742 </a>
1741 1743 </td><td>
1742 1744 Using Mercurial from scripts and automation
1743 1745 </td></tr>
1744 1746 <tr><td>
1745 1747 <a href="/help/subrepos">
1746 1748 subrepos
1747 1749 </a>
1748 1750 </td><td>
1749 1751 Subrepositories
1750 1752 </td></tr>
1751 1753 <tr><td>
1752 1754 <a href="/help/templating">
1753 1755 templating
1754 1756 </a>
1755 1757 </td><td>
1756 1758 Template Usage
1757 1759 </td></tr>
1758 1760 <tr><td>
1759 1761 <a href="/help/urls">
1760 1762 urls
1761 1763 </a>
1762 1764 </td><td>
1763 1765 URL Paths
1764 1766 </td></tr>
1765 1767 <tr><td>
1766 1768 <a href="/help/topic-containing-verbose">
1767 1769 topic-containing-verbose
1768 1770 </a>
1769 1771 </td><td>
1770 1772 This is the topic to test omit indicating.
1771 1773 </td></tr>
1772 1774
1773 1775 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1774 1776
1775 1777 <tr><td>
1776 1778 <a href="/help/add">
1777 1779 add
1778 1780 </a>
1779 1781 </td><td>
1780 1782 add the specified files on the next commit
1781 1783 </td></tr>
1782 1784 <tr><td>
1783 1785 <a href="/help/annotate">
1784 1786 annotate
1785 1787 </a>
1786 1788 </td><td>
1787 1789 show changeset information by line for each file
1788 1790 </td></tr>
1789 1791 <tr><td>
1790 1792 <a href="/help/clone">
1791 1793 clone
1792 1794 </a>
1793 1795 </td><td>
1794 1796 make a copy of an existing repository
1795 1797 </td></tr>
1796 1798 <tr><td>
1797 1799 <a href="/help/commit">
1798 1800 commit
1799 1801 </a>
1800 1802 </td><td>
1801 1803 commit the specified files or all outstanding changes
1802 1804 </td></tr>
1803 1805 <tr><td>
1804 1806 <a href="/help/diff">
1805 1807 diff
1806 1808 </a>
1807 1809 </td><td>
1808 1810 diff repository (or selected files)
1809 1811 </td></tr>
1810 1812 <tr><td>
1811 1813 <a href="/help/export">
1812 1814 export
1813 1815 </a>
1814 1816 </td><td>
1815 1817 dump the header and diffs for one or more changesets
1816 1818 </td></tr>
1817 1819 <tr><td>
1818 1820 <a href="/help/forget">
1819 1821 forget
1820 1822 </a>
1821 1823 </td><td>
1822 1824 forget the specified files on the next commit
1823 1825 </td></tr>
1824 1826 <tr><td>
1825 1827 <a href="/help/init">
1826 1828 init
1827 1829 </a>
1828 1830 </td><td>
1829 1831 create a new repository in the given directory
1830 1832 </td></tr>
1831 1833 <tr><td>
1832 1834 <a href="/help/log">
1833 1835 log
1834 1836 </a>
1835 1837 </td><td>
1836 1838 show revision history of entire repository or files
1837 1839 </td></tr>
1838 1840 <tr><td>
1839 1841 <a href="/help/merge">
1840 1842 merge
1841 1843 </a>
1842 1844 </td><td>
1843 1845 merge another revision into working directory
1844 1846 </td></tr>
1845 1847 <tr><td>
1846 1848 <a href="/help/pull">
1847 1849 pull
1848 1850 </a>
1849 1851 </td><td>
1850 1852 pull changes from the specified source
1851 1853 </td></tr>
1852 1854 <tr><td>
1853 1855 <a href="/help/push">
1854 1856 push
1855 1857 </a>
1856 1858 </td><td>
1857 1859 push changes to the specified destination
1858 1860 </td></tr>
1859 1861 <tr><td>
1860 1862 <a href="/help/remove">
1861 1863 remove
1862 1864 </a>
1863 1865 </td><td>
1864 1866 remove the specified files on the next commit
1865 1867 </td></tr>
1866 1868 <tr><td>
1867 1869 <a href="/help/serve">
1868 1870 serve
1869 1871 </a>
1870 1872 </td><td>
1871 1873 start stand-alone webserver
1872 1874 </td></tr>
1873 1875 <tr><td>
1874 1876 <a href="/help/status">
1875 1877 status
1876 1878 </a>
1877 1879 </td><td>
1878 1880 show changed files in the working directory
1879 1881 </td></tr>
1880 1882 <tr><td>
1881 1883 <a href="/help/summary">
1882 1884 summary
1883 1885 </a>
1884 1886 </td><td>
1885 1887 summarize working directory state
1886 1888 </td></tr>
1887 1889 <tr><td>
1888 1890 <a href="/help/update">
1889 1891 update
1890 1892 </a>
1891 1893 </td><td>
1892 1894 update working directory (or switch revisions)
1893 1895 </td></tr>
1894 1896
1895 1897 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1896 1898
1897 1899 <tr><td>
1898 1900 <a href="/help/addremove">
1899 1901 addremove
1900 1902 </a>
1901 1903 </td><td>
1902 1904 add all new files, delete all missing files
1903 1905 </td></tr>
1904 1906 <tr><td>
1905 1907 <a href="/help/archive">
1906 1908 archive
1907 1909 </a>
1908 1910 </td><td>
1909 1911 create an unversioned archive of a repository revision
1910 1912 </td></tr>
1911 1913 <tr><td>
1912 1914 <a href="/help/backout">
1913 1915 backout
1914 1916 </a>
1915 1917 </td><td>
1916 1918 reverse effect of earlier changeset
1917 1919 </td></tr>
1918 1920 <tr><td>
1919 1921 <a href="/help/bisect">
1920 1922 bisect
1921 1923 </a>
1922 1924 </td><td>
1923 1925 subdivision search of changesets
1924 1926 </td></tr>
1925 1927 <tr><td>
1926 1928 <a href="/help/bookmarks">
1927 1929 bookmarks
1928 1930 </a>
1929 1931 </td><td>
1930 1932 create a new bookmark or list existing bookmarks
1931 1933 </td></tr>
1932 1934 <tr><td>
1933 1935 <a href="/help/branch">
1934 1936 branch
1935 1937 </a>
1936 1938 </td><td>
1937 1939 set or show the current branch name
1938 1940 </td></tr>
1939 1941 <tr><td>
1940 1942 <a href="/help/branches">
1941 1943 branches
1942 1944 </a>
1943 1945 </td><td>
1944 1946 list repository named branches
1945 1947 </td></tr>
1946 1948 <tr><td>
1947 1949 <a href="/help/bundle">
1948 1950 bundle
1949 1951 </a>
1950 1952 </td><td>
1951 1953 create a changegroup file
1952 1954 </td></tr>
1953 1955 <tr><td>
1954 1956 <a href="/help/cat">
1955 1957 cat
1956 1958 </a>
1957 1959 </td><td>
1958 1960 output the current or given revision of files
1959 1961 </td></tr>
1960 1962 <tr><td>
1961 1963 <a href="/help/config">
1962 1964 config
1963 1965 </a>
1964 1966 </td><td>
1965 1967 show combined config settings from all hgrc files
1966 1968 </td></tr>
1967 1969 <tr><td>
1968 1970 <a href="/help/copy">
1969 1971 copy
1970 1972 </a>
1971 1973 </td><td>
1972 1974 mark files as copied for the next commit
1973 1975 </td></tr>
1974 1976 <tr><td>
1975 1977 <a href="/help/files">
1976 1978 files
1977 1979 </a>
1978 1980 </td><td>
1979 1981 list tracked files
1980 1982 </td></tr>
1981 1983 <tr><td>
1982 1984 <a href="/help/graft">
1983 1985 graft
1984 1986 </a>
1985 1987 </td><td>
1986 1988 copy changes from other branches onto the current branch
1987 1989 </td></tr>
1988 1990 <tr><td>
1989 1991 <a href="/help/grep">
1990 1992 grep
1991 1993 </a>
1992 1994 </td><td>
1993 1995 search for a pattern in specified files and revisions
1994 1996 </td></tr>
1995 1997 <tr><td>
1996 1998 <a href="/help/heads">
1997 1999 heads
1998 2000 </a>
1999 2001 </td><td>
2000 2002 show branch heads
2001 2003 </td></tr>
2002 2004 <tr><td>
2003 2005 <a href="/help/help">
2004 2006 help
2005 2007 </a>
2006 2008 </td><td>
2007 2009 show help for a given topic or a help overview
2008 2010 </td></tr>
2009 2011 <tr><td>
2010 2012 <a href="/help/identify">
2011 2013 identify
2012 2014 </a>
2013 2015 </td><td>
2014 2016 identify the working directory or specified revision
2015 2017 </td></tr>
2016 2018 <tr><td>
2017 2019 <a href="/help/import">
2018 2020 import
2019 2021 </a>
2020 2022 </td><td>
2021 2023 import an ordered set of patches
2022 2024 </td></tr>
2023 2025 <tr><td>
2024 2026 <a href="/help/incoming">
2025 2027 incoming
2026 2028 </a>
2027 2029 </td><td>
2028 2030 show new changesets found in source
2029 2031 </td></tr>
2030 2032 <tr><td>
2031 2033 <a href="/help/manifest">
2032 2034 manifest
2033 2035 </a>
2034 2036 </td><td>
2035 2037 output the current or given revision of the project manifest
2036 2038 </td></tr>
2037 2039 <tr><td>
2038 2040 <a href="/help/nohelp">
2039 2041 nohelp
2040 2042 </a>
2041 2043 </td><td>
2042 2044 (no help text available)
2043 2045 </td></tr>
2044 2046 <tr><td>
2045 2047 <a href="/help/outgoing">
2046 2048 outgoing
2047 2049 </a>
2048 2050 </td><td>
2049 2051 show changesets not found in the destination
2050 2052 </td></tr>
2051 2053 <tr><td>
2052 2054 <a href="/help/paths">
2053 2055 paths
2054 2056 </a>
2055 2057 </td><td>
2056 2058 show aliases for remote repositories
2057 2059 </td></tr>
2058 2060 <tr><td>
2059 2061 <a href="/help/phase">
2060 2062 phase
2061 2063 </a>
2062 2064 </td><td>
2063 2065 set or show the current phase name
2064 2066 </td></tr>
2065 2067 <tr><td>
2066 2068 <a href="/help/recover">
2067 2069 recover
2068 2070 </a>
2069 2071 </td><td>
2070 2072 roll back an interrupted transaction
2071 2073 </td></tr>
2072 2074 <tr><td>
2073 2075 <a href="/help/rename">
2074 2076 rename
2075 2077 </a>
2076 2078 </td><td>
2077 2079 rename files; equivalent of copy + remove
2078 2080 </td></tr>
2079 2081 <tr><td>
2080 2082 <a href="/help/resolve">
2081 2083 resolve
2082 2084 </a>
2083 2085 </td><td>
2084 2086 redo merges or set/view the merge status of files
2085 2087 </td></tr>
2086 2088 <tr><td>
2087 2089 <a href="/help/revert">
2088 2090 revert
2089 2091 </a>
2090 2092 </td><td>
2091 2093 restore files to their checkout state
2092 2094 </td></tr>
2093 2095 <tr><td>
2094 2096 <a href="/help/root">
2095 2097 root
2096 2098 </a>
2097 2099 </td><td>
2098 2100 print the root (top) of the current working directory
2099 2101 </td></tr>
2100 2102 <tr><td>
2101 2103 <a href="/help/tag">
2102 2104 tag
2103 2105 </a>
2104 2106 </td><td>
2105 2107 add one or more tags for the current or given revision
2106 2108 </td></tr>
2107 2109 <tr><td>
2108 2110 <a href="/help/tags">
2109 2111 tags
2110 2112 </a>
2111 2113 </td><td>
2112 2114 list repository tags
2113 2115 </td></tr>
2114 2116 <tr><td>
2115 2117 <a href="/help/unbundle">
2116 2118 unbundle
2117 2119 </a>
2118 2120 </td><td>
2119 2121 apply one or more changegroup files
2120 2122 </td></tr>
2121 2123 <tr><td>
2122 2124 <a href="/help/verify">
2123 2125 verify
2124 2126 </a>
2125 2127 </td><td>
2126 2128 verify the integrity of the repository
2127 2129 </td></tr>
2128 2130 <tr><td>
2129 2131 <a href="/help/version">
2130 2132 version
2131 2133 </a>
2132 2134 </td><td>
2133 2135 output version and copyright information
2134 2136 </td></tr>
2135 2137 </table>
2136 2138 </div>
2137 2139 </div>
2138 2140
2139 2141 <script type="text/javascript">process_dates()</script>
2140 2142
2141 2143
2142 2144 </body>
2143 2145 </html>
2144 2146
2145 2147
2146 2148 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2147 2149 200 Script output follows
2148 2150
2149 2151 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2150 2152 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2151 2153 <head>
2152 2154 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2153 2155 <meta name="robots" content="index, nofollow" />
2154 2156 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2155 2157 <script type="text/javascript" src="/static/mercurial.js"></script>
2156 2158
2157 2159 <title>Help: add</title>
2158 2160 </head>
2159 2161 <body>
2160 2162
2161 2163 <div class="container">
2162 2164 <div class="menu">
2163 2165 <div class="logo">
2164 2166 <a href="https://mercurial-scm.org/">
2165 2167 <img src="/static/hglogo.png" alt="mercurial" /></a>
2166 2168 </div>
2167 2169 <ul>
2168 2170 <li><a href="/shortlog">log</a></li>
2169 2171 <li><a href="/graph">graph</a></li>
2170 2172 <li><a href="/tags">tags</a></li>
2171 2173 <li><a href="/bookmarks">bookmarks</a></li>
2172 2174 <li><a href="/branches">branches</a></li>
2173 2175 </ul>
2174 2176 <ul>
2175 2177 <li class="active"><a href="/help">help</a></li>
2176 2178 </ul>
2177 2179 </div>
2178 2180
2179 2181 <div class="main">
2180 2182 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2181 2183 <h3>Help: add</h3>
2182 2184
2183 2185 <form class="search" action="/log">
2184 2186
2185 2187 <p><input name="rev" id="search1" type="text" size="30" /></p>
2186 2188 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2187 2189 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2188 2190 </form>
2189 2191 <div id="doc">
2190 2192 <p>
2191 2193 hg add [OPTION]... [FILE]...
2192 2194 </p>
2193 2195 <p>
2194 2196 add the specified files on the next commit
2195 2197 </p>
2196 2198 <p>
2197 2199 Schedule files to be version controlled and added to the
2198 2200 repository.
2199 2201 </p>
2200 2202 <p>
2201 2203 The files will be added to the repository at the next commit. To
2202 2204 undo an add before that, see &quot;hg forget&quot;.
2203 2205 </p>
2204 2206 <p>
2205 If no names are given, add all files to the repository.
2207 If no names are given, add all files to the repository (except
2208 files matching &quot;.hgignore&quot;).
2206 2209 </p>
2207 2210 <p>
2208 2211 Examples:
2209 2212 </p>
2210 2213 <ul>
2211 2214 <li> New (unknown) files are added automatically by &quot;hg add&quot;:
2212 2215 <pre>
2213 2216 \$ ls (re)
2214 2217 foo.c
2215 2218 \$ hg status (re)
2216 2219 ? foo.c
2217 2220 \$ hg add (re)
2218 2221 adding foo.c
2219 2222 \$ hg status (re)
2220 2223 A foo.c
2221 2224 </pre>
2222 2225 <li> Specific files to be added can be specified:
2223 2226 <pre>
2224 2227 \$ ls (re)
2225 2228 bar.c foo.c
2226 2229 \$ hg status (re)
2227 2230 ? bar.c
2228 2231 ? foo.c
2229 2232 \$ hg add bar.c (re)
2230 2233 \$ hg status (re)
2231 2234 A bar.c
2232 2235 ? foo.c
2233 2236 </pre>
2234 2237 </ul>
2235 2238 <p>
2236 2239 Returns 0 if all files are successfully added.
2237 2240 </p>
2238 2241 <p>
2239 2242 options ([+] can be repeated):
2240 2243 </p>
2241 2244 <table>
2242 2245 <tr><td>-I</td>
2243 2246 <td>--include PATTERN [+]</td>
2244 2247 <td>include names matching the given patterns</td></tr>
2245 2248 <tr><td>-X</td>
2246 2249 <td>--exclude PATTERN [+]</td>
2247 2250 <td>exclude names matching the given patterns</td></tr>
2248 2251 <tr><td>-S</td>
2249 2252 <td>--subrepos</td>
2250 2253 <td>recurse into subrepositories</td></tr>
2251 2254 <tr><td>-n</td>
2252 2255 <td>--dry-run</td>
2253 2256 <td>do not perform actions, just print output</td></tr>
2254 2257 </table>
2255 2258 <p>
2256 2259 global options ([+] can be repeated):
2257 2260 </p>
2258 2261 <table>
2259 2262 <tr><td>-R</td>
2260 2263 <td>--repository REPO</td>
2261 2264 <td>repository root directory or name of overlay bundle file</td></tr>
2262 2265 <tr><td></td>
2263 2266 <td>--cwd DIR</td>
2264 2267 <td>change working directory</td></tr>
2265 2268 <tr><td>-y</td>
2266 2269 <td>--noninteractive</td>
2267 2270 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2268 2271 <tr><td>-q</td>
2269 2272 <td>--quiet</td>
2270 2273 <td>suppress output</td></tr>
2271 2274 <tr><td>-v</td>
2272 2275 <td>--verbose</td>
2273 2276 <td>enable additional output</td></tr>
2274 2277 <tr><td></td>
2275 2278 <td>--config CONFIG [+]</td>
2276 2279 <td>set/override config option (use 'section.name=value')</td></tr>
2277 2280 <tr><td></td>
2278 2281 <td>--debug</td>
2279 2282 <td>enable debugging output</td></tr>
2280 2283 <tr><td></td>
2281 2284 <td>--debugger</td>
2282 2285 <td>start debugger</td></tr>
2283 2286 <tr><td></td>
2284 2287 <td>--encoding ENCODE</td>
2285 2288 <td>set the charset encoding (default: ascii)</td></tr>
2286 2289 <tr><td></td>
2287 2290 <td>--encodingmode MODE</td>
2288 2291 <td>set the charset encoding mode (default: strict)</td></tr>
2289 2292 <tr><td></td>
2290 2293 <td>--traceback</td>
2291 2294 <td>always print a traceback on exception</td></tr>
2292 2295 <tr><td></td>
2293 2296 <td>--time</td>
2294 2297 <td>time how long the command takes</td></tr>
2295 2298 <tr><td></td>
2296 2299 <td>--profile</td>
2297 2300 <td>print command execution profile</td></tr>
2298 2301 <tr><td></td>
2299 2302 <td>--version</td>
2300 2303 <td>output version information and exit</td></tr>
2301 2304 <tr><td>-h</td>
2302 2305 <td>--help</td>
2303 2306 <td>display help and exit</td></tr>
2304 2307 <tr><td></td>
2305 2308 <td>--hidden</td>
2306 2309 <td>consider hidden changesets</td></tr>
2307 2310 </table>
2308 2311
2309 2312 </div>
2310 2313 </div>
2311 2314 </div>
2312 2315
2313 2316 <script type="text/javascript">process_dates()</script>
2314 2317
2315 2318
2316 2319 </body>
2317 2320 </html>
2318 2321
2319 2322
2320 2323 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2321 2324 200 Script output follows
2322 2325
2323 2326 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2324 2327 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2325 2328 <head>
2326 2329 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2327 2330 <meta name="robots" content="index, nofollow" />
2328 2331 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2329 2332 <script type="text/javascript" src="/static/mercurial.js"></script>
2330 2333
2331 2334 <title>Help: remove</title>
2332 2335 </head>
2333 2336 <body>
2334 2337
2335 2338 <div class="container">
2336 2339 <div class="menu">
2337 2340 <div class="logo">
2338 2341 <a href="https://mercurial-scm.org/">
2339 2342 <img src="/static/hglogo.png" alt="mercurial" /></a>
2340 2343 </div>
2341 2344 <ul>
2342 2345 <li><a href="/shortlog">log</a></li>
2343 2346 <li><a href="/graph">graph</a></li>
2344 2347 <li><a href="/tags">tags</a></li>
2345 2348 <li><a href="/bookmarks">bookmarks</a></li>
2346 2349 <li><a href="/branches">branches</a></li>
2347 2350 </ul>
2348 2351 <ul>
2349 2352 <li class="active"><a href="/help">help</a></li>
2350 2353 </ul>
2351 2354 </div>
2352 2355
2353 2356 <div class="main">
2354 2357 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2355 2358 <h3>Help: remove</h3>
2356 2359
2357 2360 <form class="search" action="/log">
2358 2361
2359 2362 <p><input name="rev" id="search1" type="text" size="30" /></p>
2360 2363 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2361 2364 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2362 2365 </form>
2363 2366 <div id="doc">
2364 2367 <p>
2365 2368 hg remove [OPTION]... FILE...
2366 2369 </p>
2367 2370 <p>
2368 2371 aliases: rm
2369 2372 </p>
2370 2373 <p>
2371 2374 remove the specified files on the next commit
2372 2375 </p>
2373 2376 <p>
2374 2377 Schedule the indicated files for removal from the current branch.
2375 2378 </p>
2376 2379 <p>
2377 2380 This command schedules the files to be removed at the next commit.
2378 2381 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2379 2382 files, see &quot;hg forget&quot;.
2380 2383 </p>
2381 2384 <p>
2382 2385 -A/--after can be used to remove only files that have already
2383 2386 been deleted, -f/--force can be used to force deletion, and -Af
2384 2387 can be used to remove files from the next revision without
2385 2388 deleting them from the working directory.
2386 2389 </p>
2387 2390 <p>
2388 2391 The following table details the behavior of remove for different
2389 2392 file states (columns) and option combinations (rows). The file
2390 2393 states are Added [A], Clean [C], Modified [M] and Missing [!]
2391 2394 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2392 2395 (from branch) and Delete (from disk):
2393 2396 </p>
2394 2397 <table>
2395 2398 <tr><td>opt/state</td>
2396 2399 <td>A</td>
2397 2400 <td>C</td>
2398 2401 <td>M</td>
2399 2402 <td>!</td></tr>
2400 2403 <tr><td>none</td>
2401 2404 <td>W</td>
2402 2405 <td>RD</td>
2403 2406 <td>W</td>
2404 2407 <td>R</td></tr>
2405 2408 <tr><td>-f</td>
2406 2409 <td>R</td>
2407 2410 <td>RD</td>
2408 2411 <td>RD</td>
2409 2412 <td>R</td></tr>
2410 2413 <tr><td>-A</td>
2411 2414 <td>W</td>
2412 2415 <td>W</td>
2413 2416 <td>W</td>
2414 2417 <td>R</td></tr>
2415 2418 <tr><td>-Af</td>
2416 2419 <td>R</td>
2417 2420 <td>R</td>
2418 2421 <td>R</td>
2419 2422 <td>R</td></tr>
2420 2423 </table>
2421 2424 <p>
2422 2425 Note that remove never deletes files in Added [A] state from the
2423 2426 working directory, not even if option --force is specified.
2424 2427 </p>
2425 2428 <p>
2426 2429 Returns 0 on success, 1 if any warnings encountered.
2427 2430 </p>
2428 2431 <p>
2429 2432 options ([+] can be repeated):
2430 2433 </p>
2431 2434 <table>
2432 2435 <tr><td>-A</td>
2433 2436 <td>--after</td>
2434 2437 <td>record delete for missing files</td></tr>
2435 2438 <tr><td>-f</td>
2436 2439 <td>--force</td>
2437 2440 <td>remove (and delete) file even if added or modified</td></tr>
2438 2441 <tr><td>-S</td>
2439 2442 <td>--subrepos</td>
2440 2443 <td>recurse into subrepositories</td></tr>
2441 2444 <tr><td>-I</td>
2442 2445 <td>--include PATTERN [+]</td>
2443 2446 <td>include names matching the given patterns</td></tr>
2444 2447 <tr><td>-X</td>
2445 2448 <td>--exclude PATTERN [+]</td>
2446 2449 <td>exclude names matching the given patterns</td></tr>
2447 2450 </table>
2448 2451 <p>
2449 2452 global options ([+] can be repeated):
2450 2453 </p>
2451 2454 <table>
2452 2455 <tr><td>-R</td>
2453 2456 <td>--repository REPO</td>
2454 2457 <td>repository root directory or name of overlay bundle file</td></tr>
2455 2458 <tr><td></td>
2456 2459 <td>--cwd DIR</td>
2457 2460 <td>change working directory</td></tr>
2458 2461 <tr><td>-y</td>
2459 2462 <td>--noninteractive</td>
2460 2463 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2461 2464 <tr><td>-q</td>
2462 2465 <td>--quiet</td>
2463 2466 <td>suppress output</td></tr>
2464 2467 <tr><td>-v</td>
2465 2468 <td>--verbose</td>
2466 2469 <td>enable additional output</td></tr>
2467 2470 <tr><td></td>
2468 2471 <td>--config CONFIG [+]</td>
2469 2472 <td>set/override config option (use 'section.name=value')</td></tr>
2470 2473 <tr><td></td>
2471 2474 <td>--debug</td>
2472 2475 <td>enable debugging output</td></tr>
2473 2476 <tr><td></td>
2474 2477 <td>--debugger</td>
2475 2478 <td>start debugger</td></tr>
2476 2479 <tr><td></td>
2477 2480 <td>--encoding ENCODE</td>
2478 2481 <td>set the charset encoding (default: ascii)</td></tr>
2479 2482 <tr><td></td>
2480 2483 <td>--encodingmode MODE</td>
2481 2484 <td>set the charset encoding mode (default: strict)</td></tr>
2482 2485 <tr><td></td>
2483 2486 <td>--traceback</td>
2484 2487 <td>always print a traceback on exception</td></tr>
2485 2488 <tr><td></td>
2486 2489 <td>--time</td>
2487 2490 <td>time how long the command takes</td></tr>
2488 2491 <tr><td></td>
2489 2492 <td>--profile</td>
2490 2493 <td>print command execution profile</td></tr>
2491 2494 <tr><td></td>
2492 2495 <td>--version</td>
2493 2496 <td>output version information and exit</td></tr>
2494 2497 <tr><td>-h</td>
2495 2498 <td>--help</td>
2496 2499 <td>display help and exit</td></tr>
2497 2500 <tr><td></td>
2498 2501 <td>--hidden</td>
2499 2502 <td>consider hidden changesets</td></tr>
2500 2503 </table>
2501 2504
2502 2505 </div>
2503 2506 </div>
2504 2507 </div>
2505 2508
2506 2509 <script type="text/javascript">process_dates()</script>
2507 2510
2508 2511
2509 2512 </body>
2510 2513 </html>
2511 2514
2512 2515
2513 2516 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2514 2517 200 Script output follows
2515 2518
2516 2519 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2517 2520 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2518 2521 <head>
2519 2522 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2520 2523 <meta name="robots" content="index, nofollow" />
2521 2524 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2522 2525 <script type="text/javascript" src="/static/mercurial.js"></script>
2523 2526
2524 2527 <title>Help: revisions</title>
2525 2528 </head>
2526 2529 <body>
2527 2530
2528 2531 <div class="container">
2529 2532 <div class="menu">
2530 2533 <div class="logo">
2531 2534 <a href="https://mercurial-scm.org/">
2532 2535 <img src="/static/hglogo.png" alt="mercurial" /></a>
2533 2536 </div>
2534 2537 <ul>
2535 2538 <li><a href="/shortlog">log</a></li>
2536 2539 <li><a href="/graph">graph</a></li>
2537 2540 <li><a href="/tags">tags</a></li>
2538 2541 <li><a href="/bookmarks">bookmarks</a></li>
2539 2542 <li><a href="/branches">branches</a></li>
2540 2543 </ul>
2541 2544 <ul>
2542 2545 <li class="active"><a href="/help">help</a></li>
2543 2546 </ul>
2544 2547 </div>
2545 2548
2546 2549 <div class="main">
2547 2550 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2548 2551 <h3>Help: revisions</h3>
2549 2552
2550 2553 <form class="search" action="/log">
2551 2554
2552 2555 <p><input name="rev" id="search1" type="text" size="30" /></p>
2553 2556 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2554 2557 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2555 2558 </form>
2556 2559 <div id="doc">
2557 2560 <h1>Specifying Single Revisions</h1>
2558 2561 <p>
2559 2562 Mercurial supports several ways to specify individual revisions.
2560 2563 </p>
2561 2564 <p>
2562 2565 A plain integer is treated as a revision number. Negative integers are
2563 2566 treated as sequential offsets from the tip, with -1 denoting the tip,
2564 2567 -2 denoting the revision prior to the tip, and so forth.
2565 2568 </p>
2566 2569 <p>
2567 2570 A 40-digit hexadecimal string is treated as a unique revision
2568 2571 identifier.
2569 2572 </p>
2570 2573 <p>
2571 2574 A hexadecimal string less than 40 characters long is treated as a
2572 2575 unique revision identifier and is referred to as a short-form
2573 2576 identifier. A short-form identifier is only valid if it is the prefix
2574 2577 of exactly one full-length identifier.
2575 2578 </p>
2576 2579 <p>
2577 2580 Any other string is treated as a bookmark, tag, or branch name. A
2578 2581 bookmark is a movable pointer to a revision. A tag is a permanent name
2579 2582 associated with a revision. A branch name denotes the tipmost open branch head
2580 2583 of that branch - or if they are all closed, the tipmost closed head of the
2581 2584 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2582 2585 </p>
2583 2586 <p>
2584 2587 The reserved name &quot;tip&quot; always identifies the most recent revision.
2585 2588 </p>
2586 2589 <p>
2587 2590 The reserved name &quot;null&quot; indicates the null revision. This is the
2588 2591 revision of an empty repository, and the parent of revision 0.
2589 2592 </p>
2590 2593 <p>
2591 2594 The reserved name &quot;.&quot; indicates the working directory parent. If no
2592 2595 working directory is checked out, it is equivalent to null. If an
2593 2596 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2594 2597 parent.
2595 2598 </p>
2596 2599
2597 2600 </div>
2598 2601 </div>
2599 2602 </div>
2600 2603
2601 2604 <script type="text/javascript">process_dates()</script>
2602 2605
2603 2606
2604 2607 </body>
2605 2608 </html>
2606 2609
2607 2610
2608 2611 $ killdaemons.py
2609 2612
2610 2613 #endif
General Comments 0
You need to be logged in to leave comments. Login now