Patchwork [5,of,9] repo: clarify 'requires feature' error further, suggest enabling the feature

login
register
mail settings
Submitter Mads Kiilerich
Date March 19, 2014, 11:45 a.m.
Message ID <53298376.2050600@kiilerich.com>
Download mbox | patch
Permalink /patch/3988/
State Rejected
Headers show

Comments

Mads Kiilerich - March 19, 2014, 11:45 a.m.
On 03/19/2014 03:59 AM, Siddharth Agarwal wrote:
> On 03/18/2014 04:33 PM, Mads Kiilerich wrote:
>>               _("unknown repository format: requires features '%s' 
>> (upgrade "
>> -              "Mercurial)") % "', '".join(missings),
>> +              "Mercurial or enable feature)") % "', '".join(missings),
>
> Could you turn this into a hint, please?

Your aggressive trimming lost important context. There is already a hint:



It must thus more be a comment to http://selenic.com/hg/rev/b93791e0de25 
. Why did that changeset add a "real" Abort hint while keeping the 
parens in the primary abort message?

/Mads
Matt Mackall - March 19, 2014, 5:46 p.m.
On Wed, 2014-03-19 at 12:45 +0100, Mads Kiilerich wrote:
> On 03/19/2014 03:59 AM, Siddharth Agarwal wrote:
> > On 03/18/2014 04:33 PM, Mads Kiilerich wrote:
> >>               _("unknown repository format: requires features '%s' 
> >> (upgrade "
> >> -              "Mercurial)") % "', '".join(missings),
> >> +              "Mercurial or enable feature)") % "', '".join(missings),
> >
> > Could you turn this into a hint, please?
> 
> Your aggressive trimming lost important context. There is already a hint:
> 
> --- a/mercurial/scmutil.py
> +++ b/mercurial/scmutil.py
> @@ -735,7 +735,7 @@ def readrequires(opener, supported):
>       if missings:
>           raise error.RequirementError(
>               _("unknown repository format: requires features '%s' (upgrade "
> -              "Mercurial)") % "', '".join(missings),
> +              "Mercurial or enable feature)") % "', '".join(missings),
>               hint=_("seehttp://mercurial.selenic.com/wiki/MissingRequirement"
>                      " for details"))
>       return requirements
> 
> 
> It must thus more be a comment to http://selenic.com/hg/rev/b93791e0de25 
> . Why did that changeset add a "real" Abort hint while keeping the 
> parens in the primary abort message?

Yes, let's just drop the fake/misleading hint.

Patch

--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -735,7 +735,7 @@  def readrequires(opener, supported):
      if missings:
          raise error.RequirementError(
              _("unknown repository format: requires features '%s' (upgrade "
-              "Mercurial)") % "', '".join(missings),
+              "Mercurial or enable feature)") % "', '".join(missings),
              hint=_("seehttp://mercurial.selenic.com/wiki/MissingRequirement"
                     " for details"))
      return requirements