undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert: give saner names to crlf/eol variables, types and functions

Browse Source 
Back when the conversion was only about the end-of-line convention, it
might have made sense to call what we do upon seeing CR/LF simply an
"action", but these days the conversion routines do a lot more than just
tweaking the line ending.  Raname "action" to "crlf_action".

The function that decides what end of line conversion to use on the output
codepath was called "determine_output_conversion", as if there is no other
kind of output conversion.  Rename it to "output_eol"; it is a function
that returns what EOL convention is to be used.

A function that decides what "crlf_action" needs to be used on the input
codepath, given what conversion attribute is set to the path and global
end-of-line convention, was called "determine_action".  Rename it to
"input_crlf_action".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-05-09 13:12:57 -07:00
parent ec70f52f6f
commit c61dcff9d6
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
convert.c
View File

@ -12,7 +12,7 @@
* translation when the "text" attribute or "auto_crlf" option is set. * translation when the "text" attribute or "auto_crlf" option is set.
*/ */
enum action { enum crlf_action {
CRLF_GUESS = -1, CRLF_GUESS = -1,
CRLF_BINARY = 0, CRLF_BINARY = 0,
CRLF_TEXT, CRLF_TEXT,
@ -94,9 +94,9 @@ static int is_binary(unsigned long size, struct text_stat *stats)
return 0; return 0;
} }
static enum eol determine_output_conversion(enum action action) static enum eol output_eol(enum crlf_action crlf_action)
{ {
switch (action) { switch (crlf_action) {
case CRLF_BINARY: case CRLF_BINARY:
return EOL_UNSET; return EOL_UNSET;
case CRLF_CRLF: case CRLF_CRLF:
@ -119,13 +119,13 @@ static enum eol determine_output_conversion(enum action action)
return core_eol; return core_eol;
} }
static void check_safe_crlf(const char *path, enum action action, static void check_safe_crlf(const char *path, enum crlf_action crlf_action,
struct text_stat *stats, enum safe_crlf checksafe) struct text_stat *stats, enum safe_crlf checksafe)
{ {
if (!checksafe) if (!checksafe)
return; return;
if (determine_output_conversion(action) == EOL_LF) { if (output_eol(crlf_action) == EOL_LF) {
/* /*
* CRLFs would not be restored by checkout: * CRLFs would not be restored by checkout:
* check if we'd remove CRLFs * check if we'd remove CRLFs
@ -136,7 +136,7 @@ static void check_safe_crlf(const char *path, enum action action,
else /* i.e. SAFE_CRLF_FAIL */ else /* i.e. SAFE_CRLF_FAIL */
die("CRLF would be replaced by LF in %s.", path); die("CRLF would be replaced by LF in %s.", path);
} }
} else if (determine_output_conversion(action) == EOL_CRLF) { } else if (output_eol(crlf_action) == EOL_CRLF) {
/* /*
* CRLFs would be added by checkout: * CRLFs would be added by checkout:
* check if we have "naked" LFs * check if we have "naked" LFs
@ -188,18 +188,19 @@ static int has_cr_in_index(const char *path)
} }
static int crlf_to_git(const char *path, const char *src, size_t len, static int crlf_to_git(const char *path, const char *src, size_t len,
struct strbuf *buf, enum action action, enum safe_crlf checksafe) struct strbuf *buf,
enum crlf_action crlf_action, enum safe_crlf checksafe)
{ {
struct text_stat stats; struct text_stat stats;
char *dst; char *dst;
if (action == CRLF_BINARY || if (crlf_action == CRLF_BINARY ||
(action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) || !len) (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) || !len)
return 0; return 0;
gather_stats(src, len, &stats); gather_stats(src, len, &stats);
if (action == CRLF_AUTO || action == CRLF_GUESS) { if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) {
/* /*
* We're currently not going to even try to convert stuff * We're currently not going to even try to convert stuff
* that has bare CR characters. Does anybody do that crazy * that has bare CR characters. Does anybody do that crazy
@ -214,7 +215,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
if (is_binary(len, &stats)) if (is_binary(len, &stats))
return 0; return 0;
if (action == CRLF_GUESS) { if (crlf_action == CRLF_GUESS) {
/* /*
* If the file in the index has any CR in it, do not convert. * If the file in the index has any CR in it, do not convert.
* This is the new safer autocrlf handling. * This is the new safer autocrlf handling.
@ -224,7 +225,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
} }
} }
check_safe_crlf(path, action, &stats, checksafe); check_safe_crlf(path, crlf_action, &stats, checksafe);
/* Optimization: No CR? Nothing to convert, regardless. */ /* Optimization: No CR? Nothing to convert, regardless. */
if (!stats.cr) if (!stats.cr)
@ -234,7 +235,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
if (strbuf_avail(buf) + buf->len < len) if (strbuf_avail(buf) + buf->len < len)
strbuf_grow(buf, len - buf->len); strbuf_grow(buf, len - buf->len);
dst = buf->buf; dst = buf->buf;
if (action == CRLF_AUTO || action == CRLF_GUESS) { if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) {
/* /*
* If we guessed, we already know we rejected a file with * If we guessed, we already know we rejected a file with
* lone CR, and we can strip a CR without looking at what * lone CR, and we can strip a CR without looking at what
@ -257,12 +258,12 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
} }
static int crlf_to_worktree(const char *path, const char *src, size_t len, static int crlf_to_worktree(const char *path, const char *src, size_t len,
struct strbuf *buf, enum action action) struct strbuf *buf, enum crlf_action crlf_action)
{ {
char *to_free = NULL; char *to_free = NULL;
struct text_stat stats; struct text_stat stats;
if (!len || determine_output_conversion(action) != EOL_CRLF) if (!len || output_eol(crlf_action) != EOL_CRLF)
return 0; return 0;
gather_stats(src, len, &stats); gather_stats(src, len, &stats);
@ -275,8 +276,8 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
if (stats.lf == stats.crlf) if (stats.lf == stats.crlf)
return 0; return 0;
if (action == CRLF_AUTO || action == CRLF_GUESS) { if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) {
if (action == CRLF_GUESS) { if (crlf_action == CRLF_GUESS) {
/* If we have any CR or CRLF line endings, we do not touch it */ /* If we have any CR or CRLF line endings, we do not touch it */
/* This is the new safer autocrlf-handling */ /* This is the new safer autocrlf-handling */
if (stats.cr > 0 || stats.crlf > 0) if (stats.cr > 0 || stats.crlf > 0)
@ -715,7 +716,7 @@ static int git_path_check_ident(const char *path, struct git_attr_check *check)
return !!ATTR_TRUE(value); return !!ATTR_TRUE(value);
} }
static enum action determine_action(enum action text_attr, enum eol eol_attr) static enum crlf_action input_crlf_action(enum crlf_action text_attr, enum eol eol_attr)
{ {
if (text_attr == CRLF_BINARY) if (text_attr == CRLF_BINARY)
return CRLF_BINARY; return CRLF_BINARY;
@ -730,7 +731,7 @@ int convert_to_git(const char *path, const char *src, size_t len,
struct strbuf *dst, enum safe_crlf checksafe) struct strbuf *dst, enum safe_crlf checksafe)
{ {
struct git_attr_check check[5]; struct git_attr_check check[5];
enum action action = CRLF_GUESS; enum crlf_action crlf_action = CRLF_GUESS;
enum eol eol_attr = EOL_UNSET; enum eol eol_attr = EOL_UNSET;
int ident = 0, ret = 0; int ident = 0, ret = 0;
const char *filter = NULL; const char *filter = NULL;
@ -738,9 +739,9 @@ int convert_to_git(const char *path, const char *src, size_t len,
setup_convert_check(check); setup_convert_check(check);
if (!git_checkattr(path, ARRAY_SIZE(check), check)) { if (!git_checkattr(path, ARRAY_SIZE(check), check)) {
struct convert_driver *drv; struct convert_driver *drv;
action = git_path_check_crlf(path, check + 4); crlf_action = git_path_check_crlf(path, check + 4);
if (action == CRLF_GUESS) if (crlf_action == CRLF_GUESS)
action = git_path_check_crlf(path, check + 0); crlf_action = git_path_check_crlf(path, check + 0);
ident = git_path_check_ident(path, check + 1); ident = git_path_check_ident(path, check + 1);
drv = git_path_check_convert(path, check + 2); drv = git_path_check_convert(path, check + 2);
eol_attr = git_path_check_eol(path, check + 3); eol_attr = git_path_check_eol(path, check + 3);
@ -753,8 +754,8 @@ int convert_to_git(const char *path, const char *src, size_t len,
src = dst->buf; src = dst->buf;
len = dst->len; len = dst->len;
} }
action = determine_action(action, eol_attr); crlf_action = input_crlf_action(crlf_action, eol_attr);
ret |= crlf_to_git(path, src, len, dst, action, checksafe); ret |= crlf_to_git(path, src, len, dst, crlf_action, checksafe);
if (ret) { if (ret) {
src = dst->buf; src = dst->buf;
len = dst->len; len = dst->len;
@ -767,7 +768,7 @@ static int convert_to_working_tree_internal(const char *path, const char *src,
int normalizing) int normalizing)
{ {
struct git_attr_check check[5]; struct git_attr_check check[5];
enum action action = CRLF_GUESS; enum crlf_action crlf_action = CRLF_GUESS;
enum eol eol_attr = EOL_UNSET; enum eol eol_attr = EOL_UNSET;
int ident = 0, ret = 0; int ident = 0, ret = 0;
const char *filter = NULL; const char *filter = NULL;
@ -775,9 +776,9 @@ static int convert_to_working_tree_internal(const char *path, const char *src,
setup_convert_check(check); setup_convert_check(check);
if (!git_checkattr(path, ARRAY_SIZE(check), check)) { if (!git_checkattr(path, ARRAY_SIZE(check), check)) {
struct convert_driver *drv; struct convert_driver *drv;
action = git_path_check_crlf(path, check + 4); crlf_action = git_path_check_crlf(path, check + 4);
if (action == CRLF_GUESS) if (crlf_action == CRLF_GUESS)
action = git_path_check_crlf(path, check + 0); crlf_action = git_path_check_crlf(path, check + 0);
ident = git_path_check_ident(path, check + 1); ident = git_path_check_ident(path, check + 1);
drv = git_path_check_convert(path, check + 2); drv = git_path_check_convert(path, check + 2);
eol_attr = git_path_check_eol(path, check + 3); eol_attr = git_path_check_eol(path, check + 3);
@ -795,8 +796,8 @@ static int convert_to_working_tree_internal(const char *path, const char *src,
* is a smudge filter. The filter might expect CRLFs. * is a smudge filter. The filter might expect CRLFs.
*/ */
if (filter || !normalizing) { if (filter || !normalizing) {
action = determine_action(action, eol_attr); crlf_action = input_crlf_action(crlf_action, eol_attr);
ret |= crlf_to_worktree(path, src, len, dst, action); ret |= crlf_to_worktree(path, src, len, dst, crlf_action);
if (ret) { if (ret) {
src = dst->buf; src = dst->buf;
len = dst->len; len = dst->len;