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