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