admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rs/describe-with-lazy-queue-and-oidset'

Browse Source 
Instead of scanning for the remaining items to see if there are
still commits to be explored in the queue, use khash to remember
which items are still on the queue (an unacceptable alternative is
to reserve one object flag bits).

* rs/describe-with-lazy-queue-and-oidset:
  describe: use oidset in finish_depth_computation()
This commit is contained in:
Junio C Hamano
2025-09-12 10:41:21 -07:00
parent f67058f0fa 30598ccc4d
commit da3799a67b
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/describe.c
View File

@@ -24,6 +24,7 @@
#include "commit-slab.h"
#include "wildmatch.h"
#include "prio-queue.h"
#include "oidset.h"
#define MAX_TAGS (FLAG_BITS - 1)
#define DEFAULT_CANDIDATES 10
@@ -286,38 +287,47 @@ static void lazy_queue_clear(struct lazy_queue *queue)
queue->get_pending = false;
}
static bool all_have_flag(const struct lazy_queue *queue, unsigned flag)
{
for (size_t i = queue->get_pending ? 1 : 0; i < queue->queue.nr; i++) {
struct commit *commit = queue->queue.array[i].data;
if (!(commit->object.flags & flag))
return false;
}
return true;
}
static unsigned long finish_depth_computation(struct lazy_queue *queue,
struct possible_tag *best)
{
unsigned long seen_commits = 0;
struct oidset unflagged = OIDSET_INIT;
for (size_t i = queue->get_pending ? 1 : 0; i < queue->queue.nr; i++) {
struct commit *commit = queue->queue.array[i].data;
if (!(commit->object.flags & best->flag_within))
oidset_insert(&unflagged, &commit->object.oid);
}
while (!lazy_queue_empty(queue)) {
struct commit *c = lazy_queue_get(queue);
struct commit_list *parents = c->parents;
seen_commits++;
if (c->object.flags & best->flag_within) {
if (all_have_flag(queue, best->flag_within))
if (!oidset_size(&unflagged))
break;
} else
} else {
oidset_remove(&unflagged, &c->object.oid);
best->depth++;
}
while (parents) {
unsigned seen, flag_before, flag_after;
struct commit *p = parents->item;
repo_parse_commit(the_repository, p);
if (!(p->object.flags & SEEN))
seen = p->object.flags & SEEN;
if (!seen)
lazy_queue_put(queue, p);
flag_before = p->object.flags & best->flag_within;
p->object.flags |= c->object.flags;
flag_after = p->object.flags & best->flag_within;
if (!seen && !flag_after)
oidset_insert(&unflagged, &p->object.oid);
if (seen && !flag_before && flag_after)
oidset_remove(&unflagged, &p->object.oid);
parents = parents->next;
}
}
oidset_clear(&unflagged);
return seen_commits;
}