From mboxrd@z Thu Jan 1 00:00:00 1970 From: tboegi@web.de Subject: [PATCH v2 6/7] convert.c: Refactor crlf_action Date: Thu, 4 Feb 2016 18:49:58 +0100 Message-ID: <1454608198-5495-1-git-send-email-tboegi@web.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Feb 04 18:49:06 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aRO1h-0001FL-Ao for gcvg-git-2@plane.gmane.org; Thu, 04 Feb 2016 18:49:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758063AbcBDRtB convert rfc822-to-quoted-printable (ORCPT ); Thu, 4 Feb 2016 12:49:01 -0500 Received: from mout.web.de ([212.227.17.11]:59519 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758015AbcBDRs6 (ORCPT ); Thu, 4 Feb 2016 12:48:58 -0500 Received: from tor.lan ([195.252.60.88]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0M9GN8-1aLM9f0TRm-00CeR5; Thu, 04 Feb 2016 18:48:57 +0100 X-Mailer: git-send-email 2.7.0.303.g2c4f448.dirty In-Reply-To: In-Reply-To: References: X-Provags-ID: V03:K0:m6L4lhqHU6ArHTn8XDAcVeZq18JH4Q4HFPsAYwcc0QwvqVBFh1i nwwTKv8Hcjpx5OkBI2D9qNEy2/A5NmN67de2PJStFM9a0b+qCywsPqqzS/86AkKWaAEXBxh Kc3ik6xPrmMqYpfxDUXKrAV69e7ywizz0PVuD5cp4BySvDd6DrlhuwX6ZRox2JMOVwAxEkn v5brWGSUOraxJkcWysKbA== X-UI-Out-Filterresults: notjunk:1;V01:K0:0pTlmNK1sF4=:kaP7QqKrf+WFRZgI31igHC 5ETS7x55v2qk3jYCVD/x9qhe5u2+Xj03ceN6uctmSj85k5+Gox0fe2cCMfNaUH34ltxRclF6A z1ptk9MDANvNT4DZfnR7+EsM84AuYHuZ1miOS8ccWORScOkTOEly+ceUDPP4s3MFW08iFh6ak aKMVzCkqOroE10B5/lXO3ZqH4Rn9m+K+DrmS6MTYNTzt5vewOH26T9aDeyuIcCFtNrcHwJit7 ZLxfiYAd1a44adld67Hd1STabB6ln9S1eXHKTdPfcovCg98QV3nRDf3SZUdtWfSSfjrpWL1mz 6y173FJweaNX3ej7gj0WFqEtAiJ5C1lrEHH7pNNb2Wc+FCMjOTqmtIqQLZlL2/wDAWXvNcMuJ 4apAGZVpifC8cHZ5HD8iyMU66PGMJDjBSwvFYzQa/uGXKFaLw6X2Zmg1fjrLnpglsQcDBe/va RuppDZWffqKx/RlJkPQKsxYFoaknfvcNIDzNZY2FkD7kW7mRk0iTlMUgwvTm/xj3tR2ITb1wF i88tacVP4p9hF9TQUuuHEyzcZNpAe9bu4BS3rXcWyZsw5Cde9NH3PcEhBM/2YptbKaxazcILC fFLZ4f3WImkkIq6aaALN5naDCasG3caqsyKVkjAUyB1XUL2glzRlrK4/tHkha59/A0SQmCfGS RJByjlvc2vwwSIIO/RzOpR1HTZsJUR9suxoagB0v3HezgMmvdCL5Qhyn5KCsm2HAL9BTNDvqe J/8gfdEorge4/9426hgq92Lnxm0+zVN+Pct7mfrxdbOrWybNRds4oIjD7hdmiPA6YJPfF6iK Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Torsten B=C3=B6gershausen Refactor the determination and usage of crlf_action. Today, when no attributes are set on a file, crlf_action is set to CRLF_GUESS, and later, CRLF_GUESS is used as an indication that core.autocrlf is not false and that some automatic eol conversion is needed. Make more clear, what is what, by defining: - CRLF_UNDEFINED : No attributes set. Temparally used, until core.autoc= rlf and core.eol is evaluated and one of CRLF_BINARY, CRLF_AUTO_INPUT or CRLF_AUTO_CRLF is selected - CRLF_BINARY : No processing of line endings. - CRLF_TEXT : attribute "text" is set, line endings are processed. - CRLF_TEXT_INPUT: attribute "input" or "eol=3Dlf" is set. This implies= text. - CRLF_TEXT_CRLF : attribute "eol=3Dcrlf" is set. This implies text. - CRLF_AUTO : attribute "auto" is set. - CRLF_AUTO_INPUT: No attributes, core.autocrlf=3Dinput - CRLF_AUTO_CRLF : No attributes, core.autocrlf=3Dtrue Signed-off-by: Torsten B=C3=B6gershausen --- convert.c | 77 ++++++++++++++++++++++++++++++++++++++-----------------= -------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/convert.c b/convert.c index 4e33db1..dd9646a 100644 --- a/convert.c +++ b/convert.c @@ -19,12 +19,14 @@ #define CONVERT_STAT_BITS_BIN 0x4 =20 enum crlf_action { - CRLF_GUESS =3D -1, - CRLF_BINARY =3D 0, + CRLF_UNDEFINED, + CRLF_BINARY, CRLF_TEXT, - CRLF_INPUT, - CRLF_CRLF, - CRLF_AUTO + CRLF_TEXT_INPUT, + CRLF_TEXT_CRLF, + CRLF_AUTO, + CRLF_AUTO_INPUT, + CRLF_AUTO_CRLF }; =20 struct text_stat { @@ -167,18 +169,19 @@ static enum eol output_eol(enum crlf_action crlf_= action) switch (crlf_action) { case CRLF_BINARY: return EOL_UNSET; - case CRLF_CRLF: + case CRLF_TEXT_CRLF: return EOL_CRLF; - case CRLF_INPUT: + case CRLF_TEXT_INPUT: return EOL_LF; - case CRLF_GUESS: - if (!auto_crlf) - return EOL_UNSET; - /* fall through */ + case CRLF_UNDEFINED: + case CRLF_AUTO_CRLF: + case CRLF_AUTO_INPUT: case CRLF_TEXT: case CRLF_AUTO: + /* fall through */ return text_eol_is_crlf() ? EOL_CRLF : EOL_LF; } + warning("Illegal crlf_action %d\n", (int)crlf_action); return core_eol; } =20 @@ -247,11 +250,11 @@ static int crlf_to_git(const char *path, const ch= ar *src, size_t len, =20 gather_stats(src, len, &stats); =20 - if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_GUESS) { + if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_AUTO_INPU= T || crlf_action =3D=3D CRLF_AUTO_CRLF) { if (convert_is_binary(len, &stats)) return 0; =20 - if (crlf_action =3D=3D CRLF_GUESS) { + if (crlf_action =3D=3D CRLF_AUTO_INPUT || crlf_action =3D=3D CRLF_AU= TO_CRLF) { /* * If the file in the index has any CR in it, do not convert. * This is the new safer autocrlf handling. @@ -278,7 +281,7 @@ static int crlf_to_git(const char *path, const char= *src, size_t len, if (strbuf_avail(buf) + buf->len < len) strbuf_grow(buf, len - buf->len); dst =3D buf->buf; - if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_GUESS) { + if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_AUTO_INPU= T || crlf_action =3D=3D CRLF_AUTO_CRLF) { /* * If we guessed, we already know we rejected a file with * lone CR, and we can strip a CR without looking at what @@ -319,8 +322,8 @@ static int crlf_to_worktree(const char *path, const= char *src, size_t len, if (stats.lf =3D=3D stats.crlf) return 0; =20 - if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_GUESS) { - if (crlf_action =3D=3D CRLF_GUESS) { + if (crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_AUTO_INPU= T || crlf_action =3D=3D CRLF_AUTO_CRLF) { + if (crlf_action =3D=3D CRLF_AUTO_INPUT || crlf_action =3D=3D CRLF_AU= TO_CRLF) { /* If we have any CR or CRLF line endings, we do not touch it */ /* This is the new safer autocrlf-handling */ if (stats.cr > 0 || stats.crlf > 0) @@ -708,16 +711,16 @@ static enum crlf_action git_path_check_crlf(struc= t git_attr_check *check) const char *value =3D check->value; =20 if (ATTR_TRUE(value)) - return CRLF_TEXT; + return text_eol_is_crlf() ? CRLF_TEXT_CRLF : CRLF_TEXT_INPUT; else if (ATTR_FALSE(value)) return CRLF_BINARY; else if (ATTR_UNSET(value)) ; else if (!strcmp(value, "input")) - return CRLF_INPUT; + return CRLF_TEXT_INPUT; else if (!strcmp(value, "auto")) return CRLF_AUTO; - return CRLF_GUESS; + return CRLF_UNDEFINED; } =20 static enum eol git_path_check_eol(struct git_attr_check *check) @@ -780,7 +783,7 @@ static void convert_attrs(struct conv_attrs *ca, co= nst char *path) if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) { enum eol eol_attr; ca->crlf_action =3D git_path_check_crlf(ccheck + 4); - if (ca->crlf_action =3D=3D CRLF_GUESS) + if (ca->crlf_action =3D=3D CRLF_UNDEFINED) ca->crlf_action =3D git_path_check_crlf(ccheck + 0); ca->attr_action =3D ca->crlf_action; ca->ident =3D git_path_check_ident(ccheck + 1); @@ -789,16 +792,22 @@ static void convert_attrs(struct conv_attrs *ca, = const char *path) return; eol_attr =3D git_path_check_eol(ccheck + 3); if (eol_attr =3D=3D EOL_LF) - ca->crlf_action =3D CRLF_INPUT; + ca->crlf_action =3D CRLF_TEXT_INPUT; else if (eol_attr =3D=3D EOL_CRLF) - ca->crlf_action =3D CRLF_CRLF; + ca->crlf_action =3D CRLF_TEXT_CRLF; } else { ca->drv =3D NULL; - ca->crlf_action =3D CRLF_GUESS; + ca->crlf_action =3D CRLF_UNDEFINED; ca->ident =3D 0; } - if (ca->crlf_action =3D=3D CRLF_GUESS && auto_crlf =3D=3D AUTO_CRLF_F= ALSE) + if (ca->crlf_action =3D=3D CRLF_TEXT) + ca->crlf_action =3D text_eol_is_crlf() ? CRLF_TEXT_CRLF : CRLF_TEXT_= INPUT; + if (ca->crlf_action =3D=3D CRLF_UNDEFINED && auto_crlf =3D=3D AUTO_CR= LF_FALSE) ca->crlf_action =3D CRLF_BINARY; + if (ca->crlf_action =3D=3D CRLF_UNDEFINED && auto_crlf =3D=3D AUTO_CR= LF_TRUE) + ca->crlf_action =3D CRLF_AUTO_CRLF; + if (ca->crlf_action =3D=3D CRLF_UNDEFINED && auto_crlf =3D=3D AUTO_CR= LF_INPUT) + ca->crlf_action =3D CRLF_AUTO_INPUT; } =20 int would_convert_to_git_filter_fd(const char *path) @@ -826,18 +835,22 @@ const char *get_convert_attr_ascii(const char *pa= th) =20 convert_attrs(&ca, path); switch (ca.attr_action) { - case CRLF_GUESS: + case CRLF_UNDEFINED: return ""; case CRLF_BINARY: return "-text"; case CRLF_TEXT: return "text"; - case CRLF_INPUT: + case CRLF_TEXT_INPUT: return "text eol=3Dlf"; - case CRLF_CRLF: - return "text=3Dauto eol=3Dcrlf"; + case CRLF_TEXT_CRLF: + return "text eol=3Dcrlf"; case CRLF_AUTO: return "text=3Dauto"; + case CRLF_AUTO_CRLF: + return "text=3Dauto eol=3Dcrlf"; /* This is not supported yet */ + case CRLF_AUTO_INPUT: + return "text=3Dauto eol=3Dlf"; /* This is not supported yet */ } return ""; } @@ -1382,11 +1395,13 @@ struct stream_filter *get_stream_filter(const c= har *path, const unsigned char *s filter =3D ident_filter(sha1); =20 crlf_action =3D ca.crlf_action; - - if ((crlf_action =3D=3D CRLF_BINARY) || (crlf_action =3D=3D CRLF_INPU= T)) + if ((crlf_action =3D=3D CRLF_BINARY) || + (crlf_action =3D=3D CRLF_TEXT_INPUT)) filter =3D cascade_filter(filter, &null_filter_singleton); =20 - else if ((crlf_action =3D=3D CRLF_AUTO || crlf_action =3D=3D CRLF_GUE= SS)) + else if ((crlf_action =3D=3D CRLF_AUTO || + crlf_action =3D=3D CRLF_AUTO_INPUT || + crlf_action =3D=3D CRLF_AUTO_CRLF)) ; else if (output_eol(crlf_action) =3D=3D EOL_CRLF) filter =3D cascade_filter(filter, lf_to_crlf_filter()); --=20 2.7.0.303.g2c4f448.dirty