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