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