summaryrefslogtreecommitdiff
path: root/commit-reach.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-07-20 16:33:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-20 22:38:55 (GMT)
commitba3ca1edce70d9d2d0eea1ac69377ae786e9413a (patch)
tree9175b28af67b595a275d0613b4fb9a7c3efa9a0e /commit-reach.c
parent118be5785e2c8c90e7407bad4b4a33319ff47db3 (diff)
downloadgit-ba3ca1edce70d9d2d0eea1ac69377ae786e9413a.zip
git-ba3ca1edce70d9d2d0eea1ac69377ae786e9413a.tar.gz
git-ba3ca1edce70d9d2d0eea1ac69377ae786e9413a.tar.bz2
commit-reach: move can_all_from_reach_with_flags
There are several commit walks in the codebase. Group them together into a new commit-reach.c file and corresponding header. After we group these walks into one place, we can reduce duplicate logic by calling equivalent methods. The can_all_from_reach_with_flags method is used in a stateful way by upload-pack.c. The parameters are very flexible, so we will be able to use its commit walking logic for many other callers. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-reach.c')
-rw-r--r--commit-reach.c63
1 files changed, 63 insertions, 0 deletions
diff --git a/commit-reach.c b/commit-reach.c
index 01d796f..d806291 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -10,6 +10,7 @@
#include "commit-reach.h"
/* Remember to update object flag allocation in object.h */
+#define REACHABLE (1u<<15)
#define PARENT1 (1u<<16)
#define PARENT2 (1u<<17)
#define STALE (1u<<18)
@@ -532,3 +533,65 @@ int commit_contains(struct ref_filter *filter, struct commit *commit,
return contains_tag_algo(commit, list, cache) == CONTAINS_YES;
return is_descendant_of(commit, list);
}
+
+int reachable(struct commit *from, unsigned int with_flag,
+ unsigned int assign_flag, time_t min_commit_date)
+{
+ struct prio_queue work = { compare_commits_by_commit_date };
+
+ prio_queue_put(&work, from);
+ while (work.nr) {
+ struct commit_list *list;
+ struct commit *commit = prio_queue_get(&work);
+
+ if (commit->object.flags & with_flag) {
+ from->object.flags |= assign_flag;
+ break;
+ }
+ if (!commit->object.parsed)
+ parse_object(the_repository, &commit->object.oid);
+ if (commit->object.flags & REACHABLE)
+ continue;
+ commit->object.flags |= REACHABLE;
+ if (commit->date < min_commit_date)
+ continue;
+ for (list = commit->parents; list; list = list->next) {
+ struct commit *parent = list->item;
+ if (!(parent->object.flags & REACHABLE))
+ prio_queue_put(&work, parent);
+ }
+ }
+ from->object.flags |= REACHABLE;
+ clear_commit_marks(from, REACHABLE);
+ clear_prio_queue(&work);
+ return (from->object.flags & assign_flag);
+}
+
+int can_all_from_reach_with_flag(struct object_array *from,
+ unsigned int with_flag,
+ unsigned int assign_flag,
+ time_t min_commit_date)
+{
+ int i;
+
+ for (i = 0; i < from->nr; i++) {
+ struct object *from_one = from->objects[i].item;
+
+ if (from_one->flags & assign_flag)
+ continue;
+ from_one = deref_tag(the_repository, from_one, "a from object", 0);
+ if (!from_one || from_one->type != OBJ_COMMIT) {
+ /* no way to tell if this is reachable by
+ * looking at the ancestry chain alone, so
+ * leave a note to ourselves not to worry about
+ * this object anymore.
+ */
+ from->objects[i].item->flags |= assign_flag;
+ continue;
+ }
+ if (!reachable((struct commit *)from_one, with_flag, assign_flag,
+ min_commit_date))
+ return 0;
+ }
+ return 1;
+}