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