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