Mercurial > hg
comparison mercurial/revset.py @ 14717:c8ee2729e89f stable
revset and fileset: fix typos in parser error messages
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 22 Jun 2011 01:55:00 +0200 |
parents | a97ebfec8c29 |
children | b9faf94ee196 |
comparison
equal
deleted
inserted
replaced
14716:552329013bac | 14717:c8ee2729e89f |
---|---|
415 """ | 415 """ |
416 # i18n: "follow" is a keyword | 416 # i18n: "follow" is a keyword |
417 l = getargs(x, 0, 1, _("follow takes no arguments or a filename")) | 417 l = getargs(x, 0, 1, _("follow takes no arguments or a filename")) |
418 p = repo['.'].rev() | 418 p = repo['.'].rev() |
419 if l: | 419 if l: |
420 x = getstring(l[0], "follow expected a filename") | 420 x = getstring(l[0], _("follow expected a filename")) |
421 s = set(ctx.rev() for ctx in repo['.'][x].ancestors()) | 421 s = set(ctx.rev() for ctx in repo['.'][x].ancestors()) |
422 else: | 422 else: |
423 s = set(repo.changelog.ancestors(p)) | 423 s = set(repo.changelog.ancestors(p)) |
424 | 424 |
425 s |= set([p]) | 425 s |= set([p]) |
602 Changesets not found in the specified destination repository, or the | 602 Changesets not found in the specified destination repository, or the |
603 default push location. | 603 default push location. |
604 """ | 604 """ |
605 import hg # avoid start-up nasties | 605 import hg # avoid start-up nasties |
606 # i18n: "outgoing" is a keyword | 606 # i18n: "outgoing" is a keyword |
607 l = getargs(x, 0, 1, _("outgoing requires a repository path")) | 607 l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) |
608 # i18n: "outgoing" is a keyword | 608 # i18n: "outgoing" is a keyword |
609 dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' | 609 dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' |
610 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | 610 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
611 dest, branches = hg.parseurl(dest) | 611 dest, branches = hg.parseurl(dest) |
612 revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | 612 revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |