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 09/13] commit-reach: test can_all_from_reach
Date: Fri, 29 Jun 2018 16:12:57 +0000 [thread overview]
Message-ID: <20180629161223.229661-10-dstolee@microsoft.com> (raw)
In-Reply-To: <20180629161223.229661-1-dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
commit-reach.c | 52 +++++++++++++++++++++++++++++++++++++++----
commit-reach.h | 4 +++-
t/helper/test-reach.c | 7 ++++--
t/t6600-test-reach.sh | 51 +++++++++++++++++++++++++++++++++++++++---
upload-pack.c | 2 +-
5 files changed, 105 insertions(+), 11 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index 44c09669ec..992ad5cdc7 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -562,14 +562,14 @@ static int reachable(struct commit *from, int with_flag, int assign_flag, time_t
return (from->object.flags & assign_flag);
}
-int can_all_from_reach_with_flag(struct object_array from,
+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;
+ for (i = 0; i < from->nr; i++) {
+ struct object *from_one = from->objects[i].item;
if (from_one->flags & assign_flag)
continue;
@@ -580,7 +580,7 @@ int can_all_from_reach_with_flag(struct object_array from,
* leave a note to ourselves not to worry about
* this object anymore.
*/
- from.objects[i].item->flags |= assign_flag;
+ from->objects[i].item->flags |= assign_flag;
continue;
}
if (!reachable((struct commit *)from_one, with_flag,
@@ -589,3 +589,47 @@ int can_all_from_reach_with_flag(struct object_array from,
}
return 1;
}
+
+int can_all_from_reach(struct commit_list *from, struct commit_list *to)
+{
+ struct object_array from_objs = OBJECT_ARRAY_INIT;
+ time_t min_commit_date = from->item->date;
+ struct commit_list *from_iter = from;
+ struct commit_list *to_iter = to;
+ int result;
+
+ while (from_iter) {
+ add_object_array(&from_iter->item->object, NULL, &from_objs);
+
+ if (from_iter->item->date < min_commit_date)
+ min_commit_date = from_iter->item->date;
+
+ from_iter = from_iter->next;
+ }
+
+ while (to_iter) {
+ if (to_iter->item->date < min_commit_date)
+ min_commit_date = to_iter->item->date;
+
+ to_iter->item->object.flags |= PARENT2;
+
+ to_iter = to_iter->next;
+ }
+
+ result = can_all_from_reach_with_flag(&from_objs, PARENT2, PARENT1,
+ min_commit_date);
+
+ while (from) {
+ clear_commit_marks(from->item, PARENT1);
+ from = from->next;
+ }
+
+ while (to) {
+ clear_commit_marks(to->item, PARENT2);
+ to = to->next;
+ }
+
+ object_array_clear(&from_objs);
+
+ return result;
+}
diff --git a/commit-reach.h b/commit-reach.h
index c3da8488eb..8ab06af2eb 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -27,7 +27,9 @@ int commit_contains(struct ref_filter *filter, struct commit *commit,
* 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 can_all_from_reach_with_flag(struct object_array *from, int with_flag,
int assign_flag, time_t min_commit_date);
+int can_all_from_reach(struct commit_list *from, struct commit_list *to);
+
#endif
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index d57660af45..88639a2945 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -15,9 +15,9 @@ int cmd__reach(int ac, const char **av)
struct strbuf buf = STRBUF_INIT;
setup_git_directory();
- get_git_config(default_git_config, 0);
+ git_config(git_default_config, NULL);
- if (argc < 2)
+ if (ac < 2)
exit(1);
/* load input data */
@@ -117,6 +117,9 @@ int cmd__reach(int ac, const char **av)
printf("%s\n", oid_to_hex(&list->item->object.oid));
list = list->next;
}
+ } else if (!strcmp(av[1], "can_all_from_reach")) {
+ int result = can_all_from_reach(list_X, list_Y);
+ printf("%s(X,Y):%d\n", av[1], result);
}
exit(0);
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index 0f60db9c60..ef25e70174 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -64,7 +64,7 @@ test_expect_success 'ref_newer:miss' '
cat >expect <<- EOF &&
ref_newer:0
EOF
- test_reach_two_modes "ref_newer"
+ test_reach_two_modes ref_newer
'
test_expect_success 'ref_newer:miss' '
@@ -75,7 +75,7 @@ test_expect_success 'ref_newer:miss' '
cat >expect <<- EOF &&
ref_newer:1
EOF
- test_reach_two_modes "ref_newer"
+ test_reach_two_modes ref_newer
'
test_expect_success 'reduce_heads' '
@@ -101,7 +101,52 @@ test_expect_success 'reduce_heads' '
git rev-parse commit-1-10 >>expect &&
printf "reduce_heads(Y):\n" >>expect &&
git rev-parse commit-10-10 >>expect &&
- test_reach_two_modes "reduce_heads"
+ test_reach_two_modes reduce_heads
+'
+
+test_expect_success 'can_all_from_reach:hit' '
+ cat >input <<- EOF &&
+ X:commit-2-10
+ X:commit-3-9
+ X:commit-4-8
+ X:commit-5-7
+ X:commit-6-6
+ X:commit-7-5
+ X:commit-8-4
+ X:commit-9-3
+ Y:commit-1-9
+ Y:commit-2-8
+ Y:commit-3-7
+ Y:commit-4-6
+ Y:commit-5-5
+ Y:commit-6-4
+ Y:commit-7-3
+ Y:commit-8-1
+ EOF
+ printf "can_all_from_reach(X,Y):1\n" >expect &&
+ test_reach_two_modes can_all_from_reach
+'
+
+test_expect_success 'can_all_from_reach:miss' '
+ cat >input <<- EOF &&
+ X:commit-2-10
+ X:commit-3-9
+ X:commit-4-8
+ X:commit-5-7
+ X:commit-6-6
+ X:commit-7-5
+ X:commit-8-4
+ X:commit-9-3
+ Y:commit-1-9
+ Y:commit-2-8
+ Y:commit-3-7
+ Y:commit-4-6
+ Y:commit-5-5
+ Y:commit-6-4
+ Y:commit-8-5
+ EOF
+ printf "can_all_from_reach(X,Y):0\n" >expect &&
+ test_reach_two_modes can_all_from_reach
'
test_done
diff --git a/upload-pack.c b/upload-pack.c
index 7c58cb8f5e..e59fbca257 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -339,7 +339,7 @@ static int ok_to_give_up(void)
if (!have_obj.nr)
return 0;
- return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
+ return can_all_from_reach_with_flag(&want_obj, THEY_HAVE,
COMMON_KNOWN, oldest_have);
}
--
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 ` [RFC PATCH 06/13] commit-reach: move can_all_from_reach_with_flag() Derrick Stolee
2018-06-29 21:47 ` 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 ` Derrick Stolee [this message]
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-10-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).