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