revisions API users: add straightforward release_revisions()

avar · gitster · commit fe15d775683e · 2022-04-03T15:03:51.000-07:00
Add a release_revisions() to various users of "struct rev_list" in
those straightforward cases where we only need to add the
release_revisions() call to the end of a block, and don't need to
e.g. refactor anything to use a "goto cleanup" pattern.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/add-interactive.c b/add-interactive.c
@@ -570,6 +570,7 @@ static int get_modified_files(struct repository *r,
 
 		if (ps)
 			clear_pathspec(&rev.prune_data);
+		release_revisions(&rev);
 	}
 	hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
 	if (unmerged_count)
diff --git a/bisect.c b/bisect.c
@@ -884,6 +884,7 @@ static int check_ancestors(struct repository *r, int rev_nr,
 	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
 
+	release_revisions(&revs);
 	return res;
 }
 
@@ -964,6 +965,7 @@ static void show_diff_tree(struct repository *r,
 
 	setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
 	log_tree_commit(&opt, commit);
+	release_revisions(&opt);
 }
 
 /*
diff --git a/builtin/add.c b/builtin/add.c
@@ -340,6 +340,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
 
 	unlink(file);
 	free(file);
+	release_revisions(&rev);
 	return 0;
 }
 
diff --git a/builtin/am.c b/builtin/am.c
@@ -1397,6 +1397,7 @@ static void write_commit_patch(const struct am_state *state, struct commit *comm
 	add_pending_object(&rev_info, &commit->object, "");
 	diff_setup_done(&rev_info.diffopt);
 	log_tree_commit(&rev_info, commit);
+	release_revisions(&rev_info);
 }
 
 /**
@@ -1429,6 +1430,7 @@ static void write_index_patch(const struct am_state *state)
 	add_pending_object(&rev_info, &tree->object, "");
 	diff_setup_done(&rev_info.diffopt);
 	run_diff_index(&rev_info, 1);
+	release_revisions(&rev_info);
 }
 
 /**
@@ -1582,6 +1584,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 		add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
 		diff_setup_done(&rev_info.diffopt);
 		run_diff_index(&rev_info, 1);
+		release_revisions(&rev_info);
 	}
 
 	if (run_apply(state, index_path))
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
@@ -555,6 +555,7 @@ static int bisect_skipped_commits(struct bisect_terms *terms)
 	reset_revision_walk();
 
 	strbuf_release(&commit_name);
+	release_revisions(&revs);
 	fclose(fp);
 	return 0;
 }
@@ -1041,6 +1042,7 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar
 						oid_to_hex(&commit->object.oid));
 
 			reset_revision_walk();
+			release_revisions(&revs);
 		} else {
 			strvec_push(&argv_state, argv[i]);
 		}
diff --git a/builtin/blame.c b/builtin/blame.c
@@ -1203,5 +1203,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
 cleanup:
 	cleanup_scoreboard(&sb);
+	release_revisions(&revs);
 	return 0;
 }
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -1082,6 +1082,7 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
 
 	/* Clean up objects used, as they will be reused. */
 	repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
+	release_revisions(&revs);
 }
 
 static int switch_branches(const struct checkout_opts *opts,
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -1123,6 +1123,7 @@ static const char *find_author_by_nickname(const char *name)
 		strbuf_release(&buf);
 		format_commit_message(commit, "%aN <%aE>", &buf, &ctx);
 		clear_mailmap(&mailmap);
+		release_revisions(&revs);
 		return strbuf_detach(&buf, NULL);
 	}
 	die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -517,6 +517,7 @@ static void describe_blob(struct object_id oid, struct strbuf *dst)
 
 	traverse_commit_list(&revs, process_commit, process_object, &pcd);
 	reset_revision_walk();
+	release_revisions(&revs);
 }
 
 static void describe(const char *arg, int last_one)
@@ -667,6 +668,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 				suffix = NULL;
 			else
 				suffix = dirty;
+			release_revisions(&revs);
 		}
 		describe("HEAD", 1);
 	} else if (dirty) {
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
@@ -1275,6 +1275,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		printf("done\n");
 
 	refspec_clear(&refspecs);
+	release_revisions(&revs);
 
 	return 0;
 }
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -443,6 +443,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 	}
 	write_file_buf(git_path_squash_msg(the_repository), out.buf, out.len);
 	strbuf_release(&out);
