Mercurial > hg-stable
changeset 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 | 552329013bac |
| children | 0c81948636f3 |
| files | mercurial/fileset.py mercurial/revset.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/fileset.py Fri Jun 24 00:18:41 2011 +0200 +++ b/mercurial/fileset.py Wed Jun 22 01:55:00 2011 +0200 @@ -282,7 +282,7 @@ - 4k - 1MB (files from 4096 bytes to 1048576 bytes) """ - expr = getstring(x, _("grep requires a pattern")).strip() + expr = getstring(x, _("size requires an expression")).strip() if '-' in expr: # do we have a range? a, b = expr.split('-', 1) a = _sizetoint(a)
--- a/mercurial/revset.py Fri Jun 24 00:18:41 2011 +0200 +++ b/mercurial/revset.py Wed Jun 22 01:55:00 2011 +0200 @@ -417,7 +417,7 @@ l = getargs(x, 0, 1, _("follow takes no arguments or a filename")) p = repo['.'].rev() if l: - x = getstring(l[0], "follow expected a filename") + x = getstring(l[0], _("follow expected a filename")) s = set(ctx.rev() for ctx in repo['.'][x].ancestors()) else: s = set(repo.changelog.ancestors(p)) @@ -604,7 +604,7 @@ """ import hg # avoid start-up nasties # i18n: "outgoing" is a keyword - l = getargs(x, 0, 1, _("outgoing requires a repository path")) + l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) # i18n: "outgoing" is a keyword dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')