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