[GSOC][PATCH v2 2/2] editor: remove the_repository usage
git_sequence_editor() reads sequence.editor using the_repository. Pass struct repository through the callers instead of relying on the global state. It is called from,
- builtin/var.c: Mostly the_repository is used in all the functions and
there is no proper local access to a repository, so pass the_repository.
- editor.c: The caller is inside launch_sequence_editor() function which is
called from rebase-interactive.c:edit_todo_list(), which does have a
local repository instance, so pass it down the caller.
With no remaining global states in editor.c remove '#define USE_THE_REPOSITORY_VARIABLE' and drop the dependency on 'environment.h'. This removes another dependency on the_repository and keeps editor code consistent with the ongoing effort to reduce global state.
Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
---
builtin/var.c | 2 +-
editor.c | 11 ++++-------
editor.h | 4 ++--
rebase-interactive.c | 2 +-
4 files changed, 8 insertions(+), 11 deletions(-)
Show changes to 4 files +8 −12
builtin/var.c, editor.c, editor.h, rebase-interactive.c
diff --git a/builtin/var.c b/builtin/var.c
index cc3a43cde2..7da263b129 100644
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -38,7 +38,7 @@ static char *editor(int ident_flag UNUSED)
static char *sequence_editor(int ident_flag UNUSED)
{
- return xstrdup_or_null(git_sequence_editor());
+ return xstrdup_or_null(git_sequence_editor(the_repository));
}
static char *pager(int ident_flag UNUSED)
diff --git a/editor.c b/editor.c
index b509d23f3b..b78c8a687f 100644
--- a/editor.c
+++ b/editor.c
@@ -1,11 +1,8 @@
-#define USE_THE_REPOSITORY_VARIABLE
-
#include "git-compat-util.h"
#include "abspath.h"
#include "advice.h"
#include "config.h"
#include "editor.h"
-#include "environment.h"
#include "gettext.h"
#include "pager.h"
#include "path.h"
@@ -53,12 +50,12 @@ const char *git_editor(void)
return editor;
}
-const char *git_sequence_editor(void)
+const char *git_sequence_editor(struct repository *r)
{
const char *editor = getenv("GIT_SEQUENCE_EDITOR");
if (!editor)
- repo_config_get_string_tmp(the_repository, "sequence.editor", &editor);
+ repo_config_get_string_tmp(r, "sequence.editor", &editor);
if (!editor)
editor = git_editor();
@@ -138,9 +135,9 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
}
int launch_sequence_editor(const char *path, struct strbuf *buffer,
- const char *const *env)
+ const char *const *env, struct repository *r)
{
- return launch_specified_editor(git_sequence_editor(), path, buffer, env);
+ return launch_specified_editor(git_sequence_editor(r), path, buffer, env);
}
int strbuf_edit_interactively(struct repository *r,
diff --git a/editor.h b/editor.h
index ced29046f8..bcd0cebc85 100644
--- a/editor.h
+++ b/editor.h
@@ -5,7 +5,7 @@ struct repository;
struct strbuf;
const char *git_editor(void);
-const char *git_sequence_editor(void);
+const char *git_sequence_editor(struct repository *r);
int is_terminal_dumb(void);
int set_editor_program(const char *var, const char *value);
@@ -21,7 +21,7 @@ int launch_editor(const char *path, struct strbuf *buffer,
const char *const *env);
int launch_sequence_editor(const char *path, struct strbuf *buffer,
- const char *const *env);
+ const char *const *env, struct repository *r);
/*
* In contrast to `launch_editor()`, this function writes out the contents
diff --git a/rebase-interactive.c b/rebase-interactive.c
index 809f76a87b..405ef353af 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -132,7 +132,7 @@ int edit_todo_list(struct repository *r, struct replay_opts *opts,
(flags | TODO_LIST_APPEND_TODO_HELP) & ~TODO_LIST_SHORTEN_IDS) < 0)
return error(_("could not write '%s'."), rebase_path_todo_backup());
- if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
+ if (launch_sequence_editor(todo_file, &new_todo->buf, NULL, r))
return -2;
strbuf_stripspace(&new_todo->buf, comment_line_str);
--
2.53.0