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