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