+	release_revisions(&rev);
 }
 
 static void finish(struct commit *head_commit,
@@ -998,6 +999,7 @@ static int evaluate_result(void)
 	 */
 	cnt += count_unmerged_entries();
 
+	release_revisions(&rev);
 	return cnt;
 }
 
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -4167,11 +4167,13 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		read_object_list_from_stdin();
 	} else if (pfd.have_revs) {
 		get_object_list(&pfd.revs, rp.nr, rp.v);
+		release_revisions(&pfd.revs);
 	} else {
 		struct rev_info revs;
 
 		repo_init_revisions(the_repository, &revs, NULL);
 		get_object_list(&revs, rp.nr, rp.v);
+		release_revisions(&revs);
 	}
 	cleanup_preferred_base();
 	if (include_tag && nr_result)
diff --git a/builtin/prune.c b/builtin/prune.c
@@ -196,5 +196,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 		prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
 	}
 
+	release_revisions(&revs);
 	return 0;
 }
diff --git a/builtin/reflog.c b/builtin/reflog.c
@@ -248,6 +248,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		if (verbose)
 			printf(_("Marking reachable objects..."));
 		mark_reachable_objects(&revs, 0, 0, NULL);
+		release_revisions(&revs);
 		if (verbose)
 			putchar('\n');
 	}
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
@@ -422,6 +422,8 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 	else
 		get_from_rev(&rev, &log);
 
+	release_revisions(&rev);
+
 	shortlog_output(&log);
 	if (log.file != stdout)
 		fclose(log.file);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
@@ -1269,6 +1269,7 @@ static int compute_summary_module_list(struct object_id *head_oid,
 		run_diff_files(&rev, 0);
 	prepare_submodule_summary(info, &list);
 	strvec_clear(&diff_args);
+	release_revisions(&rev);
 	return 0;
 }
 
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
@@ -699,6 +699,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 			shortlog(origins.items[i].string,
 				 origins.items[i].util,
 				 head, &rev, opts, out);
+		release_revisions(&rev);
 	}
 
 	strbuf_complete_line(out);
diff --git a/merge-ort.c b/merge-ort.c
@@ -1594,6 +1594,7 @@ static int find_first_merges(struct repository *repo,
 	}
 
 	object_array_clear(&merges);
+	release_revisions(&revs);
 	return result->nr;
 }
 
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -1160,6 +1160,7 @@ static int find_first_merges(struct repository *repo,
 	}
 
 	object_array_clear(&merges);
+	release_revisions(&revs);
 	return result->nr;
 }
 
diff --git a/midx.c b/midx.c
@@ -1061,6 +1061,7 @@ static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr
 	if (indexed_commits_nr_p)
 		*indexed_commits_nr_p = cb.commits_nr;
 
+	release_revisions(&revs);
 	return cb.commits;
 }
 
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
@@ -326,6 +326,7 @@ static void bitmap_builder_init(struct bitmap_builder *bb,
 	trace2_data_intmax("pack-bitmap-write", the_repository,
 			   "num_maximal_commits", num_maximal);
 
+	release_revisions(&revs);
 	free_commit_list(reusable);
 }
 
diff --git a/ref-filter.c b/ref-filter.c
@@ -2392,6 +2392,7 @@ static void reach_filter(struct ref_array *array,
 		clear_commit_marks(merge_commit, ALL_REV_FLAGS);
 	}
 
+	release_revisions(&revs);
 	free(to_clear);
 }
 
diff --git a/remote.c b/remote.c
@@ -2172,6 +2172,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
 	clear_commit_marks(theirs, ALL_REV_FLAGS);
 
 	strvec_clear(&argv);
+	release_revisions(&revs);
 	return 1;
 }
 
diff --git a/sequencer.c b/sequencer.c
@@ -1347,6 +1347,7 @@ void print_commit_summary(struct repository *r,
 		log_tree_commit(&rev, commit);
 	}
 
+	release_revisions(&rev);
 	strbuf_release(&format);
 }
 
