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