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