averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

wt-status: pass struct repository through function parameters

Browse Source 
Some functions in wt-status.c (count_stash_entries(),
read_line_from_git_path(), abbrev_oid_in_line(), and
read_rebase_todolist()) rely on the_repository as they do not have access
to a local repository instance.

Add a struct repository *r parameter to these functions and pass the local
repository instance through the callers, which already have access to it
either directly by struct repository *r or indirectly by struct wt_state
*s (s->repo).

Replace uses of the_repository in these functions with the passed parameter.

Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shreyansh Paliwal
2026-02-18 23:23:40 +05:30
committed by Junio C Hamano
parent 67ad42147a
commit 4631e22f92
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wt-status.c
View File

@@ -984,17 +984,17 @@ static int stash_count_refs(const char *refname UNUSED,
return 0;
}
static int count_stash_entries(void)
static int count_stash_entries(struct repository *r)
{
int n = 0;
refs_for_each_reflog_ent(get_main_ref_store(the_repository),
refs_for_each_reflog_ent(get_main_ref_store(r),
"refs/stash", stash_count_refs, &n);
return n;
}
static void wt_longstatus_print_stash_summary(struct wt_status *s)
{
int stash_count = count_stash_entries();
int stash_count = count_stash_entries(s->repo);
if (stash_count > 0)
status_printf_ln(s, GIT_COLOR_NORMAL,
@@ -1287,10 +1287,10 @@ static void show_am_in_progress(struct wt_status *s,
wt_longstatus_print_trailer(s);
}
static char *read_line_from_git_path(const char *filename)
static char *read_line_from_git_path(struct repository *r, const char *filename)
{
struct strbuf buf = STRBUF_INIT;
FILE *fp = fopen_or_warn(repo_git_path_append(the_repository, &buf,
FILE *fp = fopen_or_warn(repo_git_path_append(r, &buf,
"%s", filename), "r");
if (!fp) {
@@ -1325,8 +1325,8 @@ static int split_commit_in_progress(struct wt_status *s)
if (head_flags & REF_ISSYMREF || orig_head_flags & REF_ISSYMREF)
return 0;
rebase_amend = read_line_from_git_path("rebase-merge/amend");
rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
rebase_amend = read_line_from_git_path(s->repo, "rebase-merge/amend");
rebase_orig_head = read_line_from_git_path(s->repo, "rebase-merge/orig-head");
if (!rebase_amend || !rebase_orig_head)
; /* fall through, no split in progress */
@@ -1350,7 +1350,7 @@ static int split_commit_in_progress(struct wt_status *s)
* The function assumes that the line does not contain useless spaces
* before or after the command.
*/
static void abbrev_oid_in_line(struct strbuf *line)
static void abbrev_oid_in_line(struct repository *r, struct strbuf *line)
{
struct string_list split = STRING_LIST_INIT_DUP;
struct object_id oid;
@@ -1362,7 +1362,7 @@ static void abbrev_oid_in_line(struct strbuf *line)
return;
if ((2 <= string_list_split(&split, line->buf, " ", 2)) &&
!repo_get_oid(the_repository, split.items[1].string, &oid)) {
!repo_get_oid(r, split.items[1].string, &oid)) {
strbuf_reset(line);
strbuf_addf(line, "%s ", split.items[0].string);
strbuf_add_unique_abbrev(line, &oid, DEFAULT_ABBREV);
@@ -1372,10 +1372,10 @@ static void abbrev_oid_in_line(struct strbuf *line)
string_list_clear(&split, 0);
}
static int read_rebase_todolist(const char *fname, struct string_list *lines)
static int read_rebase_todolist(struct repository *r, const char *fname, struct string_list *lines)
{
struct strbuf buf = STRBUF_INIT;
FILE *f = fopen(repo_git_path_append(the_repository, &buf, "%s", fname), "r");
FILE *f = fopen(repo_git_path_append(r, &buf, "%s", fname), "r");
int ret;
if (!f) {
@@ -1384,7 +1384,7 @@ static int read_rebase_todolist(const char *fname, struct string_list *lines)
goto out;
}
die_errno("Could not open file %s for reading",
repo_git_path_replace(the_repository, &buf, "%s", fname));
repo_git_path_replace(r, &buf, "%s", fname));
}
while (!strbuf_getline_lf(&buf, f)) {
if (starts_with(buf.buf, comment_line_str))
@@ -1392,7 +1392,7 @@ static int read_rebase_todolist(const char *fname, struct string_list *lines)
strbuf_trim(&buf);
if (!buf.len)
continue;
abbrev_oid_in_line(&buf);
abbrev_oid_in_line(r, &buf);
string_list_append(lines, buf.buf);
}
fclose(f);
@@ -1413,8 +1413,8 @@ static void show_rebase_information(struct wt_status *s,
struct string_list have_done = STRING_LIST_INIT_DUP;
struct string_list yet_to_do = STRING_LIST_INIT_DUP;
read_rebase_todolist("rebase-merge/done", &have_done);
if (read_rebase_todolist("rebase-merge/git-rebase-todo",
read_rebase_todolist(s->repo, "rebase-merge/done", &have_done);
if (read_rebase_todolist(s->repo, "rebase-merge/git-rebase-todo",
&yet_to_do))
status_printf_ln(s, color,
_("git-rebase-todo is missing."));
@@ -2259,7 +2259,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
*/
static void wt_porcelain_v2_print_stash(struct wt_status *s)
{
int stash_count = count_stash_entries();
int stash_count = count_stash_entries(s->repo);
char eol = s->null_termination ? '\0' : '\n';
if (stash_count > 0)