From: Derrick Stolee <dstolee@microsoft.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Cc: "peff@peff.net" <peff@peff.net>,
"sbeller@google.com" <sbeller@google.com>,
"jnareb@gmail.com" <jnareb@gmail.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: [RFC PATCH 06/13] commit-reach: move can_all_from_reach_with_flag()
Date: Fri, 29 Jun 2018 16:12:53 +0000 [thread overview]
Message-ID: <20180629161223.229661-7-dstolee@microsoft.com> (raw)
In-Reply-To: <20180629161223.229661-1-dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
commit-reach.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
commit-reach.h | 8 +++++++
upload-pack.c | 62 +++-----------------------------------------------
3 files changed, 72 insertions(+), 59 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index 6cfd7379ce..44c09669ec 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "commit.h"
+#include "commit-graph.h"
#include "decorate.h"
#include "prio-queue.h"
#include "tree.h"
@@ -528,3 +529,63 @@ 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);
}
+
+static int reachable(struct commit *from, int with_flag, 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(&commit->object.oid);
+ if (commit->object.flags & TMP_MARK)
+ continue;
+ commit->object.flags |= TMP_MARK;
+ if (commit->date < min_commit_date)
+ continue;
+ for (list = commit->parents; list; list = list->next) {
+ struct commit *parent = list->item;
+ if (!(parent->object.flags & TMP_MARK))
+ prio_queue_put(&work, parent);
+ }
+ }
+ from->object.flags |= TMP_MARK;
+ clear_commit_marks(from, TMP_MARK);
+ clear_prio_queue(&work);
+ return (from->object.flags & assign_flag);
+}
+
+int can_all_from_reach_with_flag(struct object_array from,
+ int with_flag, 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(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;
+}
diff --git a/commit-reach.h b/commit-reach.h
index 986fb388d5..c3da8488eb 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -22,4 +22,12 @@ define_commit_slab(contains_cache, enum contains_result);
int commit_contains(struct ref_filter *filter, struct commit *commit,
struct commit_list *list, struct contains_cache *cache);
+/*
+ * Can every commit or tag in the 'from' array reach a commit that has
+ * the 'with_flag' bit on? Mark the commits in 'from' that can reach
+ * such commits with 'assign_flag'.
+ */
+int can_all_from_reach_with_flag(struct object_array from, int with_flag,
+ int assign_flag, time_t min_commit_date);
+
#endif
diff --git a/upload-pack.c b/upload-pack.c
index 2f09cadbc0..7c58cb8f5e 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -22,6 +22,7 @@
#include "quote.h"
#include "upload-pack.h"
#include "serve.h"
+#include "commit-reach.h"
/* Remember to update object flag allocation in object.h */
#define THEY_HAVE (1u << 11)
@@ -333,70 +334,13 @@ static int got_oid(const char *hex, struct object_id *oid)
return 0;
}
-static int reachable(struct commit *from, int with_flag, int assign_flag)
-{
- 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(&commit->object.oid);
- if (commit->object.flags & TMP_MARK)
- continue;
- commit->object.flags |= TMP_MARK;
- if (commit->date < oldest_have)
- continue;
- for (list = commit->parents; list; list = list->next) {
- struct commit *parent = list->item;
- if (!(parent->object.flags & TMP_MARK))
- prio_queue_put(&work, parent);
- }
- }
- from->object.flags |= TMP_MARK;
- clear_commit_marks(from, TMP_MARK);
- clear_prio_queue(&work);
- return (from->object.flags & assign_flag);
-}
-
-static int can_all_from_reach_with_flag(struct object_array from,
- int with_flag, int assign_flag)
-{
- 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(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))
- return 0;
- }
- return 1;
-}
-
static int ok_to_give_up(void)
{
if (!have_obj.nr)
return 0;
- return can_all_from_reach_with_flag(want_obj, THEY_HAVE, COMMON_KNOWN);
+ return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
+ COMMON_KNOWN, oldest_have);
}
static int get_common_commits(void)
--
2.18.0.118.gd4f65b8d14
next prev parent reply other threads:[~2018-06-29 16:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 16:12 [RFC PATCH 00/13] Consolidate reachability logic Derrick Stolee
2018-06-29 16:12 ` [RFC PATCH 01/13] commit-reach: move walk methods from commit.c Derrick Stolee
2018-06-29 21:35 ` Stefan Beller
2018-06-29 21:52 ` Junio C Hamano
2018-06-29 16:12 ` [RFC PATCH 02/13] commit-reach: move ref_newer from remote.c Derrick Stolee
2018-06-29 16:12 ` [RFC PATCH 03/13] commit-reach: move commit_contains from ref-filter Derrick Stolee
2018-06-29 21:38 ` Stefan Beller
2018-06-30 1:32 ` Derrick Stolee
2018-06-29 22:00 ` Junio C Hamano
2018-06-29 16:12 ` [RFC PATCH 04/13] upload-pack: make reachable() more generic Derrick Stolee
2018-06-29 22:05 ` Junio C Hamano
2018-06-29 16:12 ` [RFC PATCH 05/13] upload-pack: refactor ok_to_give_up() Derrick Stolee
2018-06-29 21:44 ` Stefan Beller
2018-06-29 16:12 ` Derrick Stolee [this message]
2018-06-29 21:47 ` [RFC PATCH 06/13] commit-reach: move can_all_from_reach_with_flag() Stefan Beller
2018-06-30 1:35 ` Derrick Stolee
2018-06-29 16:12 ` [RFC PATCH 07/13] test-reach Derrick Stolee
2018-06-29 21:54 ` Stefan Beller
2018-06-30 1:40 ` Derrick Stolee
2018-06-29 16:12 ` [RFC PATCH 08/13] test-reach: test reduce_heads() Derrick Stolee
2018-06-29 22:06 ` Stefan Beller
2018-06-29 16:12 ` [RFC PATCH 09/13] commit-reach: test can_all_from_reach Derrick Stolee
2018-06-29 16:12 ` [RFC PATCH 10/13] commit-reach: test is_descendant_of Derrick Stolee
2018-06-29 16:13 ` [RFC PATCH 11/13] commit-reach: make can_all_from_reach... linear Derrick Stolee
2018-06-29 23:18 ` Stefan Beller
2018-06-29 16:13 ` [RFC PATCH 12/13] commit-reach: use is_descendant_of for ref_newer Derrick Stolee
2018-06-29 16:13 ` [RFC PATCH 13/13] commit-reach: use can_all_from_reach Derrick Stolee
2018-06-29 23:21 ` Stefan Beller
2018-06-29 17:33 ` [RFC PATCH 00/13] Consolidate reachability logic Derrick Stolee
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180629161223.229661-7-dstolee@microsoft.com \
--to=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).