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