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