@@ -3415,6 +3416,7 @@ static int make_patch(struct repository *r,
 		unuse_commit_buffer(commit, commit_buffer);
 	}
 	strbuf_release(&buf);
+	release_revisions(&log_tree_opt);
 
 	return res;
 }
@@ -4525,6 +4527,7 @@ static int pick_commits(struct repository *r,
 					      &log_tree_opt.diffopt);
 				log_tree_diff_flush(&log_tree_opt);
 			}
+			release_revisions(&log_tree_opt);
 		}
 		flush_rewritten_pending();
 		if (!stat(rebase_path_rewritten_list(), &st) &&
diff --git a/shallow.c b/shallow.c
@@ -261,6 +261,7 @@ struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av,
 		if ((o->flags & both_flags) == both_flags)
 			o->flags &= ~not_shallow_flag;
 	}
+	release_revisions(&revs);
 	return result;
 }
 
diff --git a/submodule.c b/submodule.c
@@ -900,9 +900,11 @@ static void collect_changed_submodules(struct repository *r,
 		diff_rev.diffopt.format_callback_data = &data;
 		diff_rev.dense_combined_merges = 1;
 		diff_tree_combined_merge(commit, &diff_rev);
+		release_revisions(&diff_rev);
 	}
 
 	reset_revision_walk();
+	release_revisions(&rev);
 }
 
 static void free_submodules_oids(struct string_list *submodules)
diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
@@ -43,6 +43,7 @@ static int run_revision_walk(void)
 	}
 
 	reset_revision_walk();
+	release_revisions(&rev);
 	return got_revision;
 }
 
diff --git a/wt-status.c b/wt-status.c
@@ -1152,6 +1152,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
 		rev.diffopt.b_prefix = "w/";
 		run_diff_files(&rev, 0);
 	}
+	release_revisions(&rev);
 }
 
 static void wt_longstatus_print_tracking(struct wt_status *s)

Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,7 @@ static int get_modified_files(struct repository *r,`
`570`	`570`
`571`	`571`	`if (ps)`
`572`	`572`	`clear_pathspec(&rev.prune_data);`
	`573`	`+ release_revisions(&rev);`
`573`	`574`	`}`
`574`	`575`	`hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);`
`575`	`576`	`if (unmerged_count)`
Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,7 @@ static int check_ancestors(struct repository *r, int rev_nr,`
`884`	`884`	`/* Clean up objects used, as they will be reused. */`
`885`	`885`	`clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);`
`886`	`886`
	`887`	`+ release_revisions(&revs);`
`887`	`888`	`return res;`
`888`	`889`	`}`
`889`	`890`
`@@ -964,6 +965,7 @@ static void show_diff_tree(struct repository *r,`
`964`	`965`
`965`	`966`	`setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);`
`966`	`967`	`log_tree_commit(&opt, commit);`
	`968`	`+ release_revisions(&opt);`
