##// END OF EJS Templates
bisect: fix format specifiers for integers
Cédric Duval -
r9012:ada93c6b default
parent child Browse files
Show More
@@ -1,3558 +1,3558 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 ui.write(_("Testing changeset %s:%s "
400 "(%s changesets remaining, ~%s tests)\n")
399 ui.write(_("Testing changeset %d:%s "
400 "(%d changesets remaining, ~%d 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 fcache = {}
1210 1210 forder = []
1211 1211 def getfile(fn):
1212 1212 if fn not in fcache:
1213 1213 if len(fcache) > 20:
1214 1214 del fcache[forder.pop(0)]
1215 1215 fcache[fn] = repo.file(fn)
1216 1216 else:
1217 1217 forder.remove(fn)
1218 1218
1219 1219 forder.append(fn)
1220 1220 return fcache[fn]
1221 1221
1222 1222 def matchlines(body):
1223 1223 begin = 0
1224 1224 linenum = 0
1225 1225 while True:
1226 1226 match = regexp.search(body, begin)
1227 1227 if not match:
1228 1228 break
1229 1229 mstart, mend = match.span()
1230 1230 linenum += body.count('\n', begin, mstart) + 1
1231 1231 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1232 1232 begin = body.find('\n', mend) + 1 or len(body)
1233 1233 lend = begin - 1
1234 1234 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1235 1235
1236 1236 class linestate(object):
1237 1237 def __init__(self, line, linenum, colstart, colend):
1238 1238 self.line = line
1239 1239 self.linenum = linenum
1240 1240 self.colstart = colstart
1241 1241 self.colend = colend
1242 1242
1243 1243 def __hash__(self):
1244 1244 return hash((self.linenum, self.line))
1245 1245
1246 1246 def __eq__(self, other):
1247 1247 return self.line == other.line
1248 1248
1249 1249 matches = {}
1250 1250 copies = {}
1251 1251 def grepbody(fn, rev, body):
1252 1252 matches[rev].setdefault(fn, [])
1253 1253 m = matches[rev][fn]
1254 1254 for lnum, cstart, cend, line in matchlines(body):
1255 1255 s = linestate(line, lnum, cstart, cend)
1256 1256 m.append(s)
1257 1257
1258 1258 def difflinestates(a, b):
1259 1259 sm = difflib.SequenceMatcher(None, a, b)
1260 1260 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1261 1261 if tag == 'insert':
1262 1262 for i in xrange(blo, bhi):
1263 1263 yield ('+', b[i])
1264 1264 elif tag == 'delete':
1265 1265 for i in xrange(alo, ahi):
1266 1266 yield ('-', a[i])
1267 1267 elif tag == 'replace':
1268 1268 for i in xrange(alo, ahi):
1269 1269 yield ('-', a[i])
1270 1270 for i in xrange(blo, bhi):
1271 1271 yield ('+', b[i])
1272 1272
1273 1273 def display(fn, r, pstates, states):
1274 1274 datefunc = ui.quiet and util.shortdate or util.datestr
1275 1275 found = False
1276 1276 filerevmatches = {}
1277 1277 if opts.get('all'):
1278 1278 iter = difflinestates(pstates, states)
1279 1279 else:
1280 1280 iter = [('', l) for l in states]
1281 1281 for change, l in iter:
1282 1282 cols = [fn, str(r)]
1283 1283 if opts.get('line_number'):
1284 1284 cols.append(str(l.linenum))
1285 1285 if opts.get('all'):
1286 1286 cols.append(change)
1287 1287 if opts.get('user'):
1288 1288 cols.append(ui.shortuser(get(r)[1]))
1289 1289 if opts.get('date'):
1290 1290 cols.append(datefunc(get(r)[2]))
1291 1291 if opts.get('files_with_matches'):
1292 1292 c = (fn, r)
1293 1293 if c in filerevmatches:
1294 1294 continue
1295 1295 filerevmatches[c] = 1
1296 1296 else:
1297 1297 cols.append(l.line)
1298 1298 ui.write(sep.join(cols), eol)
1299 1299 found = True
1300 1300 return found
1301 1301
1302 1302 skip = {}
1303 1303 revfiles = {}
1304 1304 get = util.cachefunc(lambda r: repo[r].changeset())
1305 1305 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1306 1306 found = False
1307 1307 follow = opts.get('follow')
1308 1308 for st, rev, fns in changeiter:
1309 1309 if st == 'window':
1310 1310 matches.clear()
1311 1311 revfiles.clear()
1312 1312 elif st == 'add':
1313 1313 ctx = repo[rev]
1314 1314 pctx = ctx.parents()[0]
1315 1315 parent = pctx.rev()
1316 1316 matches.setdefault(rev, {})
1317 1317 matches.setdefault(parent, {})
1318 1318 files = revfiles.setdefault(rev, [])
1319 1319 for fn in fns:
1320 1320 flog = getfile(fn)
1321 1321 try:
1322 1322 fnode = ctx.filenode(fn)
1323 1323 except error.LookupError:
1324 1324 continue
1325 1325
1326 1326 copied = flog.renamed(fnode)
1327 1327 copy = follow and copied and copied[0]
1328 1328 if copy:
1329 1329 copies.setdefault(rev, {})[fn] = copy
1330 1330 if fn in skip:
1331 1331 if copy:
1332 1332 skip[copy] = True
1333 1333 continue
1334 1334 files.append(fn)
1335 1335
1336 1336 if not matches[rev].has_key(fn):
1337 1337 grepbody(fn, rev, flog.read(fnode))
1338 1338
1339 1339 pfn = copy or fn
1340 1340 if not matches[parent].has_key(pfn):
1341 1341 try:
1342 1342 fnode = pctx.filenode(pfn)
1343 1343 grepbody(pfn, parent, flog.read(fnode))
1344 1344 except error.LookupError:
1345 1345 pass
1346 1346 elif st == 'iter':
1347 1347 parent = repo[rev].parents()[0].rev()
1348 1348 for fn in sorted(revfiles.get(rev, [])):
1349 1349 states = matches[rev][fn]
1350 1350 copy = copies.get(rev, {}).get(fn)
1351 1351 if fn in skip:
1352 1352 if copy:
1353 1353 skip[copy] = True
1354 1354 continue
1355 1355 pstates = matches.get(parent, {}).get(copy or fn, [])
1356 1356 if pstates or states:
1357 1357 r = display(fn, rev, pstates, states)
1358 1358 found = found or r
1359 1359 if r and not opts.get('all'):
1360 1360 skip[fn] = True
1361 1361 if copy:
1362 1362 skip[copy] = True
1363 1363
1364 1364 def heads(ui, repo, *branchrevs, **opts):
1365 1365 """show current repository heads or show branch heads
1366 1366
1367 1367 With no arguments, show all repository head changesets.
1368 1368
1369 1369 Repository "heads" are changesets that don't have child
1370 1370 changesets. They are where development generally takes place and
1371 1371 are the usual targets for update and merge operations.
1372 1372
1373 1373 If one or more REV is given, the "branch heads" will be shown for
1374 1374 the named branch associated with that revision. The name of the
1375 1375 branch is called the revision's branch tag.
1376 1376
1377 1377 Branch heads are revisions on a given named branch that do not have
1378 1378 any descendants on the same branch. A branch head could be a true head
1379 1379 or it could be the last changeset on a branch before a new branch
1380 1380 was created. If none of the branch heads are true heads, the branch
1381 1381 is considered inactive. If -c/--closed is specified, also show branch
1382 1382 heads marked closed (see hg commit --close-branch).
1383 1383
1384 1384 If STARTREV is specified only those heads (or branch heads) that
1385 1385 are descendants of STARTREV will be displayed.
1386 1386 """
1387 1387 if opts.get('rev'):
1388 1388 start = repo.lookup(opts['rev'])
1389 1389 else:
1390 1390 start = None
1391 1391 closed = opts.get('closed')
1392 1392 hideinactive, _heads = opts.get('active'), None
1393 1393 if not branchrevs:
1394 1394 # Assume we're looking repo-wide heads if no revs were specified.
1395 1395 heads = repo.heads(start)
1396 1396 else:
1397 1397 if hideinactive:
1398 1398 _heads = repo.heads(start)
1399 1399 heads = []
1400 1400 visitedset = set()
1401 1401 for branchrev in branchrevs:
1402 1402 branch = repo[branchrev].branch()
1403 1403 if branch in visitedset:
1404 1404 continue
1405 1405 visitedset.add(branch)
1406 1406 bheads = repo.branchheads(branch, start, closed=closed)
1407 1407 if not bheads:
1408 1408 if not opts.get('rev'):
1409 1409 ui.warn(_("no open branch heads on branch %s\n") % branch)
1410 1410 elif branch != branchrev:
1411 1411 ui.warn(_("no changes on branch %s containing %s are "
1412 1412 "reachable from %s\n")
1413 1413 % (branch, branchrev, opts.get('rev')))
1414 1414 else:
1415 1415 ui.warn(_("no changes on branch %s are reachable from %s\n")
1416 1416 % (branch, opts.get('rev')))
1417 1417 if hideinactive:
1418 1418 bheads = [bhead for bhead in bheads if bhead in _heads]
1419 1419 heads.extend(bheads)
1420 1420 if not heads:
1421 1421 return 1
1422 1422 displayer = cmdutil.show_changeset(ui, repo, opts)
1423 1423 for n in heads:
1424 1424 displayer.show(repo[n])
1425 1425
1426 1426 def help_(ui, name=None, with_version=False):
1427 1427 """show help for a given topic or a help overview
1428 1428
1429 1429 With no arguments, print a list of commands with short help messages.
1430 1430
1431 1431 Given a topic, extension, or command name, print help for that
1432 1432 topic."""
1433 1433 option_lists = []
1434 1434
1435 1435 def addglobalopts(aliases):
1436 1436 if ui.verbose:
1437 1437 option_lists.append((_("global options:"), globalopts))
1438 1438 if name == 'shortlist':
1439 1439 option_lists.append((_('use "hg help" for the full list '
1440 1440 'of commands'), ()))
1441 1441 else:
1442 1442 if name == 'shortlist':
1443 1443 msg = _('use "hg help" for the full list of commands '
1444 1444 'or "hg -v" for details')
1445 1445 elif aliases:
1446 1446 msg = _('use "hg -v help%s" to show aliases and '
1447 1447 'global options') % (name and " " + name or "")
1448 1448 else:
1449 1449 msg = _('use "hg -v help %s" to show global options') % name
1450 1450 option_lists.append((msg, ()))
1451 1451
1452 1452 def helpcmd(name):
1453 1453 if with_version:
1454 1454 version_(ui)
1455 1455 ui.write('\n')
1456 1456
1457 1457 try:
1458 1458 aliases, i = cmdutil.findcmd(name, table, False)
1459 1459 except error.AmbiguousCommand, inst:
1460 1460 select = lambda c: c.lstrip('^').startswith(inst.args[0])
1461 1461 helplist(_('list of commands:\n\n'), select)
1462 1462 return
1463 1463
1464 1464 # synopsis
1465 1465 if len(i) > 2:
1466 1466 if i[2].startswith('hg'):
1467 1467 ui.write("%s\n" % i[2])
1468 1468 else:
1469 1469 ui.write('hg %s %s\n' % (aliases[0], i[2]))
1470 1470 else:
1471 1471 ui.write('hg %s\n' % aliases[0])
1472 1472
1473 1473 # aliases
1474 1474 if not ui.quiet and len(aliases) > 1:
1475 1475 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1476 1476
1477 1477 # description
1478 1478 doc = gettext(i[0].__doc__)
1479 1479 if not doc:
1480 1480 doc = _("(no help text available)")
1481 1481 if ui.quiet:
1482 1482 doc = doc.splitlines(0)[0]
1483 1483 ui.write("\n%s\n" % doc.rstrip())
1484 1484
1485 1485 if not ui.quiet:
1486 1486 # options
1487 1487 if i[1]:
1488 1488 option_lists.append((_("options:\n"), i[1]))
1489 1489
1490 1490 addglobalopts(False)
1491 1491
1492 1492 def helplist(header, select=None):
1493 1493 h = {}
1494 1494 cmds = {}
1495 1495 for c, e in table.iteritems():
1496 1496 f = c.split("|", 1)[0]
1497 1497 if select and not select(f):
1498 1498 continue
1499 1499 if (not select and name != 'shortlist' and
1500 1500 e[0].__module__ != __name__):
1501 1501 continue
1502 1502 if name == "shortlist" and not f.startswith("^"):
1503 1503 continue
1504 1504 f = f.lstrip("^")
1505 1505 if not ui.debugflag and f.startswith("debug"):
1506 1506 continue
1507 1507 doc = gettext(e[0].__doc__)
1508 1508 if not doc:
1509 1509 doc = _("(no help text available)")
1510 1510 h[f] = doc.splitlines(0)[0].rstrip()
1511 1511 cmds[f] = c.lstrip("^")
1512 1512
1513 1513 if not h:
1514 1514 ui.status(_('no commands defined\n'))
1515 1515 return
1516 1516
1517 1517 ui.status(header)
1518 1518 fns = sorted(h)
1519 1519 m = max(map(len, fns))
1520 1520 for f in fns:
1521 1521 if ui.verbose:
1522 1522 commands = cmds[f].replace("|",", ")
1523 1523 ui.write(" %s:\n %s\n"%(commands, h[f]))
1524 1524 else:
1525 1525 ui.write(' %-*s %s\n' % (m, f, util.wrap(h[f], m + 4)))
1526 1526
1527 1527 if name != 'shortlist':
1528 1528 exts, maxlength = extensions.enabled()
1529 1529 ui.write(help.listexts(_('enabled extensions:'), exts, maxlength))
1530 1530
1531 1531 if not ui.quiet:
1532 1532 addglobalopts(True)
1533 1533
1534 1534 def helptopic(name):
1535 1535 for names, header, doc in help.helptable:
1536 1536 if name in names:
1537 1537 break
1538 1538 else:
1539 1539 raise error.UnknownCommand(name)
1540 1540
1541 1541 # description
1542 1542 if not doc:
1543 1543 doc = _("(no help text available)")
1544 1544 if hasattr(doc, '__call__'):
1545 1545 doc = doc()
1546 1546
1547 1547 ui.write("%s\n" % header)
1548 1548 ui.write("%s\n" % doc.rstrip())
1549 1549
1550 1550 def helpext(name):
1551 1551 try:
1552 1552 mod = extensions.find(name)
1553 1553 except KeyError:
1554 1554 raise error.UnknownCommand(name)
1555 1555
1556 1556 doc = gettext(mod.__doc__) or _('no help text available')
1557 1557 doc = doc.splitlines(0)
1558 1558 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1559 1559 for d in doc[1:]:
1560 1560 ui.write(d, '\n')
1561 1561
1562 1562 ui.status('\n')
1563 1563
1564 1564 try:
1565 1565 ct = mod.cmdtable
1566 1566 except AttributeError:
1567 1567 ct = {}
1568 1568
1569 1569 modcmds = set([c.split('|', 1)[0] for c in ct])
1570 1570 helplist(_('list of commands:\n\n'), modcmds.__contains__)
1571 1571
1572 1572 if name and name != 'shortlist':
1573 1573 i = None
1574 1574 for f in (helptopic, helpcmd, helpext):
1575 1575 try:
1576 1576 f(name)
1577 1577 i = None
1578 1578 break
1579 1579 except error.UnknownCommand, inst:
1580 1580 i = inst
1581 1581 if i:
1582 1582 raise i
1583 1583
1584 1584 else:
1585 1585 # program name
1586 1586 if ui.verbose or with_version:
1587 1587 version_(ui)
1588 1588 else:
1589 1589 ui.status(_("Mercurial Distributed SCM\n"))
1590 1590 ui.status('\n')
1591 1591
1592 1592 # list of commands
1593 1593 if name == "shortlist":
1594 1594 header = _('basic commands:\n\n')
1595 1595 else:
1596 1596 header = _('list of commands:\n\n')
1597 1597
1598 1598 helplist(header)
1599 1599
1600 1600 # list all option lists
1601 1601 opt_output = []
1602 1602 for title, options in option_lists:
1603 1603 opt_output.append(("\n%s" % title, None))
1604 1604 for shortopt, longopt, default, desc in options:
1605 1605 if "DEPRECATED" in desc and not ui.verbose: continue
1606 1606 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
1607 1607 longopt and " --%s" % longopt),
1608 1608 "%s%s" % (desc,
1609 1609 default
1610 1610 and _(" (default: %s)") % default
1611 1611 or "")))
1612 1612
1613 1613 if not name:
1614 1614 ui.write(_("\nadditional help topics:\n\n"))
1615 1615 topics = []
1616 1616 for names, header, doc in help.helptable:
1617 1617 names = [(-len(name), name) for name in names]
1618 1618 names.sort()
1619 1619 topics.append((names[0][1], header))
1620 1620 topics_len = max([len(s[0]) for s in topics])
1621 1621 for t, desc in topics:
1622 1622 ui.write(" %-*s %s\n" % (topics_len, t, desc))
1623 1623
1624 1624 if opt_output:
1625 1625 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
1626 1626 for first, second in opt_output:
1627 1627 if second:
1628 1628 second = util.wrap(second, opts_len + 3)
1629 1629 ui.write(" %-*s %s\n" % (opts_len, first, second))
1630 1630 else:
1631 1631 ui.write("%s\n" % first)
1632 1632
1633 1633 def identify(ui, repo, source=None,
1634 1634 rev=None, num=None, id=None, branch=None, tags=None):
1635 1635 """identify the working copy or specified revision
1636 1636
1637 1637 With no revision, print a summary of the current state of the
1638 1638 repository.
1639 1639
1640 1640 Specifying a path to a repository root or Mercurial bundle will
1641 1641 cause lookup to operate on that repository/bundle.
1642 1642
1643 1643 This summary identifies the repository state using one or two
1644 1644 parent hash identifiers, followed by a "+" if there are
1645 1645 uncommitted changes in the working directory, a list of tags for
1646 1646 this revision and a branch name for non-default branches.
1647 1647 """
1648 1648
1649 1649 if not repo and not source:
1650 1650 raise util.Abort(_("There is no Mercurial repository here "
1651 1651 "(.hg not found)"))
1652 1652
1653 1653 hexfunc = ui.debugflag and hex or short
1654 1654 default = not (num or id or branch or tags)
1655 1655 output = []
1656 1656
1657 1657 revs = []
1658 1658 if source:
1659 1659 source, revs, checkout = hg.parseurl(ui.expandpath(source), [])
1660 1660 repo = hg.repository(ui, source)
1661 1661
1662 1662 if not repo.local():
1663 1663 if not rev and revs:
1664 1664 rev = revs[0]
1665 1665 if not rev:
1666 1666 rev = "tip"
1667 1667 if num or branch or tags:
1668 1668 raise util.Abort(
1669 1669 "can't query remote revision number, branch, or tags")
1670 1670 output = [hexfunc(repo.lookup(rev))]
1671 1671 elif not rev:
1672 1672 ctx = repo[None]
1673 1673 parents = ctx.parents()
1674 1674 changed = False
1675 1675 if default or id or num:
1676 1676 changed = ctx.files() + ctx.deleted()
1677 1677 if default or id:
1678 1678 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
1679 1679 (changed) and "+" or "")]
1680 1680 if num:
1681 1681 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
1682 1682 (changed) and "+" or ""))
1683 1683 else:
1684 1684 ctx = repo[rev]
1685 1685 if default or id:
1686 1686 output = [hexfunc(ctx.node())]
1687 1687 if num:
1688 1688 output.append(str(ctx.rev()))
1689 1689
1690 1690 if repo.local() and default and not ui.quiet:
1691 1691 b = encoding.tolocal(ctx.branch())
1692 1692 if b != 'default':
1693 1693 output.append("(%s)" % b)
1694 1694
1695 1695 # multiple tags for a single parent separated by '/'
1696 1696 t = "/".join(ctx.tags())
1697 1697 if t:
1698 1698 output.append(t)
1699 1699
1700 1700 if branch:
1701 1701 output.append(encoding.tolocal(ctx.branch()))
1702 1702
1703 1703 if tags:
1704 1704 output.extend(ctx.tags())
1705 1705
1706 1706 ui.write("%s\n" % ' '.join(output))
1707 1707
1708 1708 def import_(ui, repo, patch1, *patches, **opts):
1709 1709 """import an ordered set of patches
1710 1710
1711 1711 Import a list of patches and commit them individually.
1712 1712
1713 1713 If there are outstanding changes in the working directory, import
1714 1714 will abort unless given the -f/--force flag.
1715 1715
1716 1716 You can import a patch straight from a mail message. Even patches
1717 1717 as attachments work (to use the body part, it must have type
1718 1718 text/plain or text/x-patch). From and Subject headers of email
1719 1719 message are used as default committer and commit message. All
1720 1720 text/plain body parts before first diff are added to commit
1721 1721 message.
1722 1722
1723 1723 If the imported patch was generated by hg export, user and
1724 1724 description from patch override values from message headers and
1725 1725 body. Values given on command line with -m/--message and -u/--user
1726 1726 override these.
1727 1727
1728 1728 If --exact is specified, import will set the working directory to
1729 1729 the parent of each patch before applying it, and will abort if the
1730 1730 resulting changeset has a different ID than the one recorded in
1731 1731 the patch. This may happen due to character set problems or other
1732 1732 deficiencies in the text patch format.
1733 1733
1734 1734 With -s/--similarity, hg will attempt to discover renames and
1735 1735 copies in the patch in the same way as 'addremove'.
1736 1736
1737 1737 To read a patch from standard input, use "-" as the patch name. If
1738 1738 a URL is specified, the patch will be downloaded from it.
1739 1739 See 'hg help dates' for a list of formats valid for -d/--date.
1740 1740 """
1741 1741 patches = (patch1,) + patches
1742 1742
1743 1743 date = opts.get('date')
1744 1744 if date:
1745 1745 opts['date'] = util.parsedate(date)
1746 1746
1747 1747 try:
1748 1748 sim = float(opts.get('similarity') or 0)
1749 1749 except ValueError:
1750 1750 raise util.Abort(_('similarity must be a number'))
1751 1751 if sim < 0 or sim > 100:
1752 1752 raise util.Abort(_('similarity must be between 0 and 100'))
1753 1753
1754 1754 if opts.get('exact') or not opts.get('force'):
1755 1755 cmdutil.bail_if_changed(repo)
1756 1756
1757 1757 d = opts["base"]
1758 1758 strip = opts["strip"]
1759 1759 wlock = lock = None
1760 1760 try:
1761 1761 wlock = repo.wlock()
1762 1762 lock = repo.lock()
1763 1763 for p in patches:
1764 1764 pf = os.path.join(d, p)
1765 1765
1766 1766 if pf == '-':
1767 1767 ui.status(_("applying patch from stdin\n"))
1768 1768 pf = sys.stdin
1769 1769 else:
1770 1770 ui.status(_("applying %s\n") % p)
1771 1771 pf = url.open(ui, pf)
1772 1772 data = patch.extract(ui, pf)
1773 1773 tmpname, message, user, date, branch, nodeid, p1, p2 = data
1774 1774
1775 1775 if tmpname is None:
1776 1776 raise util.Abort(_('no diffs found'))
1777 1777
1778 1778 try:
1779 1779 cmdline_message = cmdutil.logmessage(opts)
1780 1780 if cmdline_message:
1781 1781 # pickup the cmdline msg
1782 1782 message = cmdline_message
1783 1783 elif message:
1784 1784 # pickup the patch msg
1785 1785 message = message.strip()
1786 1786 else:
1787 1787 # launch the editor
1788 1788 message = None
1789 1789 ui.debug(_('message:\n%s\n') % message)
1790 1790
1791 1791 wp = repo.parents()
1792 1792 if opts.get('exact'):
1793 1793 if not nodeid or not p1:
1794 1794 raise util.Abort(_('not a Mercurial patch'))
1795 1795 p1 = repo.lookup(p1)
1796 1796 p2 = repo.lookup(p2 or hex(nullid))
1797 1797
1798 1798 if p1 != wp[0].node():
1799 1799 hg.clean(repo, p1)
1800 1800 repo.dirstate.setparents(p1, p2)
1801 1801 elif p2:
1802 1802 try:
1803 1803 p1 = repo.lookup(p1)
1804 1804 p2 = repo.lookup(p2)
1805 1805 if p1 == wp[0].node():
1806 1806 repo.dirstate.setparents(p1, p2)
1807 1807 except error.RepoError:
1808 1808 pass
1809 1809 if opts.get('exact') or opts.get('import_branch'):
1810 1810 repo.dirstate.setbranch(branch or 'default')
1811 1811
1812 1812 files = {}
1813 1813 try:
1814 1814 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
1815 1815 files=files, eolmode=None)
1816 1816 finally:
1817 1817 files = patch.updatedir(ui, repo, files, similarity=sim/100.)
1818 1818 if not opts.get('no_commit'):
1819 1819 m = cmdutil.matchfiles(repo, files or [])
1820 1820 n = repo.commit(message, opts.get('user') or user,
1821 1821 opts.get('date') or date, match=m,
1822 1822 editor=cmdutil.commiteditor)
1823 1823 if opts.get('exact'):
1824 1824 if hex(n) != nodeid:
1825 1825 repo.rollback()
1826 1826 raise util.Abort(_('patch is damaged'
1827 1827 ' or loses information'))
1828 1828 # Force a dirstate write so that the next transaction
1829 1829 # backups an up-do-date file.
1830 1830 repo.dirstate.write()
1831 1831 finally:
1832 1832 os.unlink(tmpname)
1833 1833 finally:
1834 1834 release(lock, wlock)
1835 1835
1836 1836 def incoming(ui, repo, source="default", **opts):
1837 1837 """show new changesets found in source
1838 1838
1839 1839 Show new changesets found in the specified path/URL or the default
1840 1840 pull location. These are the changesets that would have been pulled
1841 1841 if a pull at the time you issued this command.
1842 1842
1843 1843 For remote repository, using --bundle avoids downloading the
1844 1844 changesets twice if the incoming is followed by a pull.
1845 1845
1846 1846 See pull for valid source format details.
1847 1847 """
1848 1848 limit = cmdutil.loglimit(opts)
1849 1849 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev'))
1850 1850 other = hg.repository(cmdutil.remoteui(repo, opts), source)
1851 1851 ui.status(_('comparing with %s\n') % url.hidepassword(source))
1852 1852 if revs:
1853 1853 revs = [other.lookup(rev) for rev in revs]
1854 1854 common, incoming, rheads = repo.findcommonincoming(other, heads=revs,
1855 1855 force=opts["force"])
1856 1856 if not incoming:
1857 1857 try:
1858 1858 os.unlink(opts["bundle"])
1859 1859 except:
1860 1860 pass
1861 1861 ui.status(_("no changes found\n"))
1862 1862 return 1
1863 1863
1864 1864 cleanup = None
1865 1865 try:
1866 1866 fname = opts["bundle"]
1867 1867 if fname or not other.local():
1868 1868 # create a bundle (uncompressed if other repo is not local)
1869 1869
1870 1870 if revs is None and other.capable('changegroupsubset'):
1871 1871 revs = rheads
1872 1872
1873 1873 if revs is None:
1874 1874 cg = other.changegroup(incoming, "incoming")
1875 1875 else:
1876 1876 cg = other.changegroupsubset(incoming, revs, 'incoming')
1877 1877 bundletype = other.local() and "HG10BZ" or "HG10UN"
1878 1878 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
1879 1879 # keep written bundle?
1880 1880 if opts["bundle"]:
1881 1881 cleanup = None
1882 1882 if not other.local():
1883 1883 # use the created uncompressed bundlerepo
1884 1884 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1885 1885
1886 1886 o = other.changelog.nodesbetween(incoming, revs)[0]
1887 1887 if opts.get('newest_first'):
1888 1888 o.reverse()
1889 1889 displayer = cmdutil.show_changeset(ui, other, opts)
1890 1890 count = 0
1891 1891 for n in o:
1892 1892 if count >= limit:
1893 1893 break
1894 1894 parents = [p for p in other.changelog.parents(n) if p != nullid]
1895 1895 if opts.get('no_merges') and len(parents) == 2:
1896 1896 continue
1897 1897 count += 1
1898 1898 displayer.show(other[n])
1899 1899 finally:
1900 1900 if hasattr(other, 'close'):
1901 1901 other.close()
1902 1902 if cleanup:
1903 1903 os.unlink(cleanup)
1904 1904
1905 1905 def init(ui, dest=".", **opts):
1906 1906 """create a new repository in the given directory
1907 1907
1908 1908 Initialize a new repository in the given directory. If the given
1909 1909 directory does not exist, it will be created.
1910 1910
1911 1911 If no directory is given, the current directory is used.
1912 1912
1913 1913 It is possible to specify an ssh:// URL as the destination.
1914 1914 See 'hg help urls' for more information.
1915 1915 """
1916 1916 hg.repository(cmdutil.remoteui(ui, opts), dest, create=1)
1917 1917
1918 1918 def locate(ui, repo, *pats, **opts):
1919 1919 """locate files matching specific patterns
1920 1920
1921 1921 Print files under Mercurial control in the working directory whose
1922 1922 names match the given patterns.
1923 1923
1924 1924 By default, this command searches all directories in the working
1925 1925 directory. To search just the current directory and its
1926 1926 subdirectories, use "--include .".
1927 1927
1928 1928 If no patterns are given to match, this command prints the names
1929 1929 of all files under Mercurial control in the working directory.
1930 1930
1931 1931 If you want to feed the output of this command into the "xargs"
1932 1932 command, use the -0 option to both this command and "xargs". This
1933 1933 will avoid the problem of "xargs" treating single filenames that
1934 1934 contain whitespace as multiple filenames.
1935 1935 """
1936 1936 end = opts.get('print0') and '\0' or '\n'
1937 1937 rev = opts.get('rev') or None
1938 1938
1939 1939 ret = 1
1940 1940 m = cmdutil.match(repo, pats, opts, default='relglob')
1941 1941 m.bad = lambda x,y: False
1942 1942 for abs in repo[rev].walk(m):
1943 1943 if not rev and abs not in repo.dirstate:
1944 1944 continue
1945 1945 if opts.get('fullpath'):
1946 1946 ui.write(repo.wjoin(abs), end)
1947 1947 else:
1948 1948 ui.write(((pats and m.rel(abs)) or abs), end)
1949 1949 ret = 0
1950 1950
1951 1951 return ret
1952 1952
1953 1953 def log(ui, repo, *pats, **opts):
1954 1954 """show revision history of entire repository or files
1955 1955
1956 1956 Print the revision history of the specified files or the entire
1957 1957 project.
1958 1958
1959 1959 File history is shown without following rename or copy history of
1960 1960 files. Use -f/--follow with a filename to follow history across
1961 1961 renames and copies. --follow without a filename will only show
1962 1962 ancestors or descendants of the starting revision. --follow-first
1963 1963 only follows the first parent of merge revisions.
1964 1964
1965 1965 If no revision range is specified, the default is tip:0 unless
1966 1966 --follow is set, in which case the working directory parent is
1967 1967 used as the starting revision.
1968 1968
1969 1969 See 'hg help dates' for a list of formats valid for -d/--date.
1970 1970
1971 1971 By default this command prints revision number and changeset id,
1972 1972 tags, non-trivial parents, user, date and time, and a summary for
1973 1973 each commit. When the -v/--verbose switch is used, the list of
1974 1974 changed files and full commit message are shown.
1975 1975
1976 1976 NOTE: log -p/--patch may generate unexpected diff output for merge
1977 1977 changesets, as it will only compare the merge changeset against
1978 1978 its first parent. Also, only files different from BOTH parents
1979 1979 will appear in files:.
1980 1980 """
1981 1981
1982 1982 get = util.cachefunc(lambda r: repo[r].changeset())
1983 1983 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1984 1984
1985 1985 limit = cmdutil.loglimit(opts)
1986 1986 count = 0
1987 1987
1988 1988 if opts.get('copies') and opts.get('rev'):
1989 1989 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
1990 1990 else:
1991 1991 endrev = len(repo)
1992 1992 rcache = {}
1993 1993 ncache = {}
1994 1994 def getrenamed(fn, rev):
1995 1995 '''looks up all renames for a file (up to endrev) the first
1996 1996 time the file is given. It indexes on the changerev and only
1997 1997 parses the manifest if linkrev != changerev.
1998 1998 Returns rename info for fn at changerev rev.'''
1999 1999 if fn not in rcache:
2000 2000 rcache[fn] = {}
2001 2001 ncache[fn] = {}
2002 2002 fl = repo.file(fn)
2003 2003 for i in fl:
2004 2004 node = fl.node(i)
2005 2005 lr = fl.linkrev(i)
2006 2006 renamed = fl.renamed(node)
2007 2007 rcache[fn][lr] = renamed
2008 2008 if renamed:
2009 2009 ncache[fn][node] = renamed
2010 2010 if lr >= endrev:
2011 2011 break
2012 2012 if rev in rcache[fn]:
2013 2013 return rcache[fn][rev]
2014 2014
2015 2015 # If linkrev != rev (i.e. rev not found in rcache) fallback to
2016 2016 # filectx logic.
2017 2017
2018 2018 try:
2019 2019 return repo[rev][fn].renamed()
2020 2020 except error.LookupError:
2021 2021 pass
2022 2022 return None
2023 2023
2024 2024 df = False
2025 2025 if opts["date"]:
2026 2026 df = util.matchdate(opts["date"])
2027 2027
2028 2028 only_branches = opts.get('only_branch')
2029 2029
2030 2030 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
2031 2031 for st, rev, fns in changeiter:
2032 2032 if st == 'add':
2033 2033 parents = [p for p in repo.changelog.parentrevs(rev)
2034 2034 if p != nullrev]
2035 2035 if opts.get('no_merges') and len(parents) == 2:
2036 2036 continue
2037 2037 if opts.get('only_merges') and len(parents) != 2:
2038 2038 continue
2039 2039
2040 2040 if only_branches:
2041 2041 revbranch = get(rev)[5]['branch']
2042 2042 if revbranch not in only_branches:
2043 2043 continue
2044 2044
2045 2045 if df:
2046 2046 changes = get(rev)
2047 2047 if not df(changes[2][0]):
2048 2048 continue
2049 2049
2050 2050 if opts.get('keyword'):
2051 2051 changes = get(rev)
2052 2052 miss = 0
2053 2053 for k in [kw.lower() for kw in opts['keyword']]:
2054 2054 if not (k in changes[1].lower() or
2055 2055 k in changes[4].lower() or
2056 2056 k in " ".join(changes[3]).lower()):
2057 2057 miss = 1
2058 2058 break
2059 2059 if miss:
2060 2060 continue
2061 2061
2062 2062 if opts['user']:
2063 2063 changes = get(rev)
2064 2064 if not [k for k in opts['user'] if k in changes[1]]:
2065 2065 continue
2066 2066
2067 2067 copies = []
2068 2068 if opts.get('copies') and rev:
2069 2069 for fn in get(rev)[3]:
2070 2070 rename = getrenamed(fn, rev)
2071 2071 if rename:
2072 2072 copies.append((fn, rename[0]))
2073 2073 displayer.show(context.changectx(repo, rev), copies=copies)
2074 2074 elif st == 'iter':
2075 2075 if count == limit: break
2076 2076 if displayer.flush(rev):
2077 2077 count += 1
2078 2078
2079 2079 def manifest(ui, repo, node=None, rev=None):
2080 2080 """output the current or given revision of the project manifest
2081 2081
2082 2082 Print a list of version controlled files for the given revision.
2083 2083 If no revision is given, the first parent of the working directory
2084 2084 is used, or the null revision if no revision is checked out.
2085 2085
2086 2086 With -v, print file permissions, symlink and executable bits.
2087 2087 With --debug, print file revision hashes.
2088 2088 """
2089 2089
2090 2090 if rev and node:
2091 2091 raise util.Abort(_("please specify just one revision"))
2092 2092
2093 2093 if not node:
2094 2094 node = rev
2095 2095
2096 2096 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2097 2097 ctx = repo[node]
2098 2098 for f in ctx:
2099 2099 if ui.debugflag:
2100 2100 ui.write("%40s " % hex(ctx.manifest()[f]))
2101 2101 if ui.verbose:
2102 2102 ui.write(decor[ctx.flags(f)])
2103 2103 ui.write("%s\n" % f)
2104 2104
2105 2105 def merge(ui, repo, node=None, **opts):
2106 2106 """merge working directory with another revision
2107 2107
2108 2108 The current working directory is updated with all changes made in
2109 2109 the requested revision since the last common predecessor revision.
2110 2110
2111 2111 Files that changed between either parent are marked as changed for
2112 2112 the next commit and a commit must be performed before any further
2113 2113 updates to the repository are allowed. The next commit will have
2114 2114 two parents.
2115 2115
2116 2116 If no revision is specified, the working directory's parent is a
2117 2117 head revision, and the current branch contains exactly one other
2118 2118 head, the other head is merged with by default. Otherwise, an
2119 2119 explicit revision with which to merge with must be provided.
2120 2120 """
2121 2121
2122 2122 if opts.get('rev') and node:
2123 2123 raise util.Abort(_("please specify just one revision"))
2124 2124 if not node:
2125 2125 node = opts.get('rev')
2126 2126
2127 2127 if not node:
2128 2128 branch = repo.changectx(None).branch()
2129 2129 bheads = repo.branchheads(branch)
2130 2130 if len(bheads) > 2:
2131 2131 raise util.Abort(_("branch '%s' has %d heads - "
2132 2132 "please merge with an explicit rev") %
2133 2133 (branch, len(bheads)))
2134 2134
2135 2135 parent = repo.dirstate.parents()[0]
2136 2136 if len(bheads) == 1:
2137 2137 if len(repo.heads()) > 1:
2138 2138 raise util.Abort(_("branch '%s' has one head - "
2139 2139 "please merge with an explicit rev") %
2140 2140 branch)
2141 2141 msg = _('there is nothing to merge')
2142 2142 if parent != repo.lookup(repo[None].branch()):
2143 2143 msg = _('%s - use "hg update" instead') % msg
2144 2144 raise util.Abort(msg)
2145 2145
2146 2146 if parent not in bheads:
2147 2147 raise util.Abort(_('working dir not at a head rev - '
2148 2148 'use "hg update" or merge with an explicit rev'))
2149 2149 node = parent == bheads[0] and bheads[-1] or bheads[0]
2150 2150
2151 2151 if opts.get('preview'):
2152 2152 p1 = repo['.']
2153 2153 p2 = repo[node]
2154 2154 common = p1.ancestor(p2)
2155 2155 roots, heads = [common.node()], [p2.node()]
2156 2156 displayer = cmdutil.show_changeset(ui, repo, opts)
2157 2157 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
2158 2158 displayer.show(repo[node])
2159 2159 return 0
2160 2160
2161 2161 return hg.merge(repo, node, force=opts.get('force'))
2162 2162
2163 2163 def outgoing(ui, repo, dest=None, **opts):
2164 2164 """show changesets not found in destination
2165 2165
2166 2166 Show changesets not found in the specified destination repository
2167 2167 or the default push location. These are the changesets that would
2168 2168 be pushed if a push was requested.
2169 2169
2170 2170 See pull for valid destination format details.
2171 2171 """
2172 2172 limit = cmdutil.loglimit(opts)
2173 2173 dest, revs, checkout = hg.parseurl(
2174 2174 ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
2175 2175 if revs:
2176 2176 revs = [repo.lookup(rev) for rev in revs]
2177 2177
2178 2178 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
2179 2179 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2180 2180 o = repo.findoutgoing(other, force=opts.get('force'))
2181 2181 if not o:
2182 2182 ui.status(_("no changes found\n"))
2183 2183 return 1
2184 2184 o = repo.changelog.nodesbetween(o, revs)[0]
2185 2185 if opts.get('newest_first'):
2186 2186 o.reverse()
2187 2187 displayer = cmdutil.show_changeset(ui, repo, opts)
2188 2188 count = 0
2189 2189 for n in o:
2190 2190 if count >= limit:
2191 2191 break
2192 2192 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2193 2193 if opts.get('no_merges') and len(parents) == 2:
2194 2194 continue
2195 2195 count += 1
2196 2196 displayer.show(repo[n])
2197 2197
2198 2198 def parents(ui, repo, file_=None, **opts):
2199 2199 """show the parents of the working directory or revision
2200 2200
2201 2201 Print the working directory's parent revisions. If a revision is
2202 2202 given via -r/--rev, the parent of that revision will be printed.
2203 2203 If a file argument is given, the revision in which the file was
2204 2204 last changed (before the working directory revision or the
2205 2205 argument to --rev if given) is printed.
2206 2206 """
2207 2207 rev = opts.get('rev')
2208 2208 if rev:
2209 2209 ctx = repo[rev]
2210 2210 else:
2211 2211 ctx = repo[None]
2212 2212
2213 2213 if file_:
2214 2214 m = cmdutil.match(repo, (file_,), opts)
2215 2215 if m.anypats() or len(m.files()) != 1:
2216 2216 raise util.Abort(_('can only specify an explicit filename'))
2217 2217 file_ = m.files()[0]
2218 2218 filenodes = []
2219 2219 for cp in ctx.parents():
2220 2220 if not cp:
2221 2221 continue
2222 2222 try:
2223 2223 filenodes.append(cp.filenode(file_))
2224 2224 except error.LookupError:
2225 2225 pass
2226 2226 if not filenodes:
2227 2227 raise util.Abort(_("'%s' not found in manifest!") % file_)
2228 2228 fl = repo.file(file_)
2229 2229 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2230 2230 else:
2231 2231 p = [cp.node() for cp in ctx.parents()]
2232 2232
2233 2233 displayer = cmdutil.show_changeset(ui, repo, opts)
2234 2234 for n in p:
2235 2235 if n != nullid:
2236 2236 displayer.show(repo[n])
2237 2237
2238 2238 def paths(ui, repo, search=None):
2239 2239 """show aliases for remote repositories
2240 2240
2241 2241 Show definition of symbolic path name NAME. If no name is given,
2242 2242 show definition of all available names.
2243 2243
2244 2244 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2245 2245 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2246 2246
2247 2247 See 'hg help urls' for more information.
2248 2248 """
2249 2249 if search:
2250 2250 for name, path in ui.configitems("paths"):
2251 2251 if name == search:
2252 2252 ui.write("%s\n" % url.hidepassword(path))
2253 2253 return
2254 2254 ui.warn(_("not found!\n"))
2255 2255 return 1
2256 2256 else:
2257 2257 for name, path in ui.configitems("paths"):
2258 2258 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2259 2259
2260 2260 def postincoming(ui, repo, modheads, optupdate, checkout):
2261 2261 if modheads == 0:
2262 2262 return
2263 2263 if optupdate:
2264 2264 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2265 2265 return hg.update(repo, checkout)
2266 2266 else:
2267 2267 ui.status(_("not updating, since new heads added\n"))
2268 2268 if modheads > 1:
2269 2269 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2270 2270 else:
2271 2271 ui.status(_("(run 'hg update' to get a working copy)\n"))
2272 2272
2273 2273 def pull(ui, repo, source="default", **opts):
2274 2274 """pull changes from the specified source
2275 2275
2276 2276 Pull changes from a remote repository to a local one.
2277 2277
2278 2278 This finds all changes from the repository at the specified path
2279 2279 or URL and adds them to a local repository (the current one unless
2280 2280 -R is specified). By default, this does not update the copy of the
2281 2281 project in the working directory.
2282 2282
2283 2283 Use hg incoming if you want to see what would have been added by a
2284 2284 pull at the time you issued this command. If you then decide to
2285 2285 added those changes to the repository, you should use pull -r X
2286 2286 where X is the last changeset listed by hg incoming.
2287 2287
2288 2288 If SOURCE is omitted, the 'default' path will be used.
2289 2289 See 'hg help urls' for more information.
2290 2290 """
2291 2291 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev'))
2292 2292 other = hg.repository(cmdutil.remoteui(repo, opts), source)
2293 2293 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2294 2294 if revs:
2295 2295 try:
2296 2296 revs = [other.lookup(rev) for rev in revs]
2297 2297 except error.CapabilityError:
2298 2298 err = _("Other repository doesn't support revision lookup, "
2299 2299 "so a rev cannot be specified.")
2300 2300 raise util.Abort(err)
2301 2301
2302 2302 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2303 2303 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2304 2304
2305 2305 def push(ui, repo, dest=None, **opts):
2306 2306 """push changes to the specified destination
2307 2307
2308 2308 Push changes from the local repository to the given destination.
2309 2309
2310 2310 This is the symmetrical operation for pull. It moves changes from
2311 2311 the current repository to a different one. If the destination is
2312 2312 local this is identical to a pull in that directory from the
2313 2313 current one.
2314 2314
2315 2315 By default, push will refuse to run if it detects the result would
2316 2316 increase the number of remote heads. This generally indicates the
2317 2317 user forgot to pull and merge before pushing.
2318 2318
2319 2319 If -r/--rev is used, the named revision and all its ancestors will
2320 2320 be pushed to the remote repository.
2321 2321
2322 2322 Please see 'hg help urls' for important details about ssh://
2323 2323 URLs. If DESTINATION is omitted, a default path will be used.
2324 2324 """
2325 2325 dest, revs, checkout = hg.parseurl(
2326 2326 ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
2327 2327 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
2328 2328 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2329 2329 if revs:
2330 2330 revs = [repo.lookup(rev) for rev in revs]
2331 2331
2332 2332 # push subrepos depth-first for coherent ordering
2333 2333 c = repo['']
2334 2334 subs = c.substate # only repos that are committed
2335 2335 for s in sorted(subs):
2336 2336 c.sub(s).push(opts.get('force'))
2337 2337
2338 2338 r = repo.push(other, opts.get('force'), revs=revs)
2339 2339 return r == 0
2340 2340
2341 2341 def recover(ui, repo):
2342 2342 """roll back an interrupted transaction
2343 2343
2344 2344 Recover from an interrupted commit or pull.
2345 2345
2346 2346 This command tries to fix the repository status after an
2347 2347 interrupted operation. It should only be necessary when Mercurial
2348 2348 suggests it.
2349 2349 """
2350 2350 if repo.recover():
2351 2351 return hg.verify(repo)
2352 2352 return 1
2353 2353
2354 2354 def remove(ui, repo, *pats, **opts):
2355 2355 """remove the specified files on the next commit
2356 2356
2357 2357 Schedule the indicated files for removal from the repository.
2358 2358
2359 2359 This only removes files from the current branch, not from the
2360 2360 entire project history. -A/--after can be used to remove only
2361 2361 files that have already been deleted, -f/--force can be used to
2362 2362 force deletion, and -Af can be used to remove files from the next
2363 2363 revision without deleting them from the working directory.
2364 2364
2365 2365 The following table details the behavior of remove for different
2366 2366 file states (columns) and option combinations (rows). The file
2367 2367 states are Added [A], Clean [C], Modified [M] and Missing [!]
2368 2368 (as reported by hg status). The actions are Warn, Remove (from
2369 2369 branch) and Delete (from disk).
2370 2370
2371 2371 A C M !
2372 2372 none W RD W R
2373 2373 -f R RD RD R
2374 2374 -A W W W R
2375 2375 -Af R R R R
2376 2376
2377 2377 This command schedules the files to be removed at the next commit.
2378 2378 To undo a remove before that, see hg revert.
2379 2379 """
2380 2380
2381 2381 after, force = opts.get('after'), opts.get('force')
2382 2382 if not pats and not after:
2383 2383 raise util.Abort(_('no files specified'))
2384 2384
2385 2385 m = cmdutil.match(repo, pats, opts)
2386 2386 s = repo.status(match=m, clean=True)
2387 2387 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2388 2388
2389 2389 for f in m.files():
2390 2390 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2391 2391 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2392 2392
2393 2393 def warn(files, reason):
2394 2394 for f in files:
2395 2395 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2396 2396 % (m.rel(f), reason))
2397 2397
2398 2398 if force:
2399 2399 remove, forget = modified + deleted + clean, added
2400 2400 elif after:
2401 2401 remove, forget = deleted, []
2402 2402 warn(modified + added + clean, _('still exists'))
2403 2403 else:
2404 2404 remove, forget = deleted + clean, []
2405 2405 warn(modified, _('is modified'))
2406 2406 warn(added, _('has been marked for add'))
2407 2407
2408 2408 for f in sorted(remove + forget):
2409 2409 if ui.verbose or not m.exact(f):
2410 2410 ui.status(_('removing %s\n') % m.rel(f))
2411 2411
2412 2412 repo.forget(forget)
2413 2413 repo.remove(remove, unlink=not after)
2414 2414
2415 2415 def rename(ui, repo, *pats, **opts):
2416 2416 """rename files; equivalent of copy + remove
2417 2417
2418 2418 Mark dest as copies of sources; mark sources for deletion. If dest
2419 2419 is a directory, copies are put in that directory. If dest is a
2420 2420 file, there can only be one source.
2421 2421
2422 2422 By default, this command copies the contents of files as they
2423 2423 exist in the working directory. If invoked with -A/--after, the
2424 2424 operation is recorded, but no copying is performed.
2425 2425
2426 2426 This command takes effect at the next commit. To undo a rename
2427 2427 before that, see hg revert.
2428 2428 """
2429 2429 wlock = repo.wlock(False)
2430 2430 try:
2431 2431 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2432 2432 finally:
2433 2433 wlock.release()
2434 2434
2435 2435 def resolve(ui, repo, *pats, **opts):
2436 2436 """retry file merges from a merge or update
2437 2437
2438 2438 This command will cleanly retry unresolved file merges using file
2439 2439 revisions preserved from the last update or merge. To attempt to
2440 2440 resolve all unresolved files, use the -a/--all switch.
2441 2441
2442 2442 If a conflict is resolved manually, please note that the changes
2443 2443 will be overwritten if the merge is retried with resolve. The
2444 2444 -m/--mark switch should be used to mark the file as resolved.
2445 2445
2446 2446 This command also allows listing resolved files and manually
2447 2447 indicating whether or not files are resolved. All files must be
2448 2448 marked as resolved before a commit is permitted.
2449 2449
2450 2450 The codes used to show the status of files are:
2451 2451 U = unresolved
2452 2452 R = resolved
2453 2453 """
2454 2454
2455 2455 all, mark, unmark, show = [opts.get(o) for o in 'all mark unmark list'.split()]
2456 2456
2457 2457 if (show and (mark or unmark)) or (mark and unmark):
2458 2458 raise util.Abort(_("too many options specified"))
2459 2459 if pats and all:
2460 2460 raise util.Abort(_("can't specify --all and patterns"))
2461 2461 if not (all or pats or show or mark or unmark):
2462 2462 raise util.Abort(_('no files or directories specified; '
2463 2463 'use --all to remerge all files'))
2464 2464
2465 2465 ms = merge_.mergestate(repo)
2466 2466 m = cmdutil.match(repo, pats, opts)
2467 2467
2468 2468 for f in ms:
2469 2469 if m(f):
2470 2470 if show:
2471 2471 ui.write("%s %s\n" % (ms[f].upper(), f))
2472 2472 elif mark:
2473 2473 ms.mark(f, "r")
2474 2474 elif unmark:
2475 2475 ms.mark(f, "u")
2476 2476 else:
2477 2477 wctx = repo[None]
2478 2478 mctx = wctx.parents()[-1]
2479 2479
2480 2480 # backup pre-resolve (merge uses .orig for its own purposes)
2481 2481 a = repo.wjoin(f)
2482 2482 util.copyfile(a, a + ".resolve")
2483 2483
2484 2484 # resolve file
2485 2485 ms.resolve(f, wctx, mctx)
2486 2486
2487 2487 # replace filemerge's .orig file with our resolve file
2488 2488 util.rename(a + ".resolve", a + ".orig")
2489 2489
2490 2490 def revert(ui, repo, *pats, **opts):
2491 2491 """restore individual files or directories to an earlier state
2492 2492
2493 2493 (Use update -r to check out earlier revisions, revert does not
2494 2494 change the working directory parents.)
2495 2495
2496 2496 With no revision specified, revert the named files or directories
2497 2497 to the contents they had in the parent of the working directory.
2498 2498 This restores the contents of the affected files to an unmodified
2499 2499 state and unschedules adds, removes, copies, and renames. If the
2500 2500 working directory has two parents, you must explicitly specify the
2501 2501 revision to revert to.
2502 2502
2503 2503 Using the -r/--rev option, revert the given files or directories
2504 2504 to their contents as of a specific revision. This can be helpful
2505 2505 to "roll back" some or all of an earlier change. See 'hg help
2506 2506 dates' for a list of formats valid for -d/--date.
2507 2507
2508 2508 Revert modifies the working directory. It does not commit any
2509 2509 changes, or change the parent of the working directory. If you
2510 2510 revert to a revision other than the parent of the working
2511 2511 directory, the reverted files will thus appear modified
2512 2512 afterwards.
2513 2513
2514 2514 If a file has been deleted, it is restored. If the executable mode
2515 2515 of a file was changed, it is reset.
2516 2516
2517 2517 If names are given, all files matching the names are reverted.
2518 2518 If no arguments are given, no files are reverted.
2519 2519
2520 2520 Modified files are saved with a .orig suffix before reverting.
2521 2521 To disable these backups, use --no-backup.
2522 2522 """
2523 2523
2524 2524 if opts["date"]:
2525 2525 if opts["rev"]:
2526 2526 raise util.Abort(_("you can't specify a revision and a date"))
2527 2527 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
2528 2528
2529 2529 if not pats and not opts.get('all'):
2530 2530 raise util.Abort(_('no files or directories specified; '
2531 2531 'use --all to revert the whole repo'))
2532 2532
2533 2533 parent, p2 = repo.dirstate.parents()
2534 2534 if not opts.get('rev') and p2 != nullid:
2535 2535 raise util.Abort(_('uncommitted merge - please provide a '
2536 2536 'specific revision'))
2537 2537 ctx = repo[opts.get('rev')]
2538 2538 node = ctx.node()
2539 2539 mf = ctx.manifest()
2540 2540 if node == parent:
2541 2541 pmf = mf
2542 2542 else:
2543 2543 pmf = None
2544 2544
2545 2545 # need all matching names in dirstate and manifest of target rev,
2546 2546 # so have to walk both. do not print errors if files exist in one
2547 2547 # but not other.
2548 2548
2549 2549 names = {}
2550 2550
2551 2551 wlock = repo.wlock()
2552 2552 try:
2553 2553 # walk dirstate.
2554 2554
2555 2555 m = cmdutil.match(repo, pats, opts)
2556 2556 m.bad = lambda x,y: False
2557 2557 for abs in repo.walk(m):
2558 2558 names[abs] = m.rel(abs), m.exact(abs)
2559 2559
2560 2560 # walk target manifest.
2561 2561
2562 2562 def badfn(path, msg):
2563 2563 if path in names:
2564 2564 return
2565 2565 path_ = path + '/'
2566 2566 for f in names:
2567 2567 if f.startswith(path_):
2568 2568 return
2569 2569 ui.warn("%s: %s\n" % (m.rel(path), msg))
2570 2570
2571 2571 m = cmdutil.match(repo, pats, opts)
2572 2572 m.bad = badfn
2573 2573 for abs in repo[node].walk(m):
2574 2574 if abs not in names:
2575 2575 names[abs] = m.rel(abs), m.exact(abs)
2576 2576
2577 2577 m = cmdutil.matchfiles(repo, names)
2578 2578 changes = repo.status(match=m)[:4]
2579 2579 modified, added, removed, deleted = map(set, changes)
2580 2580
2581 2581 # if f is a rename, also revert the source
2582 2582 cwd = repo.getcwd()
2583 2583 for f in added:
2584 2584 src = repo.dirstate.copied(f)
2585 2585 if src and src not in names and repo.dirstate[src] == 'r':
2586 2586 removed.add(src)
2587 2587 names[src] = (repo.pathto(src, cwd), True)
2588 2588
2589 2589 def removeforget(abs):
2590 2590 if repo.dirstate[abs] == 'a':
2591 2591 return _('forgetting %s\n')
2592 2592 return _('removing %s\n')
2593 2593
2594 2594 revert = ([], _('reverting %s\n'))
2595 2595 add = ([], _('adding %s\n'))
2596 2596 remove = ([], removeforget)
2597 2597 undelete = ([], _('undeleting %s\n'))
2598 2598
2599 2599 disptable = (
2600 2600 # dispatch table:
2601 2601 # file state
2602 2602 # action if in target manifest
2603 2603 # action if not in target manifest
2604 2604 # make backup if in target manifest
2605 2605 # make backup if not in target manifest
2606 2606 (modified, revert, remove, True, True),
2607 2607 (added, revert, remove, True, False),
2608 2608 (removed, undelete, None, False, False),
2609 2609 (deleted, revert, remove, False, False),
2610 2610 )
2611 2611
2612 2612 for abs, (rel, exact) in sorted(names.items()):
2613 2613 mfentry = mf.get(abs)
2614 2614 target = repo.wjoin(abs)
2615 2615 def handle(xlist, dobackup):
2616 2616 xlist[0].append(abs)
2617 2617 if dobackup and not opts.get('no_backup') and util.lexists(target):
2618 2618 bakname = "%s.orig" % rel
2619 2619 ui.note(_('saving current version of %s as %s\n') %
2620 2620 (rel, bakname))
2621 2621 if not opts.get('dry_run'):
2622 2622 util.copyfile(target, bakname)
2623 2623 if ui.verbose or not exact:
2624 2624 msg = xlist[1]
2625 2625 if not isinstance(msg, basestring):
2626 2626 msg = msg(abs)
2627 2627 ui.status(msg % rel)
2628 2628 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2629 2629 if abs not in table: continue
2630 2630 # file has changed in dirstate
2631 2631 if mfentry:
2632 2632 handle(hitlist, backuphit)
2633 2633 elif misslist is not None:
2634 2634 handle(misslist, backupmiss)
2635 2635 break
2636 2636 else:
2637 2637 if abs not in repo.dirstate:
2638 2638 if mfentry:
2639 2639 handle(add, True)
2640 2640 elif exact:
2641 2641 ui.warn(_('file not managed: %s\n') % rel)
2642 2642 continue
2643 2643 # file has not changed in dirstate
2644 2644 if node == parent:
2645 2645 if exact: ui.warn(_('no changes needed to %s\n') % rel)
2646 2646 continue
2647 2647 if pmf is None:
2648 2648 # only need parent manifest in this unlikely case,
2649 2649 # so do not read by default
2650 2650 pmf = repo[parent].manifest()
2651 2651 if abs in pmf:
2652 2652 if mfentry:
2653 2653 # if version of file is same in parent and target
2654 2654 # manifests, do nothing
2655 2655 if (pmf[abs] != mfentry or
2656 2656 pmf.flags(abs) != mf.flags(abs)):
2657 2657 handle(revert, False)
2658 2658 else:
2659 2659 handle(remove, False)
2660 2660
2661 2661 if not opts.get('dry_run'):
2662 2662 def checkout(f):
2663 2663 fc = ctx[f]
2664 2664 repo.wwrite(f, fc.data(), fc.flags())
2665 2665
2666 2666 audit_path = util.path_auditor(repo.root)
2667 2667 for f in remove[0]:
2668 2668 if repo.dirstate[f] == 'a':
2669 2669 repo.dirstate.forget(f)
2670 2670 continue
2671 2671 audit_path(f)
2672 2672 try:
2673 2673 util.unlink(repo.wjoin(f))
2674 2674 except OSError:
2675 2675 pass
2676 2676 repo.dirstate.remove(f)
2677 2677
2678 2678 normal = None
2679 2679 if node == parent:
2680 2680 # We're reverting to our parent. If possible, we'd like status
2681 2681 # to report the file as clean. We have to use normallookup for
2682 2682 # merges to avoid losing information about merged/dirty files.
2683 2683 if p2 != nullid:
2684 2684 normal = repo.dirstate.normallookup
2685 2685 else:
2686 2686 normal = repo.dirstate.normal
2687 2687 for f in revert[0]:
2688 2688 checkout(f)
2689 2689 if normal:
2690 2690 normal(f)
2691 2691
2692 2692 for f in add[0]:
2693 2693 checkout(f)
2694 2694 repo.dirstate.add(f)
2695 2695
2696 2696 normal = repo.dirstate.normallookup
2697 2697 if node == parent and p2 == nullid:
2698 2698 normal = repo.dirstate.normal
2699 2699 for f in undelete[0]:
2700 2700 checkout(f)
2701 2701 normal(f)
2702 2702
2703 2703 finally:
2704 2704 wlock.release()
2705 2705
2706 2706 def rollback(ui, repo):
2707 2707 """roll back the last transaction
2708 2708
2709 2709 This command should be used with care. There is only one level of
2710 2710 rollback, and there is no way to undo a rollback. It will also
2711 2711 restore the dirstate at the time of the last transaction, losing
2712 2712 any dirstate changes since that time. This command does not alter
2713 2713 the working directory.
2714 2714
2715 2715 Transactions are used to encapsulate the effects of all commands
2716 2716 that create new changesets or propagate existing changesets into a
2717 2717 repository. For example, the following commands are transactional,
2718 2718 and their effects can be rolled back:
2719 2719
2720 2720 commit
2721 2721 import
2722 2722 pull
2723 2723 push (with this repository as destination)
2724 2724 unbundle
2725 2725
2726 2726 This command is not intended for use on public repositories. Once
2727 2727 changes are visible for pull by other users, rolling a transaction
2728 2728 back locally is ineffective (someone else may already have pulled
2729 2729 the changes). Furthermore, a race is possible with readers of the
2730 2730 repository; for example an in-progress pull from the repository
2731 2731 may fail if a rollback is performed.
2732 2732 """
2733 2733 repo.rollback()
2734 2734
2735 2735 def root(ui, repo):
2736 2736 """print the root (top) of the current working directory
2737 2737
2738 2738 Print the root directory of the current repository.
2739 2739 """
2740 2740 ui.write(repo.root + "\n")
2741 2741
2742 2742 def serve(ui, repo, **opts):
2743 2743 """export the repository via HTTP
2744 2744
2745 2745 Start a local HTTP repository browser and pull server.
2746 2746
2747 2747 By default, the server logs accesses to stdout and errors to
2748 2748 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
2749 2749 files.
2750 2750 """
2751 2751
2752 2752 if opts["stdio"]:
2753 2753 if repo is None:
2754 2754 raise error.RepoError(_("There is no Mercurial repository here"
2755 2755 " (.hg not found)"))
2756 2756 s = sshserver.sshserver(ui, repo)
2757 2757 s.serve_forever()
2758 2758
2759 2759 baseui = repo and repo.baseui or ui
2760 2760 optlist = ("name templates style address port prefix ipv6"
2761 2761 " accesslog errorlog webdir_conf certificate encoding")
2762 2762 for o in optlist.split():
2763 2763 if opts.get(o, None):
2764 2764 baseui.setconfig("web", o, str(opts[o]))
2765 2765 if (repo is not None) and (repo.ui != baseui):
2766 2766 repo.ui.setconfig("web", o, str(opts[o]))
2767 2767
2768 2768 if repo is None and not ui.config("web", "webdir_conf"):
2769 2769 raise error.RepoError(_("There is no Mercurial repository here"
2770 2770 " (.hg not found)"))
2771 2771
2772 2772 class service(object):
2773 2773 def init(self):
2774 2774 util.set_signal_handler()
2775 2775 self.httpd = server.create_server(baseui, repo)
2776 2776
2777 2777 if not ui.verbose: return
2778 2778
2779 2779 if self.httpd.prefix:
2780 2780 prefix = self.httpd.prefix.strip('/') + '/'
2781 2781 else:
2782 2782 prefix = ''
2783 2783
2784 2784 port = ':%d' % self.httpd.port
2785 2785 if port == ':80':
2786 2786 port = ''
2787 2787
2788 2788 bindaddr = self.httpd.addr
2789 2789 if bindaddr == '0.0.0.0':
2790 2790 bindaddr = '*'
2791 2791 elif ':' in bindaddr: # IPv6
2792 2792 bindaddr = '[%s]' % bindaddr
2793 2793
2794 2794 fqaddr = self.httpd.fqaddr
2795 2795 if ':' in fqaddr:
2796 2796 fqaddr = '[%s]' % fqaddr
2797 2797 ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
2798 2798 (fqaddr, port, prefix, bindaddr, self.httpd.port))
2799 2799
2800 2800 def run(self):
2801 2801 self.httpd.serve_forever()
2802 2802
2803 2803 service = service()
2804 2804
2805 2805 cmdutil.service(opts, initfn=service.init, runfn=service.run)
2806 2806
2807 2807 def status(ui, repo, *pats, **opts):
2808 2808 """show changed files in the working directory
2809 2809
2810 2810 Show status of files in the repository. If names are given, only
2811 2811 files that match are shown. Files that are clean or ignored or
2812 2812 the source of a copy/move operation, are not listed unless
2813 2813 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
2814 2814 Unless options described with "show only ..." are given, the
2815 2815 options -mardu are used.
2816 2816
2817 2817 Option -q/--quiet hides untracked (unknown and ignored) files
2818 2818 unless explicitly requested with -u/--unknown or -i/--ignored.
2819 2819
2820 2820 NOTE: status may appear to disagree with diff if permissions have
2821 2821 changed or a merge has occurred. The standard diff format does not
2822 2822 report permission changes and diff only reports changes relative
2823 2823 to one merge parent.
2824 2824
2825 2825 If one revision is given, it is used as the base revision.
2826 2826 If two revisions are given, the differences between them are
2827 2827 shown.
2828 2828
2829 2829 The codes used to show the status of files are:
2830 2830 M = modified
2831 2831 A = added
2832 2832 R = removed
2833 2833 C = clean
2834 2834 ! = missing (deleted by non-hg command, but still tracked)
2835 2835 ? = not tracked
2836 2836 I = ignored
2837 2837 = origin of the previous file listed as A (added)
2838 2838 """
2839 2839
2840 2840 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
2841 2841 cwd = (pats and repo.getcwd()) or ''
2842 2842 end = opts.get('print0') and '\0' or '\n'
2843 2843 copy = {}
2844 2844 states = 'modified added removed deleted unknown ignored clean'.split()
2845 2845 show = [k for k in states if opts.get(k)]
2846 2846 if opts.get('all'):
2847 2847 show += ui.quiet and (states[:4] + ['clean']) or states
2848 2848 if not show:
2849 2849 show = ui.quiet and states[:4] or states[:5]
2850 2850
2851 2851 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
2852 2852 'ignored' in show, 'clean' in show, 'unknown' in show)
2853 2853 changestates = zip(states, 'MAR!?IC', stat)
2854 2854
2855 2855 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
2856 2856 ctxn = repo[nullid]
2857 2857 ctx1 = repo[node1]
2858 2858 ctx2 = repo[node2]
2859 2859 added = stat[1]
2860 2860 if node2 is None:
2861 2861 added = stat[0] + stat[1] # merged?
2862 2862
2863 2863 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
2864 2864 if k in added:
2865 2865 copy[k] = v
2866 2866 elif v in added:
2867 2867 copy[v] = k
2868 2868
2869 2869 for state, char, files in changestates:
2870 2870 if state in show:
2871 2871 format = "%s %%s%s" % (char, end)
2872 2872 if opts.get('no_status'):
2873 2873 format = "%%s%s" % end
2874 2874
2875 2875 for f in files:
2876 2876 ui.write(format % repo.pathto(f, cwd))
2877 2877 if f in copy:
2878 2878 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
2879 2879
2880 2880 def tag(ui, repo, name1, *names, **opts):
2881 2881 """add one or more tags for the current or given revision
2882 2882
2883 2883 Name a particular revision using <name>.
2884 2884
2885 2885 Tags are used to name particular revisions of the repository and are
2886 2886 very useful to compare different revisions, to go back to significant
2887 2887 earlier versions or to mark branch points as releases, etc.
2888 2888
2889 2889 If no revision is given, the parent of the working directory is
2890 2890 used, or tip if no revision is checked out.
2891 2891
2892 2892 To facilitate version control, distribution, and merging of tags,
2893 2893 they are stored as a file named ".hgtags" which is managed
2894 2894 similarly to other project files and can be hand-edited if
2895 2895 necessary. The file '.hg/localtags' is used for local tags (not
2896 2896 shared among repositories).
2897 2897
2898 2898 See 'hg help dates' for a list of formats valid for -d/--date.
2899 2899 """
2900 2900
2901 2901 rev_ = "."
2902 2902 names = (name1,) + names
2903 2903 if len(names) != len(set(names)):
2904 2904 raise util.Abort(_('tag names must be unique'))
2905 2905 for n in names:
2906 2906 if n in ['tip', '.', 'null']:
2907 2907 raise util.Abort(_('the name \'%s\' is reserved') % n)
2908 2908 if opts.get('rev') and opts.get('remove'):
2909 2909 raise util.Abort(_("--rev and --remove are incompatible"))
2910 2910 if opts.get('rev'):
2911 2911 rev_ = opts['rev']
2912 2912 message = opts.get('message')
2913 2913 if opts.get('remove'):
2914 2914 expectedtype = opts.get('local') and 'local' or 'global'
2915 2915 for n in names:
2916 2916 if not repo.tagtype(n):
2917 2917 raise util.Abort(_('tag \'%s\' does not exist') % n)
2918 2918 if repo.tagtype(n) != expectedtype:
2919 2919 if expectedtype == 'global':
2920 2920 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
2921 2921 else:
2922 2922 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
2923 2923 rev_ = nullid
2924 2924 if not message:
2925 2925 message = _('Removed tag %s') % ', '.join(names)
2926 2926 elif not opts.get('force'):
2927 2927 for n in names:
2928 2928 if n in repo.tags():
2929 2929 raise util.Abort(_('tag \'%s\' already exists '
2930 2930 '(use -f to force)') % n)
2931 2931 if not rev_ and repo.dirstate.parents()[1] != nullid:
2932 2932 raise util.Abort(_('uncommitted merge - please provide a '
2933 2933 'specific revision'))
2934 2934 r = repo[rev_].node()
2935 2935
2936 2936 if not message:
2937 2937 message = (_('Added tag %s for changeset %s') %
2938 2938 (', '.join(names), short(r)))
2939 2939
2940 2940 date = opts.get('date')
2941 2941 if date:
2942 2942 date = util.parsedate(date)
2943 2943
2944 2944 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
2945 2945
2946 2946 def tags(ui, repo):
2947 2947 """list repository tags
2948 2948
2949 2949 This lists both regular and local tags. When the -v/--verbose
2950 2950 switch is used, a third column "local" is printed for local tags.
2951 2951 """
2952 2952
2953 2953 hexfunc = ui.debugflag and hex or short
2954 2954 tagtype = ""
2955 2955
2956 2956 for t, n in reversed(repo.tagslist()):
2957 2957 if ui.quiet:
2958 2958 ui.write("%s\n" % t)
2959 2959 continue
2960 2960
2961 2961 try:
2962 2962 hn = hexfunc(n)
2963 2963 r = "%5d:%s" % (repo.changelog.rev(n), hn)
2964 2964 except error.LookupError:
2965 2965 r = " ?:%s" % hn
2966 2966 else:
2967 2967 spaces = " " * (30 - encoding.colwidth(t))
2968 2968 if ui.verbose:
2969 2969 if repo.tagtype(t) == 'local':
2970 2970 tagtype = " local"
2971 2971 else:
2972 2972 tagtype = ""
2973 2973 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
2974 2974
2975 2975 def tip(ui, repo, **opts):
2976 2976 """show the tip revision
2977 2977
2978 2978 The tip revision (usually just called the tip) is the changeset
2979 2979 most recently added to the repository (and therefore the most
2980 2980 recently changed head).
2981 2981
2982 2982 If you have just made a commit, that commit will be the tip. If
2983 2983 you have just pulled changes from another repository, the tip of
2984 2984 that repository becomes the current tip. The "tip" tag is special
2985 2985 and cannot be renamed or assigned to a different changeset.
2986 2986 """
2987 2987 cmdutil.show_changeset(ui, repo, opts).show(repo[len(repo) - 1])
2988 2988
2989 2989 def unbundle(ui, repo, fname1, *fnames, **opts):
2990 2990 """apply one or more changegroup files
2991 2991
2992 2992 Apply one or more compressed changegroup files generated by the
2993 2993 bundle command.
2994 2994 """
2995 2995 fnames = (fname1,) + fnames
2996 2996
2997 2997 lock = repo.lock()
2998 2998 try:
2999 2999 for fname in fnames:
3000 3000 f = url.open(ui, fname)
3001 3001 gen = changegroup.readbundle(f, fname)
3002 3002 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
3003 3003 finally:
3004 3004 lock.release()
3005 3005
3006 3006 return postincoming(ui, repo, modheads, opts.get('update'), None)
3007 3007
3008 3008 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3009 3009 """update working directory
3010 3010
3011 3011 Update the repository's working directory to the specified
3012 3012 revision, or the tip of the current branch if none is specified.
3013 3013 Use null as the revision to remove the working copy (like 'hg
3014 3014 clone -U').
3015 3015
3016 3016 When the working directory contains no uncommitted changes, it
3017 3017 will be replaced by the state of the requested revision from the
3018 3018 repository. When the requested revision is on a different branch,
3019 3019 the working directory will additionally be switched to that
3020 3020 branch.
3021 3021
3022 3022 When there are uncommitted changes, use option -C/--clean to
3023 3023 discard them, forcibly replacing the state of the working
3024 3024 directory with the requested revision. Alternately, use -c/--check
3025 3025 to abort.
3026 3026
3027 3027 When there are uncommitted changes and option -C/--clean is not
3028 3028 used, and the parent revision and requested revision are on the
3029 3029 same branch, and one of them is an ancestor of the other, then the
3030 3030 new working directory will contain the requested revision merged
3031 3031 with the uncommitted changes. Otherwise, the update will fail with
3032 3032 a suggestion to use 'merge' or 'update -C' instead.
3033 3033
3034 3034 If you want to update just one file to an older revision, use
3035 3035 revert.
3036 3036
3037 3037 See 'hg help dates' for a list of formats valid for -d/--date.
3038 3038 """
3039 3039 if rev and node:
3040 3040 raise util.Abort(_("please specify just one revision"))
3041 3041
3042 3042 if not rev:
3043 3043 rev = node
3044 3044
3045 3045 if not clean and check:
3046 3046 # we could use dirty() but we can ignore merge and branch trivia
3047 3047 c = repo[None]
3048 3048 if c.modified() or c.added() or c.removed():
3049 3049 raise util.Abort(_("uncommitted local changes"))
3050 3050
3051 3051 if date:
3052 3052 if rev:
3053 3053 raise util.Abort(_("you can't specify a revision and a date"))
3054 3054 rev = cmdutil.finddate(ui, repo, date)
3055 3055
3056 3056 if clean:
3057 3057 return hg.clean(repo, rev)
3058 3058 else:
3059 3059 return hg.update(repo, rev)
3060 3060
3061 3061 def verify(ui, repo):
3062 3062 """verify the integrity of the repository
3063 3063
3064 3064 Verify the integrity of the current repository.
3065 3065
3066 3066 This will perform an extensive check of the repository's
3067 3067 integrity, validating the hashes and checksums of each entry in
3068 3068 the changelog, manifest, and tracked files, as well as the
3069 3069 integrity of their crosslinks and indices.
3070 3070 """
3071 3071 return hg.verify(repo)
3072 3072
3073 3073 def version_(ui):
3074 3074 """output version and copyright information"""
3075 3075 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3076 3076 % util.version())
3077 3077 ui.status(_(
3078 3078 "\nCopyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
3079 3079 "This is free software; see the source for copying conditions. "
3080 3080 "There is NO\nwarranty; "
3081 3081 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3082 3082 ))
3083 3083
3084 3084 # Command options and aliases are listed here, alphabetically
3085 3085
3086 3086 globalopts = [
3087 3087 ('R', 'repository', '',
3088 3088 _('repository root directory or symbolic path name')),
3089 3089 ('', 'cwd', '', _('change working directory')),
3090 3090 ('y', 'noninteractive', None,
3091 3091 _('do not prompt, assume \'yes\' for any required answers')),
3092 3092 ('q', 'quiet', None, _('suppress output')),
3093 3093 ('v', 'verbose', None, _('enable additional output')),
3094 3094 ('', 'config', [], _('set/override config option')),
3095 3095 ('', 'debug', None, _('enable debugging output')),
3096 3096 ('', 'debugger', None, _('start debugger')),
3097 3097 ('', 'encoding', encoding.encoding, _('set the charset encoding')),
3098 3098 ('', 'encodingmode', encoding.encodingmode,
3099 3099 _('set the charset encoding mode')),
3100 3100 ('', 'traceback', None, _('print traceback on exception')),
3101 3101 ('', 'time', None, _('time how long the command takes')),
3102 3102 ('', 'profile', None, _('print command execution profile')),
3103 3103 ('', 'version', None, _('output version information and exit')),
3104 3104 ('h', 'help', None, _('display help and exit')),
3105 3105 ]
3106 3106
3107 3107 dryrunopts = [('n', 'dry-run', None,
3108 3108 _('do not perform actions, just print output'))]
3109 3109
3110 3110 remoteopts = [
3111 3111 ('e', 'ssh', '', _('specify ssh command to use')),
3112 3112 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
3113 3113 ]
3114 3114
3115 3115 walkopts = [
3116 3116 ('I', 'include', [], _('include names matching the given patterns')),
3117 3117 ('X', 'exclude', [], _('exclude names matching the given patterns')),
3118 3118 ]
3119 3119
3120 3120 commitopts = [
3121 3121 ('m', 'message', '', _('use <text> as commit message')),
3122 3122 ('l', 'logfile', '', _('read commit message from <file>')),
3123 3123 ]
3124 3124
3125 3125 commitopts2 = [
3126 3126 ('d', 'date', '', _('record datecode as commit date')),
3127 3127 ('u', 'user', '', _('record the specified user as committer')),
3128 3128 ]
3129 3129
3130 3130 templateopts = [
3131 3131 ('', 'style', '', _('display using template map file')),
3132 3132 ('', 'template', '', _('display with template')),
3133 3133 ]
3134 3134
3135 3135 logopts = [
3136 3136 ('p', 'patch', None, _('show patch')),
3137 3137 ('g', 'git', None, _('use git extended diff format')),
3138 3138 ('l', 'limit', '', _('limit number of changes displayed')),
3139 3139 ('M', 'no-merges', None, _('do not show merges')),
3140 3140 ] + templateopts
3141 3141
3142 3142 diffopts = [
3143 3143 ('a', 'text', None, _('treat all files as text')),
3144 3144 ('g', 'git', None, _('use git extended diff format')),
3145 3145 ('', 'nodates', None, _("don't include dates in diff headers"))
3146 3146 ]
3147 3147
3148 3148 diffopts2 = [
3149 3149 ('p', 'show-function', None, _('show which function each change is in')),
3150 3150 ('w', 'ignore-all-space', None,
3151 3151 _('ignore white space when comparing lines')),
3152 3152 ('b', 'ignore-space-change', None,
3153 3153 _('ignore changes in the amount of white space')),
3154 3154 ('B', 'ignore-blank-lines', None,
3155 3155 _('ignore changes whose lines are all blank')),
3156 3156 ('U', 'unified', '', _('number of lines of context to show'))
3157 3157 ]
3158 3158
3159 3159 similarityopts = [
3160 3160 ('s', 'similarity', '',
3161 3161 _('guess renamed files by similarity (0<=s<=100)'))
3162 3162 ]
3163 3163
3164 3164 table = {
3165 3165 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
3166 3166 "addremove":
3167 3167 (addremove, similarityopts + walkopts + dryrunopts,
3168 3168 _('[OPTION]... [FILE]...')),
3169 3169 "^annotate|blame":
3170 3170 (annotate,
3171 3171 [('r', 'rev', '', _('annotate the specified revision')),
3172 3172 ('f', 'follow', None, _('follow file copies and renames')),
3173 3173 ('a', 'text', None, _('treat all files as text')),
3174 3174 ('u', 'user', None, _('list the author (long with -v)')),
3175 3175 ('d', 'date', None, _('list the date (short with -q)')),
3176 3176 ('n', 'number', None, _('list the revision number (default)')),
3177 3177 ('c', 'changeset', None, _('list the changeset')),
3178 3178 ('l', 'line-number', None,
3179 3179 _('show line number at the first appearance'))
3180 3180 ] + walkopts,
3181 3181 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3182 3182 "archive":
3183 3183 (archive,
3184 3184 [('', 'no-decode', None, _('do not pass files through decoders')),
3185 3185 ('p', 'prefix', '', _('directory prefix for files in archive')),
3186 3186 ('r', 'rev', '', _('revision to distribute')),
3187 3187 ('t', 'type', '', _('type of distribution to create')),
3188 3188 ] + walkopts,
3189 3189 _('[OPTION]... DEST')),
3190 3190 "backout":
3191 3191 (backout,
3192 3192 [('', 'merge', None,
3193 3193 _('merge with old dirstate parent after backout')),
3194 3194 ('', 'parent', '', _('parent to choose when backing out merge')),
3195 3195 ('r', 'rev', '', _('revision to backout')),
3196 3196 ] + walkopts + commitopts + commitopts2,
3197 3197 _('[OPTION]... [-r] REV')),
3198 3198 "bisect":
3199 3199 (bisect,
3200 3200 [('r', 'reset', False, _('reset bisect state')),
3201 3201 ('g', 'good', False, _('mark changeset good')),
3202 3202 ('b', 'bad', False, _('mark changeset bad')),
3203 3203 ('s', 'skip', False, _('skip testing changeset')),
3204 3204 ('c', 'command', '', _('use command to check changeset state')),
3205 3205 ('U', 'noupdate', False, _('do not update to target'))],
3206 3206 _("[-gbsr] [-c CMD] [REV]")),
3207 3207 "branch":
3208 3208 (branch,
3209 3209 [('f', 'force', None,
3210 3210 _('set branch name even if it shadows an existing branch')),
3211 3211 ('C', 'clean', None, _('reset branch name to parent branch name'))],
3212 3212 _('[-fC] [NAME]')),
3213 3213 "branches":
3214 3214 (branches,
3215 3215 [('a', 'active', False,
3216 3216 _('show only branches that have unmerged heads')),
3217 3217 ('c', 'closed', False,
3218 3218 _('show normal and closed heads'))],
3219 3219 _('[-a]')),
3220 3220 "bundle":
3221 3221 (bundle,
3222 3222 [('f', 'force', None,
3223 3223 _('run even when remote repository is unrelated')),
3224 3224 ('r', 'rev', [],
3225 3225 _('a changeset up to which you would like to bundle')),
3226 3226 ('', 'base', [],
3227 3227 _('a base changeset to specify instead of a destination')),
3228 3228 ('a', 'all', None, _('bundle all changesets in the repository')),
3229 3229 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3230 3230 ] + remoteopts,
3231 3231 _('[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3232 3232 "cat":
3233 3233 (cat,
3234 3234 [('o', 'output', '', _('print output to file with formatted name')),
3235 3235 ('r', 'rev', '', _('print the given revision')),
3236 3236 ('', 'decode', None, _('apply any matching decode filter')),
3237 3237 ] + walkopts,
3238 3238 _('[OPTION]... FILE...')),
3239 3239 "^clone":
3240 3240 (clone,
3241 3241 [('U', 'noupdate', None,
3242 3242 _('the clone will only contain a repository (no working copy)')),
3243 3243 ('r', 'rev', [],
3244 3244 _('a changeset you would like to have after cloning')),
3245 3245 ('', 'pull', None, _('use pull protocol to copy metadata')),
3246 3246 ('', 'uncompressed', None,
3247 3247 _('use uncompressed transfer (fast over LAN)')),
3248 3248 ] + remoteopts,
3249 3249 _('[OPTION]... SOURCE [DEST]')),
3250 3250 "^commit|ci":
3251 3251 (commit,
3252 3252 [('A', 'addremove', None,
3253 3253 _('mark new/missing files as added/removed before committing')),
3254 3254 ('', 'close-branch', None,
3255 3255 _('mark a branch as closed, hiding it from the branch list')),
3256 3256 ] + walkopts + commitopts + commitopts2,
3257 3257 _('[OPTION]... [FILE]...')),
3258 3258 "copy|cp":
3259 3259 (copy,
3260 3260 [('A', 'after', None, _('record a copy that has already occurred')),
3261 3261 ('f', 'force', None,
3262 3262 _('forcibly copy over an existing managed file')),
3263 3263 ] + walkopts + dryrunopts,
3264 3264 _('[OPTION]... [SOURCE]... DEST')),
3265 3265 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
3266 3266 "debugcheckstate": (debugcheckstate, []),
3267 3267 "debugcommands": (debugcommands, [], _('[COMMAND]')),
3268 3268 "debugcomplete":
3269 3269 (debugcomplete,
3270 3270 [('o', 'options', None, _('show the command options'))],
3271 3271 _('[-o] CMD')),
3272 3272 "debugdate":
3273 3273 (debugdate,
3274 3274 [('e', 'extended', None, _('try extended date formats'))],
3275 3275 _('[-e] DATE [RANGE]')),
3276 3276 "debugdata": (debugdata, [], _('FILE REV')),
3277 3277 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
3278 3278 "debugindex": (debugindex, [], _('FILE')),
3279 3279 "debugindexdot": (debugindexdot, [], _('FILE')),
3280 3280 "debuginstall": (debuginstall, []),
3281 3281 "debugrebuildstate":
3282 3282 (debugrebuildstate,
3283 3283 [('r', 'rev', '', _('revision to rebuild to'))],
3284 3284 _('[-r REV] [REV]')),
3285 3285 "debugrename":
3286 3286 (debugrename,
3287 3287 [('r', 'rev', '', _('revision to debug'))],
3288 3288 _('[-r REV] FILE')),
3289 3289 "debugsetparents":
3290 3290 (debugsetparents, [], _('REV1 [REV2]')),
3291 3291 "debugstate":
3292 3292 (debugstate,
3293 3293 [('', 'nodates', None, _('do not display the saved mtime'))],
3294 3294 _('[OPTION]...')),
3295 3295 "debugsub":
3296 3296 (debugsub,
3297 3297 [('r', 'rev', '', _('revision to check'))],
3298 3298 _('[-r REV] [REV]')),
3299 3299 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
3300 3300 "^diff":
3301 3301 (diff,
3302 3302 [('r', 'rev', [], _('revision')),
3303 3303 ('c', 'change', '', _('change made by revision'))
3304 3304 ] + diffopts + diffopts2 + walkopts,
3305 3305 _('[OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3306 3306 "^export":
3307 3307 (export,
3308 3308 [('o', 'output', '', _('print output to file with formatted name')),
3309 3309 ('', 'switch-parent', None, _('diff against the second parent'))
3310 3310 ] + diffopts,
3311 3311 _('[OPTION]... [-o OUTFILESPEC] REV...')),
3312 3312 "^forget":
3313 3313 (forget,
3314 3314 [] + walkopts,
3315 3315 _('[OPTION]... FILE...')),
3316 3316 "grep":
3317 3317 (grep,
3318 3318 [('0', 'print0', None, _('end fields with NUL')),
3319 3319 ('', 'all', None, _('print all revisions that match')),
3320 3320 ('f', 'follow', None,
3321 3321 _('follow changeset history, or file history across copies and renames')),
3322 3322 ('i', 'ignore-case', None, _('ignore case when matching')),
3323 3323 ('l', 'files-with-matches', None,
3324 3324 _('print only filenames and revisions that match')),
3325 3325 ('n', 'line-number', None, _('print matching line numbers')),
3326 3326 ('r', 'rev', [], _('search in given revision range')),
3327 3327 ('u', 'user', None, _('list the author (long with -v)')),
3328 3328 ('d', 'date', None, _('list the date (short with -q)')),
3329 3329 ] + walkopts,
3330 3330 _('[OPTION]... PATTERN [FILE]...')),
3331 3331 "heads":
3332 3332 (heads,
3333 3333 [('r', 'rev', '', _('show only heads which are descendants of REV')),
3334 3334 ('a', 'active', False,
3335 3335 _('show only the active heads from open branches')),
3336 3336 ('c', 'closed', False,
3337 3337 _('show normal and closed heads')),
3338 3338 ] + templateopts,
3339 3339 _('[-r STARTREV] [REV]...')),
3340 3340 "help": (help_, [], _('[TOPIC]')),
3341 3341 "identify|id":
3342 3342 (identify,
3343 3343 [('r', 'rev', '', _('identify the specified revision')),
3344 3344 ('n', 'num', None, _('show local revision number')),
3345 3345 ('i', 'id', None, _('show global revision id')),
3346 3346 ('b', 'branch', None, _('show branch')),
3347 3347 ('t', 'tags', None, _('show tags'))],
3348 3348 _('[-nibt] [-r REV] [SOURCE]')),
3349 3349 "import|patch":
3350 3350 (import_,
3351 3351 [('p', 'strip', 1,
3352 3352 _('directory strip option for patch. This has the same '
3353 3353 'meaning as the corresponding patch option')),
3354 3354 ('b', 'base', '', _('base path')),
3355 3355 ('f', 'force', None,
3356 3356 _('skip check for outstanding uncommitted changes')),
3357 3357 ('', 'no-commit', None, _("don't commit, just update the working directory")),
3358 3358 ('', 'exact', None,
3359 3359 _('apply patch to the nodes from which it was generated')),
3360 3360 ('', 'import-branch', None,
3361 3361 _('use any branch information in patch (implied by --exact)'))] +
3362 3362 commitopts + commitopts2 + similarityopts,
3363 3363 _('[OPTION]... PATCH...')),
3364 3364 "incoming|in":
3365 3365 (incoming,
3366 3366 [('f', 'force', None,
3367 3367 _('run even when remote repository is unrelated')),
3368 3368 ('n', 'newest-first', None, _('show newest record first')),
3369 3369 ('', 'bundle', '', _('file to store the bundles into')),
3370 3370 ('r', 'rev', [],
3371 3371 _('a specific revision up to which you would like to pull')),
3372 3372 ] + logopts + remoteopts,
3373 3373 _('[-p] [-n] [-M] [-f] [-r REV]...'
3374 3374 ' [--bundle FILENAME] [SOURCE]')),
3375 3375 "^init":
3376 3376 (init,
3377 3377 remoteopts,
3378 3378 _('[-e CMD] [--remotecmd CMD] [DEST]')),
3379 3379 "locate":
3380 3380 (locate,
3381 3381 [('r', 'rev', '', _('search the repository as it stood at REV')),
3382 3382 ('0', 'print0', None,
3383 3383 _('end filenames with NUL, for use with xargs')),
3384 3384 ('f', 'fullpath', None,
3385 3385 _('print complete paths from the filesystem root')),
3386 3386 ] + walkopts,
3387 3387 _('[OPTION]... [PATTERN]...')),
3388 3388 "^log|history":
3389 3389 (log,
3390 3390 [('f', 'follow', None,
3391 3391 _('follow changeset history, or file history across copies and renames')),
3392 3392 ('', 'follow-first', None,
3393 3393 _('only follow the first parent of merge changesets')),
3394 3394 ('d', 'date', '', _('show revisions matching date spec')),
3395 3395 ('C', 'copies', None, _('show copied files')),
3396 3396 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
3397 3397 ('r', 'rev', [], _('show the specified revision or range')),
3398 3398 ('', 'removed', None, _('include revisions where files were removed')),
3399 3399 ('m', 'only-merges', None, _('show only merges')),
3400 3400 ('u', 'user', [], _('revisions committed by user')),
3401 3401 ('b', 'only-branch', [],
3402 3402 _('show only changesets within the given named branch')),
3403 3403 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
3404 3404 ] + logopts + walkopts,
3405 3405 _('[OPTION]... [FILE]')),
3406 3406 "manifest":
3407 3407 (manifest,
3408 3408 [('r', 'rev', '', _('revision to display'))],
3409 3409 _('[-r REV]')),
3410 3410 "^merge":
3411 3411 (merge,
3412 3412 [('f', 'force', None, _('force a merge with outstanding changes')),
3413 3413 ('r', 'rev', '', _('revision to merge')),
3414 3414 ('P', 'preview', None,
3415 3415 _('review revisions to merge (no merge is performed)'))],
3416 3416 _('[-f] [[-r] REV]')),
3417 3417 "outgoing|out":
3418 3418 (outgoing,
3419 3419 [('f', 'force', None,
3420 3420 _('run even when remote repository is unrelated')),
3421 3421 ('r', 'rev', [],
3422 3422 _('a specific revision up to which you would like to push')),
3423 3423 ('n', 'newest-first', None, _('show newest record first')),
3424 3424 ] + logopts + remoteopts,
3425 3425 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3426 3426 "^parents":
3427 3427 (parents,
3428 3428 [('r', 'rev', '', _('show parents from the specified revision')),
3429 3429 ] + templateopts,
3430 3430 _('[-r REV] [FILE]')),
3431 3431 "paths": (paths, [], _('[NAME]')),
3432 3432 "^pull":
3433 3433 (pull,
3434 3434 [('u', 'update', None,
3435 3435 _('update to new tip if changesets were pulled')),
3436 3436 ('f', 'force', None,
3437 3437 _('run even when remote repository is unrelated')),
3438 3438 ('r', 'rev', [],
3439 3439 _('a specific revision up to which you would like to pull')),
3440 3440 ] + remoteopts,
3441 3441 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3442 3442 "^push":
3443 3443 (push,
3444 3444 [('f', 'force', None, _('force push')),
3445 3445 ('r', 'rev', [],
3446 3446 _('a specific revision up to which you would like to push')),
3447 3447 ] + remoteopts,
3448 3448 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3449 3449 "recover": (recover, []),
3450 3450 "^remove|rm":
3451 3451 (remove,
3452 3452 [('A', 'after', None, _('record delete for missing files')),
3453 3453 ('f', 'force', None,
3454 3454 _('remove (and delete) file even if added or modified')),
3455 3455 ] + walkopts,
3456 3456 _('[OPTION]... FILE...')),
3457 3457 "rename|mv":
3458 3458 (rename,
3459 3459 [('A', 'after', None, _('record a rename that has already occurred')),
3460 3460 ('f', 'force', None,
3461 3461 _('forcibly copy over an existing managed file')),
3462 3462 ] + walkopts + dryrunopts,
3463 3463 _('[OPTION]... SOURCE... DEST')),
3464 3464 "resolve":
3465 3465 (resolve,
3466 3466 [('a', 'all', None, _('remerge all unresolved files')),
3467 3467 ('l', 'list', None, _('list state of files needing merge')),
3468 3468 ('m', 'mark', None, _('mark files as resolved')),
3469 3469 ('u', 'unmark', None, _('unmark files as resolved'))]
3470 3470 + walkopts,
3471 3471 _('[OPTION]... [FILE]...')),
3472 3472 "revert":
3473 3473 (revert,
3474 3474 [('a', 'all', None, _('revert all changes when no arguments given')),
3475 3475 ('d', 'date', '', _('tipmost revision matching date')),
3476 3476 ('r', 'rev', '', _('revision to revert to')),
3477 3477 ('', 'no-backup', None, _('do not save backup copies of files')),
3478 3478 ] + walkopts + dryrunopts,
3479 3479 _('[OPTION]... [-r REV] [NAME]...')),
3480 3480 "rollback": (rollback, []),
3481 3481 "root": (root, []),
3482 3482 "^serve":
3483 3483 (serve,
3484 3484 [('A', 'accesslog', '', _('name of access log file to write to')),
3485 3485 ('d', 'daemon', None, _('run server in background')),
3486 3486 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3487 3487 ('E', 'errorlog', '', _('name of error log file to write to')),
3488 3488 ('p', 'port', 0, _('port to listen on (default: 8000)')),
3489 3489 ('a', 'address', '', _('address to listen on (default: all interfaces)')),
3490 3490 ('', 'prefix', '', _('prefix path to serve from (default: server root)')),
3491 3491 ('n', 'name', '',
3492 3492 _('name to show in web pages (default: working directory)')),
3493 3493 ('', 'webdir-conf', '', _('name of the webdir config file'
3494 3494 ' (serve more than one repository)')),
3495 3495 ('', 'pid-file', '', _('name of file to write process ID to')),
3496 3496 ('', 'stdio', None, _('for remote clients')),
3497 3497 ('t', 'templates', '', _('web templates to use')),
3498 3498 ('', 'style', '', _('template style to use')),
3499 3499 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
3500 3500 ('', 'certificate', '', _('SSL certificate file'))],
3501 3501 _('[OPTION]...')),
3502 3502 "showconfig|debugconfig":
3503 3503 (showconfig,
3504 3504 [('u', 'untrusted', None, _('show untrusted configuration options'))],
3505 3505 _('[-u] [NAME]...')),
3506 3506 "^status|st":
3507 3507 (status,
3508 3508 [('A', 'all', None, _('show status of all files')),
3509 3509 ('m', 'modified', None, _('show only modified files')),
3510 3510 ('a', 'added', None, _('show only added files')),
3511 3511 ('r', 'removed', None, _('show only removed files')),
3512 3512 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3513 3513 ('c', 'clean', None, _('show only files without changes')),
3514 3514 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3515 3515 ('i', 'ignored', None, _('show only ignored files')),
3516 3516 ('n', 'no-status', None, _('hide status prefix')),
3517 3517 ('C', 'copies', None, _('show source of copied files')),
3518 3518 ('0', 'print0', None,
3519 3519 _('end filenames with NUL, for use with xargs')),
3520 3520 ('', 'rev', [], _('show difference from revision')),
3521 3521 ] + walkopts,
3522 3522 _('[OPTION]... [FILE]...')),
3523 3523 "tag":
3524 3524 (tag,
3525 3525 [('f', 'force', None, _('replace existing tag')),
3526 3526 ('l', 'local', None, _('make the tag local')),
3527 3527 ('r', 'rev', '', _('revision to tag')),
3528 3528 ('', 'remove', None, _('remove a tag')),
3529 3529 # -l/--local is already there, commitopts cannot be used
3530 3530 ('m', 'message', '', _('use <text> as commit message')),
3531 3531 ] + commitopts2,
3532 3532 _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
3533 3533 "tags": (tags, []),
3534 3534 "tip":
3535 3535 (tip,
3536 3536 [('p', 'patch', None, _('show patch')),
3537 3537 ('g', 'git', None, _('use git extended diff format')),
3538 3538 ] + templateopts,
3539 3539 _('[-p]')),
3540 3540 "unbundle":
3541 3541 (unbundle,
3542 3542 [('u', 'update', None,
3543 3543 _('update to new tip if changesets were unbundled'))],
3544 3544 _('[-u] FILE...')),
3545 3545 "^update|up|checkout|co":
3546 3546 (update,
3547 3547 [('C', 'clean', None, _('overwrite locally modified files (no backup)')),
3548 3548 ('c', 'check', None, _('check for uncommitted changes')),
3549 3549 ('d', 'date', '', _('tipmost revision matching date')),
3550 3550 ('r', 'rev', '', _('revision'))],
3551 3551 _('[-C] [-d DATE] [[-r] REV]')),
3552 3552 "verify": (verify, []),
3553 3553 "version": (version_, []),
3554 3554 }
3555 3555
3556 3556 norepo = ("clone init version help debugcommands debugcomplete debugdata"
3557 3557 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
3558 3558 optionalrepo = ("identify paths serve showconfig debugancestor")
General Comments 0
You need to be logged in to leave comments. Login now