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

rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API

Browse Source 
... while updating their function signature.  To be squashed into
the initial patch to rev-list.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-11-01 12:02:45 -07:00
parent 751a2ac6ed
commit ff32d3420a
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
revision.c
View File

@ -1180,13 +1180,13 @@ struct all_refs_cb {
const char *name_for_errormsg; const char *name_for_errormsg;
}; };
static int ref_excluded(struct rev_info *revs, const char *path) int ref_excluded(struct string_list *ref_excludes, const char *path)
{ {
struct string_list_item *item; struct string_list_item *item;
if (!revs->ref_excludes) if (!ref_excludes)
return 0; return 0;
for_each_string_list_item(item, revs->ref_excludes) { for_each_string_list_item(item, ref_excludes) {
if (!fnmatch(item->string, path, 0)) if (!fnmatch(item->string, path, 0))
return 1; return 1;
} }
@ -1198,7 +1198,7 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, int flag,
struct all_refs_cb *cb = cb_data; struct all_refs_cb *cb = cb_data;
struct object *object; struct object *object;
if (ref_excluded(cb->all_revs, path)) if (ref_excluded(cb->all_revs->ref_excludes, path))
return 0; return 0;
object = get_reference(cb->all_revs, path, sha1, cb->all_flags); object = get_reference(cb->all_revs, path, sha1, cb->all_flags);
@ -1214,22 +1214,22 @@ static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
cb->all_flags = flags; cb->all_flags = flags;
} }
static void clear_ref_exclusion(struct rev_info *revs) void clear_ref_exclusion(struct string_list **ref_excludes_p)
{ {
if (revs->ref_excludes) { if (*ref_excludes_p) {
string_list_clear(revs->ref_excludes, 0); string_list_clear(*ref_excludes_p, 0);
free(revs->ref_excludes); free(*ref_excludes_p);
} }
revs->ref_excludes = NULL; *ref_excludes_p = NULL;
} }
static void add_ref_exclusion(struct rev_info *revs, const char *exclude) void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
{ {
if (!revs->ref_excludes) { if (!*ref_excludes_p) {
revs->ref_excludes = xcalloc(1, sizeof(*revs->ref_excludes)); *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
revs->ref_excludes->strdup_strings = 1; (*ref_excludes_p)->strdup_strings = 1;
} }
string_list_append(revs->ref_excludes, exclude); string_list_append(*ref_excludes_p, exclude);
} }
static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags, static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
@ -1988,44 +1988,44 @@ static int handle_revision_pseudo_opt(const char *submodule,
if (!strcmp(arg, "--all")) { if (!strcmp(arg, "--all")) {
handle_refs(submodule, revs, *flags, for_each_ref_submodule); handle_refs(submodule, revs, *flags, for_each_ref_submodule);
handle_refs(submodule, revs, *flags, head_ref_submodule); handle_refs(submodule, revs, *flags, head_ref_submodule);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--branches")) { } else if (!strcmp(arg, "--branches")) {
handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule); handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--bisect")) { } else if (!strcmp(arg, "--bisect")) {
handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref); handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref); handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
revs->bisect = 1; revs->bisect = 1;
} else if (!strcmp(arg, "--tags")) { } else if (!strcmp(arg, "--tags")) {
handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule); handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--remotes")) { } else if (!strcmp(arg, "--remotes")) {
handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule); handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if ((argcount = parse_long_opt("glob", argv, &optarg))) { } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
struct all_refs_cb cb; struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags); init_all_refs_cb(&cb, revs, *flags);
for_each_glob_ref(handle_one_ref, optarg, &cb); for_each_glob_ref(handle_one_ref, optarg, &cb);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
return argcount; return argcount;
} else if ((argcount = parse_long_opt("exclude", argv, &optarg))) { } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
add_ref_exclusion(revs, optarg); add_ref_exclusion(&revs->ref_excludes, optarg);
return argcount; return argcount;
} else if (!prefixcmp(arg, "--branches=")) { } else if (!prefixcmp(arg, "--branches=")) {
struct all_refs_cb cb; struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags); init_all_refs_cb(&cb, revs, *flags);
for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb); for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!prefixcmp(arg, "--tags=")) { } else if (!prefixcmp(arg, "--tags=")) {
struct all_refs_cb cb; struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags); init_all_refs_cb(&cb, revs, *flags);
for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb); for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!prefixcmp(arg, "--remotes=")) { } else if (!prefixcmp(arg, "--remotes=")) {
struct all_refs_cb cb; struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags); init_all_refs_cb(&cb, revs, *flags);
for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb); for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
clear_ref_exclusion(revs); clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--reflog")) { } else if (!strcmp(arg, "--reflog")) {
handle_reflog(revs, *flags); handle_reflog(revs, *flags);
} else if (!strcmp(arg, "--not")) { } else if (!strcmp(arg, "--not")) {

5
revision.h
View File

@ -192,6 +192,11 @@ struct rev_info {
struct decoration line_log_data; struct decoration line_log_data;
}; };
extern int ref_excluded(struct string_list *, const char *path);
void clear_ref_exclusion(struct string_list **);
void add_ref_exclusion(struct string_list **, const char *exclude);
#define REV_TREE_SAME 0 #define REV_TREE_SAME 0
#define REV_TREE_NEW 1 /* Only new files */ #define REV_TREE_NEW 1 /* Only new files */
#define REV_TREE_OLD 2 /* Only files removed */ #define REV_TREE_OLD 2 /* Only files removed */