rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API
... while updating their function signature. To be squashed into the initial patch to rev-list. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 1, 2013 at 12:02 UTC
ff32d3420a550d3811e745af7f2ccc77fb026b7b
2 files changed
+28
-23
revision.c
+23
-23
@@ -1180,13 +1180,13 @@ struct all_refs_cb {
1180
const char *name_for_errormsg;
1181
};
1182
1183
-static int ref_excluded(struct rev_info *revs, const char *path)
1183
+int ref_excluded(struct string_list *ref_excludes, const char *path)
1184
{
1185
struct string_list_item *item;
1186
1187
- if (!revs->ref_excludes)
1187
+ if (!ref_excludes)
1188
return 0;
1189
- for_each_string_list_item(item, revs->ref_excludes) {
1189
+ for_each_string_list_item(item, ref_excludes) {
1190
if (!fnmatch(item->string, path, 0))
1191
return 1;
1192
}
@@ -1198,7 +1198,7 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, int flag,
1198
struct all_refs_cb *cb = cb_data;
1199
struct object *object;
1200
1201
- if (ref_excluded(cb->all_revs, path))
1201
+ if (ref_excluded(cb->all_revs->ref_excludes, path))
1202
return 0;
1203
1204
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,
1214
cb->all_flags = flags;
1215
}
1216
1217
-static void clear_ref_exclusion(struct rev_info *revs)
1217
+void clear_ref_exclusion(struct string_list **ref_excludes_p)
1218
{
1219
- if (revs->ref_excludes) {
1220
- string_list_clear(revs->ref_excludes, 0);
1221
- free(revs->ref_excludes);
1219
+ if (*ref_excludes_p) {
1220
+ string_list_clear(*ref_excludes_p, 0);
1221
+ free(*ref_excludes_p);
1222
}
1223
- revs->ref_excludes = NULL;
1223
+ *ref_excludes_p = NULL;
1224
}
1225
1226
-static void add_ref_exclusion(struct rev_info *revs, const char *exclude)
1226
+void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1227
{
1228
- if (!revs->ref_excludes) {
1229
- revs->ref_excludes = xcalloc(1, sizeof(*revs->ref_excludes));
1230
- revs->ref_excludes->strdup_strings = 1;
1228
+ if (!*ref_excludes_p) {
1229
+ *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1230
+ (*ref_excludes_p)->strdup_strings = 1;
1231
}
1232
- string_list_append(revs->ref_excludes, exclude);
1232
+ string_list_append(*ref_excludes_p, exclude);
1233
}
1234
1235
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,
1988
if (!strcmp(arg, "--all")) {
1989
handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1990
handle_refs(submodule, revs, *flags, head_ref_submodule);
1991
- clear_ref_exclusion(revs);
1991
+ clear_ref_exclusion(&revs->ref_excludes);
1992
} else if (!strcmp(arg, "--branches")) {
1993
handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1994
- clear_ref_exclusion(revs);
1994
+ clear_ref_exclusion(&revs->ref_excludes);
1995
} else if (!strcmp(arg, "--bisect")) {
1996
handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1997
handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
1998
revs->bisect = 1;
1999
} else if (!strcmp(arg, "--tags")) {
2000
handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2001
- clear_ref_exclusion(revs);
2001
+ clear_ref_exclusion(&revs->ref_excludes);
2002
} else if (!strcmp(arg, "--remotes")) {
2003
handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2004
- clear_ref_exclusion(revs);
2004
+ clear_ref_exclusion(&revs->ref_excludes);
2005
} else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2006
struct all_refs_cb cb;
2007
init_all_refs_cb(&cb, revs, *flags);
2008
for_each_glob_ref(handle_one_ref, optarg, &cb);
2009
- clear_ref_exclusion(revs);
2009
+ clear_ref_exclusion(&revs->ref_excludes);
2010
return argcount;
2011
} else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2012
- add_ref_exclusion(revs, optarg);
2012
+ add_ref_exclusion(&revs->ref_excludes, optarg);
2013
return argcount;
2014
} else if (!prefixcmp(arg, "--branches=")) {
2015
struct all_refs_cb cb;
2016
init_all_refs_cb(&cb, revs, *flags);
2017
for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2018
- clear_ref_exclusion(revs);
2018
+ clear_ref_exclusion(&revs->ref_excludes);
2019
} else if (!prefixcmp(arg, "--tags=")) {
2020
struct all_refs_cb cb;
2021
init_all_refs_cb(&cb, revs, *flags);
2022
for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2023
- clear_ref_exclusion(revs);
2023
+ clear_ref_exclusion(&revs->ref_excludes);
2024
} else if (!prefixcmp(arg, "--remotes=")) {
2025
struct all_refs_cb cb;
2026
init_all_refs_cb(&cb, revs, *flags);
2027
for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2028
- clear_ref_exclusion(revs);
2028
+ clear_ref_exclusion(&revs->ref_excludes);
2029
} else if (!strcmp(arg, "--reflog")) {
2030
handle_reflog(revs, *flags);
2031
} else if (!strcmp(arg, "--not")) {
revision.h
+5
@@ -192,6 +192,11 @@ struct rev_info {
192
struct decoration line_log_data;
193
};
194
195
+extern int ref_excluded(struct string_list *, const char *path);
196
+void clear_ref_exclusion(struct string_list **);
197
+void add_ref_exclusion(struct string_list **, const char *exclude);
198
+
199
+
200
#define REV_TREE_SAME 0
201
#define REV_TREE_NEW 1 /* Only new files */
202
#define REV_TREE_OLD 2 /* Only files removed */