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