| Message ID | xmqqsh0uln5c.fsf_-_@gitster-ct.c.googlers.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | http: give curl version warnings consistently | expand |
On Thu, Oct 25, 2018 at 12:29:19PM +0900, Junio C Hamano wrote: > When a requested feature cannot be activated because the version of > cURL library used to build Git with is too old, most of the codepaths > give a warning like "$Feature is not supported with cURL < $Version", > marked for l10n. A few of them, however, did not follow that pattern > and said things like "$Feature is not activated, your curl version is > too old (>= $Version)", and without marking them for l10n. > > Update these to match the style of the majority of warnings and mark > them for l10n. This is definitely an improvement. > @@ -908,8 +907,7 @@ static CURL *get_curl_handle(void) > curl_easy_setopt(result, CURLOPT_PROTOCOLS, > get_curl_allowed_protocols(-1)); > #else > - warning("protocol restrictions not applied to curl redirects because\n" > - "your curl version is too old (>= 7.19.4)"); > + warning(_("Protocol restrictions not supported with cURL < 7.19.4")); This loses the mention of redirects, but I think that is actually a bonus. The #ifdef'd code covers both original and redirected requests. -Peff
Hi Junio, On Thu, 25 Oct 2018, Junio C Hamano wrote: > When a requested feature cannot be activated because the version of > cURL library used to build Git with is too old, most of the codepaths > give a warning like "$Feature is not supported with cURL < $Version", > marked for l10n. A few of them, however, did not follow that pattern > and said things like "$Feature is not activated, your curl version is > too old (>= $Version)", and without marking them for l10n. > > Update these to match the style of the majority of warnings and mark > them for l10n. > > Signed-off-by: Junio C Hamano <gitster@pobox.com> > --- I like this patch better than the one I had prepared for v2, so I dropped it again, and "hit the Submit button". Ciao, Dscho > > > I have a clean-up suggestion related to this but is orthogonal to > > this three-patch series (after the fix-up is applied, anyway), which > > I'll be sending out separately. > > So, here it is. > > http.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/http.c b/http.c > index 43e75ac583..2214100e3b 100644 > --- a/http.c > +++ b/http.c > @@ -834,8 +834,7 @@ static CURL *get_curl_handle(void) > #if LIBCURL_VERSION_NUM >= 0x072c00 > curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); > #else > - warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n" > - "your curl version is too old (< 7.44.0)"); > + warning(_("CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0")); > #endif > } > > @@ -908,8 +907,7 @@ static CURL *get_curl_handle(void) > curl_easy_setopt(result, CURLOPT_PROTOCOLS, > get_curl_allowed_protocols(-1)); > #else > - warning("protocol restrictions not applied to curl redirects because\n" > - "your curl version is too old (>= 7.19.4)"); > + warning(_("Protocol restrictions not supported with cURL < 7.19.4")); > #endif > if (getenv("GIT_CURL_VERBOSE")) > curl_easy_setopt(result, CURLOPT_VERBOSE, 1L); > -- > 2.19.1-542-gc4df23f792 > >
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > On Thu, 25 Oct 2018, Junio C Hamano wrote: > >> When a requested feature cannot be activated because the version of >> cURL library used to build Git with is too old, most of the codepaths >> give a warning like "$Feature is not supported with cURL < $Version", >> marked for l10n. A few of them, however, did not follow that pattern >> and said things like "$Feature is not activated, your curl version is >> too old (>= $Version)", and without marking them for l10n. >> >> Update these to match the style of the majority of warnings and mark >> them for l10n. >> >> Signed-off-by: Junio C Hamano <gitster@pobox.com> >> --- > > I like this patch better than the one I had prepared for v2, so I dropped > it again, and "hit the Submit button". I took your v3 and queue this on top, instead of the previous one on which this was prepared. By the way, I wondered if we want to unify them by introducing static void curl_version_warning(const char *feature, const char *verstring) { warning(_("%s is not supported with cURL < %s"), feature, verstring); } so that translators need to deal with a single instance of the message, but the "feature" part may have to get localized, in which case we'd end up with sentence lego, which is not a good idea, so I dropped it. Thanks.
diff --git a/http.c b/http.c index 43e75ac583..2214100e3b 100644 --- a/http.c +++ b/http.c @@ -834,8 +834,7 @@ static CURL *get_curl_handle(void) #if LIBCURL_VERSION_NUM >= 0x072c00 curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); #else - warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n" - "your curl version is too old (< 7.44.0)"); + warning(_("CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0")); #endif } @@ -908,8 +907,7 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_PROTOCOLS, get_curl_allowed_protocols(-1)); #else - warning("protocol restrictions not applied to curl redirects because\n" - "your curl version is too old (>= 7.19.4)"); + warning(_("Protocol restrictions not supported with cURL < 7.19.4")); #endif if (getenv("GIT_CURL_VERBOSE")) curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);