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