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