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