From ab43ad2fd822504446e7876d6352c968a74beb53 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 14 Mar 2012 11:07:14 -0700 Subject: Convert attr and other files to new errors This continues to add other files to the new error handling style. I think the only real concerns here are that there are a couple of error return cases that I have converted to asserts, but I think that it was the correct thing to do given the new error style. --- src/ignore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index a3bf0a282..4cbc55d4b 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -168,9 +168,9 @@ static int ignore_lookup_in_rules( git_attr_fnmatch *match; git_vector_rforeach(rules, j, match) { - if (git_attr_fnmatch__match(match, path) == GIT_SUCCESS) { + if (git_attr_fnmatch__match(match, path)) { *ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0); - return GIT_SUCCESS; + return 0; } } -- cgit v1.2.1 From 0d0fa7c3681e4ef3d0452666a9bc97d4b08391c9 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 16 Mar 2012 15:56:01 -0700 Subject: Convert attr, ignore, mwindow, status to new errors Also cleaned up some previously converted code that still had little things to polish. --- src/ignore.c | 105 ++++++++++++++++++++++++++--------------------------------- 1 file changed, 47 insertions(+), 58 deletions(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index 4cbc55d4b..be00efd1b 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -10,30 +10,31 @@ static int load_ignore_file( git_repository *repo, const char *path, git_attr_file *ignores) { - int error = GIT_SUCCESS; + int error; git_buf fbuf = GIT_BUF_INIT; git_attr_fnmatch *match = NULL; const char *scan = NULL; char *context = NULL; - if (ignores->path == NULL) - error = git_attr_file__set_path(repo, path, ignores); + if (ignores->path == NULL) { + if (git_attr_file__set_path(repo, path, ignores) < 0) + return -1; + } if (git__suffixcmp(ignores->path, GIT_IGNORE_FILE) == 0) { context = git__strndup(ignores->path, strlen(ignores->path) - strlen(GIT_IGNORE_FILE)); - if (!context) error = GIT_ENOMEM; + GITERR_CHECK_ALLOC(context); } - if (error == GIT_SUCCESS) - error = git_futils_readbuffer(&fbuf, path); + error = git_futils_readbuffer(&fbuf, path); scan = fbuf.ptr; - while (error == GIT_SUCCESS && *scan) { - if (!match && !(match = git__calloc(1, sizeof(git_attr_fnmatch)))) { - error = GIT_ENOMEM; - break; + while (!error && *scan) { + if (!match) { + match = git__calloc(1, sizeof(*match)); + GITERR_CHECK_ALLOC(match); } if (!(error = git_attr_fnmatch__parse(match, context, &scan))) { @@ -42,12 +43,12 @@ static int load_ignore_file( error = git_vector_insert(&ignores->rules, match); } - if (error != GIT_SUCCESS) { + if (error != 0) { git__free(match->pattern); match->pattern = NULL; if (error == GIT_ENOTFOUND) - error = GIT_SUCCESS; + error = 0; } else { match = NULL; /* vector now "owns" the match */ } @@ -57,9 +58,6 @@ static int load_ignore_file( git__free(match); git__free(context); - if (error != GIT_SUCCESS) - git__rethrow(error, "Could not open ignore file '%s'", path); - return error; } @@ -74,7 +72,7 @@ static int push_one_ignore(void *ref, git_buf *path) int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ignores) { - int error = GIT_SUCCESS; + int error = 0; git_config *cfg; const char *workdir = git_repository_workdir(repo); @@ -83,63 +81,59 @@ int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ig ignores->repo = repo; git_buf_init(&ignores->dir, 0); ignores->ign_internal = NULL; - git_vector_init(&ignores->ign_path, 8, NULL); - git_vector_init(&ignores->ign_global, 2, NULL); - if ((error = git_attr_cache__init(repo)) < GIT_SUCCESS) + if ((error = git_vector_init(&ignores->ign_path, 8, NULL)) < 0 || + (error = git_vector_init(&ignores->ign_global, 2, NULL)) < 0 || + (error = git_attr_cache__init(repo)) < 0) goto cleanup; - if ((error = git_path_find_dir(&ignores->dir, path, workdir)) < GIT_SUCCESS) + /* translate path into directory within workdir */ + if ((error = git_path_find_dir(&ignores->dir, path, workdir)) < 0) goto cleanup; /* set up internals */ error = git_attr_cache__lookup_or_create_file( repo, GIT_IGNORE_INTERNAL, NULL, NULL, &ignores->ign_internal); - if (error < GIT_SUCCESS) + if (error < 0) goto cleanup; /* load .gitignore up the path */ error = git_path_walk_up(&ignores->dir, workdir, push_one_ignore, ignores); - if (error < GIT_SUCCESS) + if (error < 0) goto cleanup; /* load .git/info/exclude */ error = push_ignore(repo, &ignores->ign_global, repo->path_repository, GIT_IGNORE_FILE_INREPO); - if (error < GIT_SUCCESS) + if (error < 0) goto cleanup; /* load core.excludesfile */ - if ((error = git_repository_config(&cfg, repo)) == GIT_SUCCESS) { + if ((error = git_repository_config(&cfg, repo)) == 0) { const char *core_ignore; error = git_config_get_string(cfg, GIT_IGNORE_CONFIG, &core_ignore); - if (error == GIT_SUCCESS && core_ignore != NULL) + if (error == 0 && core_ignore != NULL) error = push_ignore(repo, &ignores->ign_global, NULL, core_ignore); else { - error = GIT_SUCCESS; - git_clearerror(); /* don't care if attributesfile is not set */ + error = 0; + giterr_clear(); /* don't care if attributesfile is not set */ } git_config_free(cfg); } cleanup: - if (error < GIT_SUCCESS) { + if (error < 0) git_ignore__free(ignores); - git__rethrow(error, "Could not get ignore files for '%s'", path); - } - return error; } int git_ignore__push_dir(git_ignores *ign, const char *dir) { - int error = git_buf_joinpath(&ign->dir, ign->dir.ptr, dir); - - if (error == GIT_SUCCESS) - error = push_ignore( + if (git_buf_joinpath(&ign->dir, ign->dir.ptr, dir) < 0) + return -1; + else + return push_ignore( ign->repo, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE); - - return error; } int git_ignore__pop_dir(git_ignores *ign) @@ -150,7 +144,7 @@ int git_ignore__pop_dir(git_ignores *ign) git_vector_pop(&ign->ign_path); git_buf_rtruncate_at_char(&ign->dir, '/'); } - return GIT_SUCCESS; + return 0; } void git_ignore__free(git_ignores *ignores) @@ -161,7 +155,7 @@ void git_ignore__free(git_ignores *ignores) git_buf_free(&ignores->dir); } -static int ignore_lookup_in_rules( +static bool ignore_lookup_in_rules( git_vector *rules, git_attr_path *path, int *ignored) { unsigned int j; @@ -170,45 +164,40 @@ static int ignore_lookup_in_rules( git_vector_rforeach(rules, j, match) { if (git_attr_fnmatch__match(match, path)) { *ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0); - return 0; + return true; } } - return GIT_ENOTFOUND; + return false; } int git_ignore__lookup(git_ignores *ignores, const char *pathname, int *ignored) { - int error; unsigned int i; git_attr_file *file; git_attr_path path; - if ((error = git_attr_path__init( - &path, pathname, git_repository_workdir(ignores->repo))) < GIT_SUCCESS) - return git__rethrow(error, "Could not get attribute for '%s'", pathname); + if (git_attr_path__init( + &path, pathname, git_repository_workdir(ignores->repo)) < 0) + return -1; - /* first process builtins */ - error = ignore_lookup_in_rules( - &ignores->ign_internal->rules, &path, ignored); - if (error == GIT_SUCCESS) - return error; + /* first process builtins - success means path was found */ + if (ignore_lookup_in_rules( + &ignores->ign_internal->rules, &path, ignored)) + return 0; /* next process files in the path */ git_vector_foreach(&ignores->ign_path, i, file) { - error = ignore_lookup_in_rules(&file->rules, &path, ignored); - if (error == GIT_SUCCESS) - return error; + if (ignore_lookup_in_rules(&file->rules, &path, ignored)) + return 0; } /* last process global ignores */ git_vector_foreach(&ignores->ign_global, i, file) { - error = ignore_lookup_in_rules(&file->rules, &path, ignored); - if (error == GIT_SUCCESS) - return error; + if (ignore_lookup_in_rules(&file->rules, &path, ignored)) + return 0; } *ignored = 0; - - return GIT_SUCCESS; + return 0; } -- cgit v1.2.1 From 95dfb031f70601b12a9eb57229fd4aa9a51ddd54 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 30 Mar 2012 14:40:50 -0700 Subject: Improve config handling for diff,submodules,attrs This adds support for a bunch of core.* settings that affect diff and status, plus fixes up some incorrect implementations of those settings from before. Also, this cleans up the handling of config settings in the new submodules code and in the old attrs/ignore code. --- src/ignore.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index be00efd1b..1827eda82 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -1,11 +1,9 @@ #include "ignore.h" #include "path.h" -#include "git2/config.h" #define GIT_IGNORE_INTERNAL "[internal]exclude" #define GIT_IGNORE_FILE_INREPO "info/exclude" #define GIT_IGNORE_FILE ".gitignore" -#define GIT_IGNORE_CONFIG "core.excludesfile" static int load_ignore_file( git_repository *repo, const char *path, git_attr_file *ignores) @@ -73,7 +71,6 @@ static int push_one_ignore(void *ref, git_buf *path) int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ignores) { int error = 0; - git_config *cfg; const char *workdir = git_repository_workdir(repo); assert(ignores); @@ -104,26 +101,19 @@ int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ig /* load .git/info/exclude */ error = push_ignore(repo, &ignores->ign_global, - repo->path_repository, GIT_IGNORE_FILE_INREPO); + git_repository_path(repo), GIT_IGNORE_FILE_INREPO); if (error < 0) goto cleanup; /* load core.excludesfile */ - if ((error = git_repository_config(&cfg, repo)) == 0) { - const char *core_ignore; - error = git_config_get_string(cfg, GIT_IGNORE_CONFIG, &core_ignore); - if (error == 0 && core_ignore != NULL) - error = push_ignore(repo, &ignores->ign_global, NULL, core_ignore); - else { - error = 0; - giterr_clear(); /* don't care if attributesfile is not set */ - } - git_config_free(cfg); - } + if (git_repository_attr_cache(repo)->cfg_excl_file != NULL) + error = push_ignore(repo, &ignores->ign_global, NULL, + git_repository_attr_cache(repo)->cfg_excl_file); cleanup: if (error < 0) git_ignore__free(ignores); + return error; } -- cgit v1.2.1 From 19fa2bc111d50dc2bafb1393b87b5ba119615ae2 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 17 Apr 2012 15:12:50 -0700 Subject: Convert attrs and diffs to use string pools This converts the git attr related code (including ignores) and the git diff related code (and implicitly the status code) to use `git_pools` for storing strings. This reduces the number of small blocks allocated dramatically. --- src/ignore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index 1827eda82..165754b4d 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -35,7 +35,9 @@ static int load_ignore_file( GITERR_CHECK_ALLOC(match); } - if (!(error = git_attr_fnmatch__parse(match, context, &scan))) { + if (!(error = git_attr_fnmatch__parse( + match, ignores->pool, context, &scan))) + { match->flags = match->flags | GIT_ATTR_FNMATCH_IGNORE; scan = git__next_line(scan); error = git_vector_insert(&ignores->rules, match); -- cgit v1.2.1 From d58336dda873704f8d12a8b78c3191deefa4ec14 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 26 Apr 2012 10:51:45 -0700 Subject: Fix leading slash behavior in attrs/ignores We were not following the git behavior for leading slashes in path names when matching git ignores and git attribute file patterns. This should fix issue #638. --- src/ignore.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index 165754b4d..20b96c602 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -176,20 +176,23 @@ int git_ignore__lookup(git_ignores *ignores, const char *pathname, int *ignored) /* first process builtins - success means path was found */ if (ignore_lookup_in_rules( &ignores->ign_internal->rules, &path, ignored)) - return 0; + goto cleanup; /* next process files in the path */ git_vector_foreach(&ignores->ign_path, i, file) { if (ignore_lookup_in_rules(&file->rules, &path, ignored)) - return 0; + goto cleanup; } /* last process global ignores */ git_vector_foreach(&ignores->ign_global, i, file) { if (ignore_lookup_in_rules(&file->rules, &path, ignored)) - return 0; + goto cleanup; } *ignored = 0; + +cleanup: + git_attr_path__free(&path); return 0; } -- cgit v1.2.1 From f917481ee84cbba481c1854cccdedb2d98377d43 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 3 May 2012 16:37:25 -0700 Subject: Support reading attributes from index Depending on the operation, we need to consider gitattributes in both the work dir and the index. This adds a parameter to all of the gitattributes related functions that allows user control of attribute reading behavior (i.e. prefer workdir, prefer index, only use index). This fix also covers allowing us to check attributes (and hence do diff and status) on bare repositories. This was a somewhat larger change that I hoped because it had to change the cache key used for gitattributes files. --- src/ignore.c | 69 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index 20b96c602..6f70b972d 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -5,29 +5,22 @@ #define GIT_IGNORE_FILE_INREPO "info/exclude" #define GIT_IGNORE_FILE ".gitignore" -static int load_ignore_file( - git_repository *repo, const char *path, git_attr_file *ignores) +static int parse_ignore_file( + git_repository *repo, const char *buffer, git_attr_file *ignores) { int error; - git_buf fbuf = GIT_BUF_INIT; git_attr_fnmatch *match = NULL; const char *scan = NULL; char *context = NULL; - if (ignores->path == NULL) { - if (git_attr_file__set_path(repo, path, ignores) < 0) - return -1; - } + GIT_UNUSED(repo); - if (git__suffixcmp(ignores->path, GIT_IGNORE_FILE) == 0) { - context = git__strndup(ignores->path, - strlen(ignores->path) - strlen(GIT_IGNORE_FILE)); - GITERR_CHECK_ALLOC(context); + if (ignores->key && git__suffixcmp(ignores->key, "/" GIT_IGNORE_FILE) == 0) { + context = ignores->key + 2; + context[strlen(context) - strlen(GIT_IGNORE_FILE)] = '\0'; } - error = git_futils_readbuffer(&fbuf, path); - - scan = fbuf.ptr; + scan = buffer; while (!error && *scan) { if (!match) { @@ -54,23 +47,27 @@ static int load_ignore_file( } } - git_buf_free(&fbuf); git__free(match); - git__free(context); + /* restore file path used for context */ + if (context) + context[strlen(context)] = '.'; /* first char of GIT_IGNORE_FILE */ return error; } -#define push_ignore(R,S,B,F) \ - git_attr_cache__push_file((R),(S),(B),(F),load_ignore_file) +#define push_ignore_file(R,S,B,F) \ + git_attr_cache__push_file((R),(B),(F),GIT_ATTR_FILE_FROM_FILE,parse_ignore_file,(S)) static int push_one_ignore(void *ref, git_buf *path) { git_ignores *ign = (git_ignores *)ref; - return push_ignore(ign->repo, &ign->ign_path, path->ptr, GIT_IGNORE_FILE); + return push_ignore_file(ign->repo, &ign->ign_path, path->ptr, GIT_IGNORE_FILE); } -int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ignores) +int git_ignore__for_path( + git_repository *repo, + const char *path, + git_ignores *ignores) { int error = 0; const char *workdir = git_repository_workdir(repo); @@ -86,30 +83,37 @@ int git_ignore__for_path(git_repository *repo, const char *path, git_ignores *ig (error = git_attr_cache__init(repo)) < 0) goto cleanup; - /* translate path into directory within workdir */ - if ((error = git_path_find_dir(&ignores->dir, path, workdir)) < 0) + /* given a unrooted path in a non-bare repo, resolve it */ + if (workdir && git_path_root(path) < 0) + error = git_path_find_dir(&ignores->dir, path, workdir); + else + error = git_buf_sets(&ignores->dir, path); + if (error < 0) goto cleanup; /* set up internals */ - error = git_attr_cache__lookup_or_create_file( - repo, GIT_IGNORE_INTERNAL, NULL, NULL, &ignores->ign_internal); + error = git_attr_cache__internal_file( + repo, GIT_IGNORE_INTERNAL, &ignores->ign_internal); if (error < 0) goto cleanup; /* load .gitignore up the path */ - error = git_path_walk_up(&ignores->dir, workdir, push_one_ignore, ignores); - if (error < 0) - goto cleanup; + if (workdir != NULL) { + error = git_path_walk_up( + &ignores->dir, workdir, push_one_ignore, ignores); + if (error < 0) + goto cleanup; + } /* load .git/info/exclude */ - error = push_ignore(repo, &ignores->ign_global, + error = push_ignore_file(repo, &ignores->ign_global, git_repository_path(repo), GIT_IGNORE_FILE_INREPO); if (error < 0) goto cleanup; /* load core.excludesfile */ if (git_repository_attr_cache(repo)->cfg_excl_file != NULL) - error = push_ignore(repo, &ignores->ign_global, NULL, + error = push_ignore_file(repo, &ignores->ign_global, NULL, git_repository_attr_cache(repo)->cfg_excl_file); cleanup: @@ -124,7 +128,7 @@ int git_ignore__push_dir(git_ignores *ign, const char *dir) if (git_buf_joinpath(&ign->dir, ign->dir.ptr, dir) < 0) return -1; else - return push_ignore( + return push_ignore_file( ign->repo, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE); } @@ -132,7 +136,7 @@ int git_ignore__pop_dir(git_ignores *ign) { if (ign->ign_path.length > 0) { git_attr_file *file = git_vector_last(&ign->ign_path); - if (git__suffixcmp(ign->dir.ptr, file->path) == 0) + if (git__suffixcmp(ign->dir.ptr, file->key + 2) == 0) git_vector_pop(&ign->ign_path); git_buf_rtruncate_at_char(&ign->dir, '/'); } @@ -163,7 +167,8 @@ static bool ignore_lookup_in_rules( return false; } -int git_ignore__lookup(git_ignores *ignores, const char *pathname, int *ignored) +int git_ignore__lookup( + git_ignores *ignores, const char *pathname, int *ignored) { unsigned int i; git_attr_file *file; -- cgit v1.2.1 From b709e95146b9d56e2c009915ccea7a86c77d4202 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 4 May 2012 11:06:12 -0700 Subject: Fix memory leaks and use after free --- src/ignore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ignore.c') diff --git a/src/ignore.c b/src/ignore.c index 6f70b972d..fc6194bb5 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -8,7 +8,7 @@ static int parse_ignore_file( git_repository *repo, const char *buffer, git_attr_file *ignores) { - int error; + int error = 0; git_attr_fnmatch *match = NULL; const char *scan = NULL; char *context = NULL; -- cgit v1.2.1