From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: hvoigt@hvoigt.net, Stefan Beller <sbeller@google.com>
Subject: [PATCH 03/10] sha1-array: provide oid_array_remove_if
Date: Wed, 8 Aug 2018 15:17:45 -0700 [thread overview]
Message-ID: <20180808221752.195419-4-sbeller@google.com> (raw)
In-Reply-To: <20180808221752.195419-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
sha1-array.c | 39 +++++++++++++++++++++++++++++++++++++++
sha1-array.h | 3 +++
2 files changed, 42 insertions(+)
diff --git a/sha1-array.c b/sha1-array.c
index 265941fbf40..10eb08b425e 100644
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -77,3 +77,42 @@ int oid_array_for_each_unique(struct oid_array *array,
}
return 0;
}
+
+int oid_array_remove_if(struct oid_array *array,
+ for_each_oid_fn fn,
+ void *data)
+{
+ int i, j;
+ char *to_remove = xcalloc(array->nr, sizeof(char));
+
+ /* No oid_array_sort() here! See the api-oid-array.txt docs! */
+
+ for (i = 0; i < array->nr; i++) {
+ int ret = fn(array->oid + i, data);
+ if (ret)
+ to_remove[i] = 1;
+ }
+
+ i = 0, j = 0;
+ while (i < array->nr && j < array->nr) {
+ while (i < array->nr && !to_remove[i])
+ i++;
+ /* i at first marked for deletion or out */
+ if (j < i)
+ j = i;
+ while (j < array->nr && to_remove[j])
+ j++;
+ /* j > i; j at first valid after first deletion range or out */
+ if (i < array->nr && j < array->nr)
+ oidcpy(&array->oid[i], &array->oid[j]);
+ else if (i >= array->nr)
+ assert(j >= array->nr);
+ /* no pruning happened, keep original array->nr */
+ else if (j >= array->nr)
+ array->nr = i;
+ }
+
+ free(to_remove);
+
+ return 0;
+}
diff --git a/sha1-array.h b/sha1-array.h
index 232bf950172..151c7ad7f30 100644
--- a/sha1-array.h
+++ b/sha1-array.h
@@ -22,5 +22,8 @@ int oid_array_for_each(struct oid_array *array,
int oid_array_for_each_unique(struct oid_array *array,
for_each_oid_fn fn,
void *data);
+int oid_array_remove_if(struct oid_array *array,
+ for_each_oid_fn fn,
+ void *data);
#endif /* SHA1_ARRAY_H */
--
2.18.0.597.ga71716f1ad-goog
next prev parent reply other threads:[~2018-08-08 22:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 22:17 [RFC PATCH 00/10] fetch: make sure submodule oids are fetched Stefan Beller
2018-08-08 22:17 ` [PATCH 01/10] string_list: print_string_list to use trace_printf Stefan Beller
2018-08-09 21:16 ` Junio C Hamano
2018-08-09 21:40 ` Stefan Beller
2018-08-08 22:17 ` [PATCH 02/10] string-list.h: add string_list_pop function Stefan Beller
2018-08-09 7:35 ` Martin Ågren
2018-08-09 21:29 ` Junio C Hamano
2018-08-09 21:41 ` Jeff King
2018-08-09 21:52 ` Stefan Beller
2018-08-09 21:56 ` Jeff King
2018-08-09 22:10 ` Stefan Beller
2018-08-08 22:17 ` Stefan Beller [this message]
2018-08-09 7:39 ` [PATCH 03/10] sha1-array: provide oid_array_remove_if Martin Ågren
2018-08-09 17:25 ` Stefan Beller
2018-08-09 19:24 ` Jeff King
2018-08-09 21:46 ` Junio C Hamano
2018-08-09 21:44 ` Junio C Hamano
2018-08-08 22:17 ` [PATCH 04/10] submodule.c: convert submodule_move_head new argument to object id Stefan Beller
2018-08-09 22:00 ` Junio C Hamano
2018-08-08 22:17 ` [PATCH 05/10] submodule.c: fix indentation Stefan Beller
2018-08-08 22:17 ` [PATCH 06/10] submodule.c: sort changed_submodule_names before searching it Stefan Beller
2018-08-08 22:17 ` [PATCH 07/10] submodule: move global changed_submodule_names into fetch submodule struct Stefan Beller
2018-08-08 22:17 ` [PATCH 08/10] submodule.c: do not copy around submodule list Stefan Beller
2018-08-08 22:17 ` [PATCH 09/10] submodule: fetch in submodules git directory instead of in worktree Stefan Beller
2018-08-08 22:17 ` [PATCH 10/10] fetch: retry fetching submodules if sha1 were not fetched Stefan Beller
2018-08-09 7:50 ` Martin Ågren
2018-08-09 17:42 ` Stefan Beller
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=20180808221752.195419-4-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.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).