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