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