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