# HG changeset patch # User Mads Kiilerich # Date 2011-06-21 23:55:00 # Node ID c8ee2729e89f4c8951b505c0317bddf97e908c20 # Parent 552329013bacd043d48d19688611e180bbff58c6 revset and fileset: fix typos in parser error messages diff --git a/mercurial/fileset.py b/mercurial/fileset.py --- a/mercurial/fileset.py +++ b/mercurial/fileset.py @@ -282,7 +282,7 @@ def size(mctx, x): - 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) diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -417,7 +417,7 @@ def follow(repo, subset, x): 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 @@ def outgoing(repo, subset, x): """ 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')