`967`	`969`	`}`
`968`	`970`
`969`	`971`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ static int edit_patch(int argc, const char *argv, const char prefix)`
`340`	`340`
`341`	`341`	`unlink(file);`
`342`	`342`	`free(file);`
	`343`	`+ release_revisions(&rev);`
`343`	`344`	`return 0;`
`344`	`345`	`}`
`345`	`346`
Original file line number	Diff line number	Diff line change
`@@ -1397,6 +1397,7 @@ static void write_commit_patch(const struct am_state state, struct commit comm`
`1397`	`1397`	`add_pending_object(&rev_info, &commit->object, "");`
`1398`	`1398`	`diff_setup_done(&rev_info.diffopt);`
`1399`	`1399`	`log_tree_commit(&rev_info, commit);`
	`1400`	`+ release_revisions(&rev_info);`
`1400`	`1401`	`}`
`1401`	`1402`
`1402`	`1403`	`/**`
`@@ -1429,6 +1430,7 @@ static void write_index_patch(const struct am_state *state)`
`1429`	`1430`	`add_pending_object(&rev_info, &tree->object, "");`
`1430`	`1431`	`diff_setup_done(&rev_info.diffopt);`
`1431`	`1432`	`run_diff_index(&rev_info, 1);`
	`1433`	`+ release_revisions(&rev_info);`
`1432`	`1434`	`}`
`1433`	`1435`
`1434`	`1436`	`/**`
`@@ -1582,6 +1584,7 @@ static int fall_back_threeway(const struct am_state state, const char index_pa`
`1582`	`1584`	`add_pending_oid(&rev_info, "HEAD", &our_tree, 0);`
`1583`	`1585`	`diff_setup_done(&rev_info.diffopt);`
`1584`	`1586`	`run_diff_index(&rev_info, 1);`
	`1587`	`+ release_revisions(&rev_info);`
`1585`	`1588`	`}`
`1586`	`1589`
`1587`	`1590`	`if (run_apply(state, index_path))`
Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,7 @@ static int bisect_skipped_commits(struct bisect_terms *terms)`
`555`	`555`	`reset_revision_walk();`
`556`	`556`
`557`	`557`	`strbuf_release(&commit_name);`
	`558`	`+ release_revisions(&revs);`
`558`	`559`	`fclose(fp);`
`559`	`560`	`return 0;`
`560`	`561`	`}`
`@@ -1041,6 +1042,7 @@ static enum bisect_error bisect_skip(struct bisect_terms terms, const char *ar`
`1041`	`1042`	`oid_to_hex(&commit->object.oid));`
`1042`	`1043`
`1043`	`1044`	`reset_revision_walk();`
	`1045`	`+ release_revisions(&revs);`
`1044`	`1046`	`} else {`
`1045`	`1047`	`strvec_push(&argv_state, argv[i]);`
`1046`	`1048`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1203,5 +1203,6 @@ int cmd_blame(int argc, const char *argv, const char prefix)`
`1203`	`1203`
`1204`	`1204`	`cleanup:`
`1205`	`1205`	`cleanup_scoreboard(&sb);`
	`1206`	`+ release_revisions(&revs);`
`1206`	`1207`	`return 0;`
`1207`	`1208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1082,6 +1082,7 @@ static void orphaned_commit_warning(struct commit old_commit, struct commit ne`
`1082`	`1082`
`1083`	`1083`	`/* Clean up objects used, as they will be reused. */`
`1084`	`1084`	`repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);`
	`1085`	`+ release_revisions(&revs);`
`1085`	`1086`	`}`
`1086`	`1087`
`1087`	`1088`	`static int switch_branches(const struct checkout_opts *opts,`
Original file line number	Diff line number	Diff line change
`@@ -1123,6 +1123,7 @@ static const char find_author_by_nickname(const char name)`
`1123`	`1123`	`strbuf_release(&buf);`
`1124`	`1124`	`format_commit_message(commit, "%aN <%aE>", &buf, &ctx);`
`1125`	`1125`	`clear_mailmap(&mailmap);`
	`1126`	`+ release_revisions(&revs);`
`1126`	`1127`	`return strbuf_detach(&buf, NULL);`
`1127`	`1128`	`}`
`1128`	`1129`	`die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);`
Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ static void describe_blob(struct object_id oid, struct strbuf *dst)`
`517`	`517`
`518`	`518`	`traverse_commit_list(&revs, process_commit, process_object, &pcd);`
`519`	`519`	`reset_revision_walk();`
	`520`	`+ release_revisions(&revs);`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`static void describe(const char *arg, int last_one)`
`@@ -667,6 +668,7 @@ int cmd_describe(int argc, const char *argv, const char prefix)`
`667`	`668`	`suffix = NULL;`
`668`	`669`	`else`
`669`	`670`	`suffix = dirty;`
	`671`	`+ release_revisions(&revs);`
`670`	`672`	`}`
`671`	`673`	`describe("HEAD", 1);`
`672`	`674`	`} else if (dirty) {`
Original file line number	Diff line number	Diff line change
`@@ -1275,6 +1275,7 @@ int cmd_fast_export(int argc, const char *argv, const char prefix)`
`1275`	`1275`	`printf("done\n");`
`1276`	`1276`
`1277`	`1277`	`refspec_clear(&refspecs);`
	`1278`	`+ release_revisions(&revs);`
`1278`	`1279`
`1279`	`1280`	`return 0;`
`1280`	`1281`	`}`