merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
90
third_party/git/revision.c
vendored
90
third_party/git/revision.c
vendored
|
|
@ -28,6 +28,7 @@
|
|||
#include "commit-graph.h"
|
||||
#include "prio-queue.h"
|
||||
#include "hashmap.h"
|
||||
#include "utf8.h"
|
||||
|
||||
volatile show_early_output_fn_t show_early_output;
|
||||
|
||||
|
|
@ -107,30 +108,34 @@ struct path_and_oids_entry {
|
|||
};
|
||||
|
||||
static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
|
||||
const struct path_and_oids_entry *e1,
|
||||
const struct path_and_oids_entry *e2,
|
||||
const struct hashmap_entry *eptr,
|
||||
const struct hashmap_entry *entry_or_key,
|
||||
const void *keydata)
|
||||
{
|
||||
const struct path_and_oids_entry *e1, *e2;
|
||||
|
||||
e1 = container_of(eptr, const struct path_and_oids_entry, ent);
|
||||
e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
|
||||
|
||||
return strcmp(e1->path, e2->path);
|
||||
}
|
||||
|
||||
static void paths_and_oids_init(struct hashmap *map)
|
||||
{
|
||||
hashmap_init(map, (hashmap_cmp_fn) path_and_oids_cmp, NULL, 0);
|
||||
hashmap_init(map, path_and_oids_cmp, NULL, 0);
|
||||
}
|
||||
|
||||
static void paths_and_oids_clear(struct hashmap *map)
|
||||
{
|
||||
struct hashmap_iter iter;
|
||||
struct path_and_oids_entry *entry;
|
||||
hashmap_iter_init(map, &iter);
|
||||
|
||||
while ((entry = (struct path_and_oids_entry *)hashmap_iter_next(&iter))) {
|
||||
hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
|
||||
oidset_clear(&entry->trees);
|
||||
free(entry->path);
|
||||
}
|
||||
|
||||
hashmap_free(map, 1);
|
||||
hashmap_free_entries(map, struct path_and_oids_entry, ent);
|
||||
}
|
||||
|
||||
static void paths_and_oids_insert(struct hashmap *map,
|
||||
|
|
@ -141,18 +146,19 @@ static void paths_and_oids_insert(struct hashmap *map,
|
|||
struct path_and_oids_entry key;
|
||||
struct path_and_oids_entry *entry;
|
||||
|
||||
hashmap_entry_init(&key, hash);
|
||||
hashmap_entry_init(&key.ent, hash);
|
||||
|
||||
/* use a shallow copy for the lookup */
|
||||
key.path = (char *)path;
|
||||
oidset_init(&key.trees, 0);
|
||||
|
||||
if (!(entry = (struct path_and_oids_entry *)hashmap_get(map, &key, NULL))) {
|
||||
entry = hashmap_get_entry(map, &key, ent, NULL);
|
||||
if (!entry) {
|
||||
entry = xcalloc(1, sizeof(struct path_and_oids_entry));
|
||||
hashmap_entry_init(entry, hash);
|
||||
hashmap_entry_init(&entry->ent, hash);
|
||||
entry->path = xstrdup(key.path);
|
||||
oidset_init(&entry->trees, 16);
|
||||
hashmap_put(map, entry);
|
||||
hashmap_put(map, &entry->ent);
|
||||
}
|
||||
|
||||
oidset_insert(&entry->trees, oid);
|
||||
|
|
@ -235,8 +241,7 @@ void mark_trees_uninteresting_sparse(struct repository *r,
|
|||
add_children_by_path(r, tree, &map);
|
||||
}
|
||||
|
||||
hashmap_iter_init(&map, &map_iter);
|
||||
while ((entry = hashmap_iter_next(&map_iter)))
|
||||
hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
|
||||
mark_trees_uninteresting_sparse(r, &entry->trees);
|
||||
|
||||
paths_and_oids_clear(&map);
|
||||
|
|
@ -404,9 +409,7 @@ static struct commit *handle_commit(struct rev_info *revs,
|
|||
struct tag *tag = (struct tag *) object;
|
||||
if (revs->tag_objects && !(flags & UNINTERESTING))
|
||||
add_pending_object(revs, object, tag->tag);
|
||||
if (!tag->tagged)
|
||||
die("bad tag");
|
||||
object = parse_object(revs->repo, &tag->tagged->oid);
|
||||
object = parse_object(revs->repo, get_tagged_oid(tag));
|
||||
if (!object) {
|
||||
if (revs->ignore_missing_links || (flags & UNINTERESTING))
|
||||
return NULL;
|
||||
|
|
@ -1665,7 +1668,7 @@ void repo_init_revisions(struct repository *r,
|
|||
revs->diffopt.prefix_length = strlen(prefix);
|
||||
}
|
||||
|
||||
revs->notes_opt.use_default_notes = -1;
|
||||
init_display_notes(&revs->notes_opt);
|
||||
}
|
||||
|
||||
static void add_pending_commit_list(struct rev_info *revs,
|
||||
|
|
@ -2063,7 +2066,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
revs->simplify_by_decoration = 1;
|
||||
revs->limited = 1;
|
||||
revs->prune = 1;
|
||||
load_ref_decorations(NULL, DECORATE_SHORT_REFS);
|
||||
} else if (!strcmp(arg, "--date-order")) {
|
||||
revs->sort_order = REV_SORT_BY_COMMIT_DATE;
|
||||
revs->topo_order = 1;
|
||||
|
|
@ -2201,9 +2203,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
die("'%s': not a non-negative integer", arg);
|
||||
revs->expand_tabs_in_log = val;
|
||||
} else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
|
||||
revs->show_notes = 1;
|
||||
enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
|
||||
revs->show_notes_given = 1;
|
||||
revs->notes_opt.use_default_notes = 1;
|
||||
} else if (!strcmp(arg, "--show-signature")) {
|
||||
revs->show_signature = 1;
|
||||
} else if (!strcmp(arg, "--no-show-signature")) {
|
||||
|
|
@ -2218,25 +2219,14 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
revs->track_first_time = 1;
|
||||
} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
|
||||
skip_prefix(arg, "--notes=", &optarg)) {
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
revs->show_notes = 1;
|
||||
revs->show_notes_given = 1;
|
||||
if (starts_with(arg, "--show-notes=") &&
|
||||
revs->notes_opt.use_default_notes < 0)
|
||||
revs->notes_opt.use_default_notes = 1;
|
||||
strbuf_addstr(&buf, optarg);
|
||||
expand_notes_ref(&buf);
|
||||
string_list_append(&revs->notes_opt.extra_notes_refs,
|
||||
strbuf_detach(&buf, NULL));
|
||||
} else if (!strcmp(arg, "--no-notes")) {
|
||||
revs->show_notes = 0;
|
||||
enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
|
||||
revs->show_notes_given = 1;
|
||||
} else if (!strcmp(arg, "--no-notes")) {
|
||||
disable_display_notes(&revs->notes_opt, &revs->show_notes);
|
||||
revs->show_notes_given = 1;
|
||||
revs->notes_opt.use_default_notes = -1;
|
||||
/* we have been strdup'ing ourselves, so trick
|
||||
* string_list into free()ing strings */
|
||||
revs->notes_opt.extra_notes_refs.strdup_strings = 1;
|
||||
string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
|
||||
revs->notes_opt.extra_notes_refs.strdup_strings = 0;
|
||||
} else if (!strcmp(arg, "--standard-notes")) {
|
||||
revs->show_notes_given = 1;
|
||||
revs->notes_opt.use_default_notes = 1;
|
||||
|
|
@ -2523,6 +2513,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
|
||||
struct argv_array prune_data = ARGV_ARRAY_INIT;
|
||||
const char *submodule = NULL;
|
||||
int seen_end_of_options = 0;
|
||||
|
||||
if (opt)
|
||||
submodule = opt->submodule;
|
||||
|
|
@ -2552,7 +2543,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
revarg_opt |= REVARG_CANNOT_BE_FILENAME;
|
||||
for (left = i = 1; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
if (*arg == '-') {
|
||||
if (!seen_end_of_options && *arg == '-') {
|
||||
int opts;
|
||||
|
||||
opts = handle_revision_pseudo_opt(submodule,
|
||||
|
|
@ -2574,6 +2565,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
continue;
|
||||
}
|
||||
|
||||
if (!strcmp(arg, "--end-of-options")) {
|
||||
seen_end_of_options = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
opts = handle_revision_opt(revs, argc - i, argv + i,
|
||||
&left, argv, opt);
|
||||
if (opts > 0) {
|
||||
|
|
@ -2684,6 +2680,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
|
||||
grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
|
||||
&revs->grep_filter);
|
||||
if (!is_encoding_utf8(get_log_output_encoding()))
|
||||
revs->grep_filter.ignore_locale = 1;
|
||||
compile_grep_patterns(&revs->grep_filter);
|
||||
|
||||
if (revs->reverse && revs->reflog_info)
|
||||
|
|
@ -3088,7 +3086,7 @@ static void set_children(struct rev_info *revs)
|
|||
|
||||
void reset_revision_walk(void)
|
||||
{
|
||||
clear_object_flags(SEEN | ADDED | SHOWN);
|
||||
clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
|
||||
}
|
||||
|
||||
static int mark_uninteresting(const struct object_id *oid,
|
||||
|
|
@ -3201,10 +3199,26 @@ static void compute_indegrees_to_depth(struct rev_info *revs,
|
|||
indegree_walk_step(revs);
|
||||
}
|
||||
|
||||
static void reset_topo_walk(struct rev_info *revs)
|
||||
{
|
||||
struct topo_walk_info *info = revs->topo_walk_info;
|
||||
|
||||
clear_prio_queue(&info->explore_queue);
|
||||
clear_prio_queue(&info->indegree_queue);
|
||||
clear_prio_queue(&info->topo_queue);
|
||||
clear_indegree_slab(&info->indegree);
|
||||
clear_author_date_slab(&info->author_date);
|
||||
|
||||
FREE_AND_NULL(revs->topo_walk_info);
|
||||
}
|
||||
|
||||
static void init_topo_walk(struct rev_info *revs)
|
||||
{
|
||||
struct topo_walk_info *info;
|
||||
struct commit_list *list;
|
||||
if (revs->topo_walk_info)
|
||||
reset_topo_walk(revs);
|
||||
|
||||
revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
|
||||
info = revs->topo_walk_info;
|
||||
memset(info, 0, sizeof(struct topo_walk_info));
|
||||
|
|
@ -3934,7 +3948,7 @@ struct commit *get_revision(struct rev_info *revs)
|
|||
return c;
|
||||
}
|
||||
|
||||
char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
|
||||
const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
|
||||
{
|
||||
if (commit->object.flags & BOUNDARY)
|
||||
return "-";
|
||||
|
|
@ -3956,7 +3970,7 @@ char *get_revision_mark(const struct rev_info *revs, const struct commit *commit
|
|||
|
||||
void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
|
||||
{
|
||||
char *mark = get_revision_mark(revs, commit);
|
||||
const char *mark = get_revision_mark(revs, commit);
|
||||
if (!strlen(mark))
|
||||
return;
|
||||
fputs(mark, stdout);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue