##// END OF EJS Templates
Make debugcomplete -v print aliases as well as commands
Brendan Cully -
r7509:62e5d41b default
parent child Browse files
Show More
@@ -1,3403 +1,3406 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
6 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from repo import RepoError, NoCapability
10 10 from i18n import _, gettext
11 11 import os, re, sys
12 12 import hg, util, revlog, bundlerepo, extensions, copies, context
13 13 import difflib, patch, time, help, mdiff, tempfile, url
14 14 import version
15 15 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
16 16 import merge as merge_
17 17
18 18 # Commands start here, listed alphabetically
19 19
20 20 def add(ui, repo, *pats, **opts):
21 21 """add the specified files on the next commit
22 22
23 23 Schedule files to be version controlled and added to the repository.
24 24
25 25 The files will be added to the repository at the next commit. To
26 26 undo an add before that, see hg revert.
27 27
28 28 If no names are given, add all files in the repository.
29 29 """
30 30
31 31 rejected = None
32 32 exacts = {}
33 33 names = []
34 34 m = cmdutil.match(repo, pats, opts)
35 35 m.bad = lambda x,y: True
36 36 for abs in repo.walk(m):
37 37 if m.exact(abs):
38 38 if ui.verbose:
39 39 ui.status(_('adding %s\n') % m.rel(abs))
40 40 names.append(abs)
41 41 exacts[abs] = 1
42 42 elif abs not in repo.dirstate:
43 43 ui.status(_('adding %s\n') % m.rel(abs))
44 44 names.append(abs)
45 45 if not opts.get('dry_run'):
46 46 rejected = repo.add(names)
47 47 rejected = [p for p in rejected if p in exacts]
48 48 return rejected and 1 or 0
49 49
50 50 def addremove(ui, repo, *pats, **opts):
51 51 """add all new files, delete all missing files
52 52
53 53 Add all new files and remove all missing files from the repository.
54 54
55 55 New files are ignored if they match any of the patterns in .hgignore. As
56 56 with add, these changes take effect at the next commit.
57 57
58 58 Use the -s option to detect renamed files. With a parameter > 0,
59 59 this compares every removed file with every added file and records
60 60 those similar enough as renames. This option takes a percentage
61 61 between 0 (disabled) and 100 (files must be identical) as its
62 62 parameter. Detecting renamed files this way can be expensive.
63 63 """
64 64 try:
65 65 sim = float(opts.get('similarity') or 0)
66 66 except ValueError:
67 67 raise util.Abort(_('similarity must be a number'))
68 68 if sim < 0 or sim > 100:
69 69 raise util.Abort(_('similarity must be between 0 and 100'))
70 70 return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
71 71
72 72 def annotate(ui, repo, *pats, **opts):
73 73 """show changeset information per file line
74 74
75 75 List changes in files, showing the revision id responsible for each line
76 76
77 77 This command is useful to discover who did a change or when a change took
78 78 place.
79 79
80 80 Without the -a option, annotate will avoid processing files it
81 81 detects as binary. With -a, annotate will generate an annotation
82 82 anyway, probably with undesirable results.
83 83 """
84 84 datefunc = ui.quiet and util.shortdate or util.datestr
85 85 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
86 86
87 87 if not pats:
88 88 raise util.Abort(_('at least one file name or pattern required'))
89 89
90 90 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
91 91 ('number', lambda x: str(x[0].rev())),
92 92 ('changeset', lambda x: short(x[0].node())),
93 93 ('date', getdate),
94 94 ('follow', lambda x: x[0].path()),
95 95 ]
96 96
97 97 if (not opts.get('user') and not opts.get('changeset') and not opts.get('date')
98 98 and not opts.get('follow')):
99 99 opts['number'] = 1
100 100
101 101 linenumber = opts.get('line_number') is not None
102 102 if (linenumber and (not opts.get('changeset')) and (not opts.get('number'))):
103 103 raise util.Abort(_('at least one of -n/-c is required for -l'))
104 104
105 105 funcmap = [func for op, func in opmap if opts.get(op)]
106 106 if linenumber:
107 107 lastfunc = funcmap[-1]
108 108 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
109 109
110 110 ctx = repo[opts.get('rev')]
111 111
112 112 m = cmdutil.match(repo, pats, opts)
113 113 for abs in ctx.walk(m):
114 114 fctx = ctx[abs]
115 115 if not opts.get('text') and util.binary(fctx.data()):
116 116 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
117 117 continue
118 118
119 119 lines = fctx.annotate(follow=opts.get('follow'),
120 120 linenumber=linenumber)
121 121 pieces = []
122 122
123 123 for f in funcmap:
124 124 l = [f(n) for n, dummy in lines]
125 125 if l:
126 126 ml = max(map(len, l))
127 127 pieces.append(["%*s" % (ml, x) for x in l])
128 128
129 129 if pieces:
130 130 for p, l in zip(zip(*pieces), lines):
131 131 ui.write("%s: %s" % (" ".join(p), l[1]))
132 132
133 133 def archive(ui, repo, dest, **opts):
134 134 '''create unversioned archive of a repository revision
135 135
136 136 By default, the revision used is the parent of the working
137 137 directory; use "-r" to specify a different revision.
138 138
139 139 To specify the type of archive to create, use "-t". Valid
140 140 types are:
141 141
142 142 "files" (default): a directory full of files
143 143 "tar": tar archive, uncompressed
144 144 "tbz2": tar archive, compressed using bzip2
145 145 "tgz": tar archive, compressed using gzip
146 146 "uzip": zip archive, uncompressed
147 147 "zip": zip archive, compressed using deflate
148 148
149 149 The exact name of the destination archive or directory is given
150 150 using a format string; see "hg help export" for details.
151 151
152 152 Each member added to an archive file has a directory prefix
153 153 prepended. Use "-p" to specify a format string for the prefix.
154 154 The default is the basename of the archive, with suffixes removed.
155 155 '''
156 156
157 157 ctx = repo[opts.get('rev')]
158 158 if not ctx:
159 159 raise util.Abort(_('repository has no revisions'))
160 160 node = ctx.node()
161 161 dest = cmdutil.make_filename(repo, dest, node)
162 162 if os.path.realpath(dest) == repo.root:
163 163 raise util.Abort(_('repository root cannot be destination'))
164 164 matchfn = cmdutil.match(repo, [], opts)
165 165 kind = opts.get('type') or 'files'
166 166 prefix = opts.get('prefix')
167 167 if dest == '-':
168 168 if kind == 'files':
169 169 raise util.Abort(_('cannot archive plain files to stdout'))
170 170 dest = sys.stdout
171 171 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
172 172 prefix = cmdutil.make_filename(repo, prefix, node)
173 173 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
174 174 matchfn, prefix)
175 175
176 176 def backout(ui, repo, node=None, rev=None, **opts):
177 177 '''reverse effect of earlier changeset
178 178
179 179 Commit the backed out changes as a new changeset. The new
180 180 changeset is a child of the backed out changeset.
181 181
182 182 If you back out a changeset other than the tip, a new head is
183 183 created. This head will be the new tip and you should merge this
184 184 backout changeset with another head (current one by default).
185 185
186 186 The --merge option remembers the parent of the working directory
187 187 before starting the backout, then merges the new head with that
188 188 changeset afterwards. This saves you from doing the merge by
189 189 hand. The result of this merge is not committed, as for a normal
190 190 merge.
191 191
192 192 See \'hg help dates\' for a list of formats valid for -d/--date.
193 193 '''
194 194 if rev and node:
195 195 raise util.Abort(_("please specify just one revision"))
196 196
197 197 if not rev:
198 198 rev = node
199 199
200 200 if not rev:
201 201 raise util.Abort(_("please specify a revision to backout"))
202 202
203 203 date = opts.get('date')
204 204 if date:
205 205 opts['date'] = util.parsedate(date)
206 206
207 207 cmdutil.bail_if_changed(repo)
208 208 node = repo.lookup(rev)
209 209
210 210 op1, op2 = repo.dirstate.parents()
211 211 a = repo.changelog.ancestor(op1, node)
212 212 if a != node:
213 213 raise util.Abort(_('cannot back out change on a different branch'))
214 214
215 215 p1, p2 = repo.changelog.parents(node)
216 216 if p1 == nullid:
217 217 raise util.Abort(_('cannot back out a change with no parents'))
218 218 if p2 != nullid:
219 219 if not opts.get('parent'):
220 220 raise util.Abort(_('cannot back out a merge changeset without '
221 221 '--parent'))
222 222 p = repo.lookup(opts['parent'])
223 223 if p not in (p1, p2):
224 224 raise util.Abort(_('%s is not a parent of %s') %
225 225 (short(p), short(node)))
226 226 parent = p
227 227 else:
228 228 if opts.get('parent'):
229 229 raise util.Abort(_('cannot use --parent on non-merge changeset'))
230 230 parent = p1
231 231
232 232 # the backout should appear on the same branch
233 233 branch = repo.dirstate.branch()
234 234 hg.clean(repo, node, show_stats=False)
235 235 repo.dirstate.setbranch(branch)
236 236 revert_opts = opts.copy()
237 237 revert_opts['date'] = None
238 238 revert_opts['all'] = True
239 239 revert_opts['rev'] = hex(parent)
240 240 revert_opts['no_backup'] = None
241 241 revert(ui, repo, **revert_opts)
242 242 commit_opts = opts.copy()
243 243 commit_opts['addremove'] = False
244 244 if not commit_opts['message'] and not commit_opts['logfile']:
245 245 commit_opts['message'] = _("Backed out changeset %s") % (short(node))
246 246 commit_opts['force_editor'] = True
247 247 commit(ui, repo, **commit_opts)
248 248 def nice(node):
249 249 return '%d:%s' % (repo.changelog.rev(node), short(node))
250 250 ui.status(_('changeset %s backs out changeset %s\n') %
251 251 (nice(repo.changelog.tip()), nice(node)))
252 252 if op1 != node:
253 253 hg.clean(repo, op1, show_stats=False)
254 254 if opts.get('merge'):
255 255 ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
256 256 hg.merge(repo, hex(repo.changelog.tip()))
257 257 else:
258 258 ui.status(_('the backout changeset is a new head - '
259 259 'do not forget to merge\n'))
260 260 ui.status(_('(use "backout --merge" '
261 261 'if you want to auto-merge)\n'))
262 262
263 263 def bisect(ui, repo, rev=None, extra=None, command=None,
264 264 reset=None, good=None, bad=None, skip=None, noupdate=None):
265 265 """subdivision search of changesets
266 266
267 267 This command helps to find changesets which introduce problems.
268 268 To use, mark the earliest changeset you know exhibits the problem
269 269 as bad, then mark the latest changeset which is free from the
270 270 problem as good. Bisect will update your working directory to a
271 271 revision for testing (unless the --noupdate option is specified).
272 272 Once you have performed tests, mark the working directory as bad
273 273 or good and bisect will either update to another candidate changeset
274 274 or announce that it has found the bad revision.
275 275
276 276 As a shortcut, you can also use the revision argument to mark a
277 277 revision as good or bad without checking it out first.
278 278
279 279 If you supply a command it will be used for automatic bisection. Its exit
280 280 status will be used as flag to mark revision as bad or good. In case exit
281 281 status is 0 the revision is marked as good, 125 - skipped, 127 (command not
282 282 found) - bisection will be aborted and any other status bigger than 0 will
283 283 mark revision as bad.
284 284 """
285 285 def print_result(nodes, good):
286 286 displayer = cmdutil.show_changeset(ui, repo, {})
287 287 transition = (good and "good" or "bad")
288 288 if len(nodes) == 1:
289 289 # narrowed it down to a single revision
290 290 ui.write(_("The first %s revision is:\n") % transition)
291 291 displayer.show(repo[nodes[0]])
292 292 else:
293 293 # multiple possible revisions
294 294 ui.write(_("Due to skipped revisions, the first "
295 295 "%s revision could be any of:\n") % transition)
296 296 for n in nodes:
297 297 displayer.show(repo[n])
298 298
299 299 def check_state(state, interactive=True):
300 300 if not state['good'] or not state['bad']:
301 301 if (good or bad or skip or reset) and interactive:
302 302 return
303 303 if not state['good']:
304 304 raise util.Abort(_('cannot bisect (no known good revisions)'))
305 305 else:
306 306 raise util.Abort(_('cannot bisect (no known bad revisions)'))
307 307 return True
308 308
309 309 # backward compatibility
310 310 if rev in "good bad reset init".split():
311 311 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
312 312 cmd, rev, extra = rev, extra, None
313 313 if cmd == "good":
314 314 good = True
315 315 elif cmd == "bad":
316 316 bad = True
317 317 else:
318 318 reset = True
319 319 elif extra or good + bad + skip + reset + bool(command) > 1:
320 320 raise util.Abort(_('incompatible arguments'))
321 321
322 322 if reset:
323 323 p = repo.join("bisect.state")
324 324 if os.path.exists(p):
325 325 os.unlink(p)
326 326 return
327 327
328 328 state = hbisect.load_state(repo)
329 329
330 330 if command:
331 331 changesets = 1
332 332 while changesets:
333 333 # update state
334 334 status = os.spawnlp(os.P_WAIT, command)
335 335 node = repo.lookup(rev or '.')
336 336 if status == 125:
337 337 transition = "skip"
338 338 elif status == 0:
339 339 transition = "good"
340 340 # status < 0 means process was killed
341 341 elif status == 127 or status < 0:
342 342 break
343 343 else:
344 344 transition = "bad"
345 345 state[transition].append(node)
346 346 ui.note(_('Changeset %s: %s\n') % (short(node), transition))
347 347 check_state(state, interactive=False)
348 348 # bisect
349 349 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
350 350 # update to next check
351 351 cmdutil.bail_if_changed(repo)
352 352 hg.clean(repo, nodes[0], show_stats=False)
353 353 hbisect.save_state(repo, state)
354 354 return print_result(nodes, not status)
355 355
356 356 # update state
357 357 node = repo.lookup(rev or '.')
358 358 if good:
359 359 state['good'].append(node)
360 360 elif bad:
361 361 state['bad'].append(node)
362 362 elif skip:
363 363 state['skip'].append(node)
364 364
365 365 hbisect.save_state(repo, state)
366 366
367 367 if not check_state(state):
368 368 return
369 369
370 370 # actually bisect
371 371 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
372 372 if changesets == 0:
373 373 print_result(nodes, good)
374 374 else:
375 375 assert len(nodes) == 1 # only a single node can be tested next
376 376 node = nodes[0]
377 377 # compute the approximate number of remaining tests
378 378 tests, size = 0, 2
379 379 while size <= changesets:
380 380 tests, size = tests + 1, size * 2
381 381 rev = repo.changelog.rev(node)
382 382 ui.write(_("Testing changeset %s:%s "
383 383 "(%s changesets remaining, ~%s tests)\n")
384 384 % (rev, short(node), changesets, tests))
385 385 if not noupdate:
386 386 cmdutil.bail_if_changed(repo)
387 387 return hg.clean(repo, node)
388 388
389 389 def branch(ui, repo, label=None, **opts):
390 390 """set or show the current branch name
391 391
392 392 With no argument, show the current branch name. With one argument,
393 393 set the working directory branch name (the branch does not exist in
394 394 the repository until the next commit).
395 395
396 396 Unless --force is specified, branch will not let you set a
397 397 branch name that shadows an existing branch.
398 398
399 399 Use --clean to reset the working directory branch to that of the
400 400 parent of the working directory, negating a previous branch change.
401 401
402 402 Use the command 'hg update' to switch to an existing branch.
403 403 """
404 404
405 405 if opts.get('clean'):
406 406 label = repo[None].parents()[0].branch()
407 407 repo.dirstate.setbranch(label)
408 408 ui.status(_('reset working directory to branch %s\n') % label)
409 409 elif label:
410 410 if not opts.get('force') and label in repo.branchtags():
411 411 if label not in [p.branch() for p in repo.parents()]:
412 412 raise util.Abort(_('a branch of the same name already exists'
413 413 ' (use --force to override)'))
414 414 repo.dirstate.setbranch(util.fromlocal(label))
415 415 ui.status(_('marked working directory as branch %s\n') % label)
416 416 else:
417 417 ui.write("%s\n" % util.tolocal(repo.dirstate.branch()))
418 418
419 419 def branches(ui, repo, active=False):
420 420 """list repository named branches
421 421
422 422 List the repository's named branches, indicating which ones are
423 423 inactive. If active is specified, only show active branches.
424 424
425 425 A branch is considered active if it contains repository heads.
426 426
427 427 Use the command 'hg update' to switch to an existing branch.
428 428 """
429 429 hexfunc = ui.debugflag and hex or short
430 430 activebranches = [util.tolocal(repo[n].branch())
431 431 for n in repo.heads()]
432 432 branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag)
433 433 for tag, node in repo.branchtags().items()])
434 434 branches.reverse()
435 435
436 436 for isactive, node, tag in branches:
437 437 if (not active) or isactive:
438 438 if ui.quiet:
439 439 ui.write("%s\n" % tag)
440 440 else:
441 441 rev = str(node).rjust(31 - util.locallen(tag))
442 442 isinactive = ((not isactive) and " (inactive)") or ''
443 443 data = tag, rev, hexfunc(repo.lookup(node)), isinactive
444 444 ui.write("%s %s:%s%s\n" % data)
445 445
446 446 def bundle(ui, repo, fname, dest=None, **opts):
447 447 """create a changegroup file
448 448
449 449 Generate a compressed changegroup file collecting changesets not
450 450 found in the other repository.
451 451
452 452 If no destination repository is specified the destination is
453 453 assumed to have all the nodes specified by one or more --base
454 454 parameters. To create a bundle containing all changesets, use
455 455 --all (or --base null). To change the compression method applied,
456 456 use the -t option (by default, bundles are compressed using bz2).
457 457
458 458 The bundle file can then be transferred using conventional means and
459 459 applied to another repository with the unbundle or pull command.
460 460 This is useful when direct push and pull are not available or when
461 461 exporting an entire repository is undesirable.
462 462
463 463 Applying bundles preserves all changeset contents including
464 464 permissions, copy/rename information, and revision history.
465 465 """
466 466 revs = opts.get('rev') or None
467 467 if revs:
468 468 revs = [repo.lookup(rev) for rev in revs]
469 469 if opts.get('all'):
470 470 base = ['null']
471 471 else:
472 472 base = opts.get('base')
473 473 if base:
474 474 if dest:
475 475 raise util.Abort(_("--base is incompatible with specifiying "
476 476 "a destination"))
477 477 base = [repo.lookup(rev) for rev in base]
478 478 # create the right base
479 479 # XXX: nodesbetween / changegroup* should be "fixed" instead
480 480 o = []
481 481 has = {nullid: None}
482 482 for n in base:
483 483 has.update(repo.changelog.reachable(n))
484 484 if revs:
485 485 visit = list(revs)
486 486 else:
487 487 visit = repo.changelog.heads()
488 488 seen = {}
489 489 while visit:
490 490 n = visit.pop(0)
491 491 parents = [p for p in repo.changelog.parents(n) if p not in has]
492 492 if len(parents) == 0:
493 493 o.insert(0, n)
494 494 else:
495 495 for p in parents:
496 496 if p not in seen:
497 497 seen[p] = 1
498 498 visit.append(p)
499 499 else:
500 500 cmdutil.setremoteconfig(ui, opts)
501 501 dest, revs, checkout = hg.parseurl(
502 502 ui.expandpath(dest or 'default-push', dest or 'default'), revs)
503 503 other = hg.repository(ui, dest)
504 504 o = repo.findoutgoing(other, force=opts.get('force'))
505 505
506 506 if revs:
507 507 cg = repo.changegroupsubset(o, revs, 'bundle')
508 508 else:
509 509 cg = repo.changegroup(o, 'bundle')
510 510
511 511 bundletype = opts.get('type', 'bzip2').lower()
512 512 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
513 513 bundletype = btypes.get(bundletype)
514 514 if bundletype not in changegroup.bundletypes:
515 515 raise util.Abort(_('unknown bundle type specified with --type'))
516 516
517 517 changegroup.writebundle(cg, fname, bundletype)
518 518
519 519 def cat(ui, repo, file1, *pats, **opts):
520 520 """output the current or given revision of files
521 521
522 522 Print the specified files as they were at the given revision.
523 523 If no revision is given, the parent of the working directory is used,
524 524 or tip if no revision is checked out.
525 525
526 526 Output may be to a file, in which case the name of the file is
527 527 given using a format string. The formatting rules are the same as
528 528 for the export command, with the following additions:
529 529
530 530 %s basename of file being printed
531 531 %d dirname of file being printed, or '.' if in repo root
532 532 %p root-relative path name of file being printed
533 533 """
534 534 ctx = repo[opts.get('rev')]
535 535 err = 1
536 536 m = cmdutil.match(repo, (file1,) + pats, opts)
537 537 for abs in ctx.walk(m):
538 538 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
539 539 data = ctx[abs].data()
540 540 if opts.get('decode'):
541 541 data = repo.wwritedata(abs, data)
542 542 fp.write(data)
543 543 err = 0
544 544 return err
545 545
546 546 def clone(ui, source, dest=None, **opts):
547 547 """make a copy of an existing repository
548 548
549 549 Create a copy of an existing repository in a new directory.
550 550
551 551 If no destination directory name is specified, it defaults to the
552 552 basename of the source.
553 553
554 554 The location of the source is added to the new repository's
555 555 .hg/hgrc file, as the default to be used for future pulls.
556 556
557 557 For efficiency, hardlinks are used for cloning whenever the source
558 558 and destination are on the same filesystem (note this applies only
559 559 to the repository data, not to the checked out files). Some
560 560 filesystems, such as AFS, implement hardlinking incorrectly, but
561 561 do not report errors. In these cases, use the --pull option to
562 562 avoid hardlinking.
563 563
564 564 In some cases, you can clone repositories and checked out files
565 565 using full hardlinks with
566 566
567 567 $ cp -al REPO REPOCLONE
568 568
569 569 This is the fastest way to clone, but it is not always safe. The
570 570 operation is not atomic (making sure REPO is not modified during
571 571 the operation is up to you) and you have to make sure your editor
572 572 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
573 573 this is not compatible with certain extensions that place their
574 574 metadata under the .hg directory, such as mq.
575 575
576 576 If you use the -r option to clone up to a specific revision, no
577 577 subsequent revisions will be present in the cloned repository.
578 578 This option implies --pull, even on local repositories.
579 579
580 580 If the -U option is used, the new clone will contain only a repository
581 581 (.hg) and no working copy (the working copy parent is the null revision).
582 582
583 583 See pull for valid source format details.
584 584
585 585 It is possible to specify an ssh:// URL as the destination, but no
586 586 .hg/hgrc and working directory will be created on the remote side.
587 587 Look at the help text for the pull command for important details
588 588 about ssh:// URLs.
589 589 """
590 590 cmdutil.setremoteconfig(ui, opts)
591 591 hg.clone(ui, source, dest,
592 592 pull=opts.get('pull'),
593 593 stream=opts.get('uncompressed'),
594 594 rev=opts.get('rev'),
595 595 update=not opts.get('noupdate'))
596 596
597 597 def commit(ui, repo, *pats, **opts):
598 598 """commit the specified files or all outstanding changes
599 599
600 600 Commit changes to the given files into the repository.
601 601
602 602 If a list of files is omitted, all changes reported by "hg status"
603 603 will be committed.
604 604
605 605 If you are committing the result of a merge, do not provide any
606 606 file names or -I/-X filters.
607 607
608 608 If no commit message is specified, the configured editor is started to
609 609 enter a message.
610 610
611 611 See 'hg help dates' for a list of formats valid for -d/--date.
612 612 """
613 613 def commitfunc(ui, repo, message, match, opts):
614 614 return repo.commit(match.files(), message, opts.get('user'), opts.get('date'),
615 615 match, force_editor=opts.get('force_editor'))
616 616
617 617 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
618 618 if not node:
619 619 return
620 620 cl = repo.changelog
621 621 rev = cl.rev(node)
622 622 parents = cl.parentrevs(rev)
623 623 if rev - 1 in parents:
624 624 # one of the parents was the old tip
625 625 pass
626 626 elif (parents == (nullrev, nullrev) or
627 627 len(cl.heads(cl.node(parents[0]))) > 1 and
628 628 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
629 629 ui.status(_('created new head\n'))
630 630
631 631 if ui.debugflag:
632 632 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node)))
633 633 elif ui.verbose:
634 634 ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
635 635
636 636 def copy(ui, repo, *pats, **opts):
637 637 """mark files as copied for the next commit
638 638
639 639 Mark dest as having copies of source files. If dest is a
640 640 directory, copies are put in that directory. If dest is a file,
641 641 there can only be one source.
642 642
643 643 By default, this command copies the contents of files as they
644 644 stand in the working directory. If invoked with --after, the
645 645 operation is recorded, but no copying is performed.
646 646
647 647 This command takes effect in the next commit. To undo a copy
648 648 before that, see hg revert.
649 649 """
650 650 wlock = repo.wlock(False)
651 651 try:
652 652 return cmdutil.copy(ui, repo, pats, opts)
653 653 finally:
654 654 del wlock
655 655
656 656 def debugancestor(ui, repo, *args):
657 657 """find the ancestor revision of two revisions in a given index"""
658 658 if len(args) == 3:
659 659 index, rev1, rev2 = args
660 660 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
661 661 lookup = r.lookup
662 662 elif len(args) == 2:
663 663 if not repo:
664 664 raise util.Abort(_("There is no Mercurial repository here "
665 665 "(.hg not found)"))
666 666 rev1, rev2 = args
667 667 r = repo.changelog
668 668 lookup = repo.lookup
669 669 else:
670 670 raise util.Abort(_('either two or three arguments required'))
671 671 a = r.ancestor(lookup(rev1), lookup(rev2))
672 672 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
673 673
674 674 def debugcomplete(ui, cmd='', **opts):
675 675 """returns the completion list associated with the given command"""
676 676
677 677 if opts.get('options'):
678 678 options = []
679 679 otables = [globalopts]
680 680 if cmd:
681 681 aliases, entry = cmdutil.findcmd(cmd, table, False)
682 682 otables.append(entry[1])
683 683 for t in otables:
684 684 for o in t:
685 685 if o[0]:
686 686 options.append('-%s' % o[0])
687 687 options.append('--%s' % o[1])
688 688 ui.write("%s\n" % "\n".join(options))
689 689 return
690 690
691 ui.write("%s\n" % "\n".join(util.sort(cmdutil.findpossible(cmd, table))))
691 cmdlist = cmdutil.findpossible(cmd, table)
692 if ui.verbose:
693 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
694 ui.write("%s\n" % "\n".join(util.sort(cmdlist)))
692 695
693 696 def debugfsinfo(ui, path = "."):
694 697 file('.debugfsinfo', 'w').write('')
695 698 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
696 699 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
697 700 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
698 701 and 'yes' or 'no'))
699 702 os.unlink('.debugfsinfo')
700 703
701 704 def debugrebuildstate(ui, repo, rev="tip"):
702 705 """rebuild the dirstate as it would look like for the given revision"""
703 706 ctx = repo[rev]
704 707 wlock = repo.wlock()
705 708 try:
706 709 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
707 710 finally:
708 711 del wlock
709 712
710 713 def debugcheckstate(ui, repo):
711 714 """validate the correctness of the current dirstate"""
712 715 parent1, parent2 = repo.dirstate.parents()
713 716 m1 = repo[parent1].manifest()
714 717 m2 = repo[parent2].manifest()
715 718 errors = 0
716 719 for f in repo.dirstate:
717 720 state = repo.dirstate[f]
718 721 if state in "nr" and f not in m1:
719 722 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
720 723 errors += 1
721 724 if state in "a" and f in m1:
722 725 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
723 726 errors += 1
724 727 if state in "m" and f not in m1 and f not in m2:
725 728 ui.warn(_("%s in state %s, but not in either manifest\n") %
726 729 (f, state))
727 730 errors += 1
728 731 for f in m1:
729 732 state = repo.dirstate[f]
730 733 if state not in "nrm":
731 734 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
732 735 errors += 1
733 736 if errors:
734 737 error = _(".hg/dirstate inconsistent with current parent's manifest")
735 738 raise util.Abort(error)
736 739
737 740 def showconfig(ui, repo, *values, **opts):
738 741 """show combined config settings from all hgrc files
739 742
740 743 With no args, print names and values of all config items.
741 744
742 745 With one arg of the form section.name, print just the value of
743 746 that config item.
744 747
745 748 With multiple args, print names and values of all config items
746 749 with matching section names."""
747 750
748 751 untrusted = bool(opts.get('untrusted'))
749 752 if values:
750 753 if len([v for v in values if '.' in v]) > 1:
751 754 raise util.Abort(_('only one config item permitted'))
752 755 for section, name, value in ui.walkconfig(untrusted=untrusted):
753 756 sectname = section + '.' + name
754 757 if values:
755 758 for v in values:
756 759 if v == section:
757 760 ui.write('%s=%s\n' % (sectname, value))
758 761 elif v == sectname:
759 762 ui.write(value, '\n')
760 763 else:
761 764 ui.write('%s=%s\n' % (sectname, value))
762 765
763 766 def debugsetparents(ui, repo, rev1, rev2=None):
764 767 """manually set the parents of the current working directory
765 768
766 769 This is useful for writing repository conversion tools, but should
767 770 be used with care.
768 771 """
769 772
770 773 if not rev2:
771 774 rev2 = hex(nullid)
772 775
773 776 wlock = repo.wlock()
774 777 try:
775 778 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
776 779 finally:
777 780 del wlock
778 781
779 782 def debugstate(ui, repo, nodates=None):
780 783 """show the contents of the current dirstate"""
781 784 timestr = ""
782 785 showdate = not nodates
783 786 for file_, ent in util.sort(repo.dirstate._map.items()):
784 787 if showdate:
785 788 if ent[3] == -1:
786 789 # Pad or slice to locale representation
787 790 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(0)))
788 791 timestr = 'unset'
789 792 timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
790 793 else:
791 794 timestr = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(ent[3]))
792 795 if ent[1] & 020000:
793 796 mode = 'lnk'
794 797 else:
795 798 mode = '%3o' % (ent[1] & 0777)
796 799 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
797 800 for f in repo.dirstate.copies():
798 801 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
799 802
800 803 def debugdata(ui, file_, rev):
801 804 """dump the contents of a data file revision"""
802 805 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
803 806 try:
804 807 ui.write(r.revision(r.lookup(rev)))
805 808 except KeyError:
806 809 raise util.Abort(_('invalid revision identifier %s') % rev)
807 810
808 811 def debugdate(ui, date, range=None, **opts):
809 812 """parse and display a date"""
810 813 if opts["extended"]:
811 814 d = util.parsedate(date, util.extendeddateformats)
812 815 else:
813 816 d = util.parsedate(date)
814 817 ui.write("internal: %s %s\n" % d)
815 818 ui.write("standard: %s\n" % util.datestr(d))
816 819 if range:
817 820 m = util.matchdate(range)
818 821 ui.write("match: %s\n" % m(d[0]))
819 822
820 823 def debugindex(ui, file_):
821 824 """dump the contents of an index file"""
822 825 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
823 826 ui.write(" rev offset length base linkrev" +
824 827 " nodeid p1 p2\n")
825 828 for i in r:
826 829 node = r.node(i)
827 830 try:
828 831 pp = r.parents(node)
829 832 except:
830 833 pp = [nullid, nullid]
831 834 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
832 835 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
833 836 short(node), short(pp[0]), short(pp[1])))
834 837
835 838 def debugindexdot(ui, file_):
836 839 """dump an index DAG as a .dot file"""
837 840 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
838 841 ui.write("digraph G {\n")
839 842 for i in r:
840 843 node = r.node(i)
841 844 pp = r.parents(node)
842 845 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
843 846 if pp[1] != nullid:
844 847 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
845 848 ui.write("}\n")
846 849
847 850 def debuginstall(ui):
848 851 '''test Mercurial installation'''
849 852
850 853 def writetemp(contents):
851 854 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
852 855 f = os.fdopen(fd, "wb")
853 856 f.write(contents)
854 857 f.close()
855 858 return name
856 859
857 860 problems = 0
858 861
859 862 # encoding
860 863 ui.status(_("Checking encoding (%s)...\n") % util._encoding)
861 864 try:
862 865 util.fromlocal("test")
863 866 except util.Abort, inst:
864 867 ui.write(" %s\n" % inst)
865 868 ui.write(_(" (check that your locale is properly set)\n"))
866 869 problems += 1
867 870
868 871 # compiled modules
869 872 ui.status(_("Checking extensions...\n"))
870 873 try:
871 874 import bdiff, mpatch, base85
872 875 except Exception, inst:
873 876 ui.write(" %s\n" % inst)
874 877 ui.write(_(" One or more extensions could not be found"))
875 878 ui.write(_(" (check that you compiled the extensions)\n"))
876 879 problems += 1
877 880
878 881 # templates
879 882 ui.status(_("Checking templates...\n"))
880 883 try:
881 884 import templater
882 885 t = templater.templater(templater.templatepath("map-cmdline.default"))
883 886 except Exception, inst:
884 887 ui.write(" %s\n" % inst)
885 888 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
886 889 problems += 1
887 890
888 891 # patch
889 892 ui.status(_("Checking patch...\n"))
890 893 patchproblems = 0
891 894 a = "1\n2\n3\n4\n"
892 895 b = "1\n2\n3\ninsert\n4\n"
893 896 fa = writetemp(a)
894 897 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
895 898 os.path.basename(fa))
896 899 fd = writetemp(d)
897 900
898 901 files = {}
899 902 try:
900 903 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
901 904 except util.Abort, e:
902 905 ui.write(_(" patch call failed:\n"))
903 906 ui.write(" " + str(e) + "\n")
904 907 patchproblems += 1
905 908 else:
906 909 if list(files) != [os.path.basename(fa)]:
907 910 ui.write(_(" unexpected patch output!\n"))
908 911 patchproblems += 1
909 912 a = file(fa).read()
910 913 if a != b:
911 914 ui.write(_(" patch test failed!\n"))
912 915 patchproblems += 1
913 916
914 917 if patchproblems:
915 918 if ui.config('ui', 'patch'):
916 919 ui.write(_(" (Current patch tool may be incompatible with patch,"
917 920 " or misconfigured. Please check your .hgrc file)\n"))
918 921 else:
919 922 ui.write(_(" Internal patcher failure, please report this error"
920 923 " to http://www.selenic.com/mercurial/bts\n"))
921 924 problems += patchproblems
922 925
923 926 os.unlink(fa)
924 927 os.unlink(fd)
925 928
926 929 # editor
927 930 ui.status(_("Checking commit editor...\n"))
928 931 editor = ui.geteditor()
929 932 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
930 933 if not cmdpath:
931 934 if editor == 'vi':
932 935 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
933 936 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
934 937 else:
935 938 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
936 939 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
937 940 problems += 1
938 941
939 942 # check username
940 943 ui.status(_("Checking username...\n"))
941 944 user = os.environ.get("HGUSER")
942 945 if user is None:
943 946 user = ui.config("ui", "username")
944 947 if user is None:
945 948 user = os.environ.get("EMAIL")
946 949 if not user:
947 950 ui.warn(" ")
948 951 ui.username()
949 952 ui.write(_(" (specify a username in your .hgrc file)\n"))
950 953
951 954 if not problems:
952 955 ui.status(_("No problems detected\n"))
953 956 else:
954 957 ui.write(_("%s problems detected,"
955 958 " please check your install!\n") % problems)
956 959
957 960 return problems
958 961
959 962 def debugrename(ui, repo, file1, *pats, **opts):
960 963 """dump rename information"""
961 964
962 965 ctx = repo[opts.get('rev')]
963 966 m = cmdutil.match(repo, (file1,) + pats, opts)
964 967 for abs in ctx.walk(m):
965 968 fctx = ctx[abs]
966 969 o = fctx.filelog().renamed(fctx.filenode())
967 970 rel = m.rel(abs)
968 971 if o:
969 972 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
970 973 else:
971 974 ui.write(_("%s not renamed\n") % rel)
972 975
973 976 def debugwalk(ui, repo, *pats, **opts):
974 977 """show how files match on given patterns"""
975 978 m = cmdutil.match(repo, pats, opts)
976 979 items = list(repo.walk(m))
977 980 if not items:
978 981 return
979 982 fmt = 'f %%-%ds %%-%ds %%s' % (
980 983 max([len(abs) for abs in items]),
981 984 max([len(m.rel(abs)) for abs in items]))
982 985 for abs in items:
983 986 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
984 987 ui.write("%s\n" % line.rstrip())
985 988
986 989 def diff(ui, repo, *pats, **opts):
987 990 """diff repository (or selected files)
988 991
989 992 Show differences between revisions for the specified files.
990 993
991 994 Differences between files are shown using the unified diff format.
992 995
993 996 NOTE: diff may generate unexpected results for merges, as it will
994 997 default to comparing against the working directory's first parent
995 998 changeset if no revisions are specified.
996 999
997 1000 When two revision arguments are given, then changes are shown
998 1001 between those revisions. If only one revision is specified then
999 1002 that revision is compared to the working directory, and, when no
1000 1003 revisions are specified, the working directory files are compared
1001 1004 to its parent.
1002 1005
1003 1006 Without the -a option, diff will avoid generating diffs of files
1004 1007 it detects as binary. With -a, diff will generate a diff anyway,
1005 1008 probably with undesirable results.
1006 1009
1007 1010 Use the --git option to generate diffs in the git extended diff
1008 1011 format. Read the diffs help topic for more information.
1009 1012 """
1010 1013 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
1011 1014
1012 1015 m = cmdutil.match(repo, pats, opts)
1013 1016 it = patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
1014 1017 for chunk in it:
1015 1018 repo.ui.write(chunk)
1016 1019
1017 1020 def export(ui, repo, *changesets, **opts):
1018 1021 """dump the header and diffs for one or more changesets
1019 1022
1020 1023 Print the changeset header and diffs for one or more revisions.
1021 1024
1022 1025 The information shown in the changeset header is: author,
1023 1026 changeset hash, parent(s) and commit comment.
1024 1027
1025 1028 NOTE: export may generate unexpected diff output for merge changesets,
1026 1029 as it will compare the merge changeset against its first parent only.
1027 1030
1028 1031 Output may be to a file, in which case the name of the file is
1029 1032 given using a format string. The formatting rules are as follows:
1030 1033
1031 1034 %% literal "%" character
1032 1035 %H changeset hash (40 bytes of hexadecimal)
1033 1036 %N number of patches being generated
1034 1037 %R changeset revision number
1035 1038 %b basename of the exporting repository
1036 1039 %h short-form changeset hash (12 bytes of hexadecimal)
1037 1040 %n zero-padded sequence number, starting at 1
1038 1041 %r zero-padded changeset revision number
1039 1042
1040 1043 Without the -a option, export will avoid generating diffs of files
1041 1044 it detects as binary. With -a, export will generate a diff anyway,
1042 1045 probably with undesirable results.
1043 1046
1044 1047 Use the --git option to generate diffs in the git extended diff
1045 1048 format. Read the diffs help topic for more information.
1046 1049
1047 1050 With the --switch-parent option, the diff will be against the second
1048 1051 parent. It can be useful to review a merge.
1049 1052 """
1050 1053 if not changesets:
1051 1054 raise util.Abort(_("export requires at least one changeset"))
1052 1055 revs = cmdutil.revrange(repo, changesets)
1053 1056 if len(revs) > 1:
1054 1057 ui.note(_('exporting patches:\n'))
1055 1058 else:
1056 1059 ui.note(_('exporting patch:\n'))
1057 1060 patch.export(repo, revs, template=opts.get('output'),
1058 1061 switch_parent=opts.get('switch_parent'),
1059 1062 opts=patch.diffopts(ui, opts))
1060 1063
1061 1064 def grep(ui, repo, pattern, *pats, **opts):
1062 1065 """search for a pattern in specified files and revisions
1063 1066
1064 1067 Search revisions of files for a regular expression.
1065 1068
1066 1069 This command behaves differently than Unix grep. It only accepts
1067 1070 Python/Perl regexps. It searches repository history, not the
1068 1071 working directory. It always prints the revision number in which
1069 1072 a match appears.
1070 1073
1071 1074 By default, grep only prints output for the first revision of a
1072 1075 file in which it finds a match. To get it to print every revision
1073 1076 that contains a change in match status ("-" for a match that
1074 1077 becomes a non-match, or "+" for a non-match that becomes a match),
1075 1078 use the --all flag.
1076 1079 """
1077 1080 reflags = 0
1078 1081 if opts.get('ignore_case'):
1079 1082 reflags |= re.I
1080 1083 try:
1081 1084 regexp = re.compile(pattern, reflags)
1082 1085 except Exception, inst:
1083 1086 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1084 1087 return None
1085 1088 sep, eol = ':', '\n'
1086 1089 if opts.get('print0'):
1087 1090 sep = eol = '\0'
1088 1091
1089 1092 fcache = {}
1090 1093 def getfile(fn):
1091 1094 if fn not in fcache:
1092 1095 fcache[fn] = repo.file(fn)
1093 1096 return fcache[fn]
1094 1097
1095 1098 def matchlines(body):
1096 1099 begin = 0
1097 1100 linenum = 0
1098 1101 while True:
1099 1102 match = regexp.search(body, begin)
1100 1103 if not match:
1101 1104 break
1102 1105 mstart, mend = match.span()
1103 1106 linenum += body.count('\n', begin, mstart) + 1
1104 1107 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1105 1108 begin = body.find('\n', mend) + 1 or len(body)
1106 1109 lend = begin - 1
1107 1110 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1108 1111
1109 1112 class linestate(object):
1110 1113 def __init__(self, line, linenum, colstart, colend):
1111 1114 self.line = line
1112 1115 self.linenum = linenum
1113 1116 self.colstart = colstart
1114 1117 self.colend = colend
1115 1118
1116 1119 def __hash__(self):
1117 1120 return hash((self.linenum, self.line))
1118 1121
1119 1122 def __eq__(self, other):
1120 1123 return self.line == other.line
1121 1124
1122 1125 matches = {}
1123 1126 copies = {}
1124 1127 def grepbody(fn, rev, body):
1125 1128 matches[rev].setdefault(fn, [])
1126 1129 m = matches[rev][fn]
1127 1130 for lnum, cstart, cend, line in matchlines(body):
1128 1131 s = linestate(line, lnum, cstart, cend)
1129 1132 m.append(s)
1130 1133
1131 1134 def difflinestates(a, b):
1132 1135 sm = difflib.SequenceMatcher(None, a, b)
1133 1136 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1134 1137 if tag == 'insert':
1135 1138 for i in xrange(blo, bhi):
1136 1139 yield ('+', b[i])
1137 1140 elif tag == 'delete':
1138 1141 for i in xrange(alo, ahi):
1139 1142 yield ('-', a[i])
1140 1143 elif tag == 'replace':
1141 1144 for i in xrange(alo, ahi):
1142 1145 yield ('-', a[i])
1143 1146 for i in xrange(blo, bhi):
1144 1147 yield ('+', b[i])
1145 1148
1146 1149 prev = {}
1147 1150 def display(fn, rev, states, prevstates):
1148 1151 datefunc = ui.quiet and util.shortdate or util.datestr
1149 1152 found = False
1150 1153 filerevmatches = {}
1151 1154 r = prev.get(fn, -1)
1152 1155 if opts.get('all'):
1153 1156 iter = difflinestates(states, prevstates)
1154 1157 else:
1155 1158 iter = [('', l) for l in prevstates]
1156 1159 for change, l in iter:
1157 1160 cols = [fn, str(r)]
1158 1161 if opts.get('line_number'):
1159 1162 cols.append(str(l.linenum))
1160 1163 if opts.get('all'):
1161 1164 cols.append(change)
1162 1165 if opts.get('user'):
1163 1166 cols.append(ui.shortuser(get(r)[1]))
1164 1167 if opts.get('date'):
1165 1168 cols.append(datefunc(get(r)[2]))
1166 1169 if opts.get('files_with_matches'):
1167 1170 c = (fn, r)
1168 1171 if c in filerevmatches:
1169 1172 continue
1170 1173 filerevmatches[c] = 1
1171 1174 else:
1172 1175 cols.append(l.line)
1173 1176 ui.write(sep.join(cols), eol)
1174 1177 found = True
1175 1178 return found
1176 1179
1177 1180 fstate = {}
1178 1181 skip = {}
1179 1182 get = util.cachefunc(lambda r: repo[r].changeset())
1180 1183 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1181 1184 found = False
1182 1185 follow = opts.get('follow')
1183 1186 for st, rev, fns in changeiter:
1184 1187 if st == 'window':
1185 1188 matches.clear()
1186 1189 elif st == 'add':
1187 1190 ctx = repo[rev]
1188 1191 matches[rev] = {}
1189 1192 for fn in fns:
1190 1193 if fn in skip:
1191 1194 continue
1192 1195 try:
1193 1196 grepbody(fn, rev, getfile(fn).read(ctx.filenode(fn)))
1194 1197 fstate.setdefault(fn, [])
1195 1198 if follow:
1196 1199 copied = getfile(fn).renamed(ctx.filenode(fn))
1197 1200 if copied:
1198 1201 copies.setdefault(rev, {})[fn] = copied[0]
1199 1202 except revlog.LookupError:
1200 1203 pass
1201 1204 elif st == 'iter':
1202 1205 for fn, m in util.sort(matches[rev].items()):
1203 1206 copy = copies.get(rev, {}).get(fn)
1204 1207 if fn in skip:
1205 1208 if copy:
1206 1209 skip[copy] = True
1207 1210 continue
1208 1211 if fn in prev or fstate[fn]:
1209 1212 r = display(fn, rev, m, fstate[fn])
1210 1213 found = found or r
1211 1214 if r and not opts.get('all'):
1212 1215 skip[fn] = True
1213 1216 if copy:
1214 1217 skip[copy] = True
1215 1218 fstate[fn] = m
1216 1219 if copy:
1217 1220 fstate[copy] = m
1218 1221 prev[fn] = rev
1219 1222
1220 1223 for fn, state in util.sort(fstate.items()):
1221 1224 if fn in skip:
1222 1225 continue
1223 1226 if fn not in copies.get(prev[fn], {}):
1224 1227 found = display(fn, rev, {}, state) or found
1225 1228 return (not found and 1) or 0
1226 1229
1227 1230 def heads(ui, repo, *branchrevs, **opts):
1228 1231 """show current repository heads or show branch heads
1229 1232
1230 1233 With no arguments, show all repository head changesets.
1231 1234
1232 1235 If branch or revisions names are given this will show the heads of
1233 1236 the specified branches or the branches those revisions are tagged
1234 1237 with.
1235 1238
1236 1239 Repository "heads" are changesets that don't have child
1237 1240 changesets. They are where development generally takes place and
1238 1241 are the usual targets for update and merge operations.
1239 1242
1240 1243 Branch heads are changesets that have a given branch tag, but have
1241 1244 no child changesets with that tag. They are usually where
1242 1245 development on the given branch takes place.
1243 1246 """
1244 1247 if opts.get('rev'):
1245 1248 start = repo.lookup(opts['rev'])
1246 1249 else:
1247 1250 start = None
1248 1251 if not branchrevs:
1249 1252 # Assume we're looking repo-wide heads if no revs were specified.
1250 1253 heads = repo.heads(start)
1251 1254 else:
1252 1255 heads = []
1253 1256 visitedset = util.set()
1254 1257 for branchrev in branchrevs:
1255 1258 branch = repo[branchrev].branch()
1256 1259 if branch in visitedset:
1257 1260 continue
1258 1261 visitedset.add(branch)
1259 1262 bheads = repo.branchheads(branch, start)
1260 1263 if not bheads:
1261 1264 if branch != branchrev:
1262 1265 ui.warn(_("no changes on branch %s containing %s are "
1263 1266 "reachable from %s\n")
1264 1267 % (branch, branchrev, opts.get('rev')))
1265 1268 else:
1266 1269 ui.warn(_("no changes on branch %s are reachable from %s\n")
1267 1270 % (branch, opts.get('rev')))
1268 1271 heads.extend(bheads)
1269 1272 if not heads:
1270 1273 return 1
1271 1274 displayer = cmdutil.show_changeset(ui, repo, opts)
1272 1275 for n in heads:
1273 1276 displayer.show(repo[n])
1274 1277
1275 1278 def help_(ui, name=None, with_version=False):
1276 1279 """show help for a given topic or a help overview
1277 1280
1278 1281 With no arguments, print a list of commands and short help.
1279 1282
1280 1283 Given a topic, extension, or command name, print help for that topic."""
1281 1284 option_lists = []
1282 1285
1283 1286 def addglobalopts(aliases):
1284 1287 if ui.verbose:
1285 1288 option_lists.append((_("global options:"), globalopts))
1286 1289 if name == 'shortlist':
1287 1290 option_lists.append((_('use "hg help" for the full list '
1288 1291 'of commands'), ()))
1289 1292 else:
1290 1293 if name == 'shortlist':
1291 1294 msg = _('use "hg help" for the full list of commands '
1292 1295 'or "hg -v" for details')
1293 1296 elif aliases:
1294 1297 msg = _('use "hg -v help%s" to show aliases and '
1295 1298 'global options') % (name and " " + name or "")
1296 1299 else:
1297 1300 msg = _('use "hg -v help %s" to show global options') % name
1298 1301 option_lists.append((msg, ()))
1299 1302
1300 1303 def helpcmd(name):
1301 1304 if with_version:
1302 1305 version_(ui)
1303 1306 ui.write('\n')
1304 1307
1305 1308 try:
1306 1309 aliases, i = cmdutil.findcmd(name, table, False)
1307 1310 except cmdutil.AmbiguousCommand, inst:
1308 1311 select = lambda c: c.lstrip('^').startswith(inst.args[0])
1309 1312 helplist(_('list of commands:\n\n'), select)
1310 1313 return
1311 1314
1312 1315 # synopsis
1313 1316 if len(i) > 2:
1314 1317 if i[2].startswith('hg'):
1315 1318 ui.write("%s\n" % i[2])
1316 1319 else:
1317 1320 ui.write('hg %s %s\n' % (aliases[0], i[2]))
1318 1321 else:
1319 1322 ui.write('hg %s\n' % aliases[0])
1320 1323
1321 1324 # aliases
1322 1325 if not ui.quiet and len(aliases) > 1:
1323 1326 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1324 1327
1325 1328 # description
1326 1329 doc = gettext(i[0].__doc__)
1327 1330 if not doc:
1328 1331 doc = _("(No help text available)")
1329 1332 if ui.quiet:
1330 1333 doc = doc.splitlines(0)[0]
1331 1334 ui.write("\n%s\n" % doc.rstrip())
1332 1335
1333 1336 if not ui.quiet:
1334 1337 # options
1335 1338 if i[1]:
1336 1339 option_lists.append((_("options:\n"), i[1]))
1337 1340
1338 1341 addglobalopts(False)
1339 1342
1340 1343 def helplist(header, select=None):
1341 1344 h = {}
1342 1345 cmds = {}
1343 1346 for c, e in table.items():
1344 1347 f = c.split("|", 1)[0]
1345 1348 if select and not select(f):
1346 1349 continue
1347 1350 if (not select and name != 'shortlist' and
1348 1351 e[0].__module__ != __name__):
1349 1352 continue
1350 1353 if name == "shortlist" and not f.startswith("^"):
1351 1354 continue
1352 1355 f = f.lstrip("^")
1353 1356 if not ui.debugflag and f.startswith("debug"):
1354 1357 continue
1355 1358 doc = gettext(e[0].__doc__)
1356 1359 if not doc:
1357 1360 doc = _("(No help text available)")
1358 1361 h[f] = doc.splitlines(0)[0].rstrip()
1359 1362 cmds[f] = c.lstrip("^")
1360 1363
1361 1364 if not h:
1362 1365 ui.status(_('no commands defined\n'))
1363 1366 return
1364 1367
1365 1368 ui.status(header)
1366 1369 fns = util.sort(h)
1367 1370 m = max(map(len, fns))
1368 1371 for f in fns:
1369 1372 if ui.verbose:
1370 1373 commands = cmds[f].replace("|",", ")
1371 1374 ui.write(" %s:\n %s\n"%(commands, h[f]))
1372 1375 else:
1373 1376 ui.write(' %-*s %s\n' % (m, f, h[f]))
1374 1377
1375 1378 exts = list(extensions.extensions())
1376 1379 if exts and name != 'shortlist':
1377 1380 ui.write(_('\nenabled extensions:\n\n'))
1378 1381 maxlength = 0
1379 1382 exthelps = []
1380 1383 for ename, ext in exts:
1381 1384 doc = (ext.__doc__ or _('(no help text available)'))
1382 1385 ename = ename.split('.')[-1]
1383 1386 maxlength = max(len(ename), maxlength)
1384 1387 exthelps.append((ename, doc.splitlines(0)[0].strip()))
1385 1388 for ename, text in exthelps:
1386 1389 ui.write(_(' %s %s\n') % (ename.ljust(maxlength), text))
1387 1390
1388 1391 if not ui.quiet:
1389 1392 addglobalopts(True)
1390 1393
1391 1394 def helptopic(name):
1392 1395 for names, header, doc in help.helptable:
1393 1396 if name in names:
1394 1397 break
1395 1398 else:
1396 1399 raise cmdutil.UnknownCommand(name)
1397 1400
1398 1401 # description
1399 1402 if not doc:
1400 1403 doc = _("(No help text available)")
1401 1404 if callable(doc):
1402 1405 doc = doc()
1403 1406
1404 1407 ui.write("%s\n" % header)
1405 1408 ui.write("%s\n" % doc.rstrip())
1406 1409
1407 1410 def helpext(name):
1408 1411 try:
1409 1412 mod = extensions.find(name)
1410 1413 except KeyError:
1411 1414 raise cmdutil.UnknownCommand(name)
1412 1415
1413 1416 doc = gettext(mod.__doc__) or _('No help text available')
1414 1417 doc = doc.splitlines(0)
1415 1418 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1416 1419 for d in doc[1:]:
1417 1420 ui.write(d, '\n')
1418 1421
1419 1422 ui.status('\n')
1420 1423
1421 1424 try:
1422 1425 ct = mod.cmdtable
1423 1426 except AttributeError:
1424 1427 ct = {}
1425 1428
1426 1429 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct])
1427 1430 helplist(_('list of commands:\n\n'), modcmds.has_key)
1428 1431
1429 1432 if name and name != 'shortlist':
1430 1433 i = None
1431 1434 for f in (helptopic, helpcmd, helpext):
1432 1435 try:
1433 1436 f(name)
1434 1437 i = None
1435 1438 break
1436 1439 except cmdutil.UnknownCommand, inst:
1437 1440 i = inst
1438 1441 if i:
1439 1442 raise i
1440 1443
1441 1444 else:
1442 1445 # program name
1443 1446 if ui.verbose or with_version:
1444 1447 version_(ui)
1445 1448 else:
1446 1449 ui.status(_("Mercurial Distributed SCM\n"))
1447 1450 ui.status('\n')
1448 1451
1449 1452 # list of commands
1450 1453 if name == "shortlist":
1451 1454 header = _('basic commands:\n\n')
1452 1455 else:
1453 1456 header = _('list of commands:\n\n')
1454 1457
1455 1458 helplist(header)
1456 1459
1457 1460 # list all option lists
1458 1461 opt_output = []
1459 1462 for title, options in option_lists:
1460 1463 opt_output.append(("\n%s" % title, None))
1461 1464 for shortopt, longopt, default, desc in options:
1462 1465 if "DEPRECATED" in desc and not ui.verbose: continue
1463 1466 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
1464 1467 longopt and " --%s" % longopt),
1465 1468 "%s%s" % (desc,
1466 1469 default
1467 1470 and _(" (default: %s)") % default
1468 1471 or "")))
1469 1472
1470 1473 if not name:
1471 1474 ui.write(_("\nadditional help topics:\n\n"))
1472 1475 topics = []
1473 1476 for names, header, doc in help.helptable:
1474 1477 names = [(-len(name), name) for name in names]
1475 1478 names.sort()
1476 1479 topics.append((names[0][1], header))
1477 1480 topics_len = max([len(s[0]) for s in topics])
1478 1481 for t, desc in topics:
1479 1482 ui.write(" %-*s %s\n" % (topics_len, t, desc))
1480 1483
1481 1484 if opt_output:
1482 1485 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
1483 1486 for first, second in opt_output:
1484 1487 if second:
1485 1488 ui.write(" %-*s %s\n" % (opts_len, first, second))
1486 1489 else:
1487 1490 ui.write("%s\n" % first)
1488 1491
1489 1492 def identify(ui, repo, source=None,
1490 1493 rev=None, num=None, id=None, branch=None, tags=None):
1491 1494 """identify the working copy or specified revision
1492 1495
1493 1496 With no revision, print a summary of the current state of the repo.
1494 1497
1495 1498 With a path, do a lookup in another repository.
1496 1499
1497 1500 This summary identifies the repository state using one or two parent
1498 1501 hash identifiers, followed by a "+" if there are uncommitted changes
1499 1502 in the working directory, a list of tags for this revision and a branch
1500 1503 name for non-default branches.
1501 1504 """
1502 1505
1503 1506 if not repo and not source:
1504 1507 raise util.Abort(_("There is no Mercurial repository here "
1505 1508 "(.hg not found)"))
1506 1509
1507 1510 hexfunc = ui.debugflag and hex or short
1508 1511 default = not (num or id or branch or tags)
1509 1512 output = []
1510 1513
1511 1514 if source:
1512 1515 source, revs, checkout = hg.parseurl(ui.expandpath(source), [])
1513 1516 srepo = hg.repository(ui, source)
1514 1517 if not rev and revs:
1515 1518 rev = revs[0]
1516 1519 if not rev:
1517 1520 rev = "tip"
1518 1521 if num or branch or tags:
1519 1522 raise util.Abort(
1520 1523 "can't query remote revision number, branch, or tags")
1521 1524 output = [hexfunc(srepo.lookup(rev))]
1522 1525 elif not rev:
1523 1526 ctx = repo[None]
1524 1527 parents = ctx.parents()
1525 1528 changed = False
1526 1529 if default or id or num:
1527 1530 changed = ctx.files() + ctx.deleted()
1528 1531 if default or id:
1529 1532 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
1530 1533 (changed) and "+" or "")]
1531 1534 if num:
1532 1535 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
1533 1536 (changed) and "+" or ""))
1534 1537 else:
1535 1538 ctx = repo[rev]
1536 1539 if default or id:
1537 1540 output = [hexfunc(ctx.node())]
1538 1541 if num:
1539 1542 output.append(str(ctx.rev()))
1540 1543
1541 1544 if not source and default and not ui.quiet:
1542 1545 b = util.tolocal(ctx.branch())
1543 1546 if b != 'default':
1544 1547 output.append("(%s)" % b)
1545 1548
1546 1549 # multiple tags for a single parent separated by '/'
1547 1550 t = "/".join(ctx.tags())
1548 1551 if t:
1549 1552 output.append(t)
1550 1553
1551 1554 if branch:
1552 1555 output.append(util.tolocal(ctx.branch()))
1553 1556
1554 1557 if tags:
1555 1558 output.extend(ctx.tags())
1556 1559
1557 1560 ui.write("%s\n" % ' '.join(output))
1558 1561
1559 1562 def import_(ui, repo, patch1, *patches, **opts):
1560 1563 """import an ordered set of patches
1561 1564
1562 1565 Import a list of patches and commit them individually.
1563 1566
1564 1567 If there are outstanding changes in the working directory, import
1565 1568 will abort unless given the -f flag.
1566 1569
1567 1570 You can import a patch straight from a mail message. Even patches
1568 1571 as attachments work (body part must be type text/plain or
1569 1572 text/x-patch to be used). From and Subject headers of email
1570 1573 message are used as default committer and commit message. All
1571 1574 text/plain body parts before first diff are added to commit
1572 1575 message.
1573 1576
1574 1577 If the imported patch was generated by hg export, user and description
1575 1578 from patch override values from message headers and body. Values
1576 1579 given on command line with -m and -u override these.
1577 1580
1578 1581 If --exact is specified, import will set the working directory
1579 1582 to the parent of each patch before applying it, and will abort
1580 1583 if the resulting changeset has a different ID than the one
1581 1584 recorded in the patch. This may happen due to character set
1582 1585 problems or other deficiencies in the text patch format.
1583 1586
1584 1587 With --similarity, hg will attempt to discover renames and copies
1585 1588 in the patch in the same way as 'addremove'.
1586 1589
1587 1590 To read a patch from standard input, use patch name "-".
1588 1591 See 'hg help dates' for a list of formats valid for -d/--date.
1589 1592 """
1590 1593 patches = (patch1,) + patches
1591 1594
1592 1595 date = opts.get('date')
1593 1596 if date:
1594 1597 opts['date'] = util.parsedate(date)
1595 1598
1596 1599 try:
1597 1600 sim = float(opts.get('similarity') or 0)
1598 1601 except ValueError:
1599 1602 raise util.Abort(_('similarity must be a number'))
1600 1603 if sim < 0 or sim > 100:
1601 1604 raise util.Abort(_('similarity must be between 0 and 100'))
1602 1605
1603 1606 if opts.get('exact') or not opts.get('force'):
1604 1607 cmdutil.bail_if_changed(repo)
1605 1608
1606 1609 d = opts["base"]
1607 1610 strip = opts["strip"]
1608 1611 wlock = lock = None
1609 1612 try:
1610 1613 wlock = repo.wlock()
1611 1614 lock = repo.lock()
1612 1615 for p in patches:
1613 1616 pf = os.path.join(d, p)
1614 1617
1615 1618 if pf == '-':
1616 1619 ui.status(_("applying patch from stdin\n"))
1617 1620 pf = sys.stdin
1618 1621 else:
1619 1622 ui.status(_("applying %s\n") % p)
1620 1623 pf = url.open(ui, pf)
1621 1624 data = patch.extract(ui, pf)
1622 1625 tmpname, message, user, date, branch, nodeid, p1, p2 = data
1623 1626
1624 1627 if tmpname is None:
1625 1628 raise util.Abort(_('no diffs found'))
1626 1629
1627 1630 try:
1628 1631 cmdline_message = cmdutil.logmessage(opts)
1629 1632 if cmdline_message:
1630 1633 # pickup the cmdline msg
1631 1634 message = cmdline_message
1632 1635 elif message:
1633 1636 # pickup the patch msg
1634 1637 message = message.strip()
1635 1638 else:
1636 1639 # launch the editor
1637 1640 message = None
1638 1641 ui.debug(_('message:\n%s\n') % message)
1639 1642
1640 1643 wp = repo.parents()
1641 1644 if opts.get('exact'):
1642 1645 if not nodeid or not p1:
1643 1646 raise util.Abort(_('not a mercurial patch'))
1644 1647 p1 = repo.lookup(p1)
1645 1648 p2 = repo.lookup(p2 or hex(nullid))
1646 1649
1647 1650 if p1 != wp[0].node():
1648 1651 hg.clean(repo, p1)
1649 1652 repo.dirstate.setparents(p1, p2)
1650 1653 elif p2:
1651 1654 try:
1652 1655 p1 = repo.lookup(p1)
1653 1656 p2 = repo.lookup(p2)
1654 1657 if p1 == wp[0].node():
1655 1658 repo.dirstate.setparents(p1, p2)
1656 1659 except RepoError:
1657 1660 pass
1658 1661 if opts.get('exact') or opts.get('import_branch'):
1659 1662 repo.dirstate.setbranch(branch or 'default')
1660 1663
1661 1664 files = {}
1662 1665 try:
1663 1666 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
1664 1667 files=files)
1665 1668 finally:
1666 1669 files = patch.updatedir(ui, repo, files, similarity=sim/100.)
1667 1670 if not opts.get('no_commit'):
1668 1671 n = repo.commit(files, message, opts.get('user') or user,
1669 1672 opts.get('date') or date)
1670 1673 if opts.get('exact'):
1671 1674 if hex(n) != nodeid:
1672 1675 repo.rollback()
1673 1676 raise util.Abort(_('patch is damaged'
1674 1677 ' or loses information'))
1675 1678 # Force a dirstate write so that the next transaction
1676 1679 # backups an up-do-date file.
1677 1680 repo.dirstate.write()
1678 1681 finally:
1679 1682 os.unlink(tmpname)
1680 1683 finally:
1681 1684 del lock, wlock
1682 1685
1683 1686 def incoming(ui, repo, source="default", **opts):
1684 1687 """show new changesets found in source
1685 1688
1686 1689 Show new changesets found in the specified path/URL or the default
1687 1690 pull location. These are the changesets that would be pulled if a pull
1688 1691 was requested.
1689 1692
1690 1693 For remote repository, using --bundle avoids downloading the changesets
1691 1694 twice if the incoming is followed by a pull.
1692 1695
1693 1696 See pull for valid source format details.
1694 1697 """
1695 1698 limit = cmdutil.loglimit(opts)
1696 1699 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev'))
1697 1700 cmdutil.setremoteconfig(ui, opts)
1698 1701
1699 1702 other = hg.repository(ui, source)
1700 1703 ui.status(_('comparing with %s\n') % url.hidepassword(source))
1701 1704 if revs:
1702 1705 revs = [other.lookup(rev) for rev in revs]
1703 1706 common, incoming, rheads = repo.findcommonincoming(other, heads=revs,
1704 1707 force=opts["force"])
1705 1708 if not incoming:
1706 1709 try:
1707 1710 os.unlink(opts["bundle"])
1708 1711 except:
1709 1712 pass
1710 1713 ui.status(_("no changes found\n"))
1711 1714 return 1
1712 1715
1713 1716 cleanup = None
1714 1717 try:
1715 1718 fname = opts["bundle"]
1716 1719 if fname or not other.local():
1717 1720 # create a bundle (uncompressed if other repo is not local)
1718 1721
1719 1722 if revs is None and other.capable('changegroupsubset'):
1720 1723 revs = rheads
1721 1724
1722 1725 if revs is None:
1723 1726 cg = other.changegroup(incoming, "incoming")
1724 1727 else:
1725 1728 cg = other.changegroupsubset(incoming, revs, 'incoming')
1726 1729 bundletype = other.local() and "HG10BZ" or "HG10UN"
1727 1730 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
1728 1731 # keep written bundle?
1729 1732 if opts["bundle"]:
1730 1733 cleanup = None
1731 1734 if not other.local():
1732 1735 # use the created uncompressed bundlerepo
1733 1736 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1734 1737
1735 1738 o = other.changelog.nodesbetween(incoming, revs)[0]
1736 1739 if opts.get('newest_first'):
1737 1740 o.reverse()
1738 1741 displayer = cmdutil.show_changeset(ui, other, opts)
1739 1742 count = 0
1740 1743 for n in o:
1741 1744 if count >= limit:
1742 1745 break
1743 1746 parents = [p for p in other.changelog.parents(n) if p != nullid]
1744 1747 if opts.get('no_merges') and len(parents) == 2:
1745 1748 continue
1746 1749 count += 1
1747 1750 displayer.show(other[n])
1748 1751 finally:
1749 1752 if hasattr(other, 'close'):
1750 1753 other.close()
1751 1754 if cleanup:
1752 1755 os.unlink(cleanup)
1753 1756
1754 1757 def init(ui, dest=".", **opts):
1755 1758 """create a new repository in the given directory
1756 1759
1757 1760 Initialize a new repository in the given directory. If the given
1758 1761 directory does not exist, it is created.
1759 1762
1760 1763 If no directory is given, the current directory is used.
1761 1764
1762 1765 It is possible to specify an ssh:// URL as the destination.
1763 1766 Look at the help text for the pull command for important details
1764 1767 about ssh:// URLs.
1765 1768 """
1766 1769 cmdutil.setremoteconfig(ui, opts)
1767 1770 hg.repository(ui, dest, create=1)
1768 1771
1769 1772 def locate(ui, repo, *pats, **opts):
1770 1773 """locate files matching specific patterns
1771 1774
1772 1775 Print all files under Mercurial control whose names match the
1773 1776 given patterns.
1774 1777
1775 1778 This command searches the entire repository by default. To search
1776 1779 just the current directory and its subdirectories, use
1777 1780 "--include .".
1778 1781
1779 1782 If no patterns are given to match, this command prints all file
1780 1783 names.
1781 1784
1782 1785 If you want to feed the output of this command into the "xargs"
1783 1786 command, use the "-0" option to both this command and "xargs".
1784 1787 This will avoid the problem of "xargs" treating single filenames
1785 1788 that contain white space as multiple filenames.
1786 1789 """
1787 1790 end = opts.get('print0') and '\0' or '\n'
1788 1791 rev = opts.get('rev') or None
1789 1792
1790 1793 ret = 1
1791 1794 m = cmdutil.match(repo, pats, opts, default='relglob')
1792 1795 m.bad = lambda x,y: False
1793 1796 for abs in repo[rev].walk(m):
1794 1797 if not rev and abs not in repo.dirstate:
1795 1798 continue
1796 1799 if opts.get('fullpath'):
1797 1800 ui.write(os.path.join(repo.root, abs), end)
1798 1801 else:
1799 1802 ui.write(((pats and m.rel(abs)) or abs), end)
1800 1803 ret = 0
1801 1804
1802 1805 return ret
1803 1806
1804 1807 def log(ui, repo, *pats, **opts):
1805 1808 """show revision history of entire repository or files
1806 1809
1807 1810 Print the revision history of the specified files or the entire
1808 1811 project.
1809 1812
1810 1813 File history is shown without following rename or copy history of
1811 1814 files. Use -f/--follow with a file name to follow history across
1812 1815 renames and copies. --follow without a file name will only show
1813 1816 ancestors or descendants of the starting revision. --follow-first
1814 1817 only follows the first parent of merge revisions.
1815 1818
1816 1819 If no revision range is specified, the default is tip:0 unless
1817 1820 --follow is set, in which case the working directory parent is
1818 1821 used as the starting revision.
1819 1822
1820 1823 See 'hg help dates' for a list of formats valid for -d/--date.
1821 1824
1822 1825 By default this command outputs: changeset id and hash, tags,
1823 1826 non-trivial parents, user, date and time, and a summary for each
1824 1827 commit. When the -v/--verbose switch is used, the list of changed
1825 1828 files and full commit message is shown.
1826 1829
1827 1830 NOTE: log -p may generate unexpected diff output for merge
1828 1831 changesets, as it will compare the merge changeset against its
1829 1832 first parent only. Also, the files: list will only reflect files
1830 1833 that are different from BOTH parents.
1831 1834
1832 1835 """
1833 1836
1834 1837 get = util.cachefunc(lambda r: repo[r].changeset())
1835 1838 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1836 1839
1837 1840 limit = cmdutil.loglimit(opts)
1838 1841 count = 0
1839 1842
1840 1843 if opts.get('copies') and opts.get('rev'):
1841 1844 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
1842 1845 else:
1843 1846 endrev = len(repo)
1844 1847 rcache = {}
1845 1848 ncache = {}
1846 1849 def getrenamed(fn, rev):
1847 1850 '''looks up all renames for a file (up to endrev) the first
1848 1851 time the file is given. It indexes on the changerev and only
1849 1852 parses the manifest if linkrev != changerev.
1850 1853 Returns rename info for fn at changerev rev.'''
1851 1854 if fn not in rcache:
1852 1855 rcache[fn] = {}
1853 1856 ncache[fn] = {}
1854 1857 fl = repo.file(fn)
1855 1858 for i in fl:
1856 1859 node = fl.node(i)
1857 1860 lr = fl.linkrev(i)
1858 1861 renamed = fl.renamed(node)
1859 1862 rcache[fn][lr] = renamed
1860 1863 if renamed:
1861 1864 ncache[fn][node] = renamed
1862 1865 if lr >= endrev:
1863 1866 break
1864 1867 if rev in rcache[fn]:
1865 1868 return rcache[fn][rev]
1866 1869
1867 1870 # If linkrev != rev (i.e. rev not found in rcache) fallback to
1868 1871 # filectx logic.
1869 1872
1870 1873 try:
1871 1874 return repo[rev][fn].renamed()
1872 1875 except revlog.LookupError:
1873 1876 pass
1874 1877 return None
1875 1878
1876 1879 df = False
1877 1880 if opts["date"]:
1878 1881 df = util.matchdate(opts["date"])
1879 1882
1880 1883 only_branches = opts.get('only_branch')
1881 1884
1882 1885 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
1883 1886 for st, rev, fns in changeiter:
1884 1887 if st == 'add':
1885 1888 parents = [p for p in repo.changelog.parentrevs(rev)
1886 1889 if p != nullrev]
1887 1890 if opts.get('no_merges') and len(parents) == 2:
1888 1891 continue
1889 1892 if opts.get('only_merges') and len(parents) != 2:
1890 1893 continue
1891 1894
1892 1895 if only_branches:
1893 1896 revbranch = get(rev)[5]['branch']
1894 1897 if revbranch not in only_branches:
1895 1898 continue
1896 1899
1897 1900 if df:
1898 1901 changes = get(rev)
1899 1902 if not df(changes[2][0]):
1900 1903 continue
1901 1904
1902 1905 if opts.get('keyword'):
1903 1906 changes = get(rev)
1904 1907 miss = 0
1905 1908 for k in [kw.lower() for kw in opts['keyword']]:
1906 1909 if not (k in changes[1].lower() or
1907 1910 k in changes[4].lower() or
1908 1911 k in " ".join(changes[3]).lower()):
1909 1912 miss = 1
1910 1913 break
1911 1914 if miss:
1912 1915 continue
1913 1916
1914 1917 if opts['user']:
1915 1918 changes = get(rev)
1916 1919 miss = 0
1917 1920 for k in opts['user']:
1918 1921 if k != changes[1]:
1919 1922 miss = 1
1920 1923 break
1921 1924 if miss:
1922 1925 continue
1923 1926
1924 1927 copies = []
1925 1928 if opts.get('copies') and rev:
1926 1929 for fn in get(rev)[3]:
1927 1930 rename = getrenamed(fn, rev)
1928 1931 if rename:
1929 1932 copies.append((fn, rename[0]))
1930 1933 displayer.show(context.changectx(repo, rev), copies=copies)
1931 1934 elif st == 'iter':
1932 1935 if count == limit: break
1933 1936 if displayer.flush(rev):
1934 1937 count += 1
1935 1938
1936 1939 def manifest(ui, repo, node=None, rev=None):
1937 1940 """output the current or given revision of the project manifest
1938 1941
1939 1942 Print a list of version controlled files for the given revision.
1940 1943 If no revision is given, the parent of the working directory is used,
1941 1944 or tip if no revision is checked out.
1942 1945
1943 1946 The manifest is the list of files being version controlled. If no revision
1944 1947 is given then the first parent of the working directory is used.
1945 1948
1946 1949 With -v flag, print file permissions, symlink and executable bits. With
1947 1950 --debug flag, print file revision hashes.
1948 1951 """
1949 1952
1950 1953 if rev and node:
1951 1954 raise util.Abort(_("please specify just one revision"))
1952 1955
1953 1956 if not node:
1954 1957 node = rev
1955 1958
1956 1959 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
1957 1960 ctx = repo[node]
1958 1961 for f in ctx:
1959 1962 if ui.debugflag:
1960 1963 ui.write("%40s " % hex(ctx.manifest()[f]))
1961 1964 if ui.verbose:
1962 1965 ui.write(decor[ctx.flags(f)])
1963 1966 ui.write("%s\n" % f)
1964 1967
1965 1968 def merge(ui, repo, node=None, force=None, rev=None):
1966 1969 """merge working directory with another revision
1967 1970
1968 1971 Merge the contents of the current working directory and the
1969 1972 requested revision. Files that changed between either parent are
1970 1973 marked as changed for the next commit and a commit must be
1971 1974 performed before any further updates are allowed.
1972 1975
1973 1976 If no revision is specified, the working directory's parent is a
1974 1977 head revision, and the current branch contains exactly one other head,
1975 1978 the other head is merged with by default. Otherwise, an explicit
1976 1979 revision to merge with must be provided.
1977 1980 """
1978 1981
1979 1982 if rev and node:
1980 1983 raise util.Abort(_("please specify just one revision"))
1981 1984 if not node:
1982 1985 node = rev
1983 1986
1984 1987 if not node:
1985 1988 branch = repo.changectx(None).branch()
1986 1989 bheads = repo.branchheads(branch)
1987 1990 if len(bheads) > 2:
1988 1991 raise util.Abort(_("branch '%s' has %d heads - "
1989 1992 "please merge with an explicit rev") %
1990 1993 (branch, len(bheads)))
1991 1994
1992 1995 parent = repo.dirstate.parents()[0]
1993 1996 if len(bheads) == 1:
1994 1997 if len(repo.heads()) > 1:
1995 1998 raise util.Abort(_("branch '%s' has one head - "
1996 1999 "please merge with an explicit rev") %
1997 2000 branch)
1998 2001 msg = _('there is nothing to merge')
1999 2002 if parent != repo.lookup(repo[None].branch()):
2000 2003 msg = _('%s - use "hg update" instead') % msg
2001 2004 raise util.Abort(msg)
2002 2005
2003 2006 if parent not in bheads:
2004 2007 raise util.Abort(_('working dir not at a head rev - '
2005 2008 'use "hg update" or merge with an explicit rev'))
2006 2009 node = parent == bheads[0] and bheads[-1] or bheads[0]
2007 2010 return hg.merge(repo, node, force=force)
2008 2011
2009 2012 def outgoing(ui, repo, dest=None, **opts):
2010 2013 """show changesets not found in destination
2011 2014
2012 2015 Show changesets not found in the specified destination repository or
2013 2016 the default push location. These are the changesets that would be pushed
2014 2017 if a push was requested.
2015 2018
2016 2019 See pull for valid destination format details.
2017 2020 """
2018 2021 limit = cmdutil.loglimit(opts)
2019 2022 dest, revs, checkout = hg.parseurl(
2020 2023 ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
2021 2024 cmdutil.setremoteconfig(ui, opts)
2022 2025 if revs:
2023 2026 revs = [repo.lookup(rev) for rev in revs]
2024 2027
2025 2028 other = hg.repository(ui, dest)
2026 2029 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2027 2030 o = repo.findoutgoing(other, force=opts.get('force'))
2028 2031 if not o:
2029 2032 ui.status(_("no changes found\n"))
2030 2033 return 1
2031 2034 o = repo.changelog.nodesbetween(o, revs)[0]
2032 2035 if opts.get('newest_first'):
2033 2036 o.reverse()
2034 2037 displayer = cmdutil.show_changeset(ui, repo, opts)
2035 2038 count = 0
2036 2039 for n in o:
2037 2040 if count >= limit:
2038 2041 break
2039 2042 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2040 2043 if opts.get('no_merges') and len(parents) == 2:
2041 2044 continue
2042 2045 count += 1
2043 2046 displayer.show(repo[n])
2044 2047
2045 2048 def parents(ui, repo, file_=None, **opts):
2046 2049 """show the parents of the working dir or revision
2047 2050
2048 2051 Print the working directory's parent revisions. If a
2049 2052 revision is given via --rev, the parent of that revision
2050 2053 will be printed. If a file argument is given, revision in
2051 2054 which the file was last changed (before the working directory
2052 2055 revision or the argument to --rev if given) is printed.
2053 2056 """
2054 2057 rev = opts.get('rev')
2055 2058 if rev:
2056 2059 ctx = repo[rev]
2057 2060 else:
2058 2061 ctx = repo[None]
2059 2062
2060 2063 if file_:
2061 2064 m = cmdutil.match(repo, (file_,), opts)
2062 2065 if m.anypats() or len(m.files()) != 1:
2063 2066 raise util.Abort(_('can only specify an explicit file name'))
2064 2067 file_ = m.files()[0]
2065 2068 filenodes = []
2066 2069 for cp in ctx.parents():
2067 2070 if not cp:
2068 2071 continue
2069 2072 try:
2070 2073 filenodes.append(cp.filenode(file_))
2071 2074 except revlog.LookupError:
2072 2075 pass
2073 2076 if not filenodes:
2074 2077 raise util.Abort(_("'%s' not found in manifest!") % file_)
2075 2078 fl = repo.file(file_)
2076 2079 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2077 2080 else:
2078 2081 p = [cp.node() for cp in ctx.parents()]
2079 2082
2080 2083 displayer = cmdutil.show_changeset(ui, repo, opts)
2081 2084 for n in p:
2082 2085 if n != nullid:
2083 2086 displayer.show(repo[n])
2084 2087
2085 2088 def paths(ui, repo, search=None):
2086 2089 """show definition of symbolic path names
2087 2090
2088 2091 Show definition of symbolic path name NAME. If no name is given, show
2089 2092 definition of available names.
2090 2093
2091 2094 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2092 2095 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2093 2096 """
2094 2097 if search:
2095 2098 for name, path in ui.configitems("paths"):
2096 2099 if name == search:
2097 2100 ui.write("%s\n" % url.hidepassword(path))
2098 2101 return
2099 2102 ui.warn(_("not found!\n"))
2100 2103 return 1
2101 2104 else:
2102 2105 for name, path in ui.configitems("paths"):
2103 2106 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2104 2107
2105 2108 def postincoming(ui, repo, modheads, optupdate, checkout):
2106 2109 if modheads == 0:
2107 2110 return
2108 2111 if optupdate:
2109 2112 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2110 2113 return hg.update(repo, checkout)
2111 2114 else:
2112 2115 ui.status(_("not updating, since new heads added\n"))
2113 2116 if modheads > 1:
2114 2117 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2115 2118 else:
2116 2119 ui.status(_("(run 'hg update' to get a working copy)\n"))
2117 2120
2118 2121 def pull(ui, repo, source="default", **opts):
2119 2122 """pull changes from the specified source
2120 2123
2121 2124 Pull changes from a remote repository to a local one.
2122 2125
2123 2126 This finds all changes from the repository at the specified path
2124 2127 or URL and adds them to the local repository. By default, this
2125 2128 does not update the copy of the project in the working directory.
2126 2129
2127 2130 Valid URLs are of the form:
2128 2131
2129 2132 local/filesystem/path (or file://local/filesystem/path)
2130 2133 http://[user[:pass]@]host[:port]/[path]
2131 2134 https://[user[:pass]@]host[:port]/[path]
2132 2135 ssh://[user[:pass]@]host[:port]/[path]
2133 2136
2134 2137 Paths in the local filesystem can either point to Mercurial
2135 2138 repositories or to bundle files (as created by 'hg bundle' or
2136 2139 'hg incoming --bundle').
2137 2140
2138 2141 An optional identifier after # indicates a particular branch, tag,
2139 2142 or changeset to pull.
2140 2143
2141 2144 Some notes about using SSH with Mercurial:
2142 2145 - SSH requires an accessible shell account on the destination machine
2143 2146 and a copy of hg in the remote path or specified with as remotecmd.
2144 2147 - path is relative to the remote user's home directory by default.
2145 2148 Use an extra slash at the start of a path to specify an absolute path:
2146 2149 ssh://example.com//tmp/repository
2147 2150 - Mercurial doesn't use its own compression via SSH; the right thing
2148 2151 to do is to configure it in your ~/.ssh/config, e.g.:
2149 2152 Host *.mylocalnetwork.example.com
2150 2153 Compression no
2151 2154 Host *
2152 2155 Compression yes
2153 2156 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2154 2157 with the --ssh command line option.
2155 2158 """
2156 2159 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev'))
2157 2160 cmdutil.setremoteconfig(ui, opts)
2158 2161
2159 2162 other = hg.repository(ui, source)
2160 2163 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2161 2164 if revs:
2162 2165 try:
2163 2166 revs = [other.lookup(rev) for rev in revs]
2164 2167 except NoCapability:
2165 2168 error = _("Other repository doesn't support revision lookup, "
2166 2169 "so a rev cannot be specified.")
2167 2170 raise util.Abort(error)
2168 2171
2169 2172 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2170 2173 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2171 2174
2172 2175 def push(ui, repo, dest=None, **opts):
2173 2176 """push changes to the specified destination
2174 2177
2175 2178 Push changes from the local repository to the given destination.
2176 2179
2177 2180 This is the symmetrical operation for pull. It helps to move
2178 2181 changes from the current repository to a different one. If the
2179 2182 destination is local this is identical to a pull in that directory
2180 2183 from the current one.
2181 2184
2182 2185 By default, push will refuse to run if it detects the result would
2183 2186 increase the number of remote heads. This generally indicates the
2184 2187 the client has forgotten to pull and merge before pushing.
2185 2188
2186 2189 Valid URLs are of the form:
2187 2190
2188 2191 local/filesystem/path (or file://local/filesystem/path)
2189 2192 ssh://[user[:pass]@]host[:port]/[path]
2190 2193 http://[user[:pass]@]host[:port]/[path]
2191 2194 https://[user[:pass]@]host[:port]/[path]
2192 2195
2193 2196 An optional identifier after # indicates a particular branch, tag,
2194 2197 or changeset to push. If -r is used, the named changeset and all its
2195 2198 ancestors will be pushed to the remote repository.
2196 2199
2197 2200 Look at the help text for the pull command for important details
2198 2201 about ssh:// URLs.
2199 2202
2200 2203 Pushing to http:// and https:// URLs is only possible, if this
2201 2204 feature is explicitly enabled on the remote Mercurial server.
2202 2205 """
2203 2206 dest, revs, checkout = hg.parseurl(
2204 2207 ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
2205 2208 cmdutil.setremoteconfig(ui, opts)
2206 2209
2207 2210 other = hg.repository(ui, dest)
2208 2211 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2209 2212 if revs:
2210 2213 revs = [repo.lookup(rev) for rev in revs]
2211 2214 r = repo.push(other, opts.get('force'), revs=revs)
2212 2215 return r == 0
2213 2216
2214 2217 def rawcommit(ui, repo, *pats, **opts):
2215 2218 """raw commit interface (DEPRECATED)
2216 2219
2217 2220 (DEPRECATED)
2218 2221 Lowlevel commit, for use in helper scripts.
2219 2222
2220 2223 This command is not intended to be used by normal users, as it is
2221 2224 primarily useful for importing from other SCMs.
2222 2225
2223 2226 This command is now deprecated and will be removed in a future
2224 2227 release, please use debugsetparents and commit instead.
2225 2228 """
2226 2229
2227 2230 ui.warn(_("(the rawcommit command is deprecated)\n"))
2228 2231
2229 2232 message = cmdutil.logmessage(opts)
2230 2233
2231 2234 files = cmdutil.match(repo, pats, opts).files()
2232 2235 if opts.get('files'):
2233 2236 files += open(opts['files']).read().splitlines()
2234 2237
2235 2238 parents = [repo.lookup(p) for p in opts['parent']]
2236 2239
2237 2240 try:
2238 2241 repo.rawcommit(files, message, opts['user'], opts['date'], *parents)
2239 2242 except ValueError, inst:
2240 2243 raise util.Abort(str(inst))
2241 2244
2242 2245 def recover(ui, repo):
2243 2246 """roll back an interrupted transaction
2244 2247
2245 2248 Recover from an interrupted commit or pull.
2246 2249
2247 2250 This command tries to fix the repository status after an interrupted
2248 2251 operation. It should only be necessary when Mercurial suggests it.
2249 2252 """
2250 2253 if repo.recover():
2251 2254 return hg.verify(repo)
2252 2255 return 1
2253 2256
2254 2257 def remove(ui, repo, *pats, **opts):
2255 2258 """remove the specified files on the next commit
2256 2259
2257 2260 Schedule the indicated files for removal from the repository.
2258 2261
2259 2262 This only removes files from the current branch, not from the entire
2260 2263 project history. -A can be used to remove only files that have already
2261 2264 been deleted, -f can be used to force deletion, and -Af can be used
2262 2265 to remove files from the next revision without deleting them.
2263 2266
2264 2267 The following table details the behavior of remove for different file
2265 2268 states (columns) and option combinations (rows). The file states are
2266 2269 Added, Clean, Modified and Missing (as reported by hg status). The
2267 2270 actions are Warn, Remove (from branch) and Delete (from disk).
2268 2271
2269 2272 A C M !
2270 2273 none W RD W R
2271 2274 -f R RD RD R
2272 2275 -A W W W R
2273 2276 -Af R R R R
2274 2277
2275 2278 This command schedules the files to be removed at the next commit.
2276 2279 To undo a remove before that, see hg revert.
2277 2280 """
2278 2281
2279 2282 after, force = opts.get('after'), opts.get('force')
2280 2283 if not pats and not after:
2281 2284 raise util.Abort(_('no files specified'))
2282 2285
2283 2286 m = cmdutil.match(repo, pats, opts)
2284 2287 s = repo.status(match=m, clean=True)
2285 2288 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2286 2289
2287 2290 def warn(files, reason):
2288 2291 for f in files:
2289 2292 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2290 2293 % (m.rel(f), reason))
2291 2294
2292 2295 if force:
2293 2296 remove, forget = modified + deleted + clean, added
2294 2297 elif after:
2295 2298 remove, forget = deleted, []
2296 2299 warn(modified + added + clean, _('still exists'))
2297 2300 else:
2298 2301 remove, forget = deleted + clean, []
2299 2302 warn(modified, _('is modified'))
2300 2303 warn(added, _('has been marked for add'))
2301 2304
2302 2305 for f in util.sort(remove + forget):
2303 2306 if ui.verbose or not m.exact(f):
2304 2307 ui.status(_('removing %s\n') % m.rel(f))
2305 2308
2306 2309 repo.forget(forget)
2307 2310 repo.remove(remove, unlink=not after)
2308 2311
2309 2312 def rename(ui, repo, *pats, **opts):
2310 2313 """rename files; equivalent of copy + remove
2311 2314
2312 2315 Mark dest as copies of sources; mark sources for deletion. If
2313 2316 dest is a directory, copies are put in that directory. If dest is
2314 2317 a file, there can only be one source.
2315 2318
2316 2319 By default, this command copies the contents of files as they
2317 2320 stand in the working directory. If invoked with --after, the
2318 2321 operation is recorded, but no copying is performed.
2319 2322
2320 2323 This command takes effect in the next commit. To undo a rename
2321 2324 before that, see hg revert.
2322 2325 """
2323 2326 wlock = repo.wlock(False)
2324 2327 try:
2325 2328 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2326 2329 finally:
2327 2330 del wlock
2328 2331
2329 2332 def resolve(ui, repo, *pats, **opts):
2330 2333 """resolve file merges from a branch merge or update
2331 2334
2332 2335 This command will attempt to resolve unresolved merges from the
2333 2336 last update or merge command. This will use the local file
2334 2337 revision preserved at the last update or merge to cleanly retry
2335 2338 the file merge attempt. With no file or options specified, this
2336 2339 command will attempt to resolve all unresolved files.
2337 2340
2338 2341 The codes used to show the status of files are:
2339 2342 U = unresolved
2340 2343 R = resolved
2341 2344 """
2342 2345
2343 2346 if len([x for x in opts if opts[x]]) > 1:
2344 2347 raise util.Abort(_("too many options specified"))
2345 2348
2346 2349 ms = merge_.mergestate(repo)
2347 2350 m = cmdutil.match(repo, pats, opts)
2348 2351
2349 2352 for f in ms:
2350 2353 if m(f):
2351 2354 if opts.get("list"):
2352 2355 ui.write("%s %s\n" % (ms[f].upper(), f))
2353 2356 elif opts.get("mark"):
2354 2357 ms.mark(f, "r")
2355 2358 elif opts.get("unmark"):
2356 2359 ms.mark(f, "u")
2357 2360 else:
2358 2361 wctx = repo[None]
2359 2362 mctx = wctx.parents()[-1]
2360 2363 ms.resolve(f, wctx, mctx)
2361 2364
2362 2365 def revert(ui, repo, *pats, **opts):
2363 2366 """restore individual files or dirs to an earlier state
2364 2367
2365 2368 (use update -r to check out earlier revisions, revert does not
2366 2369 change the working dir parents)
2367 2370
2368 2371 With no revision specified, revert the named files or directories
2369 2372 to the contents they had in the parent of the working directory.
2370 2373 This restores the contents of the affected files to an unmodified
2371 2374 state and unschedules adds, removes, copies, and renames. If the
2372 2375 working directory has two parents, you must explicitly specify the
2373 2376 revision to revert to.
2374 2377
2375 2378 Using the -r option, revert the given files or directories to their
2376 2379 contents as of a specific revision. This can be helpful to "roll
2377 2380 back" some or all of an earlier change.
2378 2381 See 'hg help dates' for a list of formats valid for -d/--date.
2379 2382
2380 2383 Revert modifies the working directory. It does not commit any
2381 2384 changes, or change the parent of the working directory. If you
2382 2385 revert to a revision other than the parent of the working
2383 2386 directory, the reverted files will thus appear modified
2384 2387 afterwards.
2385 2388
2386 2389 If a file has been deleted, it is restored. If the executable
2387 2390 mode of a file was changed, it is reset.
2388 2391
2389 2392 If names are given, all files matching the names are reverted.
2390 2393 If no arguments are given, no files are reverted.
2391 2394
2392 2395 Modified files are saved with a .orig suffix before reverting.
2393 2396 To disable these backups, use --no-backup.
2394 2397 """
2395 2398
2396 2399 if opts["date"]:
2397 2400 if opts["rev"]:
2398 2401 raise util.Abort(_("you can't specify a revision and a date"))
2399 2402 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
2400 2403
2401 2404 if not pats and not opts.get('all'):
2402 2405 raise util.Abort(_('no files or directories specified; '
2403 2406 'use --all to revert the whole repo'))
2404 2407
2405 2408 parent, p2 = repo.dirstate.parents()
2406 2409 if not opts.get('rev') and p2 != nullid:
2407 2410 raise util.Abort(_('uncommitted merge - please provide a '
2408 2411 'specific revision'))
2409 2412 ctx = repo[opts.get('rev')]
2410 2413 node = ctx.node()
2411 2414 mf = ctx.manifest()
2412 2415 if node == parent:
2413 2416 pmf = mf
2414 2417 else:
2415 2418 pmf = None
2416 2419
2417 2420 # need all matching names in dirstate and manifest of target rev,
2418 2421 # so have to walk both. do not print errors if files exist in one
2419 2422 # but not other.
2420 2423
2421 2424 names = {}
2422 2425
2423 2426 wlock = repo.wlock()
2424 2427 try:
2425 2428 # walk dirstate.
2426 2429 files = []
2427 2430
2428 2431 m = cmdutil.match(repo, pats, opts)
2429 2432 m.bad = lambda x,y: False
2430 2433 for abs in repo.walk(m):
2431 2434 names[abs] = m.rel(abs), m.exact(abs)
2432 2435
2433 2436 # walk target manifest.
2434 2437
2435 2438 def badfn(path, msg):
2436 2439 if path in names:
2437 2440 return False
2438 2441 path_ = path + '/'
2439 2442 for f in names:
2440 2443 if f.startswith(path_):
2441 2444 return False
2442 2445 repo.ui.warn("%s: %s\n" % (m.rel(path), msg))
2443 2446 return False
2444 2447
2445 2448 m = cmdutil.match(repo, pats, opts)
2446 2449 m.bad = badfn
2447 2450 for abs in repo[node].walk(m):
2448 2451 if abs not in names:
2449 2452 names[abs] = m.rel(abs), m.exact(abs)
2450 2453
2451 2454 m = cmdutil.matchfiles(repo, names)
2452 2455 changes = repo.status(match=m)[:4]
2453 2456 modified, added, removed, deleted = map(dict.fromkeys, changes)
2454 2457
2455 2458 # if f is a rename, also revert the source
2456 2459 cwd = repo.getcwd()
2457 2460 for f in added:
2458 2461 src = repo.dirstate.copied(f)
2459 2462 if src and src not in names and repo.dirstate[src] == 'r':
2460 2463 removed[src] = None
2461 2464 names[src] = (repo.pathto(src, cwd), True)
2462 2465
2463 2466 def removeforget(abs):
2464 2467 if repo.dirstate[abs] == 'a':
2465 2468 return _('forgetting %s\n')
2466 2469 return _('removing %s\n')
2467 2470
2468 2471 revert = ([], _('reverting %s\n'))
2469 2472 add = ([], _('adding %s\n'))
2470 2473 remove = ([], removeforget)
2471 2474 undelete = ([], _('undeleting %s\n'))
2472 2475
2473 2476 disptable = (
2474 2477 # dispatch table:
2475 2478 # file state
2476 2479 # action if in target manifest
2477 2480 # action if not in target manifest
2478 2481 # make backup if in target manifest
2479 2482 # make backup if not in target manifest
2480 2483 (modified, revert, remove, True, True),
2481 2484 (added, revert, remove, True, False),
2482 2485 (removed, undelete, None, False, False),
2483 2486 (deleted, revert, remove, False, False),
2484 2487 )
2485 2488
2486 2489 for abs, (rel, exact) in util.sort(names.items()):
2487 2490 mfentry = mf.get(abs)
2488 2491 target = repo.wjoin(abs)
2489 2492 def handle(xlist, dobackup):
2490 2493 xlist[0].append(abs)
2491 2494 if dobackup and not opts.get('no_backup') and util.lexists(target):
2492 2495 bakname = "%s.orig" % rel
2493 2496 ui.note(_('saving current version of %s as %s\n') %
2494 2497 (rel, bakname))
2495 2498 if not opts.get('dry_run'):
2496 2499 util.copyfile(target, bakname)
2497 2500 if ui.verbose or not exact:
2498 2501 msg = xlist[1]
2499 2502 if not isinstance(msg, basestring):
2500 2503 msg = msg(abs)
2501 2504 ui.status(msg % rel)
2502 2505 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2503 2506 if abs not in table: continue
2504 2507 # file has changed in dirstate
2505 2508 if mfentry:
2506 2509 handle(hitlist, backuphit)
2507 2510 elif misslist is not None:
2508 2511 handle(misslist, backupmiss)
2509 2512 break
2510 2513 else:
2511 2514 if abs not in repo.dirstate:
2512 2515 if mfentry:
2513 2516 handle(add, True)
2514 2517 elif exact:
2515 2518 ui.warn(_('file not managed: %s\n') % rel)
2516 2519 continue
2517 2520 # file has not changed in dirstate
2518 2521 if node == parent:
2519 2522 if exact: ui.warn(_('no changes needed to %s\n') % rel)
2520 2523 continue
2521 2524 if pmf is None:
2522 2525 # only need parent manifest in this unlikely case,
2523 2526 # so do not read by default
2524 2527 pmf = repo[parent].manifest()
2525 2528 if abs in pmf:
2526 2529 if mfentry:
2527 2530 # if version of file is same in parent and target
2528 2531 # manifests, do nothing
2529 2532 if (pmf[abs] != mfentry or
2530 2533 pmf.flags(abs) != mf.flags(abs)):
2531 2534 handle(revert, False)
2532 2535 else:
2533 2536 handle(remove, False)
2534 2537
2535 2538 if not opts.get('dry_run'):
2536 2539 def checkout(f):
2537 2540 fc = ctx[f]
2538 2541 repo.wwrite(f, fc.data(), fc.flags())
2539 2542
2540 2543 audit_path = util.path_auditor(repo.root)
2541 2544 for f in remove[0]:
2542 2545 if repo.dirstate[f] == 'a':
2543 2546 repo.dirstate.forget(f)
2544 2547 continue
2545 2548 audit_path(f)
2546 2549 try:
2547 2550 util.unlink(repo.wjoin(f))
2548 2551 except OSError:
2549 2552 pass
2550 2553 repo.dirstate.remove(f)
2551 2554
2552 2555 normal = None
2553 2556 if node == parent:
2554 2557 # We're reverting to our parent. If possible, we'd like status
2555 2558 # to report the file as clean. We have to use normallookup for
2556 2559 # merges to avoid losing information about merged/dirty files.
2557 2560 if p2 != nullid:
2558 2561 normal = repo.dirstate.normallookup
2559 2562 else:
2560 2563 normal = repo.dirstate.normal
2561 2564 for f in revert[0]:
2562 2565 checkout(f)
2563 2566 if normal:
2564 2567 normal(f)
2565 2568
2566 2569 for f in add[0]:
2567 2570 checkout(f)
2568 2571 repo.dirstate.add(f)
2569 2572
2570 2573 normal = repo.dirstate.normallookup
2571 2574 if node == parent and p2 == nullid:
2572 2575 normal = repo.dirstate.normal
2573 2576 for f in undelete[0]:
2574 2577 checkout(f)
2575 2578 normal(f)
2576 2579
2577 2580 finally:
2578 2581 del wlock
2579 2582
2580 2583 def rollback(ui, repo):
2581 2584 """roll back the last transaction
2582 2585
2583 2586 This command should be used with care. There is only one level of
2584 2587 rollback, and there is no way to undo a rollback. It will also
2585 2588 restore the dirstate at the time of the last transaction, losing
2586 2589 any dirstate changes since that time.
2587 2590
2588 2591 Transactions are used to encapsulate the effects of all commands
2589 2592 that create new changesets or propagate existing changesets into a
2590 2593 repository. For example, the following commands are transactional,
2591 2594 and their effects can be rolled back:
2592 2595
2593 2596 commit
2594 2597 import
2595 2598 pull
2596 2599 push (with this repository as destination)
2597 2600 unbundle
2598 2601
2599 2602 This command is not intended for use on public repositories. Once
2600 2603 changes are visible for pull by other users, rolling a transaction
2601 2604 back locally is ineffective (someone else may already have pulled
2602 2605 the changes). Furthermore, a race is possible with readers of the
2603 2606 repository; for example an in-progress pull from the repository
2604 2607 may fail if a rollback is performed.
2605 2608 """
2606 2609 repo.rollback()
2607 2610
2608 2611 def root(ui, repo):
2609 2612 """print the root (top) of the current working dir
2610 2613
2611 2614 Print the root directory of the current repository.
2612 2615 """
2613 2616 ui.write(repo.root + "\n")
2614 2617
2615 2618 def serve(ui, repo, **opts):
2616 2619 """export the repository via HTTP
2617 2620
2618 2621 Start a local HTTP repository browser and pull server.
2619 2622
2620 2623 By default, the server logs accesses to stdout and errors to
2621 2624 stderr. Use the "-A" and "-E" options to log to files.
2622 2625 """
2623 2626
2624 2627 if opts["stdio"]:
2625 2628 if repo is None:
2626 2629 raise RepoError(_("There is no Mercurial repository here"
2627 2630 " (.hg not found)"))
2628 2631 s = sshserver.sshserver(ui, repo)
2629 2632 s.serve_forever()
2630 2633
2631 2634 parentui = ui.parentui or ui
2632 2635 optlist = ("name templates style address port prefix ipv6"
2633 2636 " accesslog errorlog webdir_conf certificate")
2634 2637 for o in optlist.split():
2635 2638 if opts[o]:
2636 2639 parentui.setconfig("web", o, str(opts[o]))
2637 2640 if (repo is not None) and (repo.ui != parentui):
2638 2641 repo.ui.setconfig("web", o, str(opts[o]))
2639 2642
2640 2643 if repo is None and not ui.config("web", "webdir_conf"):
2641 2644 raise RepoError(_("There is no Mercurial repository here"
2642 2645 " (.hg not found)"))
2643 2646
2644 2647 class service:
2645 2648 def init(self):
2646 2649 util.set_signal_handler()
2647 2650 self.httpd = hgweb.server.create_server(parentui, repo)
2648 2651
2649 2652 if not ui.verbose: return
2650 2653
2651 2654 if self.httpd.prefix:
2652 2655 prefix = self.httpd.prefix.strip('/') + '/'
2653 2656 else:
2654 2657 prefix = ''
2655 2658
2656 2659 port = ':%d' % self.httpd.port
2657 2660 if port == ':80':
2658 2661 port = ''
2659 2662
2660 2663 bindaddr = self.httpd.addr
2661 2664 if bindaddr == '0.0.0.0':
2662 2665 bindaddr = '*'
2663 2666 elif ':' in bindaddr: # IPv6
2664 2667 bindaddr = '[%s]' % bindaddr
2665 2668
2666 2669 fqaddr = self.httpd.fqaddr
2667 2670 if ':' in fqaddr:
2668 2671 fqaddr = '[%s]' % fqaddr
2669 2672 ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
2670 2673 (fqaddr, port, prefix, bindaddr, self.httpd.port))
2671 2674
2672 2675 def run(self):
2673 2676 self.httpd.serve_forever()
2674 2677
2675 2678 service = service()
2676 2679
2677 2680 cmdutil.service(opts, initfn=service.init, runfn=service.run)
2678 2681
2679 2682 def status(ui, repo, *pats, **opts):
2680 2683 """show changed files in the working directory
2681 2684
2682 2685 Show status of files in the repository. If names are given, only
2683 2686 files that match are shown. Files that are clean or ignored or
2684 2687 source of a copy/move operation, are not listed unless -c (clean),
2685 2688 -i (ignored), -C (copies) or -A is given. Unless options described
2686 2689 with "show only ..." are given, the options -mardu are used.
2687 2690
2688 2691 Option -q/--quiet hides untracked (unknown and ignored) files
2689 2692 unless explicitly requested with -u/--unknown or -i/-ignored.
2690 2693
2691 2694 NOTE: status may appear to disagree with diff if permissions have
2692 2695 changed or a merge has occurred. The standard diff format does not
2693 2696 report permission changes and diff only reports changes relative
2694 2697 to one merge parent.
2695 2698
2696 2699 If one revision is given, it is used as the base revision.
2697 2700 If two revisions are given, the difference between them is shown.
2698 2701
2699 2702 The codes used to show the status of files are:
2700 2703 M = modified
2701 2704 A = added
2702 2705 R = removed
2703 2706 C = clean
2704 2707 ! = deleted, but still tracked
2705 2708 ? = not tracked
2706 2709 I = ignored
2707 2710 = the previous added file was copied from here
2708 2711 """
2709 2712
2710 2713 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
2711 2714 cwd = (pats and repo.getcwd()) or ''
2712 2715 end = opts.get('print0') and '\0' or '\n'
2713 2716 copy = {}
2714 2717 states = 'modified added removed deleted unknown ignored clean'.split()
2715 2718 show = [k for k in states if opts[k]]
2716 2719 if opts.get('all'):
2717 2720 show += ui.quiet and (states[:4] + ['clean']) or states
2718 2721 if not show:
2719 2722 show = ui.quiet and states[:4] or states[:5]
2720 2723
2721 2724 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
2722 2725 'ignored' in show, 'clean' in show, 'unknown' in show)
2723 2726 changestates = zip(states, 'MAR!?IC', stat)
2724 2727
2725 2728 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
2726 2729 ctxn = repo[nullid]
2727 2730 ctx1 = repo[node1]
2728 2731 ctx2 = repo[node2]
2729 2732 added = stat[1]
2730 2733 if node2 is None:
2731 2734 added = stat[0] + stat[1] # merged?
2732 2735
2733 2736 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items():
2734 2737 if k in added:
2735 2738 copy[k] = v
2736 2739 elif v in added:
2737 2740 copy[v] = k
2738 2741
2739 2742 for state, char, files in changestates:
2740 2743 if state in show:
2741 2744 format = "%s %%s%s" % (char, end)
2742 2745 if opts.get('no_status'):
2743 2746 format = "%%s%s" % end
2744 2747
2745 2748 for f in files:
2746 2749 ui.write(format % repo.pathto(f, cwd))
2747 2750 if f in copy:
2748 2751 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
2749 2752
2750 2753 def tag(ui, repo, name1, *names, **opts):
2751 2754 """add one or more tags for the current or given revision
2752 2755
2753 2756 Name a particular revision using <name>.
2754 2757
2755 2758 Tags are used to name particular revisions of the repository and are
2756 2759 very useful to compare different revisions, to go back to significant
2757 2760 earlier versions or to mark branch points as releases, etc.
2758 2761
2759 2762 If no revision is given, the parent of the working directory is used,
2760 2763 or tip if no revision is checked out.
2761 2764
2762 2765 To facilitate version control, distribution, and merging of tags,
2763 2766 they are stored as a file named ".hgtags" which is managed
2764 2767 similarly to other project files and can be hand-edited if
2765 2768 necessary. The file '.hg/localtags' is used for local tags (not
2766 2769 shared among repositories).
2767 2770
2768 2771 See 'hg help dates' for a list of formats valid for -d/--date.
2769 2772 """
2770 2773
2771 2774 rev_ = "."
2772 2775 names = (name1,) + names
2773 2776 if len(names) != len(dict.fromkeys(names)):
2774 2777 raise util.Abort(_('tag names must be unique'))
2775 2778 for n in names:
2776 2779 if n in ['tip', '.', 'null']:
2777 2780 raise util.Abort(_('the name \'%s\' is reserved') % n)
2778 2781 if opts.get('rev') and opts.get('remove'):
2779 2782 raise util.Abort(_("--rev and --remove are incompatible"))
2780 2783 if opts.get('rev'):
2781 2784 rev_ = opts['rev']
2782 2785 message = opts.get('message')
2783 2786 if opts.get('remove'):
2784 2787 expectedtype = opts.get('local') and 'local' or 'global'
2785 2788 for n in names:
2786 2789 if not repo.tagtype(n):
2787 2790 raise util.Abort(_('tag \'%s\' does not exist') % n)
2788 2791 if repo.tagtype(n) != expectedtype:
2789 2792 raise util.Abort(_('tag \'%s\' is not a %s tag') %
2790 2793 (n, expectedtype))
2791 2794 rev_ = nullid
2792 2795 if not message:
2793 2796 message = _('Removed tag %s') % ', '.join(names)
2794 2797 elif not opts.get('force'):
2795 2798 for n in names:
2796 2799 if n in repo.tags():
2797 2800 raise util.Abort(_('tag \'%s\' already exists '
2798 2801 '(use -f to force)') % n)
2799 2802 if not rev_ and repo.dirstate.parents()[1] != nullid:
2800 2803 raise util.Abort(_('uncommitted merge - please provide a '
2801 2804 'specific revision'))
2802 2805 r = repo[rev_].node()
2803 2806
2804 2807 if not message:
2805 2808 message = (_('Added tag %s for changeset %s') %
2806 2809 (', '.join(names), short(r)))
2807 2810
2808 2811 date = opts.get('date')
2809 2812 if date:
2810 2813 date = util.parsedate(date)
2811 2814
2812 2815 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
2813 2816
2814 2817 def tags(ui, repo):
2815 2818 """list repository tags
2816 2819
2817 2820 List the repository tags.
2818 2821
2819 2822 This lists both regular and local tags. When the -v/--verbose switch
2820 2823 is used, a third column "local" is printed for local tags.
2821 2824 """
2822 2825
2823 2826 l = repo.tagslist()
2824 2827 l.reverse()
2825 2828 hexfunc = ui.debugflag and hex or short
2826 2829 tagtype = ""
2827 2830
2828 2831 for t, n in l:
2829 2832 if ui.quiet:
2830 2833 ui.write("%s\n" % t)
2831 2834 continue
2832 2835
2833 2836 try:
2834 2837 hn = hexfunc(n)
2835 2838 r = "%5d:%s" % (repo.changelog.rev(n), hn)
2836 2839 except revlog.LookupError:
2837 2840 r = " ?:%s" % hn
2838 2841 else:
2839 2842 spaces = " " * (30 - util.locallen(t))
2840 2843 if ui.verbose:
2841 2844 if repo.tagtype(t) == 'local':
2842 2845 tagtype = " local"
2843 2846 else:
2844 2847 tagtype = ""
2845 2848 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
2846 2849
2847 2850 def tip(ui, repo, **opts):
2848 2851 """show the tip revision
2849 2852
2850 2853 The tip revision (usually just called the tip) is the most
2851 2854 recently added changeset in the repository, the most recently
2852 2855 changed head.
2853 2856
2854 2857 If you have just made a commit, that commit will be the tip. If
2855 2858 you have just pulled changes from another repository, the tip of
2856 2859 that repository becomes the current tip. The "tip" tag is special
2857 2860 and cannot be renamed or assigned to a different changeset.
2858 2861 """
2859 2862 cmdutil.show_changeset(ui, repo, opts).show(repo[len(repo) - 1])
2860 2863
2861 2864 def unbundle(ui, repo, fname1, *fnames, **opts):
2862 2865 """apply one or more changegroup files
2863 2866
2864 2867 Apply one or more compressed changegroup files generated by the
2865 2868 bundle command.
2866 2869 """
2867 2870 fnames = (fname1,) + fnames
2868 2871
2869 2872 lock = None
2870 2873 try:
2871 2874 lock = repo.lock()
2872 2875 for fname in fnames:
2873 2876 f = url.open(ui, fname)
2874 2877 gen = changegroup.readbundle(f, fname)
2875 2878 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
2876 2879 finally:
2877 2880 del lock
2878 2881
2879 2882 return postincoming(ui, repo, modheads, opts.get('update'), None)
2880 2883
2881 2884 def update(ui, repo, node=None, rev=None, clean=False, date=None):
2882 2885 """update working directory
2883 2886
2884 2887 Update the repository's working directory to the specified revision,
2885 2888 or the tip of the current branch if none is specified. Use null as
2886 2889 the revision to remove the working copy (like 'hg clone -U').
2887 2890
2888 2891 When the working dir contains no uncommitted changes, it will be
2889 2892 replaced by the state of the requested revision from the repo. When
2890 2893 the requested revision is on a different branch, the working dir
2891 2894 will additionally be switched to that branch.
2892 2895
2893 2896 When there are uncommitted changes, use option -C to discard them,
2894 2897 forcibly replacing the state of the working dir with the requested
2895 2898 revision.
2896 2899
2897 2900 When there are uncommitted changes and option -C is not used, and
2898 2901 the parent revision and requested revision are on the same branch,
2899 2902 and one of them is an ancestor of the other, then the new working
2900 2903 directory will contain the requested revision merged with the
2901 2904 uncommitted changes. Otherwise, the update will fail with a
2902 2905 suggestion to use 'merge' or 'update -C' instead.
2903 2906
2904 2907 If you want to update just one file to an older revision, use revert.
2905 2908
2906 2909 See 'hg help dates' for a list of formats valid for --date.
2907 2910 """
2908 2911 if rev and node:
2909 2912 raise util.Abort(_("please specify just one revision"))
2910 2913
2911 2914 if not rev:
2912 2915 rev = node
2913 2916
2914 2917 if date:
2915 2918 if rev:
2916 2919 raise util.Abort(_("you can't specify a revision and a date"))
2917 2920 rev = cmdutil.finddate(ui, repo, date)
2918 2921
2919 2922 if clean:
2920 2923 return hg.clean(repo, rev)
2921 2924 else:
2922 2925 return hg.update(repo, rev)
2923 2926
2924 2927 def verify(ui, repo):
2925 2928 """verify the integrity of the repository
2926 2929
2927 2930 Verify the integrity of the current repository.
2928 2931
2929 2932 This will perform an extensive check of the repository's
2930 2933 integrity, validating the hashes and checksums of each entry in
2931 2934 the changelog, manifest, and tracked files, as well as the
2932 2935 integrity of their crosslinks and indices.
2933 2936 """
2934 2937 return hg.verify(repo)
2935 2938
2936 2939 def version_(ui):
2937 2940 """output version and copyright information"""
2938 2941 ui.write(_("Mercurial Distributed SCM (version %s)\n")
2939 2942 % version.get_version())
2940 2943 ui.status(_(
2941 2944 "\nCopyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n"
2942 2945 "This is free software; see the source for copying conditions. "
2943 2946 "There is NO\nwarranty; "
2944 2947 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
2945 2948 ))
2946 2949
2947 2950 # Command options and aliases are listed here, alphabetically
2948 2951
2949 2952 globalopts = [
2950 2953 ('R', 'repository', '',
2951 2954 _('repository root directory or symbolic path name')),
2952 2955 ('', 'cwd', '', _('change working directory')),
2953 2956 ('y', 'noninteractive', None,
2954 2957 _('do not prompt, assume \'yes\' for any required answers')),
2955 2958 ('q', 'quiet', None, _('suppress output')),
2956 2959 ('v', 'verbose', None, _('enable additional output')),
2957 2960 ('', 'config', [], _('set/override config option')),
2958 2961 ('', 'debug', None, _('enable debugging output')),
2959 2962 ('', 'debugger', None, _('start debugger')),
2960 2963 ('', 'encoding', util._encoding, _('set the charset encoding')),
2961 2964 ('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')),
2962 2965 ('', 'lsprof', None, _('print improved command execution profile')),
2963 2966 ('', 'traceback', None, _('print traceback on exception')),
2964 2967 ('', 'time', None, _('time how long the command takes')),
2965 2968 ('', 'profile', None, _('print command execution profile')),
2966 2969 ('', 'version', None, _('output version information and exit')),
2967 2970 ('h', 'help', None, _('display help and exit')),
2968 2971 ]
2969 2972
2970 2973 dryrunopts = [('n', 'dry-run', None,
2971 2974 _('do not perform actions, just print output'))]
2972 2975
2973 2976 remoteopts = [
2974 2977 ('e', 'ssh', '', _('specify ssh command to use')),
2975 2978 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
2976 2979 ]
2977 2980
2978 2981 walkopts = [
2979 2982 ('I', 'include', [], _('include names matching the given patterns')),
2980 2983 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2981 2984 ]
2982 2985
2983 2986 commitopts = [
2984 2987 ('m', 'message', '', _('use <text> as commit message')),
2985 2988 ('l', 'logfile', '', _('read commit message from <file>')),
2986 2989 ]
2987 2990
2988 2991 commitopts2 = [
2989 2992 ('d', 'date', '', _('record datecode as commit date')),
2990 2993 ('u', 'user', '', _('record user as committer')),
2991 2994 ]
2992 2995
2993 2996 templateopts = [
2994 2997 ('', 'style', '', _('display using template map file')),
2995 2998 ('', 'template', '', _('display with template')),
2996 2999 ]
2997 3000
2998 3001 logopts = [
2999 3002 ('p', 'patch', None, _('show patch')),
3000 3003 ('l', 'limit', '', _('limit number of changes displayed')),
3001 3004 ('M', 'no-merges', None, _('do not show merges')),
3002 3005 ] + templateopts
3003 3006
3004 3007 diffopts = [
3005 3008 ('a', 'text', None, _('treat all files as text')),
3006 3009 ('g', 'git', None, _('use git extended diff format')),
3007 3010 ('', 'nodates', None, _("don't include dates in diff headers"))
3008 3011 ]
3009 3012
3010 3013 diffopts2 = [
3011 3014 ('p', 'show-function', None, _('show which function each change is in')),
3012 3015 ('w', 'ignore-all-space', None,
3013 3016 _('ignore white space when comparing lines')),
3014 3017 ('b', 'ignore-space-change', None,
3015 3018 _('ignore changes in the amount of white space')),
3016 3019 ('B', 'ignore-blank-lines', None,
3017 3020 _('ignore changes whose lines are all blank')),
3018 3021 ('U', 'unified', '', _('number of lines of context to show'))
3019 3022 ]
3020 3023
3021 3024 similarityopts = [
3022 3025 ('s', 'similarity', '',
3023 3026 _('guess renamed files by similarity (0<=s<=100)'))
3024 3027 ]
3025 3028
3026 3029 table = {
3027 3030 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
3028 3031 "addremove":
3029 3032 (addremove, similarityopts + walkopts + dryrunopts,
3030 3033 _('[OPTION]... [FILE]...')),
3031 3034 "^annotate|blame":
3032 3035 (annotate,
3033 3036 [('r', 'rev', '', _('annotate the specified revision')),
3034 3037 ('f', 'follow', None, _('follow file copies and renames')),
3035 3038 ('a', 'text', None, _('treat all files as text')),
3036 3039 ('u', 'user', None, _('list the author (long with -v)')),
3037 3040 ('d', 'date', None, _('list the date (short with -q)')),
3038 3041 ('n', 'number', None, _('list the revision number (default)')),
3039 3042 ('c', 'changeset', None, _('list the changeset')),
3040 3043 ('l', 'line-number', None,
3041 3044 _('show line number at the first appearance'))
3042 3045 ] + walkopts,
3043 3046 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3044 3047 "archive":
3045 3048 (archive,
3046 3049 [('', 'no-decode', None, _('do not pass files through decoders')),
3047 3050 ('p', 'prefix', '', _('directory prefix for files in archive')),
3048 3051 ('r', 'rev', '', _('revision to distribute')),
3049 3052 ('t', 'type', '', _('type of distribution to create')),
3050 3053 ] + walkopts,
3051 3054 _('[OPTION]... DEST')),
3052 3055 "backout":
3053 3056 (backout,
3054 3057 [('', 'merge', None,
3055 3058 _('merge with old dirstate parent after backout')),
3056 3059 ('', 'parent', '', _('parent to choose when backing out merge')),
3057 3060 ('r', 'rev', '', _('revision to backout')),
3058 3061 ] + walkopts + commitopts + commitopts2,
3059 3062 _('[OPTION]... [-r] REV')),
3060 3063 "bisect":
3061 3064 (bisect,
3062 3065 [('r', 'reset', False, _('reset bisect state')),
3063 3066 ('g', 'good', False, _('mark changeset good')),
3064 3067 ('b', 'bad', False, _('mark changeset bad')),
3065 3068 ('s', 'skip', False, _('skip testing changeset')),
3066 3069 ('c', 'command', '', _('Use command to check changeset state')),
3067 3070 ('U', 'noupdate', False, _('do not update to target'))],
3068 3071 _("[-gbsr] [-c CMD] [REV]")),
3069 3072 "branch":
3070 3073 (branch,
3071 3074 [('f', 'force', None,
3072 3075 _('set branch name even if it shadows an existing branch')),
3073 3076 ('C', 'clean', None, _('reset branch name to parent branch name'))],
3074 3077 _('[-fC] [NAME]')),
3075 3078 "branches":
3076 3079 (branches,
3077 3080 [('a', 'active', False,
3078 3081 _('show only branches that have unmerged heads'))],
3079 3082 _('[-a]')),
3080 3083 "bundle":
3081 3084 (bundle,
3082 3085 [('f', 'force', None,
3083 3086 _('run even when remote repository is unrelated')),
3084 3087 ('r', 'rev', [],
3085 3088 _('a changeset up to which you would like to bundle')),
3086 3089 ('', 'base', [],
3087 3090 _('a base changeset to specify instead of a destination')),
3088 3091 ('a', 'all', None, _('bundle all changesets in the repository')),
3089 3092 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3090 3093 ] + remoteopts,
3091 3094 _('[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3092 3095 "cat":
3093 3096 (cat,
3094 3097 [('o', 'output', '', _('print output to file with formatted name')),
3095 3098 ('r', 'rev', '', _('print the given revision')),
3096 3099 ('', 'decode', None, _('apply any matching decode filter')),
3097 3100 ] + walkopts,
3098 3101 _('[OPTION]... FILE...')),
3099 3102 "^clone":
3100 3103 (clone,
3101 3104 [('U', 'noupdate', None,
3102 3105 _('the clone will only contain a repository (no working copy)')),
3103 3106 ('r', 'rev', [],
3104 3107 _('a changeset you would like to have after cloning')),
3105 3108 ('', 'pull', None, _('use pull protocol to copy metadata')),
3106 3109 ('', 'uncompressed', None,
3107 3110 _('use uncompressed transfer (fast over LAN)')),
3108 3111 ] + remoteopts,
3109 3112 _('[OPTION]... SOURCE [DEST]')),
3110 3113 "^commit|ci":
3111 3114 (commit,
3112 3115 [('A', 'addremove', None,
3113 3116 _('mark new/missing files as added/removed before committing')),
3114 3117 ] + walkopts + commitopts + commitopts2,
3115 3118 _('[OPTION]... [FILE]...')),
3116 3119 "copy|cp":
3117 3120 (copy,
3118 3121 [('A', 'after', None, _('record a copy that has already occurred')),
3119 3122 ('f', 'force', None,
3120 3123 _('forcibly copy over an existing managed file')),
3121 3124 ] + walkopts + dryrunopts,
3122 3125 _('[OPTION]... [SOURCE]... DEST')),
3123 3126 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
3124 3127 "debugcheckstate": (debugcheckstate, []),
3125 3128 "debugcomplete":
3126 3129 (debugcomplete,
3127 3130 [('o', 'options', None, _('show the command options'))],
3128 3131 _('[-o] CMD')),
3129 3132 "debugdate":
3130 3133 (debugdate,
3131 3134 [('e', 'extended', None, _('try extended date formats'))],
3132 3135 _('[-e] DATE [RANGE]')),
3133 3136 "debugdata": (debugdata, [], _('FILE REV')),
3134 3137 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
3135 3138 "debugindex": (debugindex, [], _('FILE')),
3136 3139 "debugindexdot": (debugindexdot, [], _('FILE')),
3137 3140 "debuginstall": (debuginstall, []),
3138 3141 "debugrawcommit|rawcommit":
3139 3142 (rawcommit,
3140 3143 [('p', 'parent', [], _('parent')),
3141 3144 ('F', 'files', '', _('file list'))
3142 3145 ] + commitopts + commitopts2,
3143 3146 _('[OPTION]... [FILE]...')),
3144 3147 "debugrebuildstate":
3145 3148 (debugrebuildstate,
3146 3149 [('r', 'rev', '', _('revision to rebuild to'))],
3147 3150 _('[-r REV] [REV]')),
3148 3151 "debugrename":
3149 3152 (debugrename,
3150 3153 [('r', 'rev', '', _('revision to debug'))],
3151 3154 _('[-r REV] FILE')),
3152 3155 "debugsetparents":
3153 3156 (debugsetparents, [], _('REV1 [REV2]')),
3154 3157 "debugstate":
3155 3158 (debugstate,
3156 3159 [('', 'nodates', None, _('do not display the saved mtime'))],
3157 3160 _('[OPTION]...')),
3158 3161 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
3159 3162 "^diff":
3160 3163 (diff,
3161 3164 [('r', 'rev', [], _('revision'))
3162 3165 ] + diffopts + diffopts2 + walkopts,
3163 3166 _('[OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3164 3167 "^export":
3165 3168 (export,
3166 3169 [('o', 'output', '', _('print output to file with formatted name')),
3167 3170 ('', 'switch-parent', None, _('diff against the second parent'))
3168 3171 ] + diffopts,
3169 3172 _('[OPTION]... [-o OUTFILESPEC] REV...')),
3170 3173 "grep":
3171 3174 (grep,
3172 3175 [('0', 'print0', None, _('end fields with NUL')),
3173 3176 ('', 'all', None, _('print all revisions that match')),
3174 3177 ('f', 'follow', None,
3175 3178 _('follow changeset history, or file history across copies and renames')),
3176 3179 ('i', 'ignore-case', None, _('ignore case when matching')),
3177 3180 ('l', 'files-with-matches', None,
3178 3181 _('print only filenames and revs that match')),
3179 3182 ('n', 'line-number', None, _('print matching line numbers')),
3180 3183 ('r', 'rev', [], _('search in given revision range')),
3181 3184 ('u', 'user', None, _('list the author (long with -v)')),
3182 3185 ('d', 'date', None, _('list the date (short with -q)')),
3183 3186 ] + walkopts,
3184 3187 _('[OPTION]... PATTERN [FILE]...')),
3185 3188 "heads":
3186 3189 (heads,
3187 3190 [('r', 'rev', '', _('show only heads which are descendants of rev')),
3188 3191 ] + templateopts,
3189 3192 _('[-r REV] [REV]...')),
3190 3193 "help": (help_, [], _('[TOPIC]')),
3191 3194 "identify|id":
3192 3195 (identify,
3193 3196 [('r', 'rev', '', _('identify the specified rev')),
3194 3197 ('n', 'num', None, _('show local revision number')),
3195 3198 ('i', 'id', None, _('show global revision id')),
3196 3199 ('b', 'branch', None, _('show branch')),
3197 3200 ('t', 'tags', None, _('show tags'))],
3198 3201 _('[-nibt] [-r REV] [SOURCE]')),
3199 3202 "import|patch":
3200 3203 (import_,
3201 3204 [('p', 'strip', 1,
3202 3205 _('directory strip option for patch. This has the same\n'
3203 3206 'meaning as the corresponding patch option')),
3204 3207 ('b', 'base', '', _('base path')),
3205 3208 ('f', 'force', None,
3206 3209 _('skip check for outstanding uncommitted changes')),
3207 3210 ('', 'no-commit', None, _("don't commit, just update the working directory")),
3208 3211 ('', 'exact', None,
3209 3212 _('apply patch to the nodes from which it was generated')),
3210 3213 ('', 'import-branch', None,
3211 3214 _('Use any branch information in patch (implied by --exact)'))] +
3212 3215 commitopts + commitopts2 + similarityopts,
3213 3216 _('[OPTION]... PATCH...')),
3214 3217 "incoming|in":
3215 3218 (incoming,
3216 3219 [('f', 'force', None,
3217 3220 _('run even when remote repository is unrelated')),
3218 3221 ('n', 'newest-first', None, _('show newest record first')),
3219 3222 ('', 'bundle', '', _('file to store the bundles into')),
3220 3223 ('r', 'rev', [],
3221 3224 _('a specific revision up to which you would like to pull')),
3222 3225 ] + logopts + remoteopts,
3223 3226 _('[-p] [-n] [-M] [-f] [-r REV]...'
3224 3227 ' [--bundle FILENAME] [SOURCE]')),
3225 3228 "^init":
3226 3229 (init,
3227 3230 remoteopts,
3228 3231 _('[-e CMD] [--remotecmd CMD] [DEST]')),
3229 3232 "locate":
3230 3233 (locate,
3231 3234 [('r', 'rev', '', _('search the repository as it stood at rev')),
3232 3235 ('0', 'print0', None,
3233 3236 _('end filenames with NUL, for use with xargs')),
3234 3237 ('f', 'fullpath', None,
3235 3238 _('print complete paths from the filesystem root')),
3236 3239 ] + walkopts,
3237 3240 _('[OPTION]... [PATTERN]...')),
3238 3241 "^log|history":
3239 3242 (log,
3240 3243 [('f', 'follow', None,
3241 3244 _('follow changeset history, or file history across copies and renames')),
3242 3245 ('', 'follow-first', None,
3243 3246 _('only follow the first parent of merge changesets')),
3244 3247 ('d', 'date', '', _('show revs matching date spec')),
3245 3248 ('C', 'copies', None, _('show copied files')),
3246 3249 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
3247 3250 ('r', 'rev', [], _('show the specified revision or range')),
3248 3251 ('', 'removed', None, _('include revs where files were removed')),
3249 3252 ('m', 'only-merges', None, _('show only merges')),
3250 3253 ('u', 'user', [], _('revs committed by user')),
3251 3254 ('b', 'only-branch', [],
3252 3255 _('show only changesets within the given named branch')),
3253 3256 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
3254 3257 ] + logopts + walkopts,
3255 3258 _('[OPTION]... [FILE]')),
3256 3259 "manifest":
3257 3260 (manifest,
3258 3261 [('r', 'rev', '', _('revision to display'))],
3259 3262 _('[-r REV]')),
3260 3263 "^merge":
3261 3264 (merge,
3262 3265 [('f', 'force', None, _('force a merge with outstanding changes')),
3263 3266 ('r', 'rev', '', _('revision to merge')),
3264 3267 ],
3265 3268 _('[-f] [[-r] REV]')),
3266 3269 "outgoing|out":
3267 3270 (outgoing,
3268 3271 [('f', 'force', None,
3269 3272 _('run even when remote repository is unrelated')),
3270 3273 ('r', 'rev', [],
3271 3274 _('a specific revision up to which you would like to push')),
3272 3275 ('n', 'newest-first', None, _('show newest record first')),
3273 3276 ] + logopts + remoteopts,
3274 3277 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3275 3278 "^parents":
3276 3279 (parents,
3277 3280 [('r', 'rev', '', _('show parents from the specified rev')),
3278 3281 ] + templateopts,
3279 3282 _('hg parents [-r REV] [FILE]')),
3280 3283 "paths": (paths, [], _('[NAME]')),
3281 3284 "^pull":
3282 3285 (pull,
3283 3286 [('u', 'update', None,
3284 3287 _('update to new tip if changesets were pulled')),
3285 3288 ('f', 'force', None,
3286 3289 _('run even when remote repository is unrelated')),
3287 3290 ('r', 'rev', [],
3288 3291 _('a specific revision up to which you would like to pull')),
3289 3292 ] + remoteopts,
3290 3293 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3291 3294 "^push":
3292 3295 (push,
3293 3296 [('f', 'force', None, _('force push')),
3294 3297 ('r', 'rev', [],
3295 3298 _('a specific revision up to which you would like to push')),
3296 3299 ] + remoteopts,
3297 3300 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3298 3301 "recover": (recover, []),
3299 3302 "^remove|rm":
3300 3303 (remove,
3301 3304 [('A', 'after', None, _('record delete for missing files')),
3302 3305 ('f', 'force', None,
3303 3306 _('remove (and delete) file even if added or modified')),
3304 3307 ] + walkopts,
3305 3308 _('[OPTION]... FILE...')),
3306 3309 "rename|mv":
3307 3310 (rename,
3308 3311 [('A', 'after', None, _('record a rename that has already occurred')),
3309 3312 ('f', 'force', None,
3310 3313 _('forcibly copy over an existing managed file')),
3311 3314 ] + walkopts + dryrunopts,
3312 3315 _('[OPTION]... SOURCE... DEST')),
3313 3316 "resolve":
3314 3317 (resolve,
3315 3318 [('l', 'list', None, _('list state of files needing merge')),
3316 3319 ('m', 'mark', None, _('mark files as resolved')),
3317 3320 ('u', 'unmark', None, _('unmark files as resolved'))],
3318 3321 _('[OPTION]... [FILE]...')),
3319 3322 "revert":
3320 3323 (revert,
3321 3324 [('a', 'all', None, _('revert all changes when no arguments given')),
3322 3325 ('d', 'date', '', _('tipmost revision matching date')),
3323 3326 ('r', 'rev', '', _('revision to revert to')),
3324 3327 ('', 'no-backup', None, _('do not save backup copies of files')),
3325 3328 ] + walkopts + dryrunopts,
3326 3329 _('[OPTION]... [-r REV] [NAME]...')),
3327 3330 "rollback": (rollback, []),
3328 3331 "root": (root, []),
3329 3332 "^serve":
3330 3333 (serve,
3331 3334 [('A', 'accesslog', '', _('name of access log file to write to')),
3332 3335 ('d', 'daemon', None, _('run server in background')),
3333 3336 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3334 3337 ('E', 'errorlog', '', _('name of error log file to write to')),
3335 3338 ('p', 'port', 0, _('port to listen on (default: 8000)')),
3336 3339 ('a', 'address', '', _('address to listen on (default: all interfaces)')),
3337 3340 ('', 'prefix', '', _('prefix path to serve from (default: server root)')),
3338 3341 ('n', 'name', '',
3339 3342 _('name to show in web pages (default: working dir)')),
3340 3343 ('', 'webdir-conf', '', _('name of the webdir config file'
3341 3344 ' (serve more than one repo)')),
3342 3345 ('', 'pid-file', '', _('name of file to write process ID to')),
3343 3346 ('', 'stdio', None, _('for remote clients')),
3344 3347 ('t', 'templates', '', _('web templates to use')),
3345 3348 ('', 'style', '', _('template style to use')),
3346 3349 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
3347 3350 ('', 'certificate', '', _('SSL certificate file'))],
3348 3351 _('[OPTION]...')),
3349 3352 "showconfig|debugconfig":
3350 3353 (showconfig,
3351 3354 [('u', 'untrusted', None, _('show untrusted configuration options'))],
3352 3355 _('[-u] [NAME]...')),
3353 3356 "^status|st":
3354 3357 (status,
3355 3358 [('A', 'all', None, _('show status of all files')),
3356 3359 ('m', 'modified', None, _('show only modified files')),
3357 3360 ('a', 'added', None, _('show only added files')),
3358 3361 ('r', 'removed', None, _('show only removed files')),
3359 3362 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3360 3363 ('c', 'clean', None, _('show only files without changes')),
3361 3364 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3362 3365 ('i', 'ignored', None, _('show only ignored files')),
3363 3366 ('n', 'no-status', None, _('hide status prefix')),
3364 3367 ('C', 'copies', None, _('show source of copied files')),
3365 3368 ('0', 'print0', None,
3366 3369 _('end filenames with NUL, for use with xargs')),
3367 3370 ('', 'rev', [], _('show difference from revision')),
3368 3371 ] + walkopts,
3369 3372 _('[OPTION]... [FILE]...')),
3370 3373 "tag":
3371 3374 (tag,
3372 3375 [('f', 'force', None, _('replace existing tag')),
3373 3376 ('l', 'local', None, _('make the tag local')),
3374 3377 ('r', 'rev', '', _('revision to tag')),
3375 3378 ('', 'remove', None, _('remove a tag')),
3376 3379 # -l/--local is already there, commitopts cannot be used
3377 3380 ('m', 'message', '', _('use <text> as commit message')),
3378 3381 ] + commitopts2,
3379 3382 _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
3380 3383 "tags": (tags, []),
3381 3384 "tip":
3382 3385 (tip,
3383 3386 [('p', 'patch', None, _('show patch')),
3384 3387 ] + templateopts,
3385 3388 _('[-p]')),
3386 3389 "unbundle":
3387 3390 (unbundle,
3388 3391 [('u', 'update', None,
3389 3392 _('update to new tip if changesets were unbundled'))],
3390 3393 _('[-u] FILE...')),
3391 3394 "^update|up|checkout|co":
3392 3395 (update,
3393 3396 [('C', 'clean', None, _('overwrite locally modified files (no backup)')),
3394 3397 ('d', 'date', '', _('tipmost revision matching date')),
3395 3398 ('r', 'rev', '', _('revision'))],
3396 3399 _('[-C] [-d DATE] [[-r] REV]')),
3397 3400 "verify": (verify, []),
3398 3401 "version": (version_, []),
3399 3402 }
3400 3403
3401 3404 norepo = ("clone init version help debugcomplete debugdata"
3402 3405 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
3403 3406 optionalrepo = ("identify paths serve showconfig debugancestor")
General Comments 0
You need to be logged in to leave comments. Login now