From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH 4/5] rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API
Date: Fri, 1 Nov 2013 12:34:14 -0700 [thread overview]
Message-ID: <1383334455-18623-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1383334455-18623-1-git-send-email-gitster@pobox.com>
... while updating their function signature. To be squashed into
the initial patch to rev-list.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
revision.c | 46 +++++++++++++++++++++++-----------------------
revision.h | 5 +++++
2 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/revision.c b/revision.c
index 3e82874..ddc71b9 100644
--- a/revision.c
+++ b/revision.c
@@ -1180,13 +1180,13 @@ struct all_refs_cb {
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;
- if (!revs->ref_excludes)
+ if (!ref_excludes)
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))
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 object *object;
- if (ref_excluded(cb->all_revs, path))
+ if (ref_excluded(cb->all_revs->ref_excludes, path))
return 0;
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;
}
-static void clear_ref_exclusion(struct rev_info *revs)
+void clear_ref_exclusion(struct string_list **ref_excludes_p)
{
- if (revs->ref_excludes) {
- string_list_clear(revs->ref_excludes, 0);
- free(revs->ref_excludes);
+ if (*ref_excludes_p) {
+ string_list_clear(*ref_excludes_p, 0);
+ 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) {
- revs->ref_excludes = xcalloc(1, sizeof(*revs->ref_excludes));
- revs->ref_excludes->strdup_strings = 1;
+ if (!*ref_excludes_p) {
+ *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
+ (*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,
@@ -1988,44 +1988,44 @@ static int handle_revision_pseudo_opt(const char *submodule,
if (!strcmp(arg, "--all")) {
handle_refs(submodule, revs, *flags, for_each_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")) {
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")) {
handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
revs->bisect = 1;
} else if (!strcmp(arg, "--tags")) {
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")) {
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))) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
for_each_glob_ref(handle_one_ref, optarg, &cb);
- clear_ref_exclusion(revs);
+ clear_ref_exclusion(&revs->ref_excludes);
return argcount;
} else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
- add_ref_exclusion(revs, optarg);
+ add_ref_exclusion(&revs->ref_excludes, optarg);
return argcount;
} else if (!prefixcmp(arg, "--branches=")) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
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=")) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
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=")) {
struct all_refs_cb cb;
init_all_refs_cb(&cb, revs, *flags);
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")) {
handle_reflog(revs, *flags);
} else if (!strcmp(arg, "--not")) {
diff --git a/revision.h b/revision.h
index b4dc56c..c67c46d 100644
--- a/revision.h
+++ b/revision.h
@@ -192,6 +192,11 @@ struct rev_info {
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_NEW 1 /* Only new files */
#define REV_TREE_OLD 2 /* Only files removed */
--
1.8.5-rc0-281-g8951339
next prev parent reply other threads:[~2013-11-01 19:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-30 5:00 [PATCH] revision: add --except option Felipe Contreras
2013-08-30 5:40 ` Felipe Contreras
2013-08-30 6:32 ` Junio C Hamano
2013-08-30 7:17 ` Felipe Contreras
[not found] ` <CAPc5daVSqoE74kmsobg7RpMtiL3vzKN+ckAcWEKU_Q_wF8HYuA@mail.gmail.com>
2013-08-30 7:32 ` Felipe Contreras
2013-08-30 9:08 ` Johannes Sixt
2013-08-30 16:48 ` Junio C Hamano
2013-08-30 18:37 ` Felipe Contreras
2013-08-30 23:55 ` [PATCH] revision: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-08-31 0:22 ` Duy Nguyen
2013-08-31 0:29 ` Junio C Hamano
2013-08-31 19:33 ` Felipe Contreras
2013-09-03 15:45 ` Junio C Hamano
2013-09-03 22:03 ` Felipe Contreras
2013-09-02 20:11 ` Johannes Sixt
2013-09-02 23:09 ` Felipe Contreras
2013-09-03 4:05 ` Michael Haggerty
2013-09-03 16:03 ` Junio C Hamano
2013-09-03 20:02 ` Johannes Sixt
2013-11-01 19:34 ` [PATCH 0/5] ref glob exclusion follow-up Junio C Hamano
2013-11-01 19:34 ` [PATCH 3/5] rev-list --exclude: tests Junio C Hamano
2013-11-01 19:34 ` Junio C Hamano [this message]
2013-11-01 19:34 ` [PATCH 5/5] rev-parse: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-11-01 19:43 ` Eric Sunshine
2013-11-01 20:01 ` Junio C Hamano
2013-11-01 21:08 ` [PATCH 0/5] ref glob exclusion follow-up Johannes Sixt
2013-08-30 7:56 ` [PATCH] revision: add --except option Johannes Sixt
2013-08-31 19:27 ` Felipe Contreras
2013-09-02 6:25 ` Johannes Sixt
2013-09-02 6:48 ` Felipe Contreras
2013-08-30 7:11 ` Johannes Sixt
2013-08-30 7:24 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383334455-18623-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).