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