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