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