##// END OF EJS Templates
help: fix bytes/digit confusion for hashes...
Matt Mackall -
r11718:3e979f47 default
parent child Browse files
Show More
@@ -1,4462 +1,4462 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _, gettext
11 11 import os, re, sys, difflib, time, tempfile
12 12 import hg, util, revlog, bundlerepo, extensions, copies, error
13 13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 15 import merge as mergemod
16 16 import minirst, revset
17 17 import dagparser
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 .. container:: verbose
33 33
34 34 An example showing how new (unknown) files are added
35 35 automatically by :hg:`add`::
36 36
37 37 $ ls
38 38 foo.c
39 39 $ hg status
40 40 ? foo.c
41 41 $ hg add
42 42 adding foo.c
43 43 $ hg status
44 44 A foo.c
45 45
46 46 Returns 0 if all files are successfully added.
47 47 """
48 48
49 49 bad = []
50 50 names = []
51 51 m = cmdutil.match(repo, pats, opts)
52 52 oldbad = m.bad
53 53 m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
54 54
55 55 for f in repo.walk(m):
56 56 exact = m.exact(f)
57 57 if exact or f not in repo.dirstate:
58 58 names.append(f)
59 59 if ui.verbose or not exact:
60 60 ui.status(_('adding %s\n') % m.rel(f))
61 61 if not opts.get('dry_run'):
62 62 bad += [f for f in repo[None].add(names) if f in m.files()]
63 63 return bad and 1 or 0
64 64
65 65 def addremove(ui, repo, *pats, **opts):
66 66 """add all new files, delete all missing files
67 67
68 68 Add all new files and remove all missing files from the
69 69 repository.
70 70
71 71 New files are ignored if they match any of the patterns in
72 72 .hgignore. As with add, these changes take effect at the next
73 73 commit.
74 74
75 75 Use the -s/--similarity option to detect renamed files. With a
76 76 parameter greater than 0, this compares every removed file with
77 77 every added file and records those similar enough as renames. This
78 78 option takes a percentage between 0 (disabled) and 100 (files must
79 79 be identical) as its parameter. Detecting renamed files this way
80 80 can be expensive. After using this option, :hg:`status -C` can be
81 81 used to check which files were identified as moved or renamed.
82 82
83 83 Returns 0 if all files are successfully added.
84 84 """
85 85 try:
86 86 sim = float(opts.get('similarity') or 100)
87 87 except ValueError:
88 88 raise util.Abort(_('similarity must be a number'))
89 89 if sim < 0 or sim > 100:
90 90 raise util.Abort(_('similarity must be between 0 and 100'))
91 91 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
92 92
93 93 def annotate(ui, repo, *pats, **opts):
94 94 """show changeset information by line for each file
95 95
96 96 List changes in files, showing the revision id responsible for
97 97 each line
98 98
99 99 This command is useful for discovering when a change was made and
100 100 by whom.
101 101
102 102 Without the -a/--text option, annotate will avoid processing files
103 103 it detects as binary. With -a, annotate will annotate the file
104 104 anyway, although the results will probably be neither useful
105 105 nor desirable.
106 106
107 107 Returns 0 on success.
108 108 """
109 109 if opts.get('follow'):
110 110 # --follow is deprecated and now just an alias for -f/--file
111 111 # to mimic the behavior of Mercurial before version 1.5
112 112 opts['file'] = 1
113 113
114 114 datefunc = ui.quiet and util.shortdate or util.datestr
115 115 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
116 116
117 117 if not pats:
118 118 raise util.Abort(_('at least one filename or pattern is required'))
119 119
120 120 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
121 121 ('number', lambda x: str(x[0].rev())),
122 122 ('changeset', lambda x: short(x[0].node())),
123 123 ('date', getdate),
124 124 ('file', lambda x: x[0].path()),
125 125 ]
126 126
127 127 if (not opts.get('user') and not opts.get('changeset')
128 128 and not opts.get('date') and not opts.get('file')):
129 129 opts['number'] = 1
130 130
131 131 linenumber = opts.get('line_number') is not None
132 132 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
133 133 raise util.Abort(_('at least one of -n/-c is required for -l'))
134 134
135 135 funcmap = [func for op, func in opmap if opts.get(op)]
136 136 if linenumber:
137 137 lastfunc = funcmap[-1]
138 138 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
139 139
140 140 ctx = repo[opts.get('rev')]
141 141 m = cmdutil.match(repo, pats, opts)
142 142 follow = not opts.get('no_follow')
143 143 for abs in ctx.walk(m):
144 144 fctx = ctx[abs]
145 145 if not opts.get('text') and util.binary(fctx.data()):
146 146 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
147 147 continue
148 148
149 149 lines = fctx.annotate(follow=follow, linenumber=linenumber)
150 150 pieces = []
151 151
152 152 for f in funcmap:
153 153 l = [f(n) for n, dummy in lines]
154 154 if l:
155 155 sized = [(x, encoding.colwidth(x)) for x in l]
156 156 ml = max([w for x, w in sized])
157 157 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
158 158
159 159 if pieces:
160 160 for p, l in zip(zip(*pieces), lines):
161 161 ui.write("%s: %s" % (" ".join(p), l[1]))
162 162
163 163 def archive(ui, repo, dest, **opts):
164 164 '''create an unversioned archive of a repository revision
165 165
166 166 By default, the revision used is the parent of the working
167 167 directory; use -r/--rev to specify a different revision.
168 168
169 169 The archive type is automatically detected based on file
170 170 extension (or override using -t/--type).
171 171
172 172 Valid types are:
173 173
174 174 :``files``: a directory full of files (default)
175 175 :``tar``: tar archive, uncompressed
176 176 :``tbz2``: tar archive, compressed using bzip2
177 177 :``tgz``: tar archive, compressed using gzip
178 178 :``uzip``: zip archive, uncompressed
179 179 :``zip``: zip archive, compressed using deflate
180 180
181 181 The exact name of the destination archive or directory is given
182 182 using a format string; see :hg:`help export` for details.
183 183
184 184 Each member added to an archive file has a directory prefix
185 185 prepended. Use -p/--prefix to specify a format string for the
186 186 prefix. The default is the basename of the archive, with suffixes
187 187 removed.
188 188
189 189 Returns 0 on success.
190 190 '''
191 191
192 192 ctx = repo[opts.get('rev')]
193 193 if not ctx:
194 194 raise util.Abort(_('no working directory: please specify a revision'))
195 195 node = ctx.node()
196 196 dest = cmdutil.make_filename(repo, dest, node)
197 197 if os.path.realpath(dest) == repo.root:
198 198 raise util.Abort(_('repository root cannot be destination'))
199 199
200 200 kind = opts.get('type') or archival.guesskind(dest) or 'files'
201 201 prefix = opts.get('prefix')
202 202
203 203 if dest == '-':
204 204 if kind == 'files':
205 205 raise util.Abort(_('cannot archive plain files to stdout'))
206 206 dest = sys.stdout
207 207 if not prefix:
208 208 prefix = os.path.basename(repo.root) + '-%h'
209 209
210 210 prefix = cmdutil.make_filename(repo, prefix, node)
211 211 matchfn = cmdutil.match(repo, [], opts)
212 212 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
213 213 matchfn, prefix)
214 214
215 215 def backout(ui, repo, node=None, rev=None, **opts):
216 216 '''reverse effect of earlier changeset
217 217
218 218 Commit the backed out changes as a new changeset. The new
219 219 changeset is a child of the backed out changeset.
220 220
221 221 If you backout a changeset other than the tip, a new head is
222 222 created. This head will be the new tip and you should merge this
223 223 backout changeset with another head.
224 224
225 225 The --merge option remembers the parent of the working directory
226 226 before starting the backout, then merges the new head with that
227 227 changeset afterwards. This saves you from doing the merge by hand.
228 228 The result of this merge is not committed, as with a normal merge.
229 229
230 230 See :hg:`help dates` for a list of formats valid for -d/--date.
231 231
232 232 Returns 0 on success.
233 233 '''
234 234 if rev and node:
235 235 raise util.Abort(_("please specify just one revision"))
236 236
237 237 if not rev:
238 238 rev = node
239 239
240 240 if not rev:
241 241 raise util.Abort(_("please specify a revision to backout"))
242 242
243 243 date = opts.get('date')
244 244 if date:
245 245 opts['date'] = util.parsedate(date)
246 246
247 247 cmdutil.bail_if_changed(repo)
248 248 node = repo.lookup(rev)
249 249
250 250 op1, op2 = repo.dirstate.parents()
251 251 a = repo.changelog.ancestor(op1, node)
252 252 if a != node:
253 253 raise util.Abort(_('cannot backout change on a different branch'))
254 254
255 255 p1, p2 = repo.changelog.parents(node)
256 256 if p1 == nullid:
257 257 raise util.Abort(_('cannot backout a change with no parents'))
258 258 if p2 != nullid:
259 259 if not opts.get('parent'):
260 260 raise util.Abort(_('cannot backout a merge changeset without '
261 261 '--parent'))
262 262 p = repo.lookup(opts['parent'])
263 263 if p not in (p1, p2):
264 264 raise util.Abort(_('%s is not a parent of %s') %
265 265 (short(p), short(node)))
266 266 parent = p
267 267 else:
268 268 if opts.get('parent'):
269 269 raise util.Abort(_('cannot use --parent on non-merge changeset'))
270 270 parent = p1
271 271
272 272 # the backout should appear on the same branch
273 273 branch = repo.dirstate.branch()
274 274 hg.clean(repo, node, show_stats=False)
275 275 repo.dirstate.setbranch(branch)
276 276 revert_opts = opts.copy()
277 277 revert_opts['date'] = None
278 278 revert_opts['all'] = True
279 279 revert_opts['rev'] = hex(parent)
280 280 revert_opts['no_backup'] = None
281 281 revert(ui, repo, **revert_opts)
282 282 commit_opts = opts.copy()
283 283 commit_opts['addremove'] = False
284 284 if not commit_opts['message'] and not commit_opts['logfile']:
285 285 # we don't translate commit messages
286 286 commit_opts['message'] = "Backed out changeset %s" % short(node)
287 287 commit_opts['force_editor'] = True
288 288 commit(ui, repo, **commit_opts)
289 289 def nice(node):
290 290 return '%d:%s' % (repo.changelog.rev(node), short(node))
291 291 ui.status(_('changeset %s backs out changeset %s\n') %
292 292 (nice(repo.changelog.tip()), nice(node)))
293 293 if op1 != node:
294 294 hg.clean(repo, op1, show_stats=False)
295 295 if opts.get('merge'):
296 296 ui.status(_('merging with changeset %s\n')
297 297 % nice(repo.changelog.tip()))
298 298 hg.merge(repo, hex(repo.changelog.tip()))
299 299 else:
300 300 ui.status(_('the backout changeset is a new head - '
301 301 'do not forget to merge\n'))
302 302 ui.status(_('(use "backout --merge" '
303 303 'if you want to auto-merge)\n'))
304 304
305 305 def bisect(ui, repo, rev=None, extra=None, command=None,
306 306 reset=None, good=None, bad=None, skip=None, noupdate=None):
307 307 """subdivision search of changesets
308 308
309 309 This command helps to find changesets which introduce problems. To
310 310 use, mark the earliest changeset you know exhibits the problem as
311 311 bad, then mark the latest changeset which is free from the problem
312 312 as good. Bisect will update your working directory to a revision
313 313 for testing (unless the -U/--noupdate option is specified). Once
314 314 you have performed tests, mark the working directory as good or
315 315 bad, and bisect will either update to another candidate changeset
316 316 or announce that it has found the bad revision.
317 317
318 318 As a shortcut, you can also use the revision argument to mark a
319 319 revision as good or bad without checking it out first.
320 320
321 321 If you supply a command, it will be used for automatic bisection.
322 322 Its exit status will be used to mark revisions as good or bad:
323 323 status 0 means good, 125 means to skip the revision, 127
324 324 (command not found) will abort the bisection, and any other
325 325 non-zero exit status means the revision is bad.
326 326
327 327 Returns 0 on success.
328 328 """
329 329 def print_result(nodes, good):
330 330 displayer = cmdutil.show_changeset(ui, repo, {})
331 331 if len(nodes) == 1:
332 332 # narrowed it down to a single revision
333 333 if good:
334 334 ui.write(_("The first good revision is:\n"))
335 335 else:
336 336 ui.write(_("The first bad revision is:\n"))
337 337 displayer.show(repo[nodes[0]])
338 338 else:
339 339 # multiple possible revisions
340 340 if good:
341 341 ui.write(_("Due to skipped revisions, the first "
342 342 "good revision could be any of:\n"))
343 343 else:
344 344 ui.write(_("Due to skipped revisions, the first "
345 345 "bad revision could be any of:\n"))
346 346 for n in nodes:
347 347 displayer.show(repo[n])
348 348 displayer.close()
349 349
350 350 def check_state(state, interactive=True):
351 351 if not state['good'] or not state['bad']:
352 352 if (good or bad or skip or reset) and interactive:
353 353 return
354 354 if not state['good']:
355 355 raise util.Abort(_('cannot bisect (no known good revisions)'))
356 356 else:
357 357 raise util.Abort(_('cannot bisect (no known bad revisions)'))
358 358 return True
359 359
360 360 # backward compatibility
361 361 if rev in "good bad reset init".split():
362 362 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
363 363 cmd, rev, extra = rev, extra, None
364 364 if cmd == "good":
365 365 good = True
366 366 elif cmd == "bad":
367 367 bad = True
368 368 else:
369 369 reset = True
370 370 elif extra or good + bad + skip + reset + bool(command) > 1:
371 371 raise util.Abort(_('incompatible arguments'))
372 372
373 373 if reset:
374 374 p = repo.join("bisect.state")
375 375 if os.path.exists(p):
376 376 os.unlink(p)
377 377 return
378 378
379 379 state = hbisect.load_state(repo)
380 380
381 381 if command:
382 382 changesets = 1
383 383 try:
384 384 while changesets:
385 385 # update state
386 386 status = util.system(command)
387 387 if status == 125:
388 388 transition = "skip"
389 389 elif status == 0:
390 390 transition = "good"
391 391 # status < 0 means process was killed
392 392 elif status == 127:
393 393 raise util.Abort(_("failed to execute %s") % command)
394 394 elif status < 0:
395 395 raise util.Abort(_("%s killed") % command)
396 396 else:
397 397 transition = "bad"
398 398 ctx = repo[rev or '.']
399 399 state[transition].append(ctx.node())
400 400 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
401 401 check_state(state, interactive=False)
402 402 # bisect
403 403 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
404 404 # update to next check
405 405 cmdutil.bail_if_changed(repo)
406 406 hg.clean(repo, nodes[0], show_stats=False)
407 407 finally:
408 408 hbisect.save_state(repo, state)
409 409 print_result(nodes, good)
410 410 return
411 411
412 412 # update state
413 413 node = repo.lookup(rev or '.')
414 414 if good or bad or skip:
415 415 if good:
416 416 state['good'].append(node)
417 417 elif bad:
418 418 state['bad'].append(node)
419 419 elif skip:
420 420 state['skip'].append(node)
421 421 hbisect.save_state(repo, state)
422 422
423 423 if not check_state(state):
424 424 return
425 425
426 426 # actually bisect
427 427 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
428 428 if changesets == 0:
429 429 print_result(nodes, good)
430 430 else:
431 431 assert len(nodes) == 1 # only a single node can be tested next
432 432 node = nodes[0]
433 433 # compute the approximate number of remaining tests
434 434 tests, size = 0, 2
435 435 while size <= changesets:
436 436 tests, size = tests + 1, size * 2
437 437 rev = repo.changelog.rev(node)
438 438 ui.write(_("Testing changeset %d:%s "
439 439 "(%d changesets remaining, ~%d tests)\n")
440 440 % (rev, short(node), changesets, tests))
441 441 if not noupdate:
442 442 cmdutil.bail_if_changed(repo)
443 443 return hg.clean(repo, node)
444 444
445 445 def branch(ui, repo, label=None, **opts):
446 446 """set or show the current branch name
447 447
448 448 With no argument, show the current branch name. With one argument,
449 449 set the working directory branch name (the branch will not exist
450 450 in the repository until the next commit). Standard practice
451 451 recommends that primary development take place on the 'default'
452 452 branch.
453 453
454 454 Unless -f/--force is specified, branch will not let you set a
455 455 branch name that already exists, even if it's inactive.
456 456
457 457 Use -C/--clean to reset the working directory branch to that of
458 458 the parent of the working directory, negating a previous branch
459 459 change.
460 460
461 461 Use the command :hg:`update` to switch to an existing branch. Use
462 462 :hg:`commit --close-branch` to mark this branch as closed.
463 463
464 464 Returns 0 on success.
465 465 """
466 466
467 467 if opts.get('clean'):
468 468 label = repo[None].parents()[0].branch()
469 469 repo.dirstate.setbranch(label)
470 470 ui.status(_('reset working directory to branch %s\n') % label)
471 471 elif label:
472 472 utflabel = encoding.fromlocal(label)
473 473 if not opts.get('force') and utflabel in repo.branchtags():
474 474 if label not in [p.branch() for p in repo.parents()]:
475 475 raise util.Abort(_('a branch of the same name already exists'
476 476 " (use 'hg update' to switch to it)"))
477 477 repo.dirstate.setbranch(utflabel)
478 478 ui.status(_('marked working directory as branch %s\n') % label)
479 479 else:
480 480 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
481 481
482 482 def branches(ui, repo, active=False, closed=False):
483 483 """list repository named branches
484 484
485 485 List the repository's named branches, indicating which ones are
486 486 inactive. If -c/--closed is specified, also list branches which have
487 487 been marked closed (see :hg:`commit --close-branch`).
488 488
489 489 If -a/--active is specified, only show active branches. A branch
490 490 is considered active if it contains repository heads.
491 491
492 492 Use the command :hg:`update` to switch to an existing branch.
493 493
494 494 Returns 0.
495 495 """
496 496
497 497 hexfunc = ui.debugflag and hex or short
498 498 activebranches = [repo[n].branch() for n in repo.heads()]
499 499 def testactive(tag, node):
500 500 realhead = tag in activebranches
501 501 open = node in repo.branchheads(tag, closed=False)
502 502 return realhead and open
503 503 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
504 504 for tag, node in repo.branchtags().items()],
505 505 reverse=True)
506 506
507 507 for isactive, node, tag in branches:
508 508 if (not active) or isactive:
509 509 encodedtag = encoding.tolocal(tag)
510 510 if ui.quiet:
511 511 ui.write("%s\n" % encodedtag)
512 512 else:
513 513 hn = repo.lookup(node)
514 514 if isactive:
515 515 notice = ''
516 516 elif hn not in repo.branchheads(tag, closed=False):
517 517 if not closed:
518 518 continue
519 519 notice = _(' (closed)')
520 520 else:
521 521 notice = _(' (inactive)')
522 522 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
523 523 data = encodedtag, rev, hexfunc(hn), notice
524 524 ui.write("%s %s:%s%s\n" % data)
525 525
526 526 def bundle(ui, repo, fname, dest=None, **opts):
527 527 """create a changegroup file
528 528
529 529 Generate a compressed changegroup file collecting changesets not
530 530 known to be in another repository.
531 531
532 532 If you omit the destination repository, then hg assumes the
533 533 destination will have all the nodes you specify with --base
534 534 parameters. To create a bundle containing all changesets, use
535 535 -a/--all (or --base null).
536 536
537 537 You can change compression method with the -t/--type option.
538 538 The available compression methods are: none, bzip2, and
539 539 gzip (by default, bundles are compressed using bzip2).
540 540
541 541 The bundle file can then be transferred using conventional means
542 542 and applied to another repository with the unbundle or pull
543 543 command. This is useful when direct push and pull are not
544 544 available or when exporting an entire repository is undesirable.
545 545
546 546 Applying bundles preserves all changeset contents including
547 547 permissions, copy/rename information, and revision history.
548 548
549 549 Returns 0 on success, 1 if no changes found.
550 550 """
551 551 revs = opts.get('rev') or None
552 552 if opts.get('all'):
553 553 base = ['null']
554 554 else:
555 555 base = opts.get('base')
556 556 if base:
557 557 if dest:
558 558 raise util.Abort(_("--base is incompatible with specifying "
559 559 "a destination"))
560 560 base = [repo.lookup(rev) for rev in base]
561 561 # create the right base
562 562 # XXX: nodesbetween / changegroup* should be "fixed" instead
563 563 o = []
564 564 has = set((nullid,))
565 565 for n in base:
566 566 has.update(repo.changelog.reachable(n))
567 567 if revs:
568 568 revs = [repo.lookup(rev) for rev in revs]
569 569 visit = revs[:]
570 570 has.difference_update(visit)
571 571 else:
572 572 visit = repo.changelog.heads()
573 573 seen = {}
574 574 while visit:
575 575 n = visit.pop(0)
576 576 parents = [p for p in repo.changelog.parents(n) if p not in has]
577 577 if len(parents) == 0:
578 578 if n not in has:
579 579 o.append(n)
580 580 else:
581 581 for p in parents:
582 582 if p not in seen:
583 583 seen[p] = 1
584 584 visit.append(p)
585 585 else:
586 586 dest = ui.expandpath(dest or 'default-push', dest or 'default')
587 587 dest, branches = hg.parseurl(dest, opts.get('branch'))
588 588 other = hg.repository(hg.remoteui(repo, opts), dest)
589 589 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
590 590 if revs:
591 591 revs = [repo.lookup(rev) for rev in revs]
592 592 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
593 593
594 594 if not o:
595 595 ui.status(_("no changes found\n"))
596 596 return 1
597 597
598 598 if revs:
599 599 cg = repo.changegroupsubset(o, revs, 'bundle')
600 600 else:
601 601 cg = repo.changegroup(o, 'bundle')
602 602
603 603 bundletype = opts.get('type', 'bzip2').lower()
604 604 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
605 605 bundletype = btypes.get(bundletype)
606 606 if bundletype not in changegroup.bundletypes:
607 607 raise util.Abort(_('unknown bundle type specified with --type'))
608 608
609 609 changegroup.writebundle(cg, fname, bundletype)
610 610
611 611 def cat(ui, repo, file1, *pats, **opts):
612 612 """output the current or given revision of files
613 613
614 614 Print the specified files as they were at the given revision. If
615 615 no revision is given, the parent of the working directory is used,
616 616 or tip if no revision is checked out.
617 617
618 618 Output may be to a file, in which case the name of the file is
619 619 given using a format string. The formatting rules are the same as
620 620 for the export command, with the following additions:
621 621
622 622 :``%s``: basename of file being printed
623 623 :``%d``: dirname of file being printed, or '.' if in repository root
624 624 :``%p``: root-relative path name of file being printed
625 625
626 626 Returns 0 on success.
627 627 """
628 628 ctx = repo[opts.get('rev')]
629 629 err = 1
630 630 m = cmdutil.match(repo, (file1,) + pats, opts)
631 631 for abs in ctx.walk(m):
632 632 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
633 633 data = ctx[abs].data()
634 634 if opts.get('decode'):
635 635 data = repo.wwritedata(abs, data)
636 636 fp.write(data)
637 637 err = 0
638 638 return err
639 639
640 640 def clone(ui, source, dest=None, **opts):
641 641 """make a copy of an existing repository
642 642
643 643 Create a copy of an existing repository in a new directory.
644 644
645 645 If no destination directory name is specified, it defaults to the
646 646 basename of the source.
647 647
648 648 The location of the source is added to the new repository's
649 649 .hg/hgrc file, as the default to be used for future pulls.
650 650
651 651 See :hg:`help urls` for valid source format details.
652 652
653 653 It is possible to specify an ``ssh://`` URL as the destination, but no
654 654 .hg/hgrc and working directory will be created on the remote side.
655 655 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
656 656
657 657 A set of changesets (tags, or branch names) to pull may be specified
658 658 by listing each changeset (tag, or branch name) with -r/--rev.
659 659 If -r/--rev is used, the cloned repository will contain only a subset
660 660 of the changesets of the source repository. Only the set of changesets
661 661 defined by all -r/--rev options (including all their ancestors)
662 662 will be pulled into the destination repository.
663 663 No subsequent changesets (including subsequent tags) will be present
664 664 in the destination.
665 665
666 666 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
667 667 local source repositories.
668 668
669 669 For efficiency, hardlinks are used for cloning whenever the source
670 670 and destination are on the same filesystem (note this applies only
671 671 to the repository data, not to the working directory). Some
672 672 filesystems, such as AFS, implement hardlinking incorrectly, but
673 673 do not report errors. In these cases, use the --pull option to
674 674 avoid hardlinking.
675 675
676 676 In some cases, you can clone repositories and the working directory
677 677 using full hardlinks with ::
678 678
679 679 $ cp -al REPO REPOCLONE
680 680
681 681 This is the fastest way to clone, but it is not always safe. The
682 682 operation is not atomic (making sure REPO is not modified during
683 683 the operation is up to you) and you have to make sure your editor
684 684 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
685 685 this is not compatible with certain extensions that place their
686 686 metadata under the .hg directory, such as mq.
687 687
688 688 Mercurial will update the working directory to the first applicable
689 689 revision from this list:
690 690
691 691 a) null if -U or the source repository has no changesets
692 692 b) if -u . and the source repository is local, the first parent of
693 693 the source repository's working directory
694 694 c) the changeset specified with -u (if a branch name, this means the
695 695 latest head of that branch)
696 696 d) the changeset specified with -r
697 697 e) the tipmost head specified with -b
698 698 f) the tipmost head specified with the url#branch source syntax
699 699 g) the tipmost head of the default branch
700 700 h) tip
701 701
702 702 Returns 0 on success.
703 703 """
704 704 if opts.get('noupdate') and opts.get('updaterev'):
705 705 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
706 706
707 707 r = hg.clone(hg.remoteui(ui, opts), source, dest,
708 708 pull=opts.get('pull'),
709 709 stream=opts.get('uncompressed'),
710 710 rev=opts.get('rev'),
711 711 update=opts.get('updaterev') or not opts.get('noupdate'),
712 712 branch=opts.get('branch'))
713 713
714 714 return r is None
715 715
716 716 def commit(ui, repo, *pats, **opts):
717 717 """commit the specified files or all outstanding changes
718 718
719 719 Commit changes to the given files into the repository. Unlike a
720 720 centralized RCS, this operation is a local operation. See
721 721 :hg:`push` for a way to actively distribute your changes.
722 722
723 723 If a list of files is omitted, all changes reported by :hg:`status`
724 724 will be committed.
725 725
726 726 If you are committing the result of a merge, do not provide any
727 727 filenames or -I/-X filters.
728 728
729 729 If no commit message is specified, the configured editor is
730 730 started to prompt you for a message.
731 731
732 732 See :hg:`help dates` for a list of formats valid for -d/--date.
733 733
734 734 Returns 0 on success, 1 if nothing changed.
735 735 """
736 736 extra = {}
737 737 if opts.get('close_branch'):
738 738 if repo['.'].node() not in repo.branchheads():
739 739 # The topo heads set is included in the branch heads set of the
740 740 # current branch, so it's sufficient to test branchheads
741 741 raise util.Abort(_('can only close branch heads'))
742 742 extra['close'] = 1
743 743 e = cmdutil.commiteditor
744 744 if opts.get('force_editor'):
745 745 e = cmdutil.commitforceeditor
746 746
747 747 def commitfunc(ui, repo, message, match, opts):
748 748 return repo.commit(message, opts.get('user'), opts.get('date'), match,
749 749 editor=e, extra=extra)
750 750
751 751 branch = repo[None].branch()
752 752 bheads = repo.branchheads(branch)
753 753
754 754 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
755 755 if not node:
756 756 ui.status(_("nothing changed\n"))
757 757 return 1
758 758
759 759 ctx = repo[node]
760 760 parents = ctx.parents()
761 761
762 762 if bheads and not [x for x in parents
763 763 if x.node() in bheads and x.branch() == branch]:
764 764 ui.status(_('created new head\n'))
765 765 # The message is not printed for initial roots. For the other
766 766 # changesets, it is printed in the following situations:
767 767 #
768 768 # Par column: for the 2 parents with ...
769 769 # N: null or no parent
770 770 # B: parent is on another named branch
771 771 # C: parent is a regular non head changeset
772 772 # H: parent was a branch head of the current branch
773 773 # Msg column: whether we print "created new head" message
774 774 # In the following, it is assumed that there already exists some
775 775 # initial branch heads of the current branch, otherwise nothing is
776 776 # printed anyway.
777 777 #
778 778 # Par Msg Comment
779 779 # NN y additional topo root
780 780 #
781 781 # BN y additional branch root
782 782 # CN y additional topo head
783 783 # HN n usual case
784 784 #
785 785 # BB y weird additional branch root
786 786 # CB y branch merge
787 787 # HB n merge with named branch
788 788 #
789 789 # CC y additional head from merge
790 790 # CH n merge with a head
791 791 #
792 792 # HH n head merge: head count decreases
793 793
794 794 if not opts.get('close_branch'):
795 795 for r in parents:
796 796 if r.extra().get('close') and r.branch() == branch:
797 797 ui.status(_('reopening closed branch head %d\n') % r)
798 798
799 799 if ui.debugflag:
800 800 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
801 801 elif ui.verbose:
802 802 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
803 803
804 804 def copy(ui, repo, *pats, **opts):
805 805 """mark files as copied for the next commit
806 806
807 807 Mark dest as having copies of source files. If dest is a
808 808 directory, copies are put in that directory. If dest is a file,
809 809 the source must be a single file.
810 810
811 811 By default, this command copies the contents of files as they
812 812 exist in the working directory. If invoked with -A/--after, the
813 813 operation is recorded, but no copying is performed.
814 814
815 815 This command takes effect with the next commit. To undo a copy
816 816 before that, see :hg:`revert`.
817 817
818 818 Returns 0 on success, 1 if errors are encountered.
819 819 """
820 820 wlock = repo.wlock(False)
821 821 try:
822 822 return cmdutil.copy(ui, repo, pats, opts)
823 823 finally:
824 824 wlock.release()
825 825
826 826 def debugancestor(ui, repo, *args):
827 827 """find the ancestor revision of two revisions in a given index"""
828 828 if len(args) == 3:
829 829 index, rev1, rev2 = args
830 830 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
831 831 lookup = r.lookup
832 832 elif len(args) == 2:
833 833 if not repo:
834 834 raise util.Abort(_("There is no Mercurial repository here "
835 835 "(.hg not found)"))
836 836 rev1, rev2 = args
837 837 r = repo.changelog
838 838 lookup = repo.lookup
839 839 else:
840 840 raise util.Abort(_('either two or three arguments required'))
841 841 a = r.ancestor(lookup(rev1), lookup(rev2))
842 842 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
843 843
844 844 def debugbuilddag(ui, repo, text,
845 845 mergeable_file=False,
846 846 appended_file=False,
847 847 overwritten_file=False,
848 848 new_file=False):
849 849 """builds a repo with a given dag from scratch in the current empty repo
850 850
851 851 Elements:
852 852
853 853 - "+n" is a linear run of n nodes based on the current default parent
854 854 - "." is a single node based on the current default parent
855 855 - "$" resets the default parent to null (implied at the start);
856 856 otherwise the default parent is always the last node created
857 857 - "<p" sets the default parent to the backref p
858 858 - "*p" is a fork at parent p, which is a backref
859 859 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
860 860 - "/p2" is a merge of the preceding node and p2
861 861 - ":tag" defines a local tag for the preceding node
862 862 - "@branch" sets the named branch for subsequent nodes
863 863 - "!command" runs the command using your shell
864 864 - "!!my command\\n" is like "!", but to the end of the line
865 865 - "#...\\n" is a comment up to the end of the line
866 866
867 867 Whitespace between the above elements is ignored.
868 868
869 869 A backref is either
870 870
871 871 - a number n, which references the node curr-n, where curr is the current
872 872 node, or
873 873 - the name of a local tag you placed earlier using ":tag", or
874 874 - empty to denote the default parent.
875 875
876 876 All string valued-elements are either strictly alphanumeric, or must
877 877 be enclosed in double quotes ("..."), with "\" as escape character.
878 878
879 879 Note that the --overwritten-file and --appended-file options imply the
880 880 use of "HGMERGE=internal:local" during DAG buildup.
881 881 """
882 882
883 883 if not (mergeable_file or appended_file or overwritten_file or new_file):
884 884 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
885 885
886 886 if len(repo.changelog) > 0:
887 887 raise util.Abort(_('repository is not empty'))
888 888
889 889 if overwritten_file or appended_file:
890 890 # we don't want to fail in merges during buildup
891 891 os.environ['HGMERGE'] = 'internal:local'
892 892
893 893 def writefile(fname, text, fmode="wb"):
894 894 f = open(fname, fmode)
895 895 try:
896 896 f.write(text)
897 897 finally:
898 898 f.close()
899 899
900 900 if mergeable_file:
901 901 linesperrev = 2
902 902 # determine number of revs in DAG
903 903 n = 0
904 904 for type, data in dagparser.parsedag(text):
905 905 if type == 'n':
906 906 n += 1
907 907 # make a file with k lines per rev
908 908 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
909 909 + "\n")
910 910
911 911 at = -1
912 912 atbranch = 'default'
913 913 for type, data in dagparser.parsedag(text):
914 914 if type == 'n':
915 915 ui.status('node %s\n' % str(data))
916 916 id, ps = data
917 917 p1 = ps[0]
918 918 if p1 != at:
919 919 update(ui, repo, node=p1, clean=True)
920 920 at = p1
921 921 if repo.dirstate.branch() != atbranch:
922 922 branch(ui, repo, atbranch, force=True)
923 923 if len(ps) > 1:
924 924 p2 = ps[1]
925 925 merge(ui, repo, node=p2)
926 926
927 927 if mergeable_file:
928 928 f = open("mf", "rb+")
929 929 try:
930 930 lines = f.read().split("\n")
931 931 lines[id * linesperrev] += " r%i" % id
932 932 f.seek(0)
933 933 f.write("\n".join(lines))
934 934 finally:
935 935 f.close()
936 936
937 937 if appended_file:
938 938 writefile("af", "r%i\n" % id, "ab")
939 939
940 940 if overwritten_file:
941 941 writefile("of", "r%i\n" % id)
942 942
943 943 if new_file:
944 944 writefile("nf%i" % id, "r%i\n" % id)
945 945
946 946 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
947 947 at = id
948 948 elif type == 'l':
949 949 id, name = data
950 950 ui.status('tag %s\n' % name)
951 951 tag(ui, repo, name, local=True)
952 952 elif type == 'a':
953 953 ui.status('branch %s\n' % data)
954 954 atbranch = data
955 955 elif type in 'cC':
956 956 r = util.system(data, cwd=repo.root)
957 957 if r:
958 958 desc, r = util.explain_exit(r)
959 959 raise util.Abort(_('%s command %s') % (data, desc))
960 960
961 961 def debugcommands(ui, cmd='', *args):
962 962 """list all available commands and options"""
963 963 for cmd, vals in sorted(table.iteritems()):
964 964 cmd = cmd.split('|')[0].strip('^')
965 965 opts = ', '.join([i[1] for i in vals[1]])
966 966 ui.write('%s: %s\n' % (cmd, opts))
967 967
968 968 def debugcomplete(ui, cmd='', **opts):
969 969 """returns the completion list associated with the given command"""
970 970
971 971 if opts.get('options'):
972 972 options = []
973 973 otables = [globalopts]
974 974 if cmd:
975 975 aliases, entry = cmdutil.findcmd(cmd, table, False)
976 976 otables.append(entry[1])
977 977 for t in otables:
978 978 for o in t:
979 979 if "(DEPRECATED)" in o[3]:
980 980 continue
981 981 if o[0]:
982 982 options.append('-%s' % o[0])
983 983 options.append('--%s' % o[1])
984 984 ui.write("%s\n" % "\n".join(options))
985 985 return
986 986
987 987 cmdlist = cmdutil.findpossible(cmd, table)
988 988 if ui.verbose:
989 989 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
990 990 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
991 991
992 992 def debugfsinfo(ui, path = "."):
993 993 """show information detected about current filesystem"""
994 994 open('.debugfsinfo', 'w').write('')
995 995 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
996 996 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
997 997 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
998 998 and 'yes' or 'no'))
999 999 os.unlink('.debugfsinfo')
1000 1000
1001 1001 def debugrebuildstate(ui, repo, rev="tip"):
1002 1002 """rebuild the dirstate as it would look like for the given revision"""
1003 1003 ctx = repo[rev]
1004 1004 wlock = repo.wlock()
1005 1005 try:
1006 1006 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1007 1007 finally:
1008 1008 wlock.release()
1009 1009
1010 1010 def debugcheckstate(ui, repo):
1011 1011 """validate the correctness of the current dirstate"""
1012 1012 parent1, parent2 = repo.dirstate.parents()
1013 1013 m1 = repo[parent1].manifest()
1014 1014 m2 = repo[parent2].manifest()
1015 1015 errors = 0
1016 1016 for f in repo.dirstate:
1017 1017 state = repo.dirstate[f]
1018 1018 if state in "nr" and f not in m1:
1019 1019 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1020 1020 errors += 1
1021 1021 if state in "a" and f in m1:
1022 1022 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1023 1023 errors += 1
1024 1024 if state in "m" and f not in m1 and f not in m2:
1025 1025 ui.warn(_("%s in state %s, but not in either manifest\n") %
1026 1026 (f, state))
1027 1027 errors += 1
1028 1028 for f in m1:
1029 1029 state = repo.dirstate[f]
1030 1030 if state not in "nrm":
1031 1031 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1032 1032 errors += 1
1033 1033 if errors:
1034 1034 error = _(".hg/dirstate inconsistent with current parent's manifest")
1035 1035 raise util.Abort(error)
1036 1036
1037 1037 def showconfig(ui, repo, *values, **opts):
1038 1038 """show combined config settings from all hgrc files
1039 1039
1040 1040 With no arguments, print names and values of all config items.
1041 1041
1042 1042 With one argument of the form section.name, print just the value
1043 1043 of that config item.
1044 1044
1045 1045 With multiple arguments, print names and values of all config
1046 1046 items with matching section names.
1047 1047
1048 1048 With --debug, the source (filename and line number) is printed
1049 1049 for each config item.
1050 1050
1051 1051 Returns 0 on success.
1052 1052 """
1053 1053
1054 1054 for f in util.rcpath():
1055 1055 ui.debug(_('read config from: %s\n') % f)
1056 1056 untrusted = bool(opts.get('untrusted'))
1057 1057 if values:
1058 1058 if len([v for v in values if '.' in v]) > 1:
1059 1059 raise util.Abort(_('only one config item permitted'))
1060 1060 for section, name, value in ui.walkconfig(untrusted=untrusted):
1061 1061 sectname = section + '.' + name
1062 1062 if values:
1063 1063 for v in values:
1064 1064 if v == section:
1065 1065 ui.debug('%s: ' %
1066 1066 ui.configsource(section, name, untrusted))
1067 1067 ui.write('%s=%s\n' % (sectname, value))
1068 1068 elif v == sectname:
1069 1069 ui.debug('%s: ' %
1070 1070 ui.configsource(section, name, untrusted))
1071 1071 ui.write(value, '\n')
1072 1072 else:
1073 1073 ui.debug('%s: ' %
1074 1074 ui.configsource(section, name, untrusted))
1075 1075 ui.write('%s=%s\n' % (sectname, value))
1076 1076
1077 1077 def debugpushkey(ui, repopath, namespace, *keyinfo):
1078 1078 '''access the pushkey key/value protocol
1079 1079
1080 1080 With two args, list the keys in the given namespace.
1081 1081
1082 1082 With five args, set a key to new if it currently is set to old.
1083 1083 Reports success or failure.
1084 1084 '''
1085 1085
1086 1086 target = hg.repository(ui, repopath)
1087 1087 if keyinfo:
1088 1088 key, old, new = keyinfo
1089 1089 r = target.pushkey(namespace, key, old, new)
1090 1090 ui.status(str(r) + '\n')
1091 1091 return not(r)
1092 1092 else:
1093 1093 for k, v in target.listkeys(namespace).iteritems():
1094 1094 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1095 1095 v.encode('string-escape')))
1096 1096
1097 1097 def debugrevspec(ui, repo, expr):
1098 1098 '''parse and apply a revision specification'''
1099 1099 if ui.verbose:
1100 1100 tree = revset.parse(expr)
1101 1101 ui.note(tree, "\n")
1102 1102 func = revset.match(expr)
1103 1103 for c in func(repo, range(len(repo))):
1104 1104 ui.write("%s\n" % c)
1105 1105
1106 1106 def debugsetparents(ui, repo, rev1, rev2=None):
1107 1107 """manually set the parents of the current working directory
1108 1108
1109 1109 This is useful for writing repository conversion tools, but should
1110 1110 be used with care.
1111 1111
1112 1112 Returns 0 on success.
1113 1113 """
1114 1114
1115 1115 if not rev2:
1116 1116 rev2 = hex(nullid)
1117 1117
1118 1118 wlock = repo.wlock()
1119 1119 try:
1120 1120 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1121 1121 finally:
1122 1122 wlock.release()
1123 1123
1124 1124 def debugstate(ui, repo, nodates=None):
1125 1125 """show the contents of the current dirstate"""
1126 1126 timestr = ""
1127 1127 showdate = not nodates
1128 1128 for file_, ent in sorted(repo.dirstate._map.iteritems()):
1129 1129 if showdate:
1130 1130 if ent[3] == -1:
1131 1131 # Pad or slice to locale representation
1132 1132 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1133 1133 time.localtime(0)))
1134 1134 timestr = 'unset'
1135 1135 timestr = (timestr[:locale_len] +
1136 1136 ' ' * (locale_len - len(timestr)))
1137 1137 else:
1138 1138 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1139 1139 time.localtime(ent[3]))
1140 1140 if ent[1] & 020000:
1141 1141 mode = 'lnk'
1142 1142 else:
1143 1143 mode = '%3o' % (ent[1] & 0777)
1144 1144 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1145 1145 for f in repo.dirstate.copies():
1146 1146 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1147 1147
1148 1148 def debugsub(ui, repo, rev=None):
1149 1149 if rev == '':
1150 1150 rev = None
1151 1151 for k, v in sorted(repo[rev].substate.items()):
1152 1152 ui.write('path %s\n' % k)
1153 1153 ui.write(' source %s\n' % v[0])
1154 1154 ui.write(' revision %s\n' % v[1])
1155 1155
1156 1156 def debugdag(ui, repo, file_=None, *revs, **opts):
1157 1157 """format the changelog or an index DAG as a concise textual description
1158 1158
1159 1159 If you pass a revlog index, the revlog's DAG is emitted. If you list
1160 1160 revision numbers, they get labelled in the output as rN.
1161 1161
1162 1162 Otherwise, the changelog DAG of the current repo is emitted.
1163 1163 """
1164 1164 spaces = opts.get('spaces')
1165 1165 dots = opts.get('dots')
1166 1166 if file_:
1167 1167 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1168 1168 revs = set((int(r) for r in revs))
1169 1169 def events():
1170 1170 for r in rlog:
1171 1171 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1172 1172 if r in revs:
1173 1173 yield 'l', (r, "r%i" % r)
1174 1174 elif repo:
1175 1175 cl = repo.changelog
1176 1176 tags = opts.get('tags')
1177 1177 branches = opts.get('branches')
1178 1178 if tags:
1179 1179 labels = {}
1180 1180 for l, n in repo.tags().items():
1181 1181 labels.setdefault(cl.rev(n), []).append(l)
1182 1182 def events():
1183 1183 b = "default"
1184 1184 for r in cl:
1185 1185 if branches:
1186 1186 newb = cl.read(cl.node(r))[5]['branch']
1187 1187 if newb != b:
1188 1188 yield 'a', newb
1189 1189 b = newb
1190 1190 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1191 1191 if tags:
1192 1192 ls = labels.get(r)
1193 1193 if ls:
1194 1194 for l in ls:
1195 1195 yield 'l', (r, l)
1196 1196 else:
1197 1197 raise util.Abort(_('need repo for changelog dag'))
1198 1198
1199 1199 for line in dagparser.dagtextlines(events(),
1200 1200 addspaces=spaces,
1201 1201 wraplabels=True,
1202 1202 wrapannotations=True,
1203 1203 wrapnonlinear=dots,
1204 1204 usedots=dots,
1205 1205 maxlinewidth=70):
1206 1206 ui.write(line)
1207 1207 ui.write("\n")
1208 1208
1209 1209 def debugdata(ui, file_, rev):
1210 1210 """dump the contents of a data file revision"""
1211 1211 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1212 1212 try:
1213 1213 ui.write(r.revision(r.lookup(rev)))
1214 1214 except KeyError:
1215 1215 raise util.Abort(_('invalid revision identifier %s') % rev)
1216 1216
1217 1217 def debugdate(ui, date, range=None, **opts):
1218 1218 """parse and display a date"""
1219 1219 if opts["extended"]:
1220 1220 d = util.parsedate(date, util.extendeddateformats)
1221 1221 else:
1222 1222 d = util.parsedate(date)
1223 1223 ui.write("internal: %s %s\n" % d)
1224 1224 ui.write("standard: %s\n" % util.datestr(d))
1225 1225 if range:
1226 1226 m = util.matchdate(range)
1227 1227 ui.write("match: %s\n" % m(d[0]))
1228 1228
1229 1229 def debugindex(ui, file_):
1230 1230 """dump the contents of an index file"""
1231 1231 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1232 1232 ui.write(" rev offset length base linkrev"
1233 1233 " nodeid p1 p2\n")
1234 1234 for i in r:
1235 1235 node = r.node(i)
1236 1236 try:
1237 1237 pp = r.parents(node)
1238 1238 except:
1239 1239 pp = [nullid, nullid]
1240 1240 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1241 1241 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1242 1242 short(node), short(pp[0]), short(pp[1])))
1243 1243
1244 1244 def debugindexdot(ui, file_):
1245 1245 """dump an index DAG as a graphviz dot file"""
1246 1246 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1247 1247 ui.write("digraph G {\n")
1248 1248 for i in r:
1249 1249 node = r.node(i)
1250 1250 pp = r.parents(node)
1251 1251 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1252 1252 if pp[1] != nullid:
1253 1253 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1254 1254 ui.write("}\n")
1255 1255
1256 1256 def debuginstall(ui):
1257 1257 '''test Mercurial installation
1258 1258
1259 1259 Returns 0 on success.
1260 1260 '''
1261 1261
1262 1262 def writetemp(contents):
1263 1263 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1264 1264 f = os.fdopen(fd, "wb")
1265 1265 f.write(contents)
1266 1266 f.close()
1267 1267 return name
1268 1268
1269 1269 problems = 0
1270 1270
1271 1271 # encoding
1272 1272 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1273 1273 try:
1274 1274 encoding.fromlocal("test")
1275 1275 except util.Abort, inst:
1276 1276 ui.write(" %s\n" % inst)
1277 1277 ui.write(_(" (check that your locale is properly set)\n"))
1278 1278 problems += 1
1279 1279
1280 1280 # compiled modules
1281 1281 ui.status(_("Checking extensions...\n"))
1282 1282 try:
1283 1283 import bdiff, mpatch, base85
1284 1284 except Exception, inst:
1285 1285 ui.write(" %s\n" % inst)
1286 1286 ui.write(_(" One or more extensions could not be found"))
1287 1287 ui.write(_(" (check that you compiled the extensions)\n"))
1288 1288 problems += 1
1289 1289
1290 1290 # templates
1291 1291 ui.status(_("Checking templates...\n"))
1292 1292 try:
1293 1293 import templater
1294 1294 templater.templater(templater.templatepath("map-cmdline.default"))
1295 1295 except Exception, inst:
1296 1296 ui.write(" %s\n" % inst)
1297 1297 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1298 1298 problems += 1
1299 1299
1300 1300 # patch
1301 1301 ui.status(_("Checking patch...\n"))
1302 1302 patchproblems = 0
1303 1303 a = "1\n2\n3\n4\n"
1304 1304 b = "1\n2\n3\ninsert\n4\n"
1305 1305 fa = writetemp(a)
1306 1306 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
1307 1307 os.path.basename(fa))
1308 1308 fd = writetemp(d)
1309 1309
1310 1310 files = {}
1311 1311 try:
1312 1312 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
1313 1313 except util.Abort, e:
1314 1314 ui.write(_(" patch call failed:\n"))
1315 1315 ui.write(" " + str(e) + "\n")
1316 1316 patchproblems += 1
1317 1317 else:
1318 1318 if list(files) != [os.path.basename(fa)]:
1319 1319 ui.write(_(" unexpected patch output!\n"))
1320 1320 patchproblems += 1
1321 1321 a = open(fa).read()
1322 1322 if a != b:
1323 1323 ui.write(_(" patch test failed!\n"))
1324 1324 patchproblems += 1
1325 1325
1326 1326 if patchproblems:
1327 1327 if ui.config('ui', 'patch'):
1328 1328 ui.write(_(" (Current patch tool may be incompatible with patch,"
1329 1329 " or misconfigured. Please check your .hgrc file)\n"))
1330 1330 else:
1331 1331 ui.write(_(" Internal patcher failure, please report this error"
1332 1332 " to http://mercurial.selenic.com/bts/\n"))
1333 1333 problems += patchproblems
1334 1334
1335 1335 os.unlink(fa)
1336 1336 os.unlink(fd)
1337 1337
1338 1338 # editor
1339 1339 ui.status(_("Checking commit editor...\n"))
1340 1340 editor = ui.geteditor()
1341 1341 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1342 1342 if not cmdpath:
1343 1343 if editor == 'vi':
1344 1344 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1345 1345 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1346 1346 else:
1347 1347 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1348 1348 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1349 1349 problems += 1
1350 1350
1351 1351 # check username
1352 1352 ui.status(_("Checking username...\n"))
1353 1353 try:
1354 1354 user = ui.username()
1355 1355 except util.Abort, e:
1356 1356 ui.write(" %s\n" % e)
1357 1357 ui.write(_(" (specify a username in your .hgrc file)\n"))
1358 1358 problems += 1
1359 1359
1360 1360 if not problems:
1361 1361 ui.status(_("No problems detected\n"))
1362 1362 else:
1363 1363 ui.write(_("%s problems detected,"
1364 1364 " please check your install!\n") % problems)
1365 1365
1366 1366 return problems
1367 1367
1368 1368 def debugrename(ui, repo, file1, *pats, **opts):
1369 1369 """dump rename information"""
1370 1370
1371 1371 ctx = repo[opts.get('rev')]
1372 1372 m = cmdutil.match(repo, (file1,) + pats, opts)
1373 1373 for abs in ctx.walk(m):
1374 1374 fctx = ctx[abs]
1375 1375 o = fctx.filelog().renamed(fctx.filenode())
1376 1376 rel = m.rel(abs)
1377 1377 if o:
1378 1378 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1379 1379 else:
1380 1380 ui.write(_("%s not renamed\n") % rel)
1381 1381
1382 1382 def debugwalk(ui, repo, *pats, **opts):
1383 1383 """show how files match on given patterns"""
1384 1384 m = cmdutil.match(repo, pats, opts)
1385 1385 items = list(repo.walk(m))
1386 1386 if not items:
1387 1387 return
1388 1388 fmt = 'f %%-%ds %%-%ds %%s' % (
1389 1389 max([len(abs) for abs in items]),
1390 1390 max([len(m.rel(abs)) for abs in items]))
1391 1391 for abs in items:
1392 1392 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1393 1393 ui.write("%s\n" % line.rstrip())
1394 1394
1395 1395 def diff(ui, repo, *pats, **opts):
1396 1396 """diff repository (or selected files)
1397 1397
1398 1398 Show differences between revisions for the specified files.
1399 1399
1400 1400 Differences between files are shown using the unified diff format.
1401 1401
1402 1402 NOTE: diff may generate unexpected results for merges, as it will
1403 1403 default to comparing against the working directory's first parent
1404 1404 changeset if no revisions are specified.
1405 1405
1406 1406 When two revision arguments are given, then changes are shown
1407 1407 between those revisions. If only one revision is specified then
1408 1408 that revision is compared to the working directory, and, when no
1409 1409 revisions are specified, the working directory files are compared
1410 1410 to its parent.
1411 1411
1412 1412 Alternatively you can specify -c/--change with a revision to see
1413 1413 the changes in that changeset relative to its first parent.
1414 1414
1415 1415 Without the -a/--text option, diff will avoid generating diffs of
1416 1416 files it detects as binary. With -a, diff will generate a diff
1417 1417 anyway, probably with undesirable results.
1418 1418
1419 1419 Use the -g/--git option to generate diffs in the git extended diff
1420 1420 format. For more information, read :hg:`help diffs`.
1421 1421
1422 1422 Returns 0 on success.
1423 1423 """
1424 1424
1425 1425 revs = opts.get('rev')
1426 1426 change = opts.get('change')
1427 1427 stat = opts.get('stat')
1428 1428 reverse = opts.get('reverse')
1429 1429
1430 1430 if revs and change:
1431 1431 msg = _('cannot specify --rev and --change at the same time')
1432 1432 raise util.Abort(msg)
1433 1433 elif change:
1434 1434 node2 = repo.lookup(change)
1435 1435 node1 = repo[node2].parents()[0].node()
1436 1436 else:
1437 1437 node1, node2 = cmdutil.revpair(repo, revs)
1438 1438
1439 1439 if reverse:
1440 1440 node1, node2 = node2, node1
1441 1441
1442 1442 diffopts = patch.diffopts(ui, opts)
1443 1443 m = cmdutil.match(repo, pats, opts)
1444 1444 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat)
1445 1445
1446 1446 def export(ui, repo, *changesets, **opts):
1447 1447 """dump the header and diffs for one or more changesets
1448 1448
1449 1449 Print the changeset header and diffs for one or more revisions.
1450 1450
1451 1451 The information shown in the changeset header is: author, date,
1452 1452 branch name (if non-default), changeset hash, parent(s) and commit
1453 1453 comment.
1454 1454
1455 1455 NOTE: export may generate unexpected diff output for merge
1456 1456 changesets, as it will compare the merge changeset against its
1457 1457 first parent only.
1458 1458
1459 1459 Output may be to a file, in which case the name of the file is
1460 1460 given using a format string. The formatting rules are as follows:
1461 1461
1462 1462 :``%%``: literal "%" character
1463 :``%H``: changeset hash (40 bytes of hexadecimal)
1463 :``%H``: changeset hash (40 hexadecimal digits)
1464 1464 :``%N``: number of patches being generated
1465 1465 :``%R``: changeset revision number
1466 1466 :``%b``: basename of the exporting repository
1467 :``%h``: short-form changeset hash (12 bytes of hexadecimal)
1467 :``%h``: short-form changeset hash (12 hexadecimal digits)
1468 1468 :``%n``: zero-padded sequence number, starting at 1
1469 1469 :``%r``: zero-padded changeset revision number
1470 1470
1471 1471 Without the -a/--text option, export will avoid generating diffs
1472 1472 of files it detects as binary. With -a, export will generate a
1473 1473 diff anyway, probably with undesirable results.
1474 1474
1475 1475 Use the -g/--git option to generate diffs in the git extended diff
1476 1476 format. See :hg:`help diffs` for more information.
1477 1477
1478 1478 With the --switch-parent option, the diff will be against the
1479 1479 second parent. It can be useful to review a merge.
1480 1480
1481 1481 Returns 0 on success.
1482 1482 """
1483 1483 changesets += tuple(opts.get('rev', []))
1484 1484 if not changesets:
1485 1485 raise util.Abort(_("export requires at least one changeset"))
1486 1486 revs = cmdutil.revrange(repo, changesets)
1487 1487 if len(revs) > 1:
1488 1488 ui.note(_('exporting patches:\n'))
1489 1489 else:
1490 1490 ui.note(_('exporting patch:\n'))
1491 1491 cmdutil.export(repo, revs, template=opts.get('output'),
1492 1492 switch_parent=opts.get('switch_parent'),
1493 1493 opts=patch.diffopts(ui, opts))
1494 1494
1495 1495 def forget(ui, repo, *pats, **opts):
1496 1496 """forget the specified files on the next commit
1497 1497
1498 1498 Mark the specified files so they will no longer be tracked
1499 1499 after the next commit.
1500 1500
1501 1501 This only removes files from the current branch, not from the
1502 1502 entire project history, and it does not delete them from the
1503 1503 working directory.
1504 1504
1505 1505 To undo a forget before the next commit, see :hg:`add`.
1506 1506
1507 1507 Returns 0 on success.
1508 1508 """
1509 1509
1510 1510 if not pats:
1511 1511 raise util.Abort(_('no files specified'))
1512 1512
1513 1513 m = cmdutil.match(repo, pats, opts)
1514 1514 s = repo.status(match=m, clean=True)
1515 1515 forget = sorted(s[0] + s[1] + s[3] + s[6])
1516 1516 errs = 0
1517 1517
1518 1518 for f in m.files():
1519 1519 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1520 1520 ui.warn(_('not removing %s: file is already untracked\n')
1521 1521 % m.rel(f))
1522 1522 errs = 1
1523 1523
1524 1524 for f in forget:
1525 1525 if ui.verbose or not m.exact(f):
1526 1526 ui.status(_('removing %s\n') % m.rel(f))
1527 1527
1528 1528 repo[None].remove(forget, unlink=False)
1529 1529 return errs
1530 1530
1531 1531 def grep(ui, repo, pattern, *pats, **opts):
1532 1532 """search for a pattern in specified files and revisions
1533 1533
1534 1534 Search revisions of files for a regular expression.
1535 1535
1536 1536 This command behaves differently than Unix grep. It only accepts
1537 1537 Python/Perl regexps. It searches repository history, not the
1538 1538 working directory. It always prints the revision number in which a
1539 1539 match appears.
1540 1540
1541 1541 By default, grep only prints output for the first revision of a
1542 1542 file in which it finds a match. To get it to print every revision
1543 1543 that contains a change in match status ("-" for a match that
1544 1544 becomes a non-match, or "+" for a non-match that becomes a match),
1545 1545 use the --all flag.
1546 1546
1547 1547 Returns 0 if a match is found, 1 otherwise.
1548 1548 """
1549 1549 reflags = 0
1550 1550 if opts.get('ignore_case'):
1551 1551 reflags |= re.I
1552 1552 try:
1553 1553 regexp = re.compile(pattern, reflags)
1554 1554 except Exception, inst:
1555 1555 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1556 1556 return 1
1557 1557 sep, eol = ':', '\n'
1558 1558 if opts.get('print0'):
1559 1559 sep = eol = '\0'
1560 1560
1561 1561 getfile = util.lrucachefunc(repo.file)
1562 1562
1563 1563 def matchlines(body):
1564 1564 begin = 0
1565 1565 linenum = 0
1566 1566 while True:
1567 1567 match = regexp.search(body, begin)
1568 1568 if not match:
1569 1569 break
1570 1570 mstart, mend = match.span()
1571 1571 linenum += body.count('\n', begin, mstart) + 1
1572 1572 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1573 1573 begin = body.find('\n', mend) + 1 or len(body)
1574 1574 lend = begin - 1
1575 1575 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1576 1576
1577 1577 class linestate(object):
1578 1578 def __init__(self, line, linenum, colstart, colend):
1579 1579 self.line = line
1580 1580 self.linenum = linenum
1581 1581 self.colstart = colstart
1582 1582 self.colend = colend
1583 1583
1584 1584 def __hash__(self):
1585 1585 return hash((self.linenum, self.line))
1586 1586
1587 1587 def __eq__(self, other):
1588 1588 return self.line == other.line
1589 1589
1590 1590 matches = {}
1591 1591 copies = {}
1592 1592 def grepbody(fn, rev, body):
1593 1593 matches[rev].setdefault(fn, [])
1594 1594 m = matches[rev][fn]
1595 1595 for lnum, cstart, cend, line in matchlines(body):
1596 1596 s = linestate(line, lnum, cstart, cend)
1597 1597 m.append(s)
1598 1598
1599 1599 def difflinestates(a, b):
1600 1600 sm = difflib.SequenceMatcher(None, a, b)
1601 1601 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1602 1602 if tag == 'insert':
1603 1603 for i in xrange(blo, bhi):
1604 1604 yield ('+', b[i])
1605 1605 elif tag == 'delete':
1606 1606 for i in xrange(alo, ahi):
1607 1607 yield ('-', a[i])
1608 1608 elif tag == 'replace':
1609 1609 for i in xrange(alo, ahi):
1610 1610 yield ('-', a[i])
1611 1611 for i in xrange(blo, bhi):
1612 1612 yield ('+', b[i])
1613 1613
1614 1614 def display(fn, ctx, pstates, states):
1615 1615 rev = ctx.rev()
1616 1616 datefunc = ui.quiet and util.shortdate or util.datestr
1617 1617 found = False
1618 1618 filerevmatches = {}
1619 1619 if opts.get('all'):
1620 1620 iter = difflinestates(pstates, states)
1621 1621 else:
1622 1622 iter = [('', l) for l in states]
1623 1623 for change, l in iter:
1624 1624 cols = [fn, str(rev)]
1625 1625 before, match, after = None, None, None
1626 1626 if opts.get('line_number'):
1627 1627 cols.append(str(l.linenum))
1628 1628 if opts.get('all'):
1629 1629 cols.append(change)
1630 1630 if opts.get('user'):
1631 1631 cols.append(ui.shortuser(ctx.user()))
1632 1632 if opts.get('date'):
1633 1633 cols.append(datefunc(ctx.date()))
1634 1634 if opts.get('files_with_matches'):
1635 1635 c = (fn, rev)
1636 1636 if c in filerevmatches:
1637 1637 continue
1638 1638 filerevmatches[c] = 1
1639 1639 else:
1640 1640 before = l.line[:l.colstart]
1641 1641 match = l.line[l.colstart:l.colend]
1642 1642 after = l.line[l.colend:]
1643 1643 ui.write(sep.join(cols))
1644 1644 if before is not None:
1645 1645 ui.write(sep + before)
1646 1646 ui.write(match, label='grep.match')
1647 1647 ui.write(after)
1648 1648 ui.write(eol)
1649 1649 found = True
1650 1650 return found
1651 1651
1652 1652 skip = {}
1653 1653 revfiles = {}
1654 1654 matchfn = cmdutil.match(repo, pats, opts)
1655 1655 found = False
1656 1656 follow = opts.get('follow')
1657 1657
1658 1658 def prep(ctx, fns):
1659 1659 rev = ctx.rev()
1660 1660 pctx = ctx.parents()[0]
1661 1661 parent = pctx.rev()
1662 1662 matches.setdefault(rev, {})
1663 1663 matches.setdefault(parent, {})
1664 1664 files = revfiles.setdefault(rev, [])
1665 1665 for fn in fns:
1666 1666 flog = getfile(fn)
1667 1667 try:
1668 1668 fnode = ctx.filenode(fn)
1669 1669 except error.LookupError:
1670 1670 continue
1671 1671
1672 1672 copied = flog.renamed(fnode)
1673 1673 copy = follow and copied and copied[0]
1674 1674 if copy:
1675 1675 copies.setdefault(rev, {})[fn] = copy
1676 1676 if fn in skip:
1677 1677 if copy:
1678 1678 skip[copy] = True
1679 1679 continue
1680 1680 files.append(fn)
1681 1681
1682 1682 if fn not in matches[rev]:
1683 1683 grepbody(fn, rev, flog.read(fnode))
1684 1684
1685 1685 pfn = copy or fn
1686 1686 if pfn not in matches[parent]:
1687 1687 try:
1688 1688 fnode = pctx.filenode(pfn)
1689 1689 grepbody(pfn, parent, flog.read(fnode))
1690 1690 except error.LookupError:
1691 1691 pass
1692 1692
1693 1693 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1694 1694 rev = ctx.rev()
1695 1695 parent = ctx.parents()[0].rev()
1696 1696 for fn in sorted(revfiles.get(rev, [])):
1697 1697 states = matches[rev][fn]
1698 1698 copy = copies.get(rev, {}).get(fn)
1699 1699 if fn in skip:
1700 1700 if copy:
1701 1701 skip[copy] = True
1702 1702 continue
1703 1703 pstates = matches.get(parent, {}).get(copy or fn, [])
1704 1704 if pstates or states:
1705 1705 r = display(fn, ctx, pstates, states)
1706 1706 found = found or r
1707 1707 if r and not opts.get('all'):
1708 1708 skip[fn] = True
1709 1709 if copy:
1710 1710 skip[copy] = True
1711 1711 del matches[rev]
1712 1712 del revfiles[rev]
1713 1713
1714 1714 return not found
1715 1715
1716 1716 def heads(ui, repo, *branchrevs, **opts):
1717 1717 """show current repository heads or show branch heads
1718 1718
1719 1719 With no arguments, show all repository branch heads.
1720 1720
1721 1721 Repository "heads" are changesets with no child changesets. They are
1722 1722 where development generally takes place and are the usual targets
1723 1723 for update and merge operations. Branch heads are changesets that have
1724 1724 no child changeset on the same branch.
1725 1725
1726 1726 If one or more REVs are given, only branch heads on the branches
1727 1727 associated with the specified changesets are shown.
1728 1728
1729 1729 If -c/--closed is specified, also show branch heads marked closed
1730 1730 (see :hg:`commit --close-branch`).
1731 1731
1732 1732 If STARTREV is specified, only those heads that are descendants of
1733 1733 STARTREV will be displayed.
1734 1734
1735 1735 If -t/--topo is specified, named branch mechanics will be ignored and only
1736 1736 changesets without children will be shown.
1737 1737
1738 1738 Returns 0 if matching heads are found, 1 if not.
1739 1739 """
1740 1740
1741 1741 if opts.get('rev'):
1742 1742 start = repo.lookup(opts['rev'])
1743 1743 else:
1744 1744 start = None
1745 1745
1746 1746 if opts.get('topo'):
1747 1747 heads = [repo[h] for h in repo.heads(start)]
1748 1748 else:
1749 1749 heads = []
1750 1750 for b, ls in repo.branchmap().iteritems():
1751 1751 if start is None:
1752 1752 heads += [repo[h] for h in ls]
1753 1753 continue
1754 1754 startrev = repo.changelog.rev(start)
1755 1755 descendants = set(repo.changelog.descendants(startrev))
1756 1756 descendants.add(startrev)
1757 1757 rev = repo.changelog.rev
1758 1758 heads += [repo[h] for h in ls if rev(h) in descendants]
1759 1759
1760 1760 if branchrevs:
1761 1761 decode, encode = encoding.fromlocal, encoding.tolocal
1762 1762 branches = set(repo[decode(br)].branch() for br in branchrevs)
1763 1763 heads = [h for h in heads if h.branch() in branches]
1764 1764
1765 1765 if not opts.get('closed'):
1766 1766 heads = [h for h in heads if not h.extra().get('close')]
1767 1767
1768 1768 if opts.get('active') and branchrevs:
1769 1769 dagheads = repo.heads(start)
1770 1770 heads = [h for h in heads if h.node() in dagheads]
1771 1771
1772 1772 if branchrevs:
1773 1773 haveheads = set(h.branch() for h in heads)
1774 1774 if branches - haveheads:
1775 1775 headless = ', '.join(encode(b) for b in branches - haveheads)
1776 1776 msg = _('no open branch heads found on branches %s')
1777 1777 if opts.get('rev'):
1778 1778 msg += _(' (started at %s)' % opts['rev'])
1779 1779 ui.warn((msg + '\n') % headless)
1780 1780
1781 1781 if not heads:
1782 1782 return 1
1783 1783
1784 1784 heads = sorted(heads, key=lambda x: -x.rev())
1785 1785 displayer = cmdutil.show_changeset(ui, repo, opts)
1786 1786 for ctx in heads:
1787 1787 displayer.show(ctx)
1788 1788 displayer.close()
1789 1789
1790 1790 def help_(ui, name=None, with_version=False, unknowncmd=False):
1791 1791 """show help for a given topic or a help overview
1792 1792
1793 1793 With no arguments, print a list of commands with short help messages.
1794 1794
1795 1795 Given a topic, extension, or command name, print help for that
1796 1796 topic.
1797 1797
1798 1798 Returns 0 if successful.
1799 1799 """
1800 1800 option_lists = []
1801 1801 textwidth = util.termwidth() - 2
1802 1802
1803 1803 def addglobalopts(aliases):
1804 1804 if ui.verbose:
1805 1805 option_lists.append((_("global options:"), globalopts))
1806 1806 if name == 'shortlist':
1807 1807 option_lists.append((_('use "hg help" for the full list '
1808 1808 'of commands'), ()))
1809 1809 else:
1810 1810 if name == 'shortlist':
1811 1811 msg = _('use "hg help" for the full list of commands '
1812 1812 'or "hg -v" for details')
1813 1813 elif aliases:
1814 1814 msg = _('use "hg -v help%s" to show aliases and '
1815 1815 'global options') % (name and " " + name or "")
1816 1816 else:
1817 1817 msg = _('use "hg -v help %s" to show global options') % name
1818 1818 option_lists.append((msg, ()))
1819 1819
1820 1820 def helpcmd(name):
1821 1821 if with_version:
1822 1822 version_(ui)
1823 1823 ui.write('\n')
1824 1824
1825 1825 try:
1826 1826 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
1827 1827 except error.AmbiguousCommand, inst:
1828 1828 # py3k fix: except vars can't be used outside the scope of the
1829 1829 # except block, nor can be used inside a lambda. python issue4617
1830 1830 prefix = inst.args[0]
1831 1831 select = lambda c: c.lstrip('^').startswith(prefix)
1832 1832 helplist(_('list of commands:\n\n'), select)
1833 1833 return
1834 1834
1835 1835 # check if it's an invalid alias and display its error if it is
1836 1836 if getattr(entry[0], 'badalias', False):
1837 1837 if not unknowncmd:
1838 1838 entry[0](ui)
1839 1839 return
1840 1840
1841 1841 # synopsis
1842 1842 if len(entry) > 2:
1843 1843 if entry[2].startswith('hg'):
1844 1844 ui.write("%s\n" % entry[2])
1845 1845 else:
1846 1846 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
1847 1847 else:
1848 1848 ui.write('hg %s\n' % aliases[0])
1849 1849
1850 1850 # aliases
1851 1851 if not ui.quiet and len(aliases) > 1:
1852 1852 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1853 1853
1854 1854 # description
1855 1855 doc = gettext(entry[0].__doc__)
1856 1856 if not doc:
1857 1857 doc = _("(no help text available)")
1858 1858 if hasattr(entry[0], 'definition'): # aliased command
1859 1859 if entry[0].definition.startswith('!'): # shell alias
1860 1860 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
1861 1861 else:
1862 1862 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
1863 1863 if ui.quiet:
1864 1864 doc = doc.splitlines()[0]
1865 1865 keep = ui.verbose and ['verbose'] or []
1866 1866 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
1867 1867 ui.write("\n%s\n" % formatted)
1868 1868 if pruned:
1869 1869 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
1870 1870
1871 1871 if not ui.quiet:
1872 1872 # options
1873 1873 if entry[1]:
1874 1874 option_lists.append((_("options:\n"), entry[1]))
1875 1875
1876 1876 addglobalopts(False)
1877 1877
1878 1878 def helplist(header, select=None):
1879 1879 h = {}
1880 1880 cmds = {}
1881 1881 for c, e in table.iteritems():
1882 1882 f = c.split("|", 1)[0]
1883 1883 if select and not select(f):
1884 1884 continue
1885 1885 if (not select and name != 'shortlist' and
1886 1886 e[0].__module__ != __name__):
1887 1887 continue
1888 1888 if name == "shortlist" and not f.startswith("^"):
1889 1889 continue
1890 1890 f = f.lstrip("^")
1891 1891 if not ui.debugflag and f.startswith("debug"):
1892 1892 continue
1893 1893 doc = e[0].__doc__
1894 1894 if doc and 'DEPRECATED' in doc and not ui.verbose:
1895 1895 continue
1896 1896 doc = gettext(doc)
1897 1897 if not doc:
1898 1898 doc = _("(no help text available)")
1899 1899 h[f] = doc.splitlines()[0].rstrip()
1900 1900 cmds[f] = c.lstrip("^")
1901 1901
1902 1902 if not h:
1903 1903 ui.status(_('no commands defined\n'))
1904 1904 return
1905 1905
1906 1906 ui.status(header)
1907 1907 fns = sorted(h)
1908 1908 m = max(map(len, fns))
1909 1909 for f in fns:
1910 1910 if ui.verbose:
1911 1911 commands = cmds[f].replace("|",", ")
1912 1912 ui.write(" %s:\n %s\n"%(commands, h[f]))
1913 1913 else:
1914 1914 ui.write('%s\n' % (util.wrap(h[f],
1915 1915 initindent=' %-*s ' % (m, f),
1916 1916 hangindent=' ' * (m + 4))))
1917 1917
1918 1918 if not ui.quiet:
1919 1919 addglobalopts(True)
1920 1920
1921 1921 def helptopic(name):
1922 1922 for names, header, doc in help.helptable:
1923 1923 if name in names:
1924 1924 break
1925 1925 else:
1926 1926 raise error.UnknownCommand(name)
1927 1927
1928 1928 # description
1929 1929 if not doc:
1930 1930 doc = _("(no help text available)")
1931 1931 if hasattr(doc, '__call__'):
1932 1932 doc = doc()
1933 1933
1934 1934 ui.write("%s\n\n" % header)
1935 1935 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
1936 1936
1937 1937 def helpext(name):
1938 1938 try:
1939 1939 mod = extensions.find(name)
1940 1940 doc = gettext(mod.__doc__) or _('no help text available')
1941 1941 except KeyError:
1942 1942 mod = None
1943 1943 doc = extensions.disabledext(name)
1944 1944 if not doc:
1945 1945 raise error.UnknownCommand(name)
1946 1946
1947 1947 if '\n' not in doc:
1948 1948 head, tail = doc, ""
1949 1949 else:
1950 1950 head, tail = doc.split('\n', 1)
1951 1951 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
1952 1952 if tail:
1953 1953 ui.write(minirst.format(tail, textwidth))
1954 1954 ui.status('\n\n')
1955 1955
1956 1956 if mod:
1957 1957 try:
1958 1958 ct = mod.cmdtable
1959 1959 except AttributeError:
1960 1960 ct = {}
1961 1961 modcmds = set([c.split('|', 1)[0] for c in ct])
1962 1962 helplist(_('list of commands:\n\n'), modcmds.__contains__)
1963 1963 else:
1964 1964 ui.write(_('use "hg help extensions" for information on enabling '
1965 1965 'extensions\n'))
1966 1966
1967 1967 def helpextcmd(name):
1968 1968 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
1969 1969 doc = gettext(mod.__doc__).splitlines()[0]
1970 1970
1971 1971 msg = help.listexts(_("'%s' is provided by the following "
1972 1972 "extension:") % cmd, {ext: doc}, len(ext),
1973 1973 indent=4)
1974 1974 ui.write(minirst.format(msg, textwidth))
1975 1975 ui.write('\n\n')
1976 1976 ui.write(_('use "hg help extensions" for information on enabling '
1977 1977 'extensions\n'))
1978 1978
1979 1979 if name and name != 'shortlist':
1980 1980 i = None
1981 1981 if unknowncmd:
1982 1982 queries = (helpextcmd,)
1983 1983 else:
1984 1984 queries = (helptopic, helpcmd, helpext, helpextcmd)
1985 1985 for f in queries:
1986 1986 try:
1987 1987 f(name)
1988 1988 i = None
1989 1989 break
1990 1990 except error.UnknownCommand, inst:
1991 1991 i = inst
1992 1992 if i:
1993 1993 raise i
1994 1994
1995 1995 else:
1996 1996 # program name
1997 1997 if ui.verbose or with_version:
1998 1998 version_(ui)
1999 1999 else:
2000 2000 ui.status(_("Mercurial Distributed SCM\n"))
2001 2001 ui.status('\n')
2002 2002
2003 2003 # list of commands
2004 2004 if name == "shortlist":
2005 2005 header = _('basic commands:\n\n')
2006 2006 else:
2007 2007 header = _('list of commands:\n\n')
2008 2008
2009 2009 helplist(header)
2010 2010 if name != 'shortlist':
2011 2011 exts, maxlength = extensions.enabled()
2012 2012 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2013 2013 if text:
2014 2014 ui.write("\n%s\n" % minirst.format(text, textwidth))
2015 2015
2016 2016 # list all option lists
2017 2017 opt_output = []
2018 2018 multioccur = False
2019 2019 for title, options in option_lists:
2020 2020 opt_output.append(("\n%s" % title, None))
2021 2021 for option in options:
2022 2022 if len(option) == 5:
2023 2023 shortopt, longopt, default, desc, optlabel = option
2024 2024 else:
2025 2025 shortopt, longopt, default, desc = option
2026 2026 optlabel = _("VALUE") # default label
2027 2027
2028 2028 if _("DEPRECATED") in desc and not ui.verbose:
2029 2029 continue
2030 2030 if isinstance(default, list):
2031 2031 numqualifier = " %s [+]" % optlabel
2032 2032 multioccur = True
2033 2033 elif (default is not None) and not isinstance(default, bool):
2034 2034 numqualifier = " %s" % optlabel
2035 2035 else:
2036 2036 numqualifier = ""
2037 2037 opt_output.append(("%2s%s" %
2038 2038 (shortopt and "-%s" % shortopt,
2039 2039 longopt and " --%s%s" %
2040 2040 (longopt, numqualifier)),
2041 2041 "%s%s" % (desc,
2042 2042 default
2043 2043 and _(" (default: %s)") % default
2044 2044 or "")))
2045 2045 if multioccur:
2046 2046 msg = _("\n[+] marked option can be specified multiple times")
2047 2047 if ui.verbose and name != 'shortlist':
2048 2048 opt_output.append((msg, None))
2049 2049 else:
2050 2050 opt_output.insert(-1, (msg, None))
2051 2051
2052 2052 if not name:
2053 2053 ui.write(_("\nadditional help topics:\n\n"))
2054 2054 topics = []
2055 2055 for names, header, doc in help.helptable:
2056 2056 topics.append((sorted(names, key=len, reverse=True)[0], header))
2057 2057 topics_len = max([len(s[0]) for s in topics])
2058 2058 for t, desc in topics:
2059 2059 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2060 2060
2061 2061 if opt_output:
2062 2062 colwidth = encoding.colwidth
2063 2063 # normalize: (opt or message, desc or None, width of opt)
2064 2064 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2065 2065 for opt, desc in opt_output]
2066 2066 hanging = max([e[2] for e in entries])
2067 2067 for opt, desc, width in entries:
2068 2068 if desc:
2069 2069 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2070 2070 hangindent = ' ' * (hanging + 3)
2071 2071 ui.write('%s\n' % (util.wrap(desc,
2072 2072 initindent=initindent,
2073 2073 hangindent=hangindent)))
2074 2074 else:
2075 2075 ui.write("%s\n" % opt)
2076 2076
2077 2077 def identify(ui, repo, source=None,
2078 2078 rev=None, num=None, id=None, branch=None, tags=None):
2079 2079 """identify the working copy or specified revision
2080 2080
2081 2081 With no revision, print a summary of the current state of the
2082 2082 repository.
2083 2083
2084 2084 Specifying a path to a repository root or Mercurial bundle will
2085 2085 cause lookup to operate on that repository/bundle.
2086 2086
2087 2087 This summary identifies the repository state using one or two
2088 2088 parent hash identifiers, followed by a "+" if there are
2089 2089 uncommitted changes in the working directory, a list of tags for
2090 2090 this revision and a branch name for non-default branches.
2091 2091
2092 2092 Returns 0 if successful.
2093 2093 """
2094 2094
2095 2095 if not repo and not source:
2096 2096 raise util.Abort(_("There is no Mercurial repository here "
2097 2097 "(.hg not found)"))
2098 2098
2099 2099 hexfunc = ui.debugflag and hex or short
2100 2100 default = not (num or id or branch or tags)
2101 2101 output = []
2102 2102
2103 2103 revs = []
2104 2104 if source:
2105 2105 source, branches = hg.parseurl(ui.expandpath(source))
2106 2106 repo = hg.repository(ui, source)
2107 2107 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2108 2108
2109 2109 if not repo.local():
2110 2110 if not rev and revs:
2111 2111 rev = revs[0]
2112 2112 if not rev:
2113 2113 rev = "tip"
2114 2114 if num or branch or tags:
2115 2115 raise util.Abort(
2116 2116 "can't query remote revision number, branch, or tags")
2117 2117 output = [hexfunc(repo.lookup(rev))]
2118 2118 elif not rev:
2119 2119 ctx = repo[None]
2120 2120 parents = ctx.parents()
2121 2121 changed = False
2122 2122 if default or id or num:
2123 2123 changed = util.any(repo.status())
2124 2124 if default or id:
2125 2125 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
2126 2126 (changed) and "+" or "")]
2127 2127 if num:
2128 2128 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
2129 2129 (changed) and "+" or ""))
2130 2130 else:
2131 2131 ctx = repo[rev]
2132 2132 if default or id:
2133 2133 output = [hexfunc(ctx.node())]
2134 2134 if num:
2135 2135 output.append(str(ctx.rev()))
2136 2136
2137 2137 if repo.local() and default and not ui.quiet:
2138 2138 b = encoding.tolocal(ctx.branch())
2139 2139 if b != 'default':
2140 2140 output.append("(%s)" % b)
2141 2141
2142 2142 # multiple tags for a single parent separated by '/'
2143 2143 t = "/".join(ctx.tags())
2144 2144 if t:
2145 2145 output.append(t)
2146 2146
2147 2147 if branch:
2148 2148 output.append(encoding.tolocal(ctx.branch()))
2149 2149
2150 2150 if tags:
2151 2151 output.extend(ctx.tags())
2152 2152
2153 2153 ui.write("%s\n" % ' '.join(output))
2154 2154
2155 2155 def import_(ui, repo, patch1, *patches, **opts):
2156 2156 """import an ordered set of patches
2157 2157
2158 2158 Import a list of patches and commit them individually (unless
2159 2159 --no-commit is specified).
2160 2160
2161 2161 If there are outstanding changes in the working directory, import
2162 2162 will abort unless given the -f/--force flag.
2163 2163
2164 2164 You can import a patch straight from a mail message. Even patches
2165 2165 as attachments work (to use the body part, it must have type
2166 2166 text/plain or text/x-patch). From and Subject headers of email
2167 2167 message are used as default committer and commit message. All
2168 2168 text/plain body parts before first diff are added to commit
2169 2169 message.
2170 2170
2171 2171 If the imported patch was generated by :hg:`export`, user and
2172 2172 description from patch override values from message headers and
2173 2173 body. Values given on command line with -m/--message and -u/--user
2174 2174 override these.
2175 2175
2176 2176 If --exact is specified, import will set the working directory to
2177 2177 the parent of each patch before applying it, and will abort if the
2178 2178 resulting changeset has a different ID than the one recorded in
2179 2179 the patch. This may happen due to character set problems or other
2180 2180 deficiencies in the text patch format.
2181 2181
2182 2182 With -s/--similarity, hg will attempt to discover renames and
2183 2183 copies in the patch in the same way as 'addremove'.
2184 2184
2185 2185 To read a patch from standard input, use "-" as the patch name. If
2186 2186 a URL is specified, the patch will be downloaded from it.
2187 2187 See :hg:`help dates` for a list of formats valid for -d/--date.
2188 2188
2189 2189 Returns 0 on success.
2190 2190 """
2191 2191 patches = (patch1,) + patches
2192 2192
2193 2193 date = opts.get('date')
2194 2194 if date:
2195 2195 opts['date'] = util.parsedate(date)
2196 2196
2197 2197 try:
2198 2198 sim = float(opts.get('similarity') or 0)
2199 2199 except ValueError:
2200 2200 raise util.Abort(_('similarity must be a number'))
2201 2201 if sim < 0 or sim > 100:
2202 2202 raise util.Abort(_('similarity must be between 0 and 100'))
2203 2203
2204 2204 if opts.get('exact') or not opts.get('force'):
2205 2205 cmdutil.bail_if_changed(repo)
2206 2206
2207 2207 d = opts["base"]
2208 2208 strip = opts["strip"]
2209 2209 wlock = lock = None
2210 2210
2211 2211 def tryone(ui, hunk):
2212 2212 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2213 2213 patch.extract(ui, hunk)
2214 2214
2215 2215 if not tmpname:
2216 2216 return None
2217 2217 commitid = _('to working directory')
2218 2218
2219 2219 try:
2220 2220 cmdline_message = cmdutil.logmessage(opts)
2221 2221 if cmdline_message:
2222 2222 # pickup the cmdline msg
2223 2223 message = cmdline_message
2224 2224 elif message:
2225 2225 # pickup the patch msg
2226 2226 message = message.strip()
2227 2227 else:
2228 2228 # launch the editor
2229 2229 message = None
2230 2230 ui.debug('message:\n%s\n' % message)
2231 2231
2232 2232 wp = repo.parents()
2233 2233 if opts.get('exact'):
2234 2234 if not nodeid or not p1:
2235 2235 raise util.Abort(_('not a Mercurial patch'))
2236 2236 p1 = repo.lookup(p1)
2237 2237 p2 = repo.lookup(p2 or hex(nullid))
2238 2238
2239 2239 if p1 != wp[0].node():
2240 2240 hg.clean(repo, p1)
2241 2241 repo.dirstate.setparents(p1, p2)
2242 2242 elif p2:
2243 2243 try:
2244 2244 p1 = repo.lookup(p1)
2245 2245 p2 = repo.lookup(p2)
2246 2246 if p1 == wp[0].node():
2247 2247 repo.dirstate.setparents(p1, p2)
2248 2248 except error.RepoError:
2249 2249 pass
2250 2250 if opts.get('exact') or opts.get('import_branch'):
2251 2251 repo.dirstate.setbranch(branch or 'default')
2252 2252
2253 2253 files = {}
2254 2254 try:
2255 2255 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2256 2256 files=files, eolmode=None)
2257 2257 finally:
2258 2258 files = patch.updatedir(ui, repo, files,
2259 2259 similarity=sim / 100.0)
2260 2260 if not opts.get('no_commit'):
2261 2261 if opts.get('exact'):
2262 2262 m = None
2263 2263 else:
2264 2264 m = cmdutil.matchfiles(repo, files or [])
2265 2265 n = repo.commit(message, opts.get('user') or user,
2266 2266 opts.get('date') or date, match=m,
2267 2267 editor=cmdutil.commiteditor)
2268 2268 if opts.get('exact'):
2269 2269 if hex(n) != nodeid:
2270 2270 repo.rollback()
2271 2271 raise util.Abort(_('patch is damaged'
2272 2272 ' or loses information'))
2273 2273 # Force a dirstate write so that the next transaction
2274 2274 # backups an up-do-date file.
2275 2275 repo.dirstate.write()
2276 2276 if n:
2277 2277 commitid = short(n)
2278 2278
2279 2279 return commitid
2280 2280 finally:
2281 2281 os.unlink(tmpname)
2282 2282
2283 2283 try:
2284 2284 wlock = repo.wlock()
2285 2285 lock = repo.lock()
2286 2286 lastcommit = None
2287 2287 for p in patches:
2288 2288 pf = os.path.join(d, p)
2289 2289
2290 2290 if pf == '-':
2291 2291 ui.status(_("applying patch from stdin\n"))
2292 2292 pf = sys.stdin
2293 2293 else:
2294 2294 ui.status(_("applying %s\n") % p)
2295 2295 pf = url.open(ui, pf)
2296 2296
2297 2297 haspatch = False
2298 2298 for hunk in patch.split(pf):
2299 2299 commitid = tryone(ui, hunk)
2300 2300 if commitid:
2301 2301 haspatch = True
2302 2302 if lastcommit:
2303 2303 ui.status(_('applied %s\n') % lastcommit)
2304 2304 lastcommit = commitid
2305 2305
2306 2306 if not haspatch:
2307 2307 raise util.Abort(_('no diffs found'))
2308 2308
2309 2309 finally:
2310 2310 release(lock, wlock)
2311 2311
2312 2312 def incoming(ui, repo, source="default", **opts):
2313 2313 """show new changesets found in source
2314 2314
2315 2315 Show new changesets found in the specified path/URL or the default
2316 2316 pull location. These are the changesets that would have been pulled
2317 2317 if a pull at the time you issued this command.
2318 2318
2319 2319 For remote repository, using --bundle avoids downloading the
2320 2320 changesets twice if the incoming is followed by a pull.
2321 2321
2322 2322 See pull for valid source format details.
2323 2323
2324 2324 Returns 0 if there are incoming changes, 1 otherwise.
2325 2325 """
2326 2326 limit = cmdutil.loglimit(opts)
2327 2327 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2328 2328 other = hg.repository(hg.remoteui(repo, opts), source)
2329 2329 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2330 2330 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2331 2331 if revs:
2332 2332 revs = [other.lookup(rev) for rev in revs]
2333 2333
2334 2334 tmp = discovery.findcommonincoming(repo, other, heads=revs,
2335 2335 force=opts.get('force'))
2336 2336 common, incoming, rheads = tmp
2337 2337 if not incoming:
2338 2338 try:
2339 2339 os.unlink(opts["bundle"])
2340 2340 except:
2341 2341 pass
2342 2342 ui.status(_("no changes found\n"))
2343 2343 return 1
2344 2344
2345 2345 cleanup = None
2346 2346 try:
2347 2347 fname = opts["bundle"]
2348 2348 if fname or not other.local():
2349 2349 # create a bundle (uncompressed if other repo is not local)
2350 2350
2351 2351 if revs is None and other.capable('changegroupsubset'):
2352 2352 revs = rheads
2353 2353
2354 2354 if revs is None:
2355 2355 cg = other.changegroup(incoming, "incoming")
2356 2356 else:
2357 2357 cg = other.changegroupsubset(incoming, revs, 'incoming')
2358 2358 bundletype = other.local() and "HG10BZ" or "HG10UN"
2359 2359 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
2360 2360 # keep written bundle?
2361 2361 if opts["bundle"]:
2362 2362 cleanup = None
2363 2363 if not other.local():
2364 2364 # use the created uncompressed bundlerepo
2365 2365 other = bundlerepo.bundlerepository(ui, repo.root, fname)
2366 2366
2367 2367 o = other.changelog.nodesbetween(incoming, revs)[0]
2368 2368 if opts.get('newest_first'):
2369 2369 o.reverse()
2370 2370 displayer = cmdutil.show_changeset(ui, other, opts)
2371 2371 count = 0
2372 2372 for n in o:
2373 2373 if limit is not None and count >= limit:
2374 2374 break
2375 2375 parents = [p for p in other.changelog.parents(n) if p != nullid]
2376 2376 if opts.get('no_merges') and len(parents) == 2:
2377 2377 continue
2378 2378 count += 1
2379 2379 displayer.show(other[n])
2380 2380 displayer.close()
2381 2381 finally:
2382 2382 if hasattr(other, 'close'):
2383 2383 other.close()
2384 2384 if cleanup:
2385 2385 os.unlink(cleanup)
2386 2386
2387 2387 def init(ui, dest=".", **opts):
2388 2388 """create a new repository in the given directory
2389 2389
2390 2390 Initialize a new repository in the given directory. If the given
2391 2391 directory does not exist, it will be created.
2392 2392
2393 2393 If no directory is given, the current directory is used.
2394 2394
2395 2395 It is possible to specify an ``ssh://`` URL as the destination.
2396 2396 See :hg:`help urls` for more information.
2397 2397
2398 2398 Returns 0 on success.
2399 2399 """
2400 2400 hg.repository(hg.remoteui(ui, opts), dest, create=1)
2401 2401
2402 2402 def locate(ui, repo, *pats, **opts):
2403 2403 """locate files matching specific patterns
2404 2404
2405 2405 Print files under Mercurial control in the working directory whose
2406 2406 names match the given patterns.
2407 2407
2408 2408 By default, this command searches all directories in the working
2409 2409 directory. To search just the current directory and its
2410 2410 subdirectories, use "--include .".
2411 2411
2412 2412 If no patterns are given to match, this command prints the names
2413 2413 of all files under Mercurial control in the working directory.
2414 2414
2415 2415 If you want to feed the output of this command into the "xargs"
2416 2416 command, use the -0 option to both this command and "xargs". This
2417 2417 will avoid the problem of "xargs" treating single filenames that
2418 2418 contain whitespace as multiple filenames.
2419 2419
2420 2420 Returns 0 if a match is found, 1 otherwise.
2421 2421 """
2422 2422 end = opts.get('print0') and '\0' or '\n'
2423 2423 rev = opts.get('rev') or None
2424 2424
2425 2425 ret = 1
2426 2426 m = cmdutil.match(repo, pats, opts, default='relglob')
2427 2427 m.bad = lambda x, y: False
2428 2428 for abs in repo[rev].walk(m):
2429 2429 if not rev and abs not in repo.dirstate:
2430 2430 continue
2431 2431 if opts.get('fullpath'):
2432 2432 ui.write(repo.wjoin(abs), end)
2433 2433 else:
2434 2434 ui.write(((pats and m.rel(abs)) or abs), end)
2435 2435 ret = 0
2436 2436
2437 2437 return ret
2438 2438
2439 2439 def log(ui, repo, *pats, **opts):
2440 2440 """show revision history of entire repository or files
2441 2441
2442 2442 Print the revision history of the specified files or the entire
2443 2443 project.
2444 2444
2445 2445 File history is shown without following rename or copy history of
2446 2446 files. Use -f/--follow with a filename to follow history across
2447 2447 renames and copies. --follow without a filename will only show
2448 2448 ancestors or descendants of the starting revision. --follow-first
2449 2449 only follows the first parent of merge revisions.
2450 2450
2451 2451 If no revision range is specified, the default is tip:0 unless
2452 2452 --follow is set, in which case the working directory parent is
2453 2453 used as the starting revision. You can specify a revision set for
2454 2454 log, see :hg:`help revsets` for more information.
2455 2455
2456 2456 See :hg:`help dates` for a list of formats valid for -d/--date.
2457 2457
2458 2458 By default this command prints revision number and changeset id,
2459 2459 tags, non-trivial parents, user, date and time, and a summary for
2460 2460 each commit. When the -v/--verbose switch is used, the list of
2461 2461 changed files and full commit message are shown.
2462 2462
2463 2463 NOTE: log -p/--patch may generate unexpected diff output for merge
2464 2464 changesets, as it will only compare the merge changeset against
2465 2465 its first parent. Also, only files different from BOTH parents
2466 2466 will appear in files:.
2467 2467
2468 2468 Returns 0 on success.
2469 2469 """
2470 2470
2471 2471 matchfn = cmdutil.match(repo, pats, opts)
2472 2472 limit = cmdutil.loglimit(opts)
2473 2473 count = 0
2474 2474
2475 2475 endrev = None
2476 2476 if opts.get('copies') and opts.get('rev'):
2477 2477 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2478 2478
2479 2479 df = False
2480 2480 if opts["date"]:
2481 2481 df = util.matchdate(opts["date"])
2482 2482
2483 2483 branches = opts.get('branch', []) + opts.get('only_branch', [])
2484 2484 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2485 2485
2486 2486 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2487 2487 def prep(ctx, fns):
2488 2488 rev = ctx.rev()
2489 2489 parents = [p for p in repo.changelog.parentrevs(rev)
2490 2490 if p != nullrev]
2491 2491 if opts.get('no_merges') and len(parents) == 2:
2492 2492 return
2493 2493 if opts.get('only_merges') and len(parents) != 2:
2494 2494 return
2495 2495 if opts.get('branch') and ctx.branch() not in opts['branch']:
2496 2496 return
2497 2497 if df and not df(ctx.date()[0]):
2498 2498 return
2499 2499 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
2500 2500 return
2501 2501 if opts.get('keyword'):
2502 2502 for k in [kw.lower() for kw in opts['keyword']]:
2503 2503 if (k in ctx.user().lower() or
2504 2504 k in ctx.description().lower() or
2505 2505 k in " ".join(ctx.files()).lower()):
2506 2506 break
2507 2507 else:
2508 2508 return
2509 2509
2510 2510 copies = None
2511 2511 if opts.get('copies') and rev:
2512 2512 copies = []
2513 2513 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2514 2514 for fn in ctx.files():
2515 2515 rename = getrenamed(fn, rev)
2516 2516 if rename:
2517 2517 copies.append((fn, rename[0]))
2518 2518
2519 2519 revmatchfn = None
2520 2520 if opts.get('patch') or opts.get('stat'):
2521 2521 revmatchfn = cmdutil.match(repo, fns, default='path')
2522 2522
2523 2523 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2524 2524
2525 2525 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2526 2526 if count == limit:
2527 2527 break
2528 2528 if displayer.flush(ctx.rev()):
2529 2529 count += 1
2530 2530 displayer.close()
2531 2531
2532 2532 def manifest(ui, repo, node=None, rev=None):
2533 2533 """output the current or given revision of the project manifest
2534 2534
2535 2535 Print a list of version controlled files for the given revision.
2536 2536 If no revision is given, the first parent of the working directory
2537 2537 is used, or the null revision if no revision is checked out.
2538 2538
2539 2539 With -v, print file permissions, symlink and executable bits.
2540 2540 With --debug, print file revision hashes.
2541 2541
2542 2542 Returns 0 on success.
2543 2543 """
2544 2544
2545 2545 if rev and node:
2546 2546 raise util.Abort(_("please specify just one revision"))
2547 2547
2548 2548 if not node:
2549 2549 node = rev
2550 2550
2551 2551 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2552 2552 ctx = repo[node]
2553 2553 for f in ctx:
2554 2554 if ui.debugflag:
2555 2555 ui.write("%40s " % hex(ctx.manifest()[f]))
2556 2556 if ui.verbose:
2557 2557 ui.write(decor[ctx.flags(f)])
2558 2558 ui.write("%s\n" % f)
2559 2559
2560 2560 def merge(ui, repo, node=None, **opts):
2561 2561 """merge working directory with another revision
2562 2562
2563 2563 The current working directory is updated with all changes made in
2564 2564 the requested revision since the last common predecessor revision.
2565 2565
2566 2566 Files that changed between either parent are marked as changed for
2567 2567 the next commit and a commit must be performed before any further
2568 2568 updates to the repository are allowed. The next commit will have
2569 2569 two parents.
2570 2570
2571 2571 If no revision is specified, the working directory's parent is a
2572 2572 head revision, and the current branch contains exactly one other
2573 2573 head, the other head is merged with by default. Otherwise, an
2574 2574 explicit revision with which to merge with must be provided.
2575 2575
2576 2576 To undo an uncommitted merge, use :hg:`update --clean .` which
2577 2577 will check out a clean copy of the original merge parent, losing
2578 2578 all changes.
2579 2579
2580 2580 Returns 0 on success, 1 if there are unresolved files.
2581 2581 """
2582 2582
2583 2583 if opts.get('rev') and node:
2584 2584 raise util.Abort(_("please specify just one revision"))
2585 2585 if not node:
2586 2586 node = opts.get('rev')
2587 2587
2588 2588 if not node:
2589 2589 branch = repo.changectx(None).branch()
2590 2590 bheads = repo.branchheads(branch)
2591 2591 if len(bheads) > 2:
2592 2592 raise util.Abort(_(
2593 2593 'branch \'%s\' has %d heads - '
2594 2594 'please merge with an explicit rev\n'
2595 2595 '(run \'hg heads .\' to see heads)')
2596 2596 % (branch, len(bheads)))
2597 2597
2598 2598 parent = repo.dirstate.parents()[0]
2599 2599 if len(bheads) == 1:
2600 2600 if len(repo.heads()) > 1:
2601 2601 raise util.Abort(_(
2602 2602 'branch \'%s\' has one head - '
2603 2603 'please merge with an explicit rev\n'
2604 2604 '(run \'hg heads\' to see all heads)')
2605 2605 % branch)
2606 2606 msg = _('there is nothing to merge')
2607 2607 if parent != repo.lookup(repo[None].branch()):
2608 2608 msg = _('%s - use "hg update" instead') % msg
2609 2609 raise util.Abort(msg)
2610 2610
2611 2611 if parent not in bheads:
2612 2612 raise util.Abort(_('working dir not at a head rev - '
2613 2613 'use "hg update" or merge with an explicit rev'))
2614 2614 node = parent == bheads[0] and bheads[-1] or bheads[0]
2615 2615
2616 2616 if opts.get('preview'):
2617 2617 # find nodes that are ancestors of p2 but not of p1
2618 2618 p1 = repo.lookup('.')
2619 2619 p2 = repo.lookup(node)
2620 2620 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2621 2621
2622 2622 displayer = cmdutil.show_changeset(ui, repo, opts)
2623 2623 for node in nodes:
2624 2624 displayer.show(repo[node])
2625 2625 displayer.close()
2626 2626 return 0
2627 2627
2628 2628 return hg.merge(repo, node, force=opts.get('force'))
2629 2629
2630 2630 def outgoing(ui, repo, dest=None, **opts):
2631 2631 """show changesets not found in the destination
2632 2632
2633 2633 Show changesets not found in the specified destination repository
2634 2634 or the default push location. These are the changesets that would
2635 2635 be pushed if a push was requested.
2636 2636
2637 2637 See pull for details of valid destination formats.
2638 2638
2639 2639 Returns 0 if there are outgoing changes, 1 otherwise.
2640 2640 """
2641 2641 limit = cmdutil.loglimit(opts)
2642 2642 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2643 2643 dest, branches = hg.parseurl(dest, opts.get('branch'))
2644 2644 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2645 2645 if revs:
2646 2646 revs = [repo.lookup(rev) for rev in revs]
2647 2647
2648 2648 other = hg.repository(hg.remoteui(repo, opts), dest)
2649 2649 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2650 2650 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
2651 2651 if not o:
2652 2652 ui.status(_("no changes found\n"))
2653 2653 return 1
2654 2654 o = repo.changelog.nodesbetween(o, revs)[0]
2655 2655 if opts.get('newest_first'):
2656 2656 o.reverse()
2657 2657 displayer = cmdutil.show_changeset(ui, repo, opts)
2658 2658 count = 0
2659 2659 for n in o:
2660 2660 if limit is not None and count >= limit:
2661 2661 break
2662 2662 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2663 2663 if opts.get('no_merges') and len(parents) == 2:
2664 2664 continue
2665 2665 count += 1
2666 2666 displayer.show(repo[n])
2667 2667 displayer.close()
2668 2668
2669 2669 def parents(ui, repo, file_=None, **opts):
2670 2670 """show the parents of the working directory or revision
2671 2671
2672 2672 Print the working directory's parent revisions. If a revision is
2673 2673 given via -r/--rev, the parent of that revision will be printed.
2674 2674 If a file argument is given, the revision in which the file was
2675 2675 last changed (before the working directory revision or the
2676 2676 argument to --rev if given) is printed.
2677 2677
2678 2678 Returns 0 on success.
2679 2679 """
2680 2680 rev = opts.get('rev')
2681 2681 if rev:
2682 2682 ctx = repo[rev]
2683 2683 else:
2684 2684 ctx = repo[None]
2685 2685
2686 2686 if file_:
2687 2687 m = cmdutil.match(repo, (file_,), opts)
2688 2688 if m.anypats() or len(m.files()) != 1:
2689 2689 raise util.Abort(_('can only specify an explicit filename'))
2690 2690 file_ = m.files()[0]
2691 2691 filenodes = []
2692 2692 for cp in ctx.parents():
2693 2693 if not cp:
2694 2694 continue
2695 2695 try:
2696 2696 filenodes.append(cp.filenode(file_))
2697 2697 except error.LookupError:
2698 2698 pass
2699 2699 if not filenodes:
2700 2700 raise util.Abort(_("'%s' not found in manifest!") % file_)
2701 2701 fl = repo.file(file_)
2702 2702 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2703 2703 else:
2704 2704 p = [cp.node() for cp in ctx.parents()]
2705 2705
2706 2706 displayer = cmdutil.show_changeset(ui, repo, opts)
2707 2707 for n in p:
2708 2708 if n != nullid:
2709 2709 displayer.show(repo[n])
2710 2710 displayer.close()
2711 2711
2712 2712 def paths(ui, repo, search=None):
2713 2713 """show aliases for remote repositories
2714 2714
2715 2715 Show definition of symbolic path name NAME. If no name is given,
2716 2716 show definition of all available names.
2717 2717
2718 2718 Path names are defined in the [paths] section of
2719 2719 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
2720 2720 repository, ``.hg/hgrc`` is used, too.
2721 2721
2722 2722 The path names ``default`` and ``default-push`` have a special
2723 2723 meaning. When performing a push or pull operation, they are used
2724 2724 as fallbacks if no location is specified on the command-line.
2725 2725 When ``default-push`` is set, it will be used for push and
2726 2726 ``default`` will be used for pull; otherwise ``default`` is used
2727 2727 as the fallback for both. When cloning a repository, the clone
2728 2728 source is written as ``default`` in ``.hg/hgrc``. Note that
2729 2729 ``default`` and ``default-push`` apply to all inbound (e.g.
2730 2730 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2731 2731 :hg:`bundle`) operations.
2732 2732
2733 2733 See :hg:`help urls` for more information.
2734 2734
2735 2735 Returns 0 on success.
2736 2736 """
2737 2737 if search:
2738 2738 for name, path in ui.configitems("paths"):
2739 2739 if name == search:
2740 2740 ui.write("%s\n" % url.hidepassword(path))
2741 2741 return
2742 2742 ui.warn(_("not found!\n"))
2743 2743 return 1
2744 2744 else:
2745 2745 for name, path in ui.configitems("paths"):
2746 2746 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2747 2747
2748 2748 def postincoming(ui, repo, modheads, optupdate, checkout):
2749 2749 if modheads == 0:
2750 2750 return
2751 2751 if optupdate:
2752 2752 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2753 2753 return hg.update(repo, checkout)
2754 2754 else:
2755 2755 ui.status(_("not updating, since new heads added\n"))
2756 2756 if modheads > 1:
2757 2757 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2758 2758 else:
2759 2759 ui.status(_("(run 'hg update' to get a working copy)\n"))
2760 2760
2761 2761 def pull(ui, repo, source="default", **opts):
2762 2762 """pull changes from the specified source
2763 2763
2764 2764 Pull changes from a remote repository to a local one.
2765 2765
2766 2766 This finds all changes from the repository at the specified path
2767 2767 or URL and adds them to a local repository (the current one unless
2768 2768 -R is specified). By default, this does not update the copy of the
2769 2769 project in the working directory.
2770 2770
2771 2771 Use :hg:`incoming` if you want to see what would have been added
2772 2772 by a pull at the time you issued this command. If you then decide
2773 2773 to add those changes to the repository, you should use :hg:`pull
2774 2774 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
2775 2775
2776 2776 If SOURCE is omitted, the 'default' path will be used.
2777 2777 See :hg:`help urls` for more information.
2778 2778
2779 2779 Returns 0 on success, 1 if an update had unresolved files.
2780 2780 """
2781 2781 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2782 2782 other = hg.repository(hg.remoteui(repo, opts), source)
2783 2783 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2784 2784 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2785 2785 if revs:
2786 2786 try:
2787 2787 revs = [other.lookup(rev) for rev in revs]
2788 2788 except error.CapabilityError:
2789 2789 err = _("Other repository doesn't support revision lookup, "
2790 2790 "so a rev cannot be specified.")
2791 2791 raise util.Abort(err)
2792 2792
2793 2793 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2794 2794 if checkout:
2795 2795 checkout = str(repo.changelog.rev(other.lookup(checkout)))
2796 2796 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2797 2797
2798 2798 def push(ui, repo, dest=None, **opts):
2799 2799 """push changes to the specified destination
2800 2800
2801 2801 Push changesets from the local repository to the specified
2802 2802 destination.
2803 2803
2804 2804 This operation is symmetrical to pull: it is identical to a pull
2805 2805 in the destination repository from the current one.
2806 2806
2807 2807 By default, push will not allow creation of new heads at the
2808 2808 destination, since multiple heads would make it unclear which head
2809 2809 to use. In this situation, it is recommended to pull and merge
2810 2810 before pushing.
2811 2811
2812 2812 Use --new-branch if you want to allow push to create a new named
2813 2813 branch that is not present at the destination. This allows you to
2814 2814 only create a new branch without forcing other changes.
2815 2815
2816 2816 Use -f/--force to override the default behavior and push all
2817 2817 changesets on all branches.
2818 2818
2819 2819 If -r/--rev is used, the specified revision and all its ancestors
2820 2820 will be pushed to the remote repository.
2821 2821
2822 2822 Please see :hg:`help urls` for important details about ``ssh://``
2823 2823 URLs. If DESTINATION is omitted, a default path will be used.
2824 2824
2825 2825 Returns 0 if push was successful, 1 if nothing to push.
2826 2826 """
2827 2827 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2828 2828 dest, branches = hg.parseurl(dest, opts.get('branch'))
2829 2829 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2830 2830 other = hg.repository(hg.remoteui(repo, opts), dest)
2831 2831 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2832 2832 if revs:
2833 2833 revs = [repo.lookup(rev) for rev in revs]
2834 2834
2835 2835 # push subrepos depth-first for coherent ordering
2836 2836 c = repo['']
2837 2837 subs = c.substate # only repos that are committed
2838 2838 for s in sorted(subs):
2839 2839 if not c.sub(s).push(opts.get('force')):
2840 2840 return False
2841 2841
2842 2842 r = repo.push(other, opts.get('force'), revs=revs,
2843 2843 newbranch=opts.get('new_branch'))
2844 2844 return r == 0
2845 2845
2846 2846 def recover(ui, repo):
2847 2847 """roll back an interrupted transaction
2848 2848
2849 2849 Recover from an interrupted commit or pull.
2850 2850
2851 2851 This command tries to fix the repository status after an
2852 2852 interrupted operation. It should only be necessary when Mercurial
2853 2853 suggests it.
2854 2854
2855 2855 Returns 0 if successful, 1 if nothing to recover or verify fails.
2856 2856 """
2857 2857 if repo.recover():
2858 2858 return hg.verify(repo)
2859 2859 return 1
2860 2860
2861 2861 def remove(ui, repo, *pats, **opts):
2862 2862 """remove the specified files on the next commit
2863 2863
2864 2864 Schedule the indicated files for removal from the repository.
2865 2865
2866 2866 This only removes files from the current branch, not from the
2867 2867 entire project history. -A/--after can be used to remove only
2868 2868 files that have already been deleted, -f/--force can be used to
2869 2869 force deletion, and -Af can be used to remove files from the next
2870 2870 revision without deleting them from the working directory.
2871 2871
2872 2872 The following table details the behavior of remove for different
2873 2873 file states (columns) and option combinations (rows). The file
2874 2874 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
2875 2875 reported by :hg:`status`). The actions are Warn, Remove (from
2876 2876 branch) and Delete (from disk)::
2877 2877
2878 2878 A C M !
2879 2879 none W RD W R
2880 2880 -f R RD RD R
2881 2881 -A W W W R
2882 2882 -Af R R R R
2883 2883
2884 2884 This command schedules the files to be removed at the next commit.
2885 2885 To undo a remove before that, see :hg:`revert`.
2886 2886
2887 2887 Returns 0 on success, 1 if any warnings encountered.
2888 2888 """
2889 2889
2890 2890 ret = 0
2891 2891 after, force = opts.get('after'), opts.get('force')
2892 2892 if not pats and not after:
2893 2893 raise util.Abort(_('no files specified'))
2894 2894
2895 2895 m = cmdutil.match(repo, pats, opts)
2896 2896 s = repo.status(match=m, clean=True)
2897 2897 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2898 2898
2899 2899 for f in m.files():
2900 2900 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2901 2901 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2902 2902 ret = 1
2903 2903
2904 2904 def warn(files, reason):
2905 2905 for f in files:
2906 2906 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2907 2907 % (m.rel(f), reason))
2908 2908 ret = 1
2909 2909
2910 2910 if force:
2911 2911 remove, forget = modified + deleted + clean, added
2912 2912 elif after:
2913 2913 remove, forget = deleted, []
2914 2914 warn(modified + added + clean, _('still exists'))
2915 2915 else:
2916 2916 remove, forget = deleted + clean, []
2917 2917 warn(modified, _('is modified'))
2918 2918 warn(added, _('has been marked for add'))
2919 2919
2920 2920 for f in sorted(remove + forget):
2921 2921 if ui.verbose or not m.exact(f):
2922 2922 ui.status(_('removing %s\n') % m.rel(f))
2923 2923
2924 2924 repo[None].forget(forget)
2925 2925 repo[None].remove(remove, unlink=not after)
2926 2926 return ret
2927 2927
2928 2928 def rename(ui, repo, *pats, **opts):
2929 2929 """rename files; equivalent of copy + remove
2930 2930
2931 2931 Mark dest as copies of sources; mark sources for deletion. If dest
2932 2932 is a directory, copies are put in that directory. If dest is a
2933 2933 file, there can only be one source.
2934 2934
2935 2935 By default, this command copies the contents of files as they
2936 2936 exist in the working directory. If invoked with -A/--after, the
2937 2937 operation is recorded, but no copying is performed.
2938 2938
2939 2939 This command takes effect at the next commit. To undo a rename
2940 2940 before that, see :hg:`revert`.
2941 2941
2942 2942 Returns 0 on success, 1 if errors are encountered.
2943 2943 """
2944 2944 wlock = repo.wlock(False)
2945 2945 try:
2946 2946 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2947 2947 finally:
2948 2948 wlock.release()
2949 2949
2950 2950 def resolve(ui, repo, *pats, **opts):
2951 2951 """various operations to help finish a merge
2952 2952
2953 2953 This command includes several actions that are often useful while
2954 2954 performing a merge, after running ``merge`` but before running
2955 2955 ``commit``. (It is only meaningful if your working directory has
2956 2956 two parents.) It is most relevant for merges with unresolved
2957 2957 conflicts, which are typically a result of non-interactive merging with
2958 2958 ``internal:merge`` or a command-line merge tool like ``diff3``.
2959 2959
2960 2960 The available actions are:
2961 2961
2962 2962 1) list files that were merged with conflicts (U, for unresolved)
2963 2963 and without conflicts (R, for resolved): ``hg resolve -l``
2964 2964 (this is like ``status`` for merges)
2965 2965 2) record that you have resolved conflicts in certain files:
2966 2966 ``hg resolve -m [file ...]`` (default: mark all unresolved files)
2967 2967 3) forget that you have resolved conflicts in certain files:
2968 2968 ``hg resolve -u [file ...]`` (default: unmark all resolved files)
2969 2969 4) discard your current attempt(s) at resolving conflicts and
2970 2970 restart the merge from scratch: ``hg resolve file...``
2971 2971 (or ``-a`` for all unresolved files)
2972 2972
2973 2973 Note that Mercurial will not let you commit files with unresolved merge
2974 2974 conflicts. You must use ``hg resolve -m ...`` before you can commit
2975 2975 after a conflicting merge.
2976 2976
2977 2977 Returns 0 on success, 1 if any files fail a resolve attempt.
2978 2978 """
2979 2979
2980 2980 all, mark, unmark, show, nostatus = \
2981 2981 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
2982 2982
2983 2983 if (show and (mark or unmark)) or (mark and unmark):
2984 2984 raise util.Abort(_("too many options specified"))
2985 2985 if pats and all:
2986 2986 raise util.Abort(_("can't specify --all and patterns"))
2987 2987 if not (all or pats or show or mark or unmark):
2988 2988 raise util.Abort(_('no files or directories specified; '
2989 2989 'use --all to remerge all files'))
2990 2990
2991 2991 ms = mergemod.mergestate(repo)
2992 2992 m = cmdutil.match(repo, pats, opts)
2993 2993 ret = 0
2994 2994
2995 2995 for f in ms:
2996 2996 if m(f):
2997 2997 if show:
2998 2998 if nostatus:
2999 2999 ui.write("%s\n" % f)
3000 3000 else:
3001 3001 ui.write("%s %s\n" % (ms[f].upper(), f),
3002 3002 label='resolve.' +
3003 3003 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3004 3004 elif mark:
3005 3005 ms.mark(f, "r")
3006 3006 elif unmark:
3007 3007 ms.mark(f, "u")
3008 3008 else:
3009 3009 wctx = repo[None]
3010 3010 mctx = wctx.parents()[-1]
3011 3011
3012 3012 # backup pre-resolve (merge uses .orig for its own purposes)
3013 3013 a = repo.wjoin(f)
3014 3014 util.copyfile(a, a + ".resolve")
3015 3015
3016 3016 # resolve file
3017 3017 if ms.resolve(f, wctx, mctx):
3018 3018 ret = 1
3019 3019
3020 3020 # replace filemerge's .orig file with our resolve file
3021 3021 util.rename(a + ".resolve", a + ".orig")
3022 3022 return ret
3023 3023
3024 3024 def revert(ui, repo, *pats, **opts):
3025 3025 """restore individual files or directories to an earlier state
3026 3026
3027 3027 NOTE: This command is most likely not what you are looking for. revert
3028 3028 will partially overwrite content in the working directory without changing
3029 3029 the working directory parents. Use :hg:`update -r rev` to check out earlier
3030 3030 revisions, or :hg:`update --clean .` to undo a merge which has added
3031 3031 another parent.
3032 3032
3033 3033 With no revision specified, revert the named files or directories
3034 3034 to the contents they had in the parent of the working directory.
3035 3035 This restores the contents of the affected files to an unmodified
3036 3036 state and unschedules adds, removes, copies, and renames. If the
3037 3037 working directory has two parents, you must explicitly specify a
3038 3038 revision.
3039 3039
3040 3040 Using the -r/--rev option, revert the given files or directories
3041 3041 to their contents as of a specific revision. This can be helpful
3042 3042 to "roll back" some or all of an earlier change. See :hg:`help
3043 3043 dates` for a list of formats valid for -d/--date.
3044 3044
3045 3045 Revert modifies the working directory. It does not commit any
3046 3046 changes, or change the parent of the working directory. If you
3047 3047 revert to a revision other than the parent of the working
3048 3048 directory, the reverted files will thus appear modified
3049 3049 afterwards.
3050 3050
3051 3051 If a file has been deleted, it is restored. If the executable mode
3052 3052 of a file was changed, it is reset.
3053 3053
3054 3054 If names are given, all files matching the names are reverted.
3055 3055 If no arguments are given, no files are reverted.
3056 3056
3057 3057 Modified files are saved with a .orig suffix before reverting.
3058 3058 To disable these backups, use --no-backup.
3059 3059
3060 3060 Returns 0 on success.
3061 3061 """
3062 3062
3063 3063 if opts["date"]:
3064 3064 if opts["rev"]:
3065 3065 raise util.Abort(_("you can't specify a revision and a date"))
3066 3066 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3067 3067
3068 3068 if not pats and not opts.get('all'):
3069 3069 raise util.Abort(_('no files or directories specified; '
3070 3070 'use --all to revert the whole repo'))
3071 3071
3072 3072 parent, p2 = repo.dirstate.parents()
3073 3073 if not opts.get('rev') and p2 != nullid:
3074 3074 raise util.Abort(_('uncommitted merge - please provide a '
3075 3075 'specific revision'))
3076 3076 ctx = repo[opts.get('rev')]
3077 3077 node = ctx.node()
3078 3078 mf = ctx.manifest()
3079 3079 if node == parent:
3080 3080 pmf = mf
3081 3081 else:
3082 3082 pmf = None
3083 3083
3084 3084 # need all matching names in dirstate and manifest of target rev,
3085 3085 # so have to walk both. do not print errors if files exist in one
3086 3086 # but not other.
3087 3087
3088 3088 names = {}
3089 3089
3090 3090 wlock = repo.wlock()
3091 3091 try:
3092 3092 # walk dirstate.
3093 3093
3094 3094 m = cmdutil.match(repo, pats, opts)
3095 3095 m.bad = lambda x, y: False
3096 3096 for abs in repo.walk(m):
3097 3097 names[abs] = m.rel(abs), m.exact(abs)
3098 3098
3099 3099 # walk target manifest.
3100 3100
3101 3101 def badfn(path, msg):
3102 3102 if path in names:
3103 3103 return
3104 3104 path_ = path + '/'
3105 3105 for f in names:
3106 3106 if f.startswith(path_):
3107 3107 return
3108 3108 ui.warn("%s: %s\n" % (m.rel(path), msg))
3109 3109
3110 3110 m = cmdutil.match(repo, pats, opts)
3111 3111 m.bad = badfn
3112 3112 for abs in repo[node].walk(m):
3113 3113 if abs not in names:
3114 3114 names[abs] = m.rel(abs), m.exact(abs)
3115 3115
3116 3116 m = cmdutil.matchfiles(repo, names)
3117 3117 changes = repo.status(match=m)[:4]
3118 3118 modified, added, removed, deleted = map(set, changes)
3119 3119
3120 3120 # if f is a rename, also revert the source
3121 3121 cwd = repo.getcwd()
3122 3122 for f in added:
3123 3123 src = repo.dirstate.copied(f)
3124 3124 if src and src not in names and repo.dirstate[src] == 'r':
3125 3125 removed.add(src)
3126 3126 names[src] = (repo.pathto(src, cwd), True)
3127 3127
3128 3128 def removeforget(abs):
3129 3129 if repo.dirstate[abs] == 'a':
3130 3130 return _('forgetting %s\n')
3131 3131 return _('removing %s\n')
3132 3132
3133 3133 revert = ([], _('reverting %s\n'))
3134 3134 add = ([], _('adding %s\n'))
3135 3135 remove = ([], removeforget)
3136 3136 undelete = ([], _('undeleting %s\n'))
3137 3137
3138 3138 disptable = (
3139 3139 # dispatch table:
3140 3140 # file state
3141 3141 # action if in target manifest
3142 3142 # action if not in target manifest
3143 3143 # make backup if in target manifest
3144 3144 # make backup if not in target manifest
3145 3145 (modified, revert, remove, True, True),
3146 3146 (added, revert, remove, True, False),
3147 3147 (removed, undelete, None, False, False),
3148 3148 (deleted, revert, remove, False, False),
3149 3149 )
3150 3150
3151 3151 for abs, (rel, exact) in sorted(names.items()):
3152 3152 mfentry = mf.get(abs)
3153 3153 target = repo.wjoin(abs)
3154 3154 def handle(xlist, dobackup):
3155 3155 xlist[0].append(abs)
3156 3156 if dobackup and not opts.get('no_backup') and util.lexists(target):
3157 3157 bakname = "%s.orig" % rel
3158 3158 ui.note(_('saving current version of %s as %s\n') %
3159 3159 (rel, bakname))
3160 3160 if not opts.get('dry_run'):
3161 3161 util.rename(target, bakname)
3162 3162 if ui.verbose or not exact:
3163 3163 msg = xlist[1]
3164 3164 if not isinstance(msg, basestring):
3165 3165 msg = msg(abs)
3166 3166 ui.status(msg % rel)
3167 3167 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3168 3168 if abs not in table:
3169 3169 continue
3170 3170 # file has changed in dirstate
3171 3171 if mfentry:
3172 3172 handle(hitlist, backuphit)
3173 3173 elif misslist is not None:
3174 3174 handle(misslist, backupmiss)
3175 3175 break
3176 3176 else:
3177 3177 if abs not in repo.dirstate:
3178 3178 if mfentry:
3179 3179 handle(add, True)
3180 3180 elif exact:
3181 3181 ui.warn(_('file not managed: %s\n') % rel)
3182 3182 continue
3183 3183 # file has not changed in dirstate
3184 3184 if node == parent:
3185 3185 if exact:
3186 3186 ui.warn(_('no changes needed to %s\n') % rel)
3187 3187 continue
3188 3188 if pmf is None:
3189 3189 # only need parent manifest in this unlikely case,
3190 3190 # so do not read by default
3191 3191 pmf = repo[parent].manifest()
3192 3192 if abs in pmf:
3193 3193 if mfentry:
3194 3194 # if version of file is same in parent and target
3195 3195 # manifests, do nothing
3196 3196 if (pmf[abs] != mfentry or
3197 3197 pmf.flags(abs) != mf.flags(abs)):
3198 3198 handle(revert, False)
3199 3199 else:
3200 3200 handle(remove, False)
3201 3201
3202 3202 if not opts.get('dry_run'):
3203 3203 def checkout(f):
3204 3204 fc = ctx[f]
3205 3205 repo.wwrite(f, fc.data(), fc.flags())
3206 3206
3207 3207 audit_path = util.path_auditor(repo.root)
3208 3208 for f in remove[0]:
3209 3209 if repo.dirstate[f] == 'a':
3210 3210 repo.dirstate.forget(f)
3211 3211 continue
3212 3212 audit_path(f)
3213 3213 try:
3214 3214 util.unlink(repo.wjoin(f))
3215 3215 except OSError:
3216 3216 pass
3217 3217 repo.dirstate.remove(f)
3218 3218
3219 3219 normal = None
3220 3220 if node == parent:
3221 3221 # We're reverting to our parent. If possible, we'd like status
3222 3222 # to report the file as clean. We have to use normallookup for
3223 3223 # merges to avoid losing information about merged/dirty files.
3224 3224 if p2 != nullid:
3225 3225 normal = repo.dirstate.normallookup
3226 3226 else:
3227 3227 normal = repo.dirstate.normal
3228 3228 for f in revert[0]:
3229 3229 checkout(f)
3230 3230 if normal:
3231 3231 normal(f)
3232 3232
3233 3233 for f in add[0]:
3234 3234 checkout(f)
3235 3235 repo.dirstate.add(f)
3236 3236
3237 3237 normal = repo.dirstate.normallookup
3238 3238 if node == parent and p2 == nullid:
3239 3239 normal = repo.dirstate.normal
3240 3240 for f in undelete[0]:
3241 3241 checkout(f)
3242 3242 normal(f)
3243 3243
3244 3244 finally:
3245 3245 wlock.release()
3246 3246
3247 3247 def rollback(ui, repo, **opts):
3248 3248 """roll back the last transaction (dangerous)
3249 3249
3250 3250 This command should be used with care. There is only one level of
3251 3251 rollback, and there is no way to undo a rollback. It will also
3252 3252 restore the dirstate at the time of the last transaction, losing
3253 3253 any dirstate changes since that time. This command does not alter
3254 3254 the working directory.
3255 3255
3256 3256 Transactions are used to encapsulate the effects of all commands
3257 3257 that create new changesets or propagate existing changesets into a
3258 3258 repository. For example, the following commands are transactional,
3259 3259 and their effects can be rolled back:
3260 3260
3261 3261 - commit
3262 3262 - import
3263 3263 - pull
3264 3264 - push (with this repository as the destination)
3265 3265 - unbundle
3266 3266
3267 3267 This command is not intended for use on public repositories. Once
3268 3268 changes are visible for pull by other users, rolling a transaction
3269 3269 back locally is ineffective (someone else may already have pulled
3270 3270 the changes). Furthermore, a race is possible with readers of the
3271 3271 repository; for example an in-progress pull from the repository
3272 3272 may fail if a rollback is performed.
3273 3273
3274 3274 Returns 0 on success, 1 if no rollback data is available.
3275 3275 """
3276 3276 return repo.rollback(opts.get('dry_run'))
3277 3277
3278 3278 def root(ui, repo):
3279 3279 """print the root (top) of the current working directory
3280 3280
3281 3281 Print the root directory of the current repository.
3282 3282
3283 3283 Returns 0 on success.
3284 3284 """
3285 3285 ui.write(repo.root + "\n")
3286 3286
3287 3287 def serve(ui, repo, **opts):
3288 3288 """start stand-alone webserver
3289 3289
3290 3290 Start a local HTTP repository browser and pull server. You can use
3291 3291 this for ad-hoc sharing and browing of repositories. It is
3292 3292 recommended to use a real web server to serve a repository for
3293 3293 longer periods of time.
3294 3294
3295 3295 Please note that the server does not implement access control.
3296 3296 This means that, by default, anybody can read from the server and
3297 3297 nobody can write to it by default. Set the ``web.allow_push``
3298 3298 option to ``*`` to allow everybody to push to the server. You
3299 3299 should use a real web server if you need to authenticate users.
3300 3300
3301 3301 By default, the server logs accesses to stdout and errors to
3302 3302 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3303 3303 files.
3304 3304
3305 3305 To have the server choose a free port number to listen on, specify
3306 3306 a port number of 0; in this case, the server will print the port
3307 3307 number it uses.
3308 3308
3309 3309 Returns 0 on success.
3310 3310 """
3311 3311
3312 3312 if opts["stdio"]:
3313 3313 if repo is None:
3314 3314 raise error.RepoError(_("There is no Mercurial repository here"
3315 3315 " (.hg not found)"))
3316 3316 s = sshserver.sshserver(ui, repo)
3317 3317 s.serve_forever()
3318 3318
3319 3319 # this way we can check if something was given in the command-line
3320 3320 if opts.get('port'):
3321 3321 opts['port'] = int(opts.get('port'))
3322 3322
3323 3323 baseui = repo and repo.baseui or ui
3324 3324 optlist = ("name templates style address port prefix ipv6"
3325 3325 " accesslog errorlog certificate encoding")
3326 3326 for o in optlist.split():
3327 3327 val = opts.get(o, '')
3328 3328 if val in (None, ''): # should check against default options instead
3329 3329 continue
3330 3330 baseui.setconfig("web", o, val)
3331 3331 if repo and repo.ui != baseui:
3332 3332 repo.ui.setconfig("web", o, val)
3333 3333
3334 3334 o = opts.get('web_conf') or opts.get('webdir_conf')
3335 3335 if not o:
3336 3336 if not repo:
3337 3337 raise error.RepoError(_("There is no Mercurial repository"
3338 3338 " here (.hg not found)"))
3339 3339 o = repo.root
3340 3340
3341 3341 app = hgweb.hgweb(o, baseui=ui)
3342 3342
3343 3343 class service(object):
3344 3344 def init(self):
3345 3345 util.set_signal_handler()
3346 3346 self.httpd = hgweb.server.create_server(ui, app)
3347 3347
3348 3348 if opts['port'] and not ui.verbose:
3349 3349 return
3350 3350
3351 3351 if self.httpd.prefix:
3352 3352 prefix = self.httpd.prefix.strip('/') + '/'
3353 3353 else:
3354 3354 prefix = ''
3355 3355
3356 3356 port = ':%d' % self.httpd.port
3357 3357 if port == ':80':
3358 3358 port = ''
3359 3359
3360 3360 bindaddr = self.httpd.addr
3361 3361 if bindaddr == '0.0.0.0':
3362 3362 bindaddr = '*'
3363 3363 elif ':' in bindaddr: # IPv6
3364 3364 bindaddr = '[%s]' % bindaddr
3365 3365
3366 3366 fqaddr = self.httpd.fqaddr
3367 3367 if ':' in fqaddr:
3368 3368 fqaddr = '[%s]' % fqaddr
3369 3369 if opts['port']:
3370 3370 write = ui.status
3371 3371 else:
3372 3372 write = ui.write
3373 3373 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3374 3374 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3375 3375
3376 3376 def run(self):
3377 3377 self.httpd.serve_forever()
3378 3378
3379 3379 service = service()
3380 3380
3381 3381 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3382 3382
3383 3383 def status(ui, repo, *pats, **opts):
3384 3384 """show changed files in the working directory
3385 3385
3386 3386 Show status of files in the repository. If names are given, only
3387 3387 files that match are shown. Files that are clean or ignored or
3388 3388 the source of a copy/move operation, are not listed unless
3389 3389 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3390 3390 Unless options described with "show only ..." are given, the
3391 3391 options -mardu are used.
3392 3392
3393 3393 Option -q/--quiet hides untracked (unknown and ignored) files
3394 3394 unless explicitly requested with -u/--unknown or -i/--ignored.
3395 3395
3396 3396 NOTE: status may appear to disagree with diff if permissions have
3397 3397 changed or a merge has occurred. The standard diff format does not
3398 3398 report permission changes and diff only reports changes relative
3399 3399 to one merge parent.
3400 3400
3401 3401 If one revision is given, it is used as the base revision.
3402 3402 If two revisions are given, the differences between them are
3403 3403 shown. The --change option can also be used as a shortcut to list
3404 3404 the changed files of a revision from its first parent.
3405 3405
3406 3406 The codes used to show the status of files are::
3407 3407
3408 3408 M = modified
3409 3409 A = added
3410 3410 R = removed
3411 3411 C = clean
3412 3412 ! = missing (deleted by non-hg command, but still tracked)
3413 3413 ? = not tracked
3414 3414 I = ignored
3415 3415 = origin of the previous file listed as A (added)
3416 3416
3417 3417 Returns 0 on success.
3418 3418 """
3419 3419
3420 3420 revs = opts.get('rev')
3421 3421 change = opts.get('change')
3422 3422
3423 3423 if revs and change:
3424 3424 msg = _('cannot specify --rev and --change at the same time')
3425 3425 raise util.Abort(msg)
3426 3426 elif change:
3427 3427 node2 = repo.lookup(change)
3428 3428 node1 = repo[node2].parents()[0].node()
3429 3429 else:
3430 3430 node1, node2 = cmdutil.revpair(repo, revs)
3431 3431
3432 3432 cwd = (pats and repo.getcwd()) or ''
3433 3433 end = opts.get('print0') and '\0' or '\n'
3434 3434 copy = {}
3435 3435 states = 'modified added removed deleted unknown ignored clean'.split()
3436 3436 show = [k for k in states if opts.get(k)]
3437 3437 if opts.get('all'):
3438 3438 show += ui.quiet and (states[:4] + ['clean']) or states
3439 3439 if not show:
3440 3440 show = ui.quiet and states[:4] or states[:5]
3441 3441
3442 3442 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3443 3443 'ignored' in show, 'clean' in show, 'unknown' in show)
3444 3444 changestates = zip(states, 'MAR!?IC', stat)
3445 3445
3446 3446 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3447 3447 ctxn = repo[nullid]
3448 3448 ctx1 = repo[node1]
3449 3449 ctx2 = repo[node2]
3450 3450 added = stat[1]
3451 3451 if node2 is None:
3452 3452 added = stat[0] + stat[1] # merged?
3453 3453
3454 3454 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3455 3455 if k in added:
3456 3456 copy[k] = v
3457 3457 elif v in added:
3458 3458 copy[v] = k
3459 3459
3460 3460 for state, char, files in changestates:
3461 3461 if state in show:
3462 3462 format = "%s %%s%s" % (char, end)
3463 3463 if opts.get('no_status'):
3464 3464 format = "%%s%s" % end
3465 3465
3466 3466 for f in files:
3467 3467 ui.write(format % repo.pathto(f, cwd),
3468 3468 label='status.' + state)
3469 3469 if f in copy:
3470 3470 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3471 3471 label='status.copied')
3472 3472
3473 3473 def summary(ui, repo, **opts):
3474 3474 """summarize working directory state
3475 3475
3476 3476 This generates a brief summary of the working directory state,
3477 3477 including parents, branch, commit status, and available updates.
3478 3478
3479 3479 With the --remote option, this will check the default paths for
3480 3480 incoming and outgoing changes. This can be time-consuming.
3481 3481
3482 3482 Returns 0 on success.
3483 3483 """
3484 3484
3485 3485 ctx = repo[None]
3486 3486 parents = ctx.parents()
3487 3487 pnode = parents[0].node()
3488 3488
3489 3489 for p in parents:
3490 3490 # label with log.changeset (instead of log.parent) since this
3491 3491 # shows a working directory parent *changeset*:
3492 3492 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3493 3493 label='log.changeset')
3494 3494 ui.write(' '.join(p.tags()), label='log.tag')
3495 3495 if p.rev() == -1:
3496 3496 if not len(repo):
3497 3497 ui.write(_(' (empty repository)'))
3498 3498 else:
3499 3499 ui.write(_(' (no revision checked out)'))
3500 3500 ui.write('\n')
3501 3501 if p.description():
3502 3502 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3503 3503 label='log.summary')
3504 3504
3505 3505 branch = ctx.branch()
3506 3506 bheads = repo.branchheads(branch)
3507 3507 m = _('branch: %s\n') % branch
3508 3508 if branch != 'default':
3509 3509 ui.write(m, label='log.branch')
3510 3510 else:
3511 3511 ui.status(m, label='log.branch')
3512 3512
3513 3513 st = list(repo.status(unknown=True))[:6]
3514 3514
3515 3515 c = repo.dirstate.copies()
3516 3516 copied, renamed = [], []
3517 3517 for d, s in c.iteritems():
3518 3518 if s in st[2]:
3519 3519 st[2].remove(s)
3520 3520 renamed.append(d)
3521 3521 else:
3522 3522 copied.append(d)
3523 3523 if d in st[1]:
3524 3524 st[1].remove(d)
3525 3525 st.insert(3, renamed)
3526 3526 st.insert(4, copied)
3527 3527
3528 3528 ms = mergemod.mergestate(repo)
3529 3529 st.append([f for f in ms if ms[f] == 'u'])
3530 3530
3531 3531 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3532 3532 st.append(subs)
3533 3533
3534 3534 labels = [ui.label(_('%d modified'), 'status.modified'),
3535 3535 ui.label(_('%d added'), 'status.added'),
3536 3536 ui.label(_('%d removed'), 'status.removed'),
3537 3537 ui.label(_('%d renamed'), 'status.copied'),
3538 3538 ui.label(_('%d copied'), 'status.copied'),
3539 3539 ui.label(_('%d deleted'), 'status.deleted'),
3540 3540 ui.label(_('%d unknown'), 'status.unknown'),
3541 3541 ui.label(_('%d ignored'), 'status.ignored'),
3542 3542 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3543 3543 ui.label(_('%d subrepos'), 'status.modified')]
3544 3544 t = []
3545 3545 for s, l in zip(st, labels):
3546 3546 if s:
3547 3547 t.append(l % len(s))
3548 3548
3549 3549 t = ', '.join(t)
3550 3550 cleanworkdir = False
3551 3551
3552 3552 if len(parents) > 1:
3553 3553 t += _(' (merge)')
3554 3554 elif branch != parents[0].branch():
3555 3555 t += _(' (new branch)')
3556 3556 elif (parents[0].extra().get('close') and
3557 3557 pnode in repo.branchheads(branch, closed=True)):
3558 3558 t += _(' (head closed)')
3559 3559 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3560 3560 t += _(' (clean)')
3561 3561 cleanworkdir = True
3562 3562 elif pnode not in bheads:
3563 3563 t += _(' (new branch head)')
3564 3564
3565 3565 if cleanworkdir:
3566 3566 ui.status(_('commit: %s\n') % t.strip())
3567 3567 else:
3568 3568 ui.write(_('commit: %s\n') % t.strip())
3569 3569
3570 3570 # all ancestors of branch heads - all ancestors of parent = new csets
3571 3571 new = [0] * len(repo)
3572 3572 cl = repo.changelog
3573 3573 for a in [cl.rev(n) for n in bheads]:
3574 3574 new[a] = 1
3575 3575 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3576 3576 new[a] = 1
3577 3577 for a in [p.rev() for p in parents]:
3578 3578 if a >= 0:
3579 3579 new[a] = 0
3580 3580 for a in cl.ancestors(*[p.rev() for p in parents]):
3581 3581 new[a] = 0
3582 3582 new = sum(new)
3583 3583
3584 3584 if new == 0:
3585 3585 ui.status(_('update: (current)\n'))
3586 3586 elif pnode not in bheads:
3587 3587 ui.write(_('update: %d new changesets (update)\n') % new)
3588 3588 else:
3589 3589 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3590 3590 (new, len(bheads)))
3591 3591
3592 3592 if opts.get('remote'):
3593 3593 t = []
3594 3594 source, branches = hg.parseurl(ui.expandpath('default'))
3595 3595 other = hg.repository(hg.remoteui(repo, {}), source)
3596 3596 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3597 3597 ui.debug('comparing with %s\n' % url.hidepassword(source))
3598 3598 repo.ui.pushbuffer()
3599 3599 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3600 3600 repo.ui.popbuffer()
3601 3601 if incoming:
3602 3602 t.append(_('1 or more incoming'))
3603 3603
3604 3604 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3605 3605 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3606 3606 other = hg.repository(hg.remoteui(repo, {}), dest)
3607 3607 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3608 3608 repo.ui.pushbuffer()
3609 3609 o = discovery.findoutgoing(repo, other)
3610 3610 repo.ui.popbuffer()
3611 3611 o = repo.changelog.nodesbetween(o, None)[0]
3612 3612 if o:
3613 3613 t.append(_('%d outgoing') % len(o))
3614 3614
3615 3615 if t:
3616 3616 ui.write(_('remote: %s\n') % (', '.join(t)))
3617 3617 else:
3618 3618 ui.status(_('remote: (synced)\n'))
3619 3619
3620 3620 def tag(ui, repo, name1, *names, **opts):
3621 3621 """add one or more tags for the current or given revision
3622 3622
3623 3623 Name a particular revision using <name>.
3624 3624
3625 3625 Tags are used to name particular revisions of the repository and are
3626 3626 very useful to compare different revisions, to go back to significant
3627 3627 earlier versions or to mark branch points as releases, etc.
3628 3628
3629 3629 If no revision is given, the parent of the working directory is
3630 3630 used, or tip if no revision is checked out.
3631 3631
3632 3632 To facilitate version control, distribution, and merging of tags,
3633 3633 they are stored as a file named ".hgtags" which is managed
3634 3634 similarly to other project files and can be hand-edited if
3635 3635 necessary. The file '.hg/localtags' is used for local tags (not
3636 3636 shared among repositories).
3637 3637
3638 3638 See :hg:`help dates` for a list of formats valid for -d/--date.
3639 3639
3640 3640 Since tag names have priority over branch names during revision
3641 3641 lookup, using an existing branch name as a tag name is discouraged.
3642 3642
3643 3643 Returns 0 on success.
3644 3644 """
3645 3645
3646 3646 rev_ = "."
3647 3647 names = [t.strip() for t in (name1,) + names]
3648 3648 if len(names) != len(set(names)):
3649 3649 raise util.Abort(_('tag names must be unique'))
3650 3650 for n in names:
3651 3651 if n in ['tip', '.', 'null']:
3652 3652 raise util.Abort(_('the name \'%s\' is reserved') % n)
3653 3653 if not n:
3654 3654 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
3655 3655 if opts.get('rev') and opts.get('remove'):
3656 3656 raise util.Abort(_("--rev and --remove are incompatible"))
3657 3657 if opts.get('rev'):
3658 3658 rev_ = opts['rev']
3659 3659 message = opts.get('message')
3660 3660 if opts.get('remove'):
3661 3661 expectedtype = opts.get('local') and 'local' or 'global'
3662 3662 for n in names:
3663 3663 if not repo.tagtype(n):
3664 3664 raise util.Abort(_('tag \'%s\' does not exist') % n)
3665 3665 if repo.tagtype(n) != expectedtype:
3666 3666 if expectedtype == 'global':
3667 3667 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
3668 3668 else:
3669 3669 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
3670 3670 rev_ = nullid
3671 3671 if not message:
3672 3672 # we don't translate commit messages
3673 3673 message = 'Removed tag %s' % ', '.join(names)
3674 3674 elif not opts.get('force'):
3675 3675 for n in names:
3676 3676 if n in repo.tags():
3677 3677 raise util.Abort(_('tag \'%s\' already exists '
3678 3678 '(use -f to force)') % n)
3679 3679 if not rev_ and repo.dirstate.parents()[1] != nullid:
3680 3680 raise util.Abort(_('uncommitted merge - please provide a '
3681 3681 'specific revision'))
3682 3682 r = repo[rev_].node()
3683 3683
3684 3684 if not message:
3685 3685 # we don't translate commit messages
3686 3686 message = ('Added tag %s for changeset %s' %
3687 3687 (', '.join(names), short(r)))
3688 3688
3689 3689 date = opts.get('date')
3690 3690 if date:
3691 3691 date = util.parsedate(date)
3692 3692
3693 3693 if opts.get('edit'):
3694 3694 message = ui.edit(message, ui.username())
3695 3695
3696 3696 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
3697 3697
3698 3698 def tags(ui, repo):
3699 3699 """list repository tags
3700 3700
3701 3701 This lists both regular and local tags. When the -v/--verbose
3702 3702 switch is used, a third column "local" is printed for local tags.
3703 3703
3704 3704 Returns 0 on success.
3705 3705 """
3706 3706
3707 3707 hexfunc = ui.debugflag and hex or short
3708 3708 tagtype = ""
3709 3709
3710 3710 for t, n in reversed(repo.tagslist()):
3711 3711 if ui.quiet:
3712 3712 ui.write("%s\n" % t)
3713 3713 continue
3714 3714
3715 3715 try:
3716 3716 hn = hexfunc(n)
3717 3717 r = "%5d:%s" % (repo.changelog.rev(n), hn)
3718 3718 except error.LookupError:
3719 3719 r = " ?:%s" % hn
3720 3720 else:
3721 3721 spaces = " " * (30 - encoding.colwidth(t))
3722 3722 if ui.verbose:
3723 3723 if repo.tagtype(t) == 'local':
3724 3724 tagtype = " local"
3725 3725 else:
3726 3726 tagtype = ""
3727 3727 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
3728 3728
3729 3729 def tip(ui, repo, **opts):
3730 3730 """show the tip revision
3731 3731
3732 3732 The tip revision (usually just called the tip) is the changeset
3733 3733 most recently added to the repository (and therefore the most
3734 3734 recently changed head).
3735 3735
3736 3736 If you have just made a commit, that commit will be the tip. If
3737 3737 you have just pulled changes from another repository, the tip of
3738 3738 that repository becomes the current tip. The "tip" tag is special
3739 3739 and cannot be renamed or assigned to a different changeset.
3740 3740
3741 3741 Returns 0 on success.
3742 3742 """
3743 3743 displayer = cmdutil.show_changeset(ui, repo, opts)
3744 3744 displayer.show(repo[len(repo) - 1])
3745 3745 displayer.close()
3746 3746
3747 3747 def unbundle(ui, repo, fname1, *fnames, **opts):
3748 3748 """apply one or more changegroup files
3749 3749
3750 3750 Apply one or more compressed changegroup files generated by the
3751 3751 bundle command.
3752 3752
3753 3753 Returns 0 on success, 1 if an update has unresolved files.
3754 3754 """
3755 3755 fnames = (fname1,) + fnames
3756 3756
3757 3757 lock = repo.lock()
3758 3758 try:
3759 3759 for fname in fnames:
3760 3760 f = url.open(ui, fname)
3761 3761 gen = changegroup.readbundle(f, fname)
3762 3762 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
3763 3763 lock=lock)
3764 3764 finally:
3765 3765 lock.release()
3766 3766
3767 3767 return postincoming(ui, repo, modheads, opts.get('update'), None)
3768 3768
3769 3769 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3770 3770 """update working directory (or switch revisions)
3771 3771
3772 3772 Update the repository's working directory to the specified
3773 3773 changeset.
3774 3774
3775 3775 If no changeset is specified, attempt to update to the tip of the
3776 3776 current branch. If this changeset is a descendant of the working
3777 3777 directory's parent, update to it, otherwise abort.
3778 3778
3779 3779 The following rules apply when the working directory contains
3780 3780 uncommitted changes:
3781 3781
3782 3782 1. If neither -c/--check nor -C/--clean is specified, and if
3783 3783 the requested changeset is an ancestor or descendant of
3784 3784 the working directory's parent, the uncommitted changes
3785 3785 are merged into the requested changeset and the merged
3786 3786 result is left uncommitted. If the requested changeset is
3787 3787 not an ancestor or descendant (that is, it is on another
3788 3788 branch), the update is aborted and the uncommitted changes
3789 3789 are preserved.
3790 3790
3791 3791 2. With the -c/--check option, the update is aborted and the
3792 3792 uncommitted changes are preserved.
3793 3793
3794 3794 3. With the -C/--clean option, uncommitted changes are discarded and
3795 3795 the working directory is updated to the requested changeset.
3796 3796
3797 3797 Use null as the changeset to remove the working directory (like
3798 3798 :hg:`clone -U`).
3799 3799
3800 3800 If you want to update just one file to an older changeset, use :hg:`revert`.
3801 3801
3802 3802 See :hg:`help dates` for a list of formats valid for -d/--date.
3803 3803
3804 3804 Returns 0 on success, 1 if there are unresolved files.
3805 3805 """
3806 3806 if rev and node:
3807 3807 raise util.Abort(_("please specify just one revision"))
3808 3808
3809 3809 if not rev:
3810 3810 rev = node
3811 3811
3812 3812 if check and clean:
3813 3813 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3814 3814
3815 3815 if check:
3816 3816 # we could use dirty() but we can ignore merge and branch trivia
3817 3817 c = repo[None]
3818 3818 if c.modified() or c.added() or c.removed():
3819 3819 raise util.Abort(_("uncommitted local changes"))
3820 3820
3821 3821 if date:
3822 3822 if rev:
3823 3823 raise util.Abort(_("you can't specify a revision and a date"))
3824 3824 rev = cmdutil.finddate(ui, repo, date)
3825 3825
3826 3826 if clean or check:
3827 3827 return hg.clean(repo, rev)
3828 3828 else:
3829 3829 return hg.update(repo, rev)
3830 3830
3831 3831 def verify(ui, repo):
3832 3832 """verify the integrity of the repository
3833 3833
3834 3834 Verify the integrity of the current repository.
3835 3835
3836 3836 This will perform an extensive check of the repository's
3837 3837 integrity, validating the hashes and checksums of each entry in
3838 3838 the changelog, manifest, and tracked files, as well as the
3839 3839 integrity of their crosslinks and indices.
3840 3840
3841 3841 Returns 0 on success, 1 if errors are encountered.
3842 3842 """
3843 3843 return hg.verify(repo)
3844 3844
3845 3845 def version_(ui):
3846 3846 """output version and copyright information"""
3847 3847 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3848 3848 % util.version())
3849 3849 ui.status(_(
3850 3850 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3851 3851 "This is free software; see the source for copying conditions. "
3852 3852 "There is NO\nwarranty; "
3853 3853 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3854 3854 ))
3855 3855
3856 3856 # Command options and aliases are listed here, alphabetically
3857 3857
3858 3858 globalopts = [
3859 3859 ('R', 'repository', '',
3860 3860 _('repository root directory or name of overlay bundle file'),
3861 3861 _('REPO')),
3862 3862 ('', 'cwd', '',
3863 3863 _('change working directory'), _('DIR')),
3864 3864 ('y', 'noninteractive', None,
3865 3865 _('do not prompt, assume \'yes\' for any required answers')),
3866 3866 ('q', 'quiet', None, _('suppress output')),
3867 3867 ('v', 'verbose', None, _('enable additional output')),
3868 3868 ('', 'config', [],
3869 3869 _('set/override config option (use \'section.name=value\')'),
3870 3870 _('CONFIG')),
3871 3871 ('', 'debug', None, _('enable debugging output')),
3872 3872 ('', 'debugger', None, _('start debugger')),
3873 3873 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
3874 3874 _('ENCODE')),
3875 3875 ('', 'encodingmode', encoding.encodingmode,
3876 3876 _('set the charset encoding mode'), _('MODE')),
3877 3877 ('', 'traceback', None, _('always print a traceback on exception')),
3878 3878 ('', 'time', None, _('time how long the command takes')),
3879 3879 ('', 'profile', None, _('print command execution profile')),
3880 3880 ('', 'version', None, _('output version information and exit')),
3881 3881 ('h', 'help', None, _('display help and exit')),
3882 3882 ]
3883 3883
3884 3884 dryrunopts = [('n', 'dry-run', None,
3885 3885 _('do not perform actions, just print output'))]
3886 3886
3887 3887 remoteopts = [
3888 3888 ('e', 'ssh', '',
3889 3889 _('specify ssh command to use'), _('CMD')),
3890 3890 ('', 'remotecmd', '',
3891 3891 _('specify hg command to run on the remote side'), _('CMD')),
3892 3892 ]
3893 3893
3894 3894 walkopts = [
3895 3895 ('I', 'include', [],
3896 3896 _('include names matching the given patterns'), _('PATTERN')),
3897 3897 ('X', 'exclude', [],
3898 3898 _('exclude names matching the given patterns'), _('PATTERN')),
3899 3899 ]
3900 3900
3901 3901 commitopts = [
3902 3902 ('m', 'message', '',
3903 3903 _('use text as commit message'), _('TEXT')),
3904 3904 ('l', 'logfile', '',
3905 3905 _('read commit message from file'), _('FILE')),
3906 3906 ]
3907 3907
3908 3908 commitopts2 = [
3909 3909 ('d', 'date', '',
3910 3910 _('record datecode as commit date'), _('DATE')),
3911 3911 ('u', 'user', '',
3912 3912 _('record the specified user as committer'), _('USER')),
3913 3913 ]
3914 3914
3915 3915 templateopts = [
3916 3916 ('', 'style', '',
3917 3917 _('display using template map file'), _('STYLE')),
3918 3918 ('', 'template', '',
3919 3919 _('display with template'), _('TEMPLATE')),
3920 3920 ]
3921 3921
3922 3922 logopts = [
3923 3923 ('p', 'patch', None, _('show patch')),
3924 3924 ('g', 'git', None, _('use git extended diff format')),
3925 3925 ('l', 'limit', '',
3926 3926 _('limit number of changes displayed'), _('NUM')),
3927 3927 ('M', 'no-merges', None, _('do not show merges')),
3928 3928 ('', 'stat', None, _('output diffstat-style summary of changes')),
3929 3929 ] + templateopts
3930 3930
3931 3931 diffopts = [
3932 3932 ('a', 'text', None, _('treat all files as text')),
3933 3933 ('g', 'git', None, _('use git extended diff format')),
3934 3934 ('', 'nodates', None, _('omit dates from diff headers'))
3935 3935 ]
3936 3936
3937 3937 diffopts2 = [
3938 3938 ('p', 'show-function', None, _('show which function each change is in')),
3939 3939 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3940 3940 ('w', 'ignore-all-space', None,
3941 3941 _('ignore white space when comparing lines')),
3942 3942 ('b', 'ignore-space-change', None,
3943 3943 _('ignore changes in the amount of white space')),
3944 3944 ('B', 'ignore-blank-lines', None,
3945 3945 _('ignore changes whose lines are all blank')),
3946 3946 ('U', 'unified', '',
3947 3947 _('number of lines of context to show'), _('NUM')),
3948 3948 ('', 'stat', None, _('output diffstat-style summary of changes')),
3949 3949 ]
3950 3950
3951 3951 similarityopts = [
3952 3952 ('s', 'similarity', '',
3953 3953 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
3954 3954 ]
3955 3955
3956 3956 table = {
3957 3957 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
3958 3958 "addremove":
3959 3959 (addremove, similarityopts + walkopts + dryrunopts,
3960 3960 _('[OPTION]... [FILE]...')),
3961 3961 "^annotate|blame":
3962 3962 (annotate,
3963 3963 [('r', 'rev', '',
3964 3964 _('annotate the specified revision'), _('REV')),
3965 3965 ('', 'follow', None,
3966 3966 _('follow copies/renames and list the filename (DEPRECATED)')),
3967 3967 ('', 'no-follow', None, _("don't follow copies and renames")),
3968 3968 ('a', 'text', None, _('treat all files as text')),
3969 3969 ('u', 'user', None, _('list the author (long with -v)')),
3970 3970 ('f', 'file', None, _('list the filename')),
3971 3971 ('d', 'date', None, _('list the date (short with -q)')),
3972 3972 ('n', 'number', None, _('list the revision number (default)')),
3973 3973 ('c', 'changeset', None, _('list the changeset')),
3974 3974 ('l', 'line-number', None,
3975 3975 _('show line number at the first appearance'))
3976 3976 ] + walkopts,
3977 3977 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3978 3978 "archive":
3979 3979 (archive,
3980 3980 [('', 'no-decode', None, _('do not pass files through decoders')),
3981 3981 ('p', 'prefix', '',
3982 3982 _('directory prefix for files in archive'), _('PREFIX')),
3983 3983 ('r', 'rev', '',
3984 3984 _('revision to distribute'), _('REV')),
3985 3985 ('t', 'type', '',
3986 3986 _('type of distribution to create'), _('TYPE')),
3987 3987 ] + walkopts,
3988 3988 _('[OPTION]... DEST')),
3989 3989 "backout":
3990 3990 (backout,
3991 3991 [('', 'merge', None,
3992 3992 _('merge with old dirstate parent after backout')),
3993 3993 ('', 'parent', '',
3994 3994 _('parent to choose when backing out merge'), _('REV')),
3995 3995 ('r', 'rev', '',
3996 3996 _('revision to backout'), _('REV')),
3997 3997 ] + walkopts + commitopts + commitopts2,
3998 3998 _('[OPTION]... [-r] REV')),
3999 3999 "bisect":
4000 4000 (bisect,
4001 4001 [('r', 'reset', False, _('reset bisect state')),
4002 4002 ('g', 'good', False, _('mark changeset good')),
4003 4003 ('b', 'bad', False, _('mark changeset bad')),
4004 4004 ('s', 'skip', False, _('skip testing changeset')),
4005 4005 ('c', 'command', '',
4006 4006 _('use command to check changeset state'), _('CMD')),
4007 4007 ('U', 'noupdate', False, _('do not update to target'))],
4008 4008 _("[-gbsr] [-U] [-c CMD] [REV]")),
4009 4009 "branch":
4010 4010 (branch,
4011 4011 [('f', 'force', None,
4012 4012 _('set branch name even if it shadows an existing branch')),
4013 4013 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4014 4014 _('[-fC] [NAME]')),
4015 4015 "branches":
4016 4016 (branches,
4017 4017 [('a', 'active', False,
4018 4018 _('show only branches that have unmerged heads')),
4019 4019 ('c', 'closed', False,
4020 4020 _('show normal and closed branches'))],
4021 4021 _('[-ac]')),
4022 4022 "bundle":
4023 4023 (bundle,
4024 4024 [('f', 'force', None,
4025 4025 _('run even when the destination is unrelated')),
4026 4026 ('r', 'rev', [],
4027 4027 _('a changeset intended to be added to the destination'),
4028 4028 _('REV')),
4029 4029 ('b', 'branch', [],
4030 4030 _('a specific branch you would like to bundle'),
4031 4031 _('BRANCH')),
4032 4032 ('', 'base', [],
4033 4033 _('a base changeset assumed to be available at the destination'),
4034 4034 _('REV')),
4035 4035 ('a', 'all', None, _('bundle all changesets in the repository')),
4036 4036 ('t', 'type', 'bzip2',
4037 4037 _('bundle compression type to use'), _('TYPE')),
4038 4038 ] + remoteopts,
4039 4039 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4040 4040 "cat":
4041 4041 (cat,
4042 4042 [('o', 'output', '',
4043 4043 _('print output to file with formatted name'), _('FORMAT')),
4044 4044 ('r', 'rev', '',
4045 4045 _('print the given revision'), _('REV')),
4046 4046 ('', 'decode', None, _('apply any matching decode filter')),
4047 4047 ] + walkopts,
4048 4048 _('[OPTION]... FILE...')),
4049 4049 "^clone":
4050 4050 (clone,
4051 4051 [('U', 'noupdate', None,
4052 4052 _('the clone will include an empty working copy (only a repository)')),
4053 4053 ('u', 'updaterev', '',
4054 4054 _('revision, tag or branch to check out'), _('REV')),
4055 4055 ('r', 'rev', [],
4056 4056 _('include the specified changeset'), _('REV')),
4057 4057 ('b', 'branch', [],
4058 4058 _('clone only the specified branch'), _('BRANCH')),
4059 4059 ('', 'pull', None, _('use pull protocol to copy metadata')),
4060 4060 ('', 'uncompressed', None,
4061 4061 _('use uncompressed transfer (fast over LAN)')),
4062 4062 ] + remoteopts,
4063 4063 _('[OPTION]... SOURCE [DEST]')),
4064 4064 "^commit|ci":
4065 4065 (commit,
4066 4066 [('A', 'addremove', None,
4067 4067 _('mark new/missing files as added/removed before committing')),
4068 4068 ('', 'close-branch', None,
4069 4069 _('mark a branch as closed, hiding it from the branch list')),
4070 4070 ] + walkopts + commitopts + commitopts2,
4071 4071 _('[OPTION]... [FILE]...')),
4072 4072 "copy|cp":
4073 4073 (copy,
4074 4074 [('A', 'after', None, _('record a copy that has already occurred')),
4075 4075 ('f', 'force', None,
4076 4076 _('forcibly copy over an existing managed file')),
4077 4077 ] + walkopts + dryrunopts,
4078 4078 _('[OPTION]... [SOURCE]... DEST')),
4079 4079 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4080 4080 "debugbuilddag":
4081 4081 (debugbuilddag,
4082 4082 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4083 4083 ('a', 'appended-file', None, _('add single file all revs append to')),
4084 4084 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4085 4085 ('n', 'new-file', None, _('add new file at each rev')),
4086 4086 ],
4087 4087 _('[OPTION]... TEXT')),
4088 4088 "debugcheckstate": (debugcheckstate, [], ''),
4089 4089 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4090 4090 "debugcomplete":
4091 4091 (debugcomplete,
4092 4092 [('o', 'options', None, _('show the command options'))],
4093 4093 _('[-o] CMD')),
4094 4094 "debugdag":
4095 4095 (debugdag,
4096 4096 [('t', 'tags', None, _('use tags as labels')),
4097 4097 ('b', 'branches', None, _('annotate with branch names')),
4098 4098 ('', 'dots', None, _('use dots for runs')),
4099 4099 ('s', 'spaces', None, _('separate elements by spaces')),
4100 4100 ],
4101 4101 _('[OPTION]... [FILE [REV]...]')),
4102 4102 "debugdate":
4103 4103 (debugdate,
4104 4104 [('e', 'extended', None, _('try extended date formats'))],
4105 4105 _('[-e] DATE [RANGE]')),
4106 4106 "debugdata": (debugdata, [], _('FILE REV')),
4107 4107 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4108 4108 "debugindex": (debugindex, [], _('FILE')),
4109 4109 "debugindexdot": (debugindexdot, [], _('FILE')),
4110 4110 "debuginstall": (debuginstall, [], ''),
4111 4111 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4112 4112 "debugrebuildstate":
4113 4113 (debugrebuildstate,
4114 4114 [('r', 'rev', '',
4115 4115 _('revision to rebuild to'), _('REV'))],
4116 4116 _('[-r REV] [REV]')),
4117 4117 "debugrename":
4118 4118 (debugrename,
4119 4119 [('r', 'rev', '',
4120 4120 _('revision to debug'), _('REV'))],
4121 4121 _('[-r REV] FILE')),
4122 4122 "debugrevspec":
4123 4123 (debugrevspec, [], ('REVSPEC')),
4124 4124 "debugsetparents":
4125 4125 (debugsetparents, [], _('REV1 [REV2]')),
4126 4126 "debugstate":
4127 4127 (debugstate,
4128 4128 [('', 'nodates', None, _('do not display the saved mtime'))],
4129 4129 _('[OPTION]...')),
4130 4130 "debugsub":
4131 4131 (debugsub,
4132 4132 [('r', 'rev', '',
4133 4133 _('revision to check'), _('REV'))],
4134 4134 _('[-r REV] [REV]')),
4135 4135 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4136 4136 "^diff":
4137 4137 (diff,
4138 4138 [('r', 'rev', [],
4139 4139 _('revision'), _('REV')),
4140 4140 ('c', 'change', '',
4141 4141 _('change made by revision'), _('REV'))
4142 4142 ] + diffopts + diffopts2 + walkopts,
4143 4143 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4144 4144 "^export":
4145 4145 (export,
4146 4146 [('o', 'output', '',
4147 4147 _('print output to file with formatted name'), _('FORMAT')),
4148 4148 ('', 'switch-parent', None, _('diff against the second parent')),
4149 4149 ('r', 'rev', [],
4150 4150 _('revisions to export'), _('REV')),
4151 4151 ] + diffopts,
4152 4152 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4153 4153 "^forget":
4154 4154 (forget,
4155 4155 [] + walkopts,
4156 4156 _('[OPTION]... FILE...')),
4157 4157 "grep":
4158 4158 (grep,
4159 4159 [('0', 'print0', None, _('end fields with NUL')),
4160 4160 ('', 'all', None, _('print all revisions that match')),
4161 4161 ('f', 'follow', None,
4162 4162 _('follow changeset history,'
4163 4163 ' or file history across copies and renames')),
4164 4164 ('i', 'ignore-case', None, _('ignore case when matching')),
4165 4165 ('l', 'files-with-matches', None,
4166 4166 _('print only filenames and revisions that match')),
4167 4167 ('n', 'line-number', None, _('print matching line numbers')),
4168 4168 ('r', 'rev', [],
4169 4169 _('only search files changed within revision range'), _('REV')),
4170 4170 ('u', 'user', None, _('list the author (long with -v)')),
4171 4171 ('d', 'date', None, _('list the date (short with -q)')),
4172 4172 ] + walkopts,
4173 4173 _('[OPTION]... PATTERN [FILE]...')),
4174 4174 "heads":
4175 4175 (heads,
4176 4176 [('r', 'rev', '',
4177 4177 _('show only heads which are descendants of REV'), _('REV')),
4178 4178 ('t', 'topo', False, _('show topological heads only')),
4179 4179 ('a', 'active', False,
4180 4180 _('show active branchheads only [DEPRECATED]')),
4181 4181 ('c', 'closed', False,
4182 4182 _('show normal and closed branch heads')),
4183 4183 ] + templateopts,
4184 4184 _('[-ac] [-r REV] [REV]...')),
4185 4185 "help": (help_, [], _('[TOPIC]')),
4186 4186 "identify|id":
4187 4187 (identify,
4188 4188 [('r', 'rev', '',
4189 4189 _('identify the specified revision'), _('REV')),
4190 4190 ('n', 'num', None, _('show local revision number')),
4191 4191 ('i', 'id', None, _('show global revision id')),
4192 4192 ('b', 'branch', None, _('show branch')),
4193 4193 ('t', 'tags', None, _('show tags'))],
4194 4194 _('[-nibt] [-r REV] [SOURCE]')),
4195 4195 "import|patch":
4196 4196 (import_,
4197 4197 [('p', 'strip', 1,
4198 4198 _('directory strip option for patch. This has the same '
4199 4199 'meaning as the corresponding patch option'),
4200 4200 _('NUM')),
4201 4201 ('b', 'base', '',
4202 4202 _('base path'), _('PATH')),
4203 4203 ('f', 'force', None,
4204 4204 _('skip check for outstanding uncommitted changes')),
4205 4205 ('', 'no-commit', None,
4206 4206 _("don't commit, just update the working directory")),
4207 4207 ('', 'exact', None,
4208 4208 _('apply patch to the nodes from which it was generated')),
4209 4209 ('', 'import-branch', None,
4210 4210 _('use any branch information in patch (implied by --exact)'))] +
4211 4211 commitopts + commitopts2 + similarityopts,
4212 4212 _('[OPTION]... PATCH...')),
4213 4213 "incoming|in":
4214 4214 (incoming,
4215 4215 [('f', 'force', None,
4216 4216 _('run even if remote repository is unrelated')),
4217 4217 ('n', 'newest-first', None, _('show newest record first')),
4218 4218 ('', 'bundle', '',
4219 4219 _('file to store the bundles into'), _('FILE')),
4220 4220 ('r', 'rev', [],
4221 4221 _('a remote changeset intended to be added'), _('REV')),
4222 4222 ('b', 'branch', [],
4223 4223 _('a specific branch you would like to pull'), _('BRANCH')),
4224 4224 ] + logopts + remoteopts,
4225 4225 _('[-p] [-n] [-M] [-f] [-r REV]...'
4226 4226 ' [--bundle FILENAME] [SOURCE]')),
4227 4227 "^init":
4228 4228 (init,
4229 4229 remoteopts,
4230 4230 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4231 4231 "locate":
4232 4232 (locate,
4233 4233 [('r', 'rev', '',
4234 4234 _('search the repository as it is in REV'), _('REV')),
4235 4235 ('0', 'print0', None,
4236 4236 _('end filenames with NUL, for use with xargs')),
4237 4237 ('f', 'fullpath', None,
4238 4238 _('print complete paths from the filesystem root')),
4239 4239 ] + walkopts,
4240 4240 _('[OPTION]... [PATTERN]...')),
4241 4241 "^log|history":
4242 4242 (log,
4243 4243 [('f', 'follow', None,
4244 4244 _('follow changeset history,'
4245 4245 ' or file history across copies and renames')),
4246 4246 ('', 'follow-first', None,
4247 4247 _('only follow the first parent of merge changesets')),
4248 4248 ('d', 'date', '',
4249 4249 _('show revisions matching date spec'), _('DATE')),
4250 4250 ('C', 'copies', None, _('show copied files')),
4251 4251 ('k', 'keyword', [],
4252 4252 _('do case-insensitive search for a given text'), _('TEXT')),
4253 4253 ('r', 'rev', [],
4254 4254 _('show the specified revision or range'), _('REV')),
4255 4255 ('', 'removed', None, _('include revisions where files were removed')),
4256 4256 ('m', 'only-merges', None, _('show only merges')),
4257 4257 ('u', 'user', [],
4258 4258 _('revisions committed by user'), _('USER')),
4259 4259 ('', 'only-branch', [],
4260 4260 _('show only changesets within the given named branch (DEPRECATED)'),
4261 4261 _('BRANCH')),
4262 4262 ('b', 'branch', [],
4263 4263 _('show changesets within the given named branch'), _('BRANCH')),
4264 4264 ('P', 'prune', [],
4265 4265 _('do not display revision or any of its ancestors'), _('REV')),
4266 4266 ] + logopts + walkopts,
4267 4267 _('[OPTION]... [FILE]')),
4268 4268 "manifest":
4269 4269 (manifest,
4270 4270 [('r', 'rev', '',
4271 4271 _('revision to display'), _('REV'))],
4272 4272 _('[-r REV]')),
4273 4273 "^merge":
4274 4274 (merge,
4275 4275 [('f', 'force', None, _('force a merge with outstanding changes')),
4276 4276 ('r', 'rev', '',
4277 4277 _('revision to merge'), _('REV')),
4278 4278 ('P', 'preview', None,
4279 4279 _('review revisions to merge (no merge is performed)'))],
4280 4280 _('[-P] [-f] [[-r] REV]')),
4281 4281 "outgoing|out":
4282 4282 (outgoing,
4283 4283 [('f', 'force', None,
4284 4284 _('run even when the destination is unrelated')),
4285 4285 ('r', 'rev', [],
4286 4286 _('a changeset intended to be included in the destination'),
4287 4287 _('REV')),
4288 4288 ('n', 'newest-first', None, _('show newest record first')),
4289 4289 ('b', 'branch', [],
4290 4290 _('a specific branch you would like to push'), _('BRANCH')),
4291 4291 ] + logopts + remoteopts,
4292 4292 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4293 4293 "parents":
4294 4294 (parents,
4295 4295 [('r', 'rev', '',
4296 4296 _('show parents of the specified revision'), _('REV')),
4297 4297 ] + templateopts,
4298 4298 _('[-r REV] [FILE]')),
4299 4299 "paths": (paths, [], _('[NAME]')),
4300 4300 "^pull":
4301 4301 (pull,
4302 4302 [('u', 'update', None,
4303 4303 _('update to new branch head if changesets were pulled')),
4304 4304 ('f', 'force', None,
4305 4305 _('run even when remote repository is unrelated')),
4306 4306 ('r', 'rev', [],
4307 4307 _('a remote changeset intended to be added'), _('REV')),
4308 4308 ('b', 'branch', [],
4309 4309 _('a specific branch you would like to pull'), _('BRANCH')),
4310 4310 ] + remoteopts,
4311 4311 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4312 4312 "^push":
4313 4313 (push,
4314 4314 [('f', 'force', None, _('force push')),
4315 4315 ('r', 'rev', [],
4316 4316 _('a changeset intended to be included in the destination'),
4317 4317 _('REV')),
4318 4318 ('b', 'branch', [],
4319 4319 _('a specific branch you would like to push'), _('BRANCH')),
4320 4320 ('', 'new-branch', False, _('allow pushing a new branch')),
4321 4321 ] + remoteopts,
4322 4322 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4323 4323 "recover": (recover, []),
4324 4324 "^remove|rm":
4325 4325 (remove,
4326 4326 [('A', 'after', None, _('record delete for missing files')),
4327 4327 ('f', 'force', None,
4328 4328 _('remove (and delete) file even if added or modified')),
4329 4329 ] + walkopts,
4330 4330 _('[OPTION]... FILE...')),
4331 4331 "rename|mv":
4332 4332 (rename,
4333 4333 [('A', 'after', None, _('record a rename that has already occurred')),
4334 4334 ('f', 'force', None,
4335 4335 _('forcibly copy over an existing managed file')),
4336 4336 ] + walkopts + dryrunopts,
4337 4337 _('[OPTION]... SOURCE... DEST')),
4338 4338 "resolve":
4339 4339 (resolve,
4340 4340 [('a', 'all', None, _('select all unresolved files')),
4341 4341 ('l', 'list', None, _('list state of files needing merge')),
4342 4342 ('m', 'mark', None, _('mark files as resolved')),
4343 4343 ('u', 'unmark', None, _('unmark files as resolved')),
4344 4344 ('n', 'no-status', None, _('hide status prefix'))]
4345 4345 + walkopts,
4346 4346 _('[OPTION]... [FILE]...')),
4347 4347 "revert":
4348 4348 (revert,
4349 4349 [('a', 'all', None, _('revert all changes when no arguments given')),
4350 4350 ('d', 'date', '',
4351 4351 _('tipmost revision matching date'), _('DATE')),
4352 4352 ('r', 'rev', '',
4353 4353 _('revert to the specified revision'), _('REV')),
4354 4354 ('', 'no-backup', None, _('do not save backup copies of files')),
4355 4355 ] + walkopts + dryrunopts,
4356 4356 _('[OPTION]... [-r REV] [NAME]...')),
4357 4357 "rollback": (rollback, dryrunopts),
4358 4358 "root": (root, []),
4359 4359 "^serve":
4360 4360 (serve,
4361 4361 [('A', 'accesslog', '',
4362 4362 _('name of access log file to write to'), _('FILE')),
4363 4363 ('d', 'daemon', None, _('run server in background')),
4364 4364 ('', 'daemon-pipefds', '',
4365 4365 _('used internally by daemon mode'), _('NUM')),
4366 4366 ('E', 'errorlog', '',
4367 4367 _('name of error log file to write to'), _('FILE')),
4368 4368 # use string type, then we can check if something was passed
4369 4369 ('p', 'port', '',
4370 4370 _('port to listen on (default: 8000)'), _('PORT')),
4371 4371 ('a', 'address', '',
4372 4372 _('address to listen on (default: all interfaces)'), _('ADDR')),
4373 4373 ('', 'prefix', '',
4374 4374 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4375 4375 ('n', 'name', '',
4376 4376 _('name to show in web pages (default: working directory)'),
4377 4377 _('NAME')),
4378 4378 ('', 'web-conf', '',
4379 4379 _('name of the hgweb config file (serve more than one repository)'),
4380 4380 _('FILE')),
4381 4381 ('', 'webdir-conf', '',
4382 4382 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4383 4383 ('', 'pid-file', '',
4384 4384 _('name of file to write process ID to'), _('FILE')),
4385 4385 ('', 'stdio', None, _('for remote clients')),
4386 4386 ('t', 'templates', '',
4387 4387 _('web templates to use'), _('TEMPLATE')),
4388 4388 ('', 'style', '',
4389 4389 _('template style to use'), _('STYLE')),
4390 4390 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4391 4391 ('', 'certificate', '',
4392 4392 _('SSL certificate file'), _('FILE'))],
4393 4393 _('[OPTION]...')),
4394 4394 "showconfig|debugconfig":
4395 4395 (showconfig,
4396 4396 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4397 4397 _('[-u] [NAME]...')),
4398 4398 "^summary|sum":
4399 4399 (summary,
4400 4400 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4401 4401 "^status|st":
4402 4402 (status,
4403 4403 [('A', 'all', None, _('show status of all files')),
4404 4404 ('m', 'modified', None, _('show only modified files')),
4405 4405 ('a', 'added', None, _('show only added files')),
4406 4406 ('r', 'removed', None, _('show only removed files')),
4407 4407 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4408 4408 ('c', 'clean', None, _('show only files without changes')),
4409 4409 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4410 4410 ('i', 'ignored', None, _('show only ignored files')),
4411 4411 ('n', 'no-status', None, _('hide status prefix')),
4412 4412 ('C', 'copies', None, _('show source of copied files')),
4413 4413 ('0', 'print0', None,
4414 4414 _('end filenames with NUL, for use with xargs')),
4415 4415 ('', 'rev', [],
4416 4416 _('show difference from revision'), _('REV')),
4417 4417 ('', 'change', '',
4418 4418 _('list the changed files of a revision'), _('REV')),
4419 4419 ] + walkopts,
4420 4420 _('[OPTION]... [FILE]...')),
4421 4421 "tag":
4422 4422 (tag,
4423 4423 [('f', 'force', None, _('replace existing tag')),
4424 4424 ('l', 'local', None, _('make the tag local')),
4425 4425 ('r', 'rev', '',
4426 4426 _('revision to tag'), _('REV')),
4427 4427 ('', 'remove', None, _('remove a tag')),
4428 4428 # -l/--local is already there, commitopts cannot be used
4429 4429 ('e', 'edit', None, _('edit commit message')),
4430 4430 ('m', 'message', '',
4431 4431 _('use <text> as commit message'), _('TEXT')),
4432 4432 ] + commitopts2,
4433 4433 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4434 4434 "tags": (tags, [], ''),
4435 4435 "tip":
4436 4436 (tip,
4437 4437 [('p', 'patch', None, _('show patch')),
4438 4438 ('g', 'git', None, _('use git extended diff format')),
4439 4439 ] + templateopts,
4440 4440 _('[-p] [-g]')),
4441 4441 "unbundle":
4442 4442 (unbundle,
4443 4443 [('u', 'update', None,
4444 4444 _('update to new branch head if changesets were unbundled'))],
4445 4445 _('[-u] FILE...')),
4446 4446 "^update|up|checkout|co":
4447 4447 (update,
4448 4448 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4449 4449 ('c', 'check', None, _('check for uncommitted changes')),
4450 4450 ('d', 'date', '',
4451 4451 _('tipmost revision matching date'), _('DATE')),
4452 4452 ('r', 'rev', '',
4453 4453 _('revision'), _('REV'))],
4454 4454 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4455 4455 "verify": (verify, []),
4456 4456 "version": (version_, []),
4457 4457 }
4458 4458
4459 4459 norepo = ("clone init version help debugcommands debugcomplete debugdata"
4460 4460 " debugindex debugindexdot debugdate debuginstall debugfsinfo"
4461 4461 " debugpushkey")
4462 4462 optionalrepo = ("identify paths serve showconfig debugancestor debugdag")
@@ -1,357 +1,357 b''
1 1 Ancestor
2 2 Any changeset that can be reached by an unbroken chain of parent
3 3 changesets from a given changeset. More precisely, the ancestors
4 4 of a changeset can be defined by two properties: a parent of a
5 5 changeset is an ancestor, and a parent of an ancestor is an
6 6 ancestor. See also: 'Descendant'.
7 7
8 8 Branch
9 9 (Noun) A child changeset that has been created from a parent that
10 10 is not a head. These are known as topological branches, see
11 11 'Branch, topological'. If a topological branch is named, it becomes
12 12 a named branch. If a topological branch is not named, it becomes
13 13 an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
14 14
15 15 Branches may be created when changes are pulled from or pushed to
16 16 a remote repository, since new heads may be created by these
17 17 operations. Note that the term branch can also be used informally
18 18 to describe a development process in which certain development is
19 19 done independently of other development. This is sometimes done
20 20 explicitly with a named branch, but it can also be done locally,
21 21 using bookmarks or clones and anonymous branches.
22 22
23 23 Example: "The experimental branch".
24 24
25 25 (Verb) The action of creating a child changeset which results in
26 26 its parent having more than one child.
27 27
28 28 Example: "I'm going to branch at X".
29 29
30 30 Branch, anonymous
31 31 Every time a new child changeset is created from a parent that is not
32 32 a head and the name of the branch is not changed, a new anonymous
33 33 branch is created.
34 34
35 35 Branch, closed
36 36 A named branch whose branch heads have all been closed.
37 37
38 38 Branch, default
39 39 The branch assigned to a changeset when no name has previously been
40 40 assigned.
41 41
42 42 Branch head
43 43 See 'Head, branch'.
44 44
45 45 Branch, named
46 46 A collection of changesets which have the same branch name. By
47 47 default, children of a changeset in a named branch belong to the
48 48 same named branch. A child can be explicitly assigned to a
49 49 different branch. See :hg:`help branch`, :hg:`help branches` and
50 50 :hg:`commit --close-branch` for more information on managing
51 51 branches.
52 52
53 53 Named branches can be thought of as a kind of namespace, dividing
54 54 the collection of changesets that comprise the repository into a
55 55 collection of disjoint subsets. A named branch is not necessarily
56 56 a topological branch. If a new named branch is created from the
57 57 head of another named branch, or the default branch, but no
58 58 further changesets are added to that previous branch, then that
59 59 previous branch will be a branch in name only.
60 60
61 61 Branch tip
62 62 See 'Tip, branch'.
63 63
64 64 Branch, topological
65 65 Every time a new child changeset is created from a parent that is
66 66 not a head, a new topological branch is created. If a topological
67 67 branch is named, it becomes a named branch. If a topological
68 68 branch is not named, it becomes an anonymous branch of the
69 69 current, possibly default, branch.
70 70
71 71 Changelog
72 72 A record of the changesets in the order in which they were added
73 73 to the repository. This includes details such as changeset id,
74 74 author, commit message, date, and list of changed files.
75 75
76 76 Changeset
77 77 A snapshot of the state of the repository used to record a change.
78 78
79 79 Changeset, child
80 80 The converse of parent changeset: if P is a parent of C, then C is
81 81 a child of P. There is no limit to the number of children that a
82 82 changeset may have.
83 83
84 84 Changeset id
85 85 A SHA-1 hash that uniquely identifies a changeset. It may be
86 represented as either a "long" 40-byte hexadecimal string, or a
87 "short" 12-byte hexadecimal string.
86 represented as either a "long" 40 hexadecimal digit string, or a
87 "short" 12 hexadecimal digit string.
88 88
89 89 Changeset, merge
90 90 A changeset with two parents. This occurs when a merge is
91 91 committed.
92 92
93 93 Changeset, parent
94 94 A revision upon which a child changeset is based. Specifically, a
95 95 parent changeset of a changeset C is a changeset whose node
96 96 immediately precedes C in the DAG. Changesets have at most two
97 97 parents.
98 98
99 99 Checkout
100 100 (Noun) The working directory being updated to a specific
101 101 revision. This use should probably be avoided where possible, as
102 102 changeset is much more appropriate than checkout in this context.
103 103
104 104 Example: "I'm using checkout X."
105 105
106 106 (Verb) Updating the working directory to a specific changeset. See
107 107 :hg:`help update`.
108 108
109 109 Example: "I'm going to check out changeset X."
110 110
111 111 Child changeset
112 112 See 'Changeset, child'.
113 113
114 114 Close changeset
115 115 See 'Changeset, close'.
116 116
117 117 Closed branch
118 118 See 'Branch, closed'.
119 119
120 120 Clone
121 121 (Noun) An entire or partial copy of a repository. The partial
122 122 clone must be in the form of a revision and its ancestors.
123 123
124 124 Example: "Is your clone up to date?".
125 125
126 126 (Verb) The process of creating a clone, using :hg:`clone`.
127 127
128 128 Example: "I'm going to clone the repository".
129 129
130 130 Closed branch head
131 131 See 'Head, closed branch'.
132 132
133 133 Commit
134 134 (Noun) A synonym for changeset.
135 135
136 136 Example: "Is the bug fixed in your recent commit?"
137 137
138 138 (Verb) The act of recording changes to a repository. When files
139 139 are committed in a working directory, Mercurial finds the
140 140 differences between the committed files and their parent
141 141 changeset, creating a new changeset in the repository.
142 142
143 143 Example: "You should commit those changes now."
144 144
145 145 Cset
146 146 A common abbreviation of the term changeset.
147 147
148 148 DAG
149 149 The repository of changesets of a distributed version control
150 150 system (DVCS) can be described as a directed acyclic graph (DAG),
151 151 consisting of nodes and edges, where nodes correspond to
152 152 changesets and edges imply a parent -> child relation. This graph
153 153 can be visualized by graphical tools such as :hg:`glog`
154 154 (graphlog). In Mercurial, the DAG is limited by the requirement
155 155 for children to have at most two parents.
156 156
157 157 Default branch
158 158 See 'Branch, default'.
159 159
160 160 Descendant
161 161 Any changeset that can be reached by a chain of child changesets
162 162 from a given changeset. More precisely, the descendants of a
163 163 changeset can be defined by two properties: the child of a
164 164 changeset is a descendant, and the child of a descendant is a
165 165 descendant. See also: 'Ancestor'.
166 166
167 167 Diff
168 168 (Noun) The difference between the contents and attributes of files
169 169 in two changesets or a changeset and the current working
170 170 directory. The difference is usually represented in a standard
171 171 form called a "diff" or "patch". The "git diff" format is used
172 172 when the changes include copies, renames, or changes to file
173 173 attributes, none of which can be represented/handled by classic
174 174 "diff" and "patch".
175 175
176 176 Example: "Did you see my correction in the diff?"
177 177
178 178 (Verb) Diffing two changesets is the action of creating a diff or
179 179 patch.
180 180
181 181 Example: "If you diff with changeset X, you will see what I mean."
182 182
183 183 Directory, working
184 184 The working directory represents the state of the files tracked by
185 185 Mercurial, that will be recorded in the next commit. The working
186 186 directory initially corresponds to the snapshot at an existing
187 187 changeset, known as the parent of the working directory. See
188 188 'Parent, working directory'. The state may be modified by changes
189 189 to the files introduced manually or by a merge. The repository
190 190 metadata exists in the .hg directory inside the working directory.
191 191
192 192 Graph
193 193 See DAG and :hg:`help graphlog`.
194 194
195 195 Head
196 196 The term 'head' may be used to refer to both a branch head or a
197 197 repository head, depending on the context. See 'Head, branch' and
198 198 'Head, repository' for specific definitions.
199 199
200 200 Heads are where development generally takes place and are the
201 201 usual targets for update and merge operations.
202 202
203 203 Head, branch
204 204 A changeset with no descendants on the same named branch.
205 205
206 206 Head, closed branch
207 207 A changeset that marks a head as no longer interesting. The closed
208 208 head is no longer listed by :hg:`heads`. A branch is considered
209 209 closed when all its heads are closed and consequently is not
210 210 listed by :hg:`branches`.
211 211
212 212 Head, repository
213 213 A topological head which has not been closed.
214 214
215 215 Head, topological
216 216 A changeset with no children in the repository.
217 217
218 218 History, immutable
219 219 Once committed, changesets cannot be altered. Extensions which
220 220 appear to change history actually create new changesets that
221 221 replace existing ones, and then destroy the old changesets. Doing
222 222 so in public repositories can result in old changesets being
223 223 reintroduced to the repository.
224 224
225 225 History, rewriting
226 226 The changesets in a repository are immutable. However, extensions
227 227 to Mercurial can be used to alter the repository, usually in such
228 228 a way as to preserve changeset contents.
229 229
230 230 Immutable history
231 231 See 'History, immutable'.
232 232
233 233 Merge changeset
234 234 See 'Changeset, merge'.
235 235
236 236 Manifest
237 237 Each changeset has a manifest, which is the list of files that are
238 238 tracked by the changeset.
239 239
240 240 Merge
241 241 Used to bring together divergent branches of work. When you update
242 242 to a changeset and then merge another changeset, you bring the
243 243 history of the latter changeset into your working directory. Once
244 244 conflicts are resolved (and marked), this merge may be committed
245 245 as a merge changeset, bringing two branches together in the DAG.
246 246
247 247 Named branch
248 248 See 'Branch, named'.
249 249
250 250 Null changeset
251 251 The empty changeset. It is the parent state of newly-initialized
252 252 repositories and repositories with no checked out revision. It is
253 253 thus the parent of root changesets and the effective ancestor when
254 254 merging unrelated changesets. Can be specified by the alias 'null'
255 255 or by the changeset ID '000000000000'.
256 256
257 257 Parent
258 258 See 'Changeset, parent'.
259 259
260 260 Parent changeset
261 261 See 'Changeset, parent'.
262 262
263 263 Parent, working directory
264 264 The working directory parent reflects a virtual revision which is
265 265 the child of the changeset (or two changesets with an uncommitted
266 266 merge) shown by :hg:`parents`. This is changed with
267 267 :hg:`update`. Other commands to see the working directory parent
268 268 are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
269 269
270 270 Patch
271 271 (Noun) The product of a diff operation.
272 272
273 273 Example: "I've sent you my patch."
274 274
275 275 (Verb) The process of using a patch file to transform one
276 276 changeset into another.
277 277
278 278 Example: "You will need to patch that revision."
279 279
280 280 Pull
281 281 An operation in which changesets in a remote repository which are
282 282 not in the local repository are brought into the local
283 283 repository. Note that this operation without special arguments
284 284 only updates the repository, it does not update the files in the
285 285 working directory. See :hg:`help pull`.
286 286
287 287 Push
288 288 An operation in which changesets in a local repository which are
289 289 not in a remote repository are sent to the remote repository. Note
290 290 that this operation only adds changesets which have been committed
291 291 locally to the remote repository. Uncommitted changes are not
292 292 sent. See :hg:`help push`.
293 293
294 294 Repository
295 295 The metadata describing all recorded states of a collection of
296 296 files. Each recorded state is represented by a changeset. A
297 297 repository is usually (but not always) found in the ``.hg``
298 298 subdirectory of a working directory. Any recorded state can be
299 299 recreated by "updating" a working directory to a specific
300 300 changeset.
301 301
302 302 Repository head
303 303 See 'Head, repository'.
304 304
305 305 Revision
306 306 A state of the repository at some point in time. Earlier revisions
307 307 can be updated to by using :hg:`update`. See also 'Revision
308 308 number'; See also 'Changeset'.
309 309
310 310 Revision number
311 311 This integer uniquely identifies a changeset in a specific
312 312 repository. It represents the order in which changesets were added
313 313 to a repository, starting with revision number 0. Note that the
314 314 revision number may be different in each clone of a repository. To
315 315 identify changesets uniquely between different clones, see
316 316 'Changeset id'.
317 317
318 318 Revlog
319 319 History storage mechanism used by Mercurial. It is a form of delta
320 320 encoding, with occasional full revision of data followed by delta
321 321 of each successive revision. It includes data and an index
322 322 pointing to the data.
323 323
324 324 Rewriting history
325 325 See 'History, rewriting'.
326 326
327 327 Root
328 328 A changeset that has only the null changeset as its parent. Most
329 329 repositories have only a single root changeset.
330 330
331 331 Tip
332 332 The changeset with the highest revision number. It is the changeset
333 333 most recently added in a repository.
334 334
335 335 Tip, branch
336 336 The head of a given branch with the highest revision number. When
337 337 a branch name is used as a revision identifier, it refers to the
338 338 branch tip. See also 'Branch, head'. Note that because revision
339 339 numbers may be different in different repository clones, the
340 340 branch tip may be different in different cloned repositories.
341 341
342 342 Update
343 343 (Noun) Another synonym of changeset.
344 344
345 345 Example: "I've pushed an update".
346 346
347 347 (Verb) This term is usually used to describe updating the state of
348 348 the working directory to that of a specific changeset. See
349 349 :hg:`help update`.
350 350
351 351 Example: "You should update".
352 352
353 353 Working directory
354 354 See 'Directory, working'.
355 355
356 356 Working directory parent
357 357 See 'Parent, working directory'.
@@ -1,153 +1,153 b''
1 1 Mercurial allows you to customize output of commands through
2 2 templates. You can either pass in a template from the command
3 3 line, via the --template option, or select an existing
4 4 template-style (--style).
5 5
6 6 You can customize output for any "log-like" command: log,
7 7 outgoing, incoming, tip, parents, heads and glog.
8 8
9 9 Four styles are packaged with Mercurial: default (the style used
10 10 when no explicit preference is passed), compact, changelog,
11 11 and xml.
12 12 Usage::
13 13
14 14 $ hg log -r1 --style changelog
15 15
16 16 A template is a piece of text, with markup to invoke variable
17 17 expansion::
18 18
19 19 $ hg log -r1 --template "{node}\n"
20 20 b56ce7b07c52de7d5fd79fb89701ea538af65746
21 21
22 22 Strings in curly braces are called keywords. The availability of
23 23 keywords depends on the exact context of the templater. These
24 24 keywords are usually available for templating a log-like command:
25 25
26 26 :author: String. The unmodified author of the changeset.
27 27
28 28 :branches: String. The name of the branch on which the changeset was
29 29 committed. Will be empty if the branch name was default.
30 30
31 31 :children: List of strings. The children of the changeset.
32 32
33 33 :date: Date information. The date when the changeset was committed.
34 34
35 35 :desc: String. The text of the changeset description.
36 36
37 37 :diffstat: String. Statistics of changes with the following format:
38 38 "modified files: +added/-removed lines"
39 39
40 40 :files: List of strings. All files modified, added, or removed by this
41 41 changeset.
42 42
43 43 :file_adds: List of strings. Files added by this changeset.
44 44
45 45 :file_copies: List of strings. Files copied in this changeset with
46 46 their sources.
47 47
48 48 :file_copies_switch: List of strings. Like "file_copies" but displayed
49 49 only if the --copied switch is set.
50 50
51 51 :file_mods: List of strings. Files modified by this changeset.
52 52
53 53 :file_dels: List of strings. Files removed by this changeset.
54 54
55 :node: String. The changeset identification hash, as a 40-character
56 hexadecimal string.
55 :node: String. The changeset identification hash, as a 40 hexadecimal
56 digit string.
57 57
58 58 :parents: List of strings. The parents of the changeset.
59 59
60 60 :rev: Integer. The repository-local changeset revision number.
61 61
62 62 :tags: List of strings. Any tags associated with the changeset.
63 63
64 64 :latesttag: String. Most recent global tag in the ancestors of this
65 65 changeset.
66 66
67 67 :latesttagdistance: Integer. Longest path to the latest tag.
68 68
69 69 The "date" keyword does not produce human-readable output. If you
70 70 want to use a date in your output, you can use a filter to process
71 71 it. Filters are functions which return a string based on the input
72 72 variable. Be sure to use the stringify filter first when you're
73 73 applying a string-input filter to a list-like input variable.
74 74 You can also use a chain of filters to get the desired output::
75 75
76 76 $ hg tip --template "{date|isodate}\n"
77 77 2008-08-21 18:22 +0000
78 78
79 79 List of filters:
80 80
81 81 :addbreaks: Any text. Add an XHTML "<br />" tag before the end of
82 82 every line except the last.
83 83
84 84 :age: Date. Returns a human-readable date/time difference between the
85 85 given date/time and the current date/time.
86 86
87 87 :basename: Any text. Treats the text as a path, and returns the last
88 88 component of the path after splitting by the path separator
89 89 (ignoring trailing separators). For example, "foo/bar/baz" becomes
90 90 "baz" and "foo/bar//" becomes "bar".
91 91
92 92 :stripdir: Treat the text as path and strip a directory level, if
93 93 possible. For example, "foo" and "foo/bar" becomes "foo".
94 94
95 95 :date: Date. Returns a date in a Unix date format, including the
96 96 timezone: "Mon Sep 04 15:13:13 2006 0700".
97 97
98 98 :domain: Any text. Finds the first string that looks like an email
99 99 address, and extracts just the domain component. Example: ``User
100 100 <user@example.com>`` becomes ``example.com``.
101 101
102 102 :email: Any text. Extracts the first string that looks like an email
103 103 address. Example: ``User <user@example.com>`` becomes
104 104 ``user@example.com``.
105 105
106 106 :escape: Any text. Replaces the special XML/XHTML characters "&", "<"
107 107 and ">" with XML entities.
108 108
109 109 :fill68: Any text. Wraps the text to fit in 68 columns.
110 110
111 111 :fill76: Any text. Wraps the text to fit in 76 columns.
112 112
113 113 :firstline: Any text. Returns the first line of text.
114 114
115 115 :nonempty: Any text. Returns '(none)' if the string is empty.
116 116
117 117 :hgdate: Date. Returns the date as a pair of numbers: "1157407993
118 118 25200" (Unix timestamp, timezone offset).
119 119
120 120 :isodate: Date. Returns the date in ISO 8601 format: "2009-08-18 13:00
121 121 +0200".
122 122
123 123 :isodatesec: Date. Returns the date in ISO 8601 format, including
124 124 seconds: "2009-08-18 13:00:13 +0200". See also the rfc3339date
125 125 filter.
126 126
127 127 :localdate: Date. Converts a date to local date.
128 128
129 129 :obfuscate: Any text. Returns the input text rendered as a sequence of
130 130 XML entities.
131 131
132 132 :person: Any text. Returns the text before an email address.
133 133
134 134 :rfc822date: Date. Returns a date using the same format used in email
135 135 headers: "Tue, 18 Aug 2009 13:00:13 +0200".
136 136
137 137 :rfc3339date: Date. Returns a date using the Internet date format
138 138 specified in RFC 3339: "2009-08-18T13:00:13+02:00".
139 139
140 140 :short: Changeset hash. Returns the short form of a changeset hash,
141 i.e. a 12-byte hexadecimal string.
141 i.e. a 12 hexadecimal digit string.
142 142
143 143 :shortdate: Date. Returns a date like "2006-09-18".
144 144
145 145 :strip: Any text. Strips all leading and trailing whitespace.
146 146
147 147 :tabindent: Any text. Returns the text, with every line except the
148 148 first starting with a tab character.
149 149
150 150 :urlescape: Any text. Escapes all "special" characters. For example,
151 151 "foo bar" becomes "foo%20bar".
152 152
153 153 :user: Any text. Returns the user portion of an email address.
General Comments 0
You need to be logged in to leave comments. Login now