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