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