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