mirror of
https://gitlab.gnome.org/GNOME/gitg
synced 2024-08-24 18:36:25 +00:00
Switch command v/va function names111
This commit is contained in:
parent
32840505d3
commit
f8cf3547d3
|
@ -134,8 +134,8 @@ run_progress (GitgWindow *window,
|
|||
GitgShell *shell = gitg_shell_new (1000);
|
||||
gchar const **argv = parse_valist (ap);
|
||||
|
||||
GitgCommand *cmd = gitg_command_new (gitg_window_get_repository (window),
|
||||
(gchar const * const *)argv);
|
||||
GitgCommand *cmd = gitg_command_newv (gitg_window_get_repository (window),
|
||||
(gchar const * const *)argv);
|
||||
|
||||
if (!gitg_shell_run (shell, cmd, NULL))
|
||||
{
|
||||
|
@ -263,7 +263,7 @@ remove_local_branch (GitgWindow *window,
|
|||
gchar const *name = gitg_ref_get_shortname (ref);
|
||||
GitgRepository *repository = gitg_window_get_repository (window);
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"branch",
|
||||
"-d",
|
||||
name,
|
||||
|
@ -279,7 +279,7 @@ remove_local_branch (GitgWindow *window,
|
|||
|
||||
if (ret == GTK_RESPONSE_ACCEPT)
|
||||
{
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"branch",
|
||||
"-D",
|
||||
name,
|
||||
|
@ -377,7 +377,7 @@ get_stash_refspec (GitgRepository *repository, GitgRef *stash)
|
|||
{
|
||||
gchar **out;
|
||||
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_newv (repository,
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_new (repository,
|
||||
"log",
|
||||
"--no-color",
|
||||
"--pretty=oneline",
|
||||
|
@ -435,7 +435,7 @@ remove_stash (GitgWindow *window, GitgRef *ref)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"reflog",
|
||||
"delete",
|
||||
"--updateref",
|
||||
|
@ -452,14 +452,14 @@ remove_stash (GitgWindow *window, GitgRef *ref)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"rev-parse",
|
||||
"--verify",
|
||||
"refs/stash@{0}",
|
||||
NULL),
|
||||
NULL))
|
||||
{
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-d",
|
||||
"refs/stash",
|
||||
|
@ -494,7 +494,7 @@ remove_tag (GitgWindow *window, GitgRef *ref)
|
|||
|
||||
GitgRepository *repository = gitg_window_get_repository (window);
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"tag",
|
||||
"-d",
|
||||
name,
|
||||
|
@ -558,7 +558,7 @@ rename_branch (GitgWindow *window,
|
|||
gchar const *oldname = gitg_ref_get_shortname (ref);
|
||||
GitgRepository *repository = gitg_window_get_repository (window);
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"branch",
|
||||
"-m",
|
||||
oldname,
|
||||
|
@ -575,7 +575,7 @@ rename_branch (GitgWindow *window,
|
|||
|
||||
if (ret == GTK_RESPONSE_ACCEPT)
|
||||
{
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"branch",
|
||||
"-M",
|
||||
oldname,
|
||||
|
@ -708,18 +708,18 @@ update_buffer (GitgShell *shell, gchar **lines, GString *buffer)
|
|||
static gboolean
|
||||
no_changes (GitgRepository *repository)
|
||||
{
|
||||
return gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
return gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-index",
|
||||
"--refresh",
|
||||
NULL),
|
||||
NULL) &&
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"diff-files",
|
||||
"--no-ext-diff",
|
||||
"--quiet",
|
||||
NULL),
|
||||
NULL) &&
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"diff-index",
|
||||
"--no-ext-diff",
|
||||
"--cached",
|
||||
|
@ -771,7 +771,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
}
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"log",
|
||||
"--no-color",
|
||||
"--abbrev-commit",
|
||||
|
@ -795,7 +795,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
|
||||
// Create tree object of the current index
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"write-tree",
|
||||
NULL),
|
||||
NULL);
|
||||
|
@ -818,7 +818,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
g_object_unref (inp);
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"commit-tree",
|
||||
tree,
|
||||
"-p",
|
||||
|
@ -874,35 +874,35 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
|
||||
tmpname = g_file_get_path (customindex);
|
||||
|
||||
GitgCommand *cmd_read_tree = gitg_command_newv (repository,
|
||||
GitgCommand *cmd_read_tree = gitg_command_new (repository,
|
||||
"read-tree",
|
||||
"-m",
|
||||
tree,
|
||||
NULL);
|
||||
|
||||
gitg_command_add_environmentv (cmd_read_tree,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
gitg_command_add_environment (cmd_read_tree,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
|
||||
GitgCommand *cmd_add = gitg_command_newv (repository,
|
||||
GitgCommand *cmd_add = gitg_command_new (repository,
|
||||
"add",
|
||||
"-u",
|
||||
NULL);
|
||||
|
||||
gitg_command_add_environmentv (cmd_add,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
gitg_command_add_environment (cmd_add,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
|
||||
GitgCommand *cmd_write_tree = gitg_command_newv (repository,
|
||||
GitgCommand *cmd_write_tree = gitg_command_new (repository,
|
||||
"write-tree",
|
||||
NULL);
|
||||
|
||||
gitg_command_add_environmentv (cmd_write_tree,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
gitg_command_add_environment (cmd_write_tree,
|
||||
"GIT_INDEX_FILE",
|
||||
tmpname,
|
||||
NULL);
|
||||
|
||||
g_free (tmpname);
|
||||
|
||||
|
@ -931,7 +931,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
g_object_unref (inp);
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"commit-tree",
|
||||
stashtree,
|
||||
"-p",
|
||||
|
@ -985,7 +985,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
g_free (path);
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
reason,
|
||||
|
@ -997,7 +997,7 @@ stash_changes_real (GitgWindow *window, gchar **ref, gboolean storeref)
|
|||
g_free (rref);
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"reset",
|
||||
"--hard",
|
||||
NULL),
|
||||
|
@ -1046,7 +1046,7 @@ checkout_local_branch_real (GitgWindow *window, GitgRef *ref)
|
|||
{
|
||||
GitgRepository *repository = gitg_window_get_repository (window);
|
||||
|
||||
return gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
return gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"checkout",
|
||||
gitg_ref_get_shortname (ref),
|
||||
NULL),
|
||||
|
@ -1095,7 +1095,7 @@ checkout_remote_branch (GitgWindow *window,
|
|||
gchar const *local = gitg_ref_get_local_name (ref);
|
||||
gboolean ret;
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"checkout",
|
||||
"--track",
|
||||
"-b",
|
||||
|
@ -1135,7 +1135,7 @@ checkout_tag (GitgWindow *window,
|
|||
gchar const *name = gitg_ref_get_shortname (ref);
|
||||
gboolean ret;
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"checkout",
|
||||
"-b",
|
||||
name,
|
||||
|
@ -1264,7 +1264,7 @@ on_merge_rebase_result (GitgWindow *window,
|
|||
|
||||
if (info->stashcommit)
|
||||
{
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
"gitg autosave stash",
|
||||
|
@ -1285,7 +1285,7 @@ on_merge_rebase_result (GitgWindow *window,
|
|||
else if (info->stashcommit)
|
||||
{
|
||||
// Reapply stash
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (gitg_window_get_repository (window),
|
||||
if (!gitg_shell_run_sync (gitg_command_new (gitg_window_get_repository (window),
|
||||
"stash",
|
||||
"apply",
|
||||
"--index",
|
||||
|
@ -1293,7 +1293,7 @@ on_merge_rebase_result (GitgWindow *window,
|
|||
NULL),
|
||||
NULL))
|
||||
{
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
"gitg autosave stash",
|
||||
|
@ -1354,7 +1354,7 @@ gitg_branch_actions_merge (GitgWindow *window,
|
|||
GitgRef *head = gitg_repository_get_current_working_ref (repository);
|
||||
|
||||
// First checkout the correct branch on which to merge, e.g. dest
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"checkout",
|
||||
gitg_ref_get_shortname (dest),
|
||||
NULL),
|
||||
|
@ -1666,7 +1666,7 @@ gitg_branch_actions_apply_stash (GitgWindow *window,
|
|||
gchar *sha1 = gitg_hash_hash_to_sha1_new (gitg_ref_get_hash (stash));
|
||||
gboolean ret;
|
||||
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"stash",
|
||||
"apply",
|
||||
"--index",
|
||||
|
@ -1710,7 +1710,7 @@ gitg_branch_actions_create (GitgWindow *window, gchar const *sha1, gchar const *
|
|||
|
||||
repository = gitg_window_get_repository (window);
|
||||
|
||||
result = gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
result = gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"branch",
|
||||
name,
|
||||
sha1,
|
||||
|
@ -1751,7 +1751,7 @@ gitg_branch_actions_tag (GitgWindow *window, gchar const *sha1, gchar const *nam
|
|||
|
||||
if (message != NULL && message[0] != '\0')
|
||||
{
|
||||
result = gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
result = gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"tag",
|
||||
"-m",
|
||||
message,
|
||||
|
@ -1763,7 +1763,7 @@ gitg_branch_actions_tag (GitgWindow *window, gchar const *sha1, gchar const *nam
|
|||
}
|
||||
else
|
||||
{
|
||||
result = gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
result = gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"tag",
|
||||
name,
|
||||
sha1,
|
||||
|
@ -1857,7 +1857,7 @@ on_cherry_pick_result (GitgWindow *window,
|
|||
|
||||
if (info->stashcommit)
|
||||
{
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
"gitg autosave stash",
|
||||
|
@ -1878,7 +1878,7 @@ on_cherry_pick_result (GitgWindow *window,
|
|||
else if (info->stashcommit)
|
||||
{
|
||||
// Reapply stash
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (gitg_window_get_repository (window),
|
||||
if (!gitg_shell_run_sync (gitg_command_new (gitg_window_get_repository (window),
|
||||
"stash",
|
||||
"apply",
|
||||
"--index",
|
||||
|
@ -1886,7 +1886,7 @@ on_cherry_pick_result (GitgWindow *window,
|
|||
NULL),
|
||||
NULL))
|
||||
{
|
||||
gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
"gitg autosave stash",
|
||||
|
@ -1942,7 +1942,7 @@ gitg_branch_actions_cherry_pick (GitgWindow *window,
|
|||
GitgRef *head = gitg_repository_get_current_working_ref (repository);
|
||||
|
||||
// First checkout the correct branch on which to cherry-pick
|
||||
if (!gitg_shell_run_sync (gitg_command_newv (repository,
|
||||
if (!gitg_shell_run_sync (gitg_command_new (repository,
|
||||
"checkout",
|
||||
gitg_ref_get_shortname (dest),
|
||||
NULL),
|
||||
|
|
|
@ -507,14 +507,14 @@ unstaged_selection_changed (GtkTreeSelection *selection,
|
|||
NULL);
|
||||
|
||||
gitg_shell_run (view->priv->shell,
|
||||
gitg_command_newv (view->priv->repository,
|
||||
"diff",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
"--no-color",
|
||||
ct,
|
||||
"--",
|
||||
path,
|
||||
NULL),
|
||||
gitg_command_new (view->priv->repository,
|
||||
"diff",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
"--no-color",
|
||||
ct,
|
||||
"--",
|
||||
path,
|
||||
NULL),
|
||||
NULL);
|
||||
|
||||
g_free (path);
|
||||
|
@ -576,12 +576,12 @@ staged_selection_changed (GtkTreeSelection *selection, GitgCommitView *view)
|
|||
|
||||
gchar *indexpath = g_strconcat (":0:", path, NULL);
|
||||
gitg_shell_run (view->priv->shell,
|
||||
gitg_command_newv (view->priv->repository,
|
||||
"show",
|
||||
"--encoding=UTF-8",
|
||||
"--no-color",
|
||||
indexpath,
|
||||
NULL),
|
||||
gitg_command_new (view->priv->repository,
|
||||
"show",
|
||||
"--encoding=UTF-8",
|
||||
"--no-color",
|
||||
indexpath,
|
||||
NULL),
|
||||
NULL);
|
||||
|
||||
g_free (indexpath);
|
||||
|
@ -607,16 +607,16 @@ staged_selection_changed (GtkTreeSelection *selection, GitgCommitView *view)
|
|||
NULL);
|
||||
|
||||
gitg_shell_run (view->priv->shell,
|
||||
gitg_command_newv (view->priv->repository,
|
||||
"diff-index",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
ct,
|
||||
"--cached",
|
||||
"--no-color",
|
||||
head,
|
||||
"--",
|
||||
path,
|
||||
NULL),
|
||||
gitg_command_new (view->priv->repository,
|
||||
"diff-index",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
ct,
|
||||
"--cached",
|
||||
"--no-color",
|
||||
head,
|
||||
"--",
|
||||
path,
|
||||
NULL),
|
||||
NULL);
|
||||
|
||||
g_free(head);
|
||||
|
|
|
@ -777,12 +777,12 @@ revision_to_text (GitgRepository *repository,
|
|||
gchar **lines;
|
||||
gchar *sha1 = gitg_revision_get_sha1 (revision);
|
||||
|
||||
lines = gitg_shell_run_sync_with_output (gitg_command_newv (repository,
|
||||
"log",
|
||||
"-1",
|
||||
"--pretty=format:%h: %s%n%n%b",
|
||||
sha1,
|
||||
NULL),
|
||||
lines = gitg_shell_run_sync_with_output (gitg_command_new (repository,
|
||||
"log",
|
||||
"-1",
|
||||
"--pretty=format:%h: %s%n%n%b",
|
||||
sha1,
|
||||
NULL),
|
||||
FALSE,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -435,7 +435,7 @@ fetch_remote (GitgRepositoryDialog *dialog, GtkTreeIter *iter)
|
|||
gtk_tree_model_get (model, iter, COLUMN_NAME, &name, -1);
|
||||
|
||||
gitg_shell_run (shell,
|
||||
gitg_command_newv (dialog->priv->repository,
|
||||
gitg_command_new (dialog->priv->repository,
|
||||
"fetch",
|
||||
name,
|
||||
NULL),
|
||||
|
@ -737,7 +737,7 @@ on_button_fetch_remote_clicked (GtkButton *button,
|
|||
static gboolean
|
||||
remove_remote (GitgRepositoryDialog *dialog, gchar const *name)
|
||||
{
|
||||
return gitg_shell_run_sync (gitg_command_newv (dialog->priv->repository,
|
||||
return gitg_shell_run_sync (gitg_command_new (dialog->priv->repository,
|
||||
"remote",
|
||||
"rm",
|
||||
name,
|
||||
|
@ -829,7 +829,7 @@ on_button_add_remote_clicked (GtkButton *button,
|
|||
gchar *name = g_strdup_printf ("remote%d", num + 1);
|
||||
gchar const url[] = "git://example.com/repository.git";
|
||||
|
||||
if (gitg_shell_run_sync (gitg_command_newv (dialog->priv->repository,
|
||||
if (gitg_shell_run_sync (gitg_command_new (dialog->priv->repository,
|
||||
"remote",
|
||||
"add",
|
||||
name,
|
||||
|
@ -908,7 +908,7 @@ on_remote_name_edited (GtkCellRendererText *renderer,
|
|||
COLUMN_URL, &url,
|
||||
-1);
|
||||
|
||||
if (gitg_shell_run_sync (gitg_command_newv (dialog->priv->repository,
|
||||
if (gitg_shell_run_sync (gitg_command_new (dialog->priv->repository,
|
||||
"remote",
|
||||
"add",
|
||||
new_text,
|
||||
|
|
|
@ -605,7 +605,7 @@ reload_diff (GitgRevisionChangesPanel *changes_panel)
|
|||
{
|
||||
case 't':
|
||||
gitg_shell_run (changes_panel->priv->diff_shell,
|
||||
gitg_command_newv (changes_panel->priv->repository,
|
||||
gitg_command_new (changes_panel->priv->repository,
|
||||
"diff",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
"--cached",
|
||||
|
@ -618,7 +618,7 @@ reload_diff (GitgRevisionChangesPanel *changes_panel)
|
|||
break;
|
||||
case 'u':
|
||||
gitg_shell_run (changes_panel->priv->diff_shell,
|
||||
gitg_command_newv (changes_panel->priv->repository,
|
||||
gitg_command_new (changes_panel->priv->repository,
|
||||
"diff",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
"-M",
|
||||
|
@ -633,7 +633,7 @@ reload_diff (GitgRevisionChangesPanel *changes_panel)
|
|||
gchar *hash = gitg_revision_get_sha1 (changes_panel->priv->revision);
|
||||
|
||||
gitg_shell_run (changes_panel->priv->diff_shell,
|
||||
gitg_command_newv (changes_panel->priv->repository,
|
||||
gitg_command_new (changes_panel->priv->repository,
|
||||
"show",
|
||||
"-M",
|
||||
"--pretty=format:",
|
||||
|
@ -858,7 +858,7 @@ on_diff_end_loading (GitgShell *shell,
|
|||
cached = "--cached";
|
||||
|
||||
gitg_shell_run (self->priv->diff_files_shell,
|
||||
gitg_command_newv (self->priv->repository,
|
||||
gitg_command_new (self->priv->repository,
|
||||
"diff-index",
|
||||
allow_external ? "--ext-diff" : "--no-ext-diff",
|
||||
"--raw",
|
||||
|
@ -874,7 +874,7 @@ on_diff_end_loading (GitgShell *shell,
|
|||
{
|
||||
gchar *sha = gitg_revision_get_sha1 (self->priv->revision);
|
||||
gitg_shell_run (self->priv->diff_files_shell,
|
||||
gitg_command_newv (self->priv->repository,
|
||||
gitg_command_new (self->priv->repository,
|
||||
"show",
|
||||
"--encoding=UTF-8",
|
||||
"--raw",
|
||||
|
|
|
@ -658,7 +658,7 @@ update_details (GitgRevisionDetailsPanel *panel)
|
|||
sha1 = gitg_revision_get_sha1 (panel->priv->revision);
|
||||
|
||||
gitg_shell_run (panel->priv->shell,
|
||||
gitg_command_newv (panel->priv->repository,
|
||||
gitg_command_new (panel->priv->repository,
|
||||
"show",
|
||||
"--numstat",
|
||||
"--pretty=format:%s%n%n%b%n\x01",
|
||||
|
|
|
@ -327,7 +327,7 @@ on_selection_changed (GtkTreeSelection *selection,
|
|||
gchar *id = node_identity (tree, &iter);
|
||||
|
||||
gitg_shell_run (tree->priv->content_shell,
|
||||
gitg_command_newv (tree->priv->repository,
|
||||
gitg_command_new (tree->priv->repository,
|
||||
"show",
|
||||
"--encoding=UTF-8",
|
||||
id,
|
||||
|
@ -1042,7 +1042,7 @@ load_node (GitgRevisionFilesView *tree,
|
|||
|
||||
tree->priv->skipped_blank_line = FALSE;
|
||||
gitg_shell_run (tree->priv->loader,
|
||||
gitg_command_newv (tree->priv->repository,
|
||||
gitg_command_new (tree->priv->repository,
|
||||
"show",
|
||||
"--encoding=UTF-8",
|
||||
id,
|
||||
|
|
|
@ -88,12 +88,12 @@ gitg_command_set_property (GObject *object,
|
|||
self->priv->repository = g_value_dup_object (value);
|
||||
break;
|
||||
case PROP_ARGUMENTS:
|
||||
gitg_command_set_arguments (self,
|
||||
g_value_get_boxed (value));
|
||||
gitg_command_set_argumentsv (self,
|
||||
g_value_get_boxed (value));
|
||||
break;
|
||||
case PROP_ENVIRONMENT:
|
||||
gitg_command_set_environment (self,
|
||||
g_value_get_boxed (value));
|
||||
gitg_command_set_environmentv (self,
|
||||
g_value_get_boxed (value));
|
||||
break;
|
||||
case PROP_WORKING_DIRECTORY:
|
||||
gitg_command_set_working_directory (self,
|
||||
|
@ -226,8 +226,8 @@ combine_environment (gchar const * const *environment)
|
|||
}
|
||||
|
||||
GitgCommand *
|
||||
gitg_command_new (GitgRepository *repository,
|
||||
gchar const * const *arguments)
|
||||
gitg_command_newv (GitgRepository *repository,
|
||||
gchar const * const *arguments)
|
||||
{
|
||||
g_return_val_if_fail (repository == NULL || GITG_IS_REPOSITORY (repository), NULL);
|
||||
|
||||
|
@ -238,8 +238,8 @@ gitg_command_new (GitgRepository *repository,
|
|||
}
|
||||
|
||||
GitgCommand *
|
||||
gitg_command_newv (GitgRepository *repository,
|
||||
...)
|
||||
gitg_command_new (GitgRepository *repository,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
GitgCommand *ret;
|
||||
|
@ -250,7 +250,7 @@ gitg_command_newv (GitgRepository *repository,
|
|||
va_start (ap, repository);
|
||||
|
||||
arguments = collect_arguments (ap);
|
||||
ret = gitg_command_new (repository, CONST_CONST (arguments));
|
||||
ret = gitg_command_newv (repository, CONST_CONST (arguments));
|
||||
|
||||
g_strfreev (arguments);
|
||||
va_end (ap);
|
||||
|
@ -267,8 +267,8 @@ gitg_command_get_repository (GitgCommand *command)
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_set_arguments (GitgCommand *command,
|
||||
gchar const * const *arguments)
|
||||
gitg_command_set_argumentsv (GitgCommand *command,
|
||||
gchar const * const *arguments)
|
||||
{
|
||||
GPtrArray *ret;
|
||||
|
||||
|
@ -314,8 +314,8 @@ gitg_command_set_arguments (GitgCommand *command,
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_set_argumentsv (GitgCommand *command,
|
||||
...)
|
||||
gitg_command_set_arguments (GitgCommand *command,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
gchar **arguments;
|
||||
|
@ -326,14 +326,14 @@ gitg_command_set_argumentsv (GitgCommand *command,
|
|||
arguments = collect_arguments (ap);
|
||||
va_end (ap);
|
||||
|
||||
gitg_command_set_arguments (command, CONST_CONST (arguments));
|
||||
gitg_command_set_argumentsv (command, CONST_CONST (arguments));
|
||||
|
||||
g_strfreev (arguments);
|
||||
}
|
||||
|
||||
void
|
||||
gitg_command_add_arguments (GitgCommand *command,
|
||||
gchar const * const *arguments)
|
||||
gitg_command_add_argumentsv (GitgCommand *command,
|
||||
gchar const * const *arguments)
|
||||
{
|
||||
GPtrArray *args;
|
||||
gchar **ptr;
|
||||
|
@ -361,8 +361,8 @@ gitg_command_add_arguments (GitgCommand *command,
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_add_argumentsv (GitgCommand *command,
|
||||
...)
|
||||
gitg_command_add_arguments (GitgCommand *command,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
gchar **arguments;
|
||||
|
@ -373,7 +373,7 @@ gitg_command_add_argumentsv (GitgCommand *command,
|
|||
arguments = collect_arguments (ap);
|
||||
va_end (ap);
|
||||
|
||||
gitg_command_add_arguments (command, CONST_CONST (arguments));
|
||||
gitg_command_add_argumentsv (command, CONST_CONST (arguments));
|
||||
|
||||
g_strfreev (arguments);
|
||||
}
|
||||
|
@ -386,8 +386,8 @@ gitg_command_get_arguments (GitgCommand *command)
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_set_environment (GitgCommand *command,
|
||||
gchar const * const *environment)
|
||||
gitg_command_set_environmentv (GitgCommand *command,
|
||||
gchar const * const *environment)
|
||||
{
|
||||
g_return_if_fail (GITG_IS_COMMAND (command));
|
||||
|
||||
|
@ -398,8 +398,8 @@ gitg_command_set_environment (GitgCommand *command,
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_set_environmentv (GitgCommand *command,
|
||||
...)
|
||||
gitg_command_set_environment (GitgCommand *command,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
gchar **environment;
|
||||
|
@ -410,14 +410,14 @@ gitg_command_set_environmentv (GitgCommand *command,
|
|||
environment = collect_arguments (ap);
|
||||
va_end (ap);
|
||||
|
||||
gitg_command_set_environment (command, CONST_CONST (environment));
|
||||
gitg_command_set_environmentv (command, CONST_CONST (environment));
|
||||
|
||||
g_strfreev (environment);
|
||||
}
|
||||
|
||||
void
|
||||
gitg_command_add_environment (GitgCommand *command,
|
||||
gchar const * const *environment)
|
||||
gitg_command_add_environmentv (GitgCommand *command,
|
||||
gchar const * const *environment)
|
||||
{
|
||||
GPtrArray *args;
|
||||
gchar **combined;
|
||||
|
@ -450,8 +450,8 @@ gitg_command_add_environment (GitgCommand *command,
|
|||
}
|
||||
|
||||
void
|
||||
gitg_command_add_environmentv (GitgCommand *command,
|
||||
...)
|
||||
gitg_command_add_environment (GitgCommand *command,
|
||||
...)
|
||||
{
|
||||
va_list ap;
|
||||
gchar **environment;
|
||||
|
@ -462,7 +462,7 @@ gitg_command_add_environmentv (GitgCommand *command,
|
|||
environment = collect_arguments (ap);
|
||||
va_end (ap);
|
||||
|
||||
gitg_command_add_environment (command, CONST_CONST (environment));
|
||||
gitg_command_add_environmentv (command, CONST_CONST (environment));
|
||||
g_strfreev (environment);
|
||||
}
|
||||
|
||||
|
|
|
@ -61,9 +61,9 @@ struct _GitgCommandClass
|
|||
GType gitg_command_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GitgCommand *gitg_command_new (GitgRepository *repository,
|
||||
gchar const * const *arguments);
|
||||
GitgCommand *gitg_command_newv (GitgRepository *repository,
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
GitgCommand *gitg_command_newv (GitgRepository *repository,
|
||||
gchar const * const *arguments);
|
||||
|
||||
GitgRepository *gitg_command_get_repository (GitgCommand *command);
|
||||
|
||||
|
@ -72,24 +72,24 @@ void gitg_command_set_working_directory (GitgCommand *co
|
|||
GFile *file);
|
||||
|
||||
void gitg_command_set_arguments (GitgCommand *command,
|
||||
gchar const * const *arguments);
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_set_argumentsv (GitgCommand *command,
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_add_arguments (GitgCommand *command,
|
||||
gchar const * const *arguments);
|
||||
void gitg_command_add_argumentsv (GitgCommand *command,
|
||||
void gitg_command_add_arguments (GitgCommand *command,
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_add_argumentsv (GitgCommand *command,
|
||||
gchar const * const *arguments);
|
||||
|
||||
gchar const * const *gitg_command_get_arguments (GitgCommand *command);
|
||||
|
||||
void gitg_command_set_environment (GitgCommand *command,
|
||||
gchar const * const *environment);
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_set_environmentv (GitgCommand *command,
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_add_environment (GitgCommand *command,
|
||||
gchar const * const *environment);
|
||||
void gitg_command_add_environmentv (GitgCommand *command,
|
||||
void gitg_command_add_environment (GitgCommand *command,
|
||||
...) G_GNUC_NULL_TERMINATED;
|
||||
void gitg_command_add_environmentv (GitgCommand *command,
|
||||
gchar const * const *environment);
|
||||
|
||||
gchar const * const *gitg_command_get_environment (GitgCommand *command);
|
||||
|
||||
|
|
|
@ -424,7 +424,7 @@ read_unstaged_files_end (GitgShell *shell,
|
|||
G_CALLBACK (refresh_done));
|
||||
|
||||
gitg_shell_run (commit->priv->shell,
|
||||
gitg_command_newv (commit->priv->repository,
|
||||
gitg_command_new (commit->priv->repository,
|
||||
"diff-index",
|
||||
"--no-ext-diff",
|
||||
"--cached",
|
||||
|
@ -455,7 +455,7 @@ read_other_files_end (GitgShell *shell,
|
|||
G_CALLBACK (read_unstaged_files_end));
|
||||
|
||||
gitg_shell_run (commit->priv->shell,
|
||||
gitg_command_newv (commit->priv->repository,
|
||||
gitg_command_new (commit->priv->repository,
|
||||
"diff-files",
|
||||
"--no-ext-diff",
|
||||
NULL),
|
||||
|
@ -522,7 +522,7 @@ update_index_end (GitgShell *shell,
|
|||
G_CALLBACK (read_other_files_end));
|
||||
|
||||
gitg_shell_run (commit->priv->shell,
|
||||
gitg_command_newv (commit->priv->repository,
|
||||
gitg_command_new (commit->priv->repository,
|
||||
"ls-files",
|
||||
"--others",
|
||||
"--exclude-standard",
|
||||
|
@ -538,7 +538,7 @@ update_index (GitgCommit *commit)
|
|||
G_CALLBACK (update_index_end));
|
||||
|
||||
gitg_shell_run (commit->priv->shell,
|
||||
gitg_command_newv (commit->priv->repository,
|
||||
gitg_command_new (commit->priv->repository,
|
||||
"update-index",
|
||||
"-q",
|
||||
"--unmerged",
|
||||
|
@ -588,7 +588,7 @@ update_index_staged (GitgCommit *commit,
|
|||
gchar *path = gitg_repository_relative (commit->priv->repository, f);
|
||||
gchar *head = gitg_repository_parse_head (commit->priv->repository);
|
||||
|
||||
gchar **ret = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
gchar **ret = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"diff-index",
|
||||
"--no-ext-diff",
|
||||
"--cached",
|
||||
|
@ -643,7 +643,7 @@ update_index_unstaged (GitgCommit *commit,
|
|||
gchar *path = gitg_repository_relative (commit->priv->repository, f);
|
||||
gchar **ret;
|
||||
|
||||
ret = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
ret = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"diff-files",
|
||||
"--no-ext-diff",
|
||||
"--",
|
||||
|
@ -683,7 +683,7 @@ update_index_file (GitgCommit *commit,
|
|||
gchar *path = gitg_repository_relative (commit->priv->repository, f);
|
||||
g_object_unref (f);
|
||||
|
||||
gitg_shell_run_sync (gitg_command_newv (commit->priv->repository,
|
||||
gitg_shell_run_sync (gitg_command_new (commit->priv->repository,
|
||||
"update-index",
|
||||
"-q",
|
||||
"--unmerged",
|
||||
|
@ -741,7 +741,7 @@ apply_hunk (GitgCommit *commit,
|
|||
|
||||
g_return_val_if_fail (hunk != NULL, FALSE);
|
||||
|
||||
gboolean ret = gitg_shell_run_sync_with_input (gitg_command_newv (commit->priv->repository,
|
||||
gboolean ret = gitg_shell_run_sync_with_input (gitg_command_new (commit->priv->repository,
|
||||
"apply",
|
||||
"--cached",
|
||||
reverse ? "--reverse" : NULL,
|
||||
|
@ -773,7 +773,7 @@ gitg_commit_stage (GitgCommit *commit,
|
|||
gchar *path = gitg_repository_relative (commit->priv->repository, f);
|
||||
g_object_unref (f);
|
||||
|
||||
gboolean ret = gitg_shell_run_sync (gitg_command_newv (commit->priv->repository,
|
||||
gboolean ret = gitg_shell_run_sync (gitg_command_new (commit->priv->repository,
|
||||
"update-index",
|
||||
"--add",
|
||||
"--remove",
|
||||
|
@ -816,7 +816,7 @@ gitg_commit_unstage (GitgCommit *commit,
|
|||
gitg_changed_file_get_sha (file),
|
||||
path);
|
||||
|
||||
gboolean ret = gitg_shell_run_sync_with_input (gitg_command_newv (commit->priv->repository,
|
||||
gboolean ret = gitg_shell_run_sync_with_input (gitg_command_new (commit->priv->repository,
|
||||
"update-index",
|
||||
"--index-info",
|
||||
NULL),
|
||||
|
@ -885,7 +885,7 @@ comment_parse_subject (gchar const *comment)
|
|||
static gboolean
|
||||
write_tree (GitgCommit *commit, gchar **tree, GError **error)
|
||||
{
|
||||
gchar **lines = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
gchar **lines = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"write-tree",
|
||||
NULL),
|
||||
FALSE,
|
||||
|
@ -906,7 +906,7 @@ write_tree (GitgCommit *commit, gchar **tree, GError **error)
|
|||
static gchar *
|
||||
get_signed_off_line (GitgCommit *commit)
|
||||
{
|
||||
gchar **user = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
gchar **user = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"config",
|
||||
"--get",
|
||||
"user.name",
|
||||
|
@ -925,7 +925,7 @@ get_signed_off_line (GitgCommit *commit)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
gchar **email = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
gchar **email = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"config",
|
||||
"--get",
|
||||
"user.email",
|
||||
|
@ -960,7 +960,7 @@ set_amend_environment (GitgCommit *commit,
|
|||
{
|
||||
gchar **out;
|
||||
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"cat-file",
|
||||
"commit",
|
||||
"HEAD",
|
||||
|
@ -985,9 +985,9 @@ set_amend_environment (GitgCommit *commit,
|
|||
gchar *email = g_match_info_fetch (info, 2);
|
||||
gchar *date = g_match_info_fetch (info, 3);
|
||||
|
||||
gitg_command_add_environmentv (command, "GIT_AUTHOR_NAME", name, NULL);
|
||||
gitg_command_add_environmentv (command, "GIT_AUTHOR_EMAIL", email, NULL);
|
||||
gitg_command_add_environmentv (command, "GIT_AUTHOR_DATE", date, NULL);
|
||||
gitg_command_add_environment (command, "GIT_AUTHOR_NAME", name, NULL);
|
||||
gitg_command_add_environment (command, "GIT_AUTHOR_EMAIL", email, NULL);
|
||||
gitg_command_add_environment (command, "GIT_AUTHOR_DATE", date, NULL);
|
||||
|
||||
g_free (name);
|
||||
g_free (email);
|
||||
|
@ -1095,7 +1095,7 @@ commit_tree (GitgCommit *commit,
|
|||
GitgCommand *command;
|
||||
gchar **buffer;
|
||||
|
||||
command = gitg_command_newv (commit->priv->repository,
|
||||
command = gitg_command_new (commit->priv->repository,
|
||||
"commit-tree",
|
||||
tree,
|
||||
head ? "-p" : NULL,
|
||||
|
@ -1139,7 +1139,7 @@ update_ref (GitgCommit *commit,
|
|||
{
|
||||
gchar *converted = convert_commit_encoding (commit, subject);
|
||||
|
||||
gboolean ret = gitg_shell_run_sync (gitg_command_newv (commit->priv->repository,
|
||||
gboolean ret = gitg_shell_run_sync (gitg_command_new (commit->priv->repository,
|
||||
"update-ref",
|
||||
"-m",
|
||||
converted,
|
||||
|
@ -1253,7 +1253,7 @@ gitg_commit_undo (GitgCommit *commit,
|
|||
GFile *f = gitg_changed_file_get_file (file);
|
||||
gchar *path = gitg_repository_relative (commit->priv->repository, f);
|
||||
|
||||
ret = gitg_shell_run_sync_with_input (gitg_command_newv (commit->priv->repository,
|
||||
ret = gitg_shell_run_sync_with_input (gitg_command_new (commit->priv->repository,
|
||||
"checkout-index",
|
||||
"--index",
|
||||
"--quiet",
|
||||
|
@ -1271,7 +1271,7 @@ gitg_commit_undo (GitgCommit *commit,
|
|||
}
|
||||
else
|
||||
{
|
||||
ret = gitg_shell_run_sync_with_input (gitg_command_newv (commit->priv->repository,
|
||||
ret = gitg_shell_run_sync_with_input (gitg_command_new (commit->priv->repository,
|
||||
"apply",
|
||||
"-R",
|
||||
"-",
|
||||
|
@ -1370,7 +1370,7 @@ gitg_commit_amend_message (GitgCommit *commit)
|
|||
|
||||
gchar **out;
|
||||
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_newv (commit->priv->repository,
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_new (commit->priv->repository,
|
||||
"cat-file",
|
||||
"commit",
|
||||
"HEAD",
|
||||
|
|
|
@ -181,7 +181,7 @@ static gchar *
|
|||
get_value_global (GitgConfig *config, gchar const *key)
|
||||
{
|
||||
gboolean ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--global",
|
||||
key,
|
||||
|
@ -197,7 +197,7 @@ get_value_global_regex (GitgConfig *config,
|
|||
gchar const *value_regex)
|
||||
{
|
||||
gboolean ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--global",
|
||||
"--get-regexp",
|
||||
|
@ -221,7 +221,7 @@ get_value_local (GitgConfig *config, gchar const *key)
|
|||
cfg = g_file_get_path (cfg_file);
|
||||
|
||||
ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--file",
|
||||
cfg,
|
||||
|
@ -253,7 +253,7 @@ get_value_local_regex (GitgConfig *config,
|
|||
cfg = g_file_get_path (cfg_file);
|
||||
|
||||
ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--file",
|
||||
cfg,
|
||||
|
@ -275,7 +275,7 @@ static gboolean
|
|||
set_value_global (GitgConfig *config, gchar const *key, gchar const *value)
|
||||
{
|
||||
return gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--global",
|
||||
value == NULL ? "--unset" : key,
|
||||
|
@ -298,7 +298,7 @@ set_value_local (GitgConfig *config, gchar const *key, gchar const *value)
|
|||
cfg = g_file_get_path (cfg_file);
|
||||
|
||||
ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--file",
|
||||
cfg,
|
||||
|
@ -319,7 +319,7 @@ static gboolean
|
|||
rename_global (GitgConfig *config, gchar const *old, gchar const *nw)
|
||||
{
|
||||
return gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--global",
|
||||
"--rename-section",
|
||||
|
@ -343,7 +343,7 @@ rename_local (GitgConfig *config, gchar const *old, gchar const *nw)
|
|||
cfg = g_file_get_path (cfg_file);
|
||||
|
||||
ret = gitg_shell_run (config->priv->shell,
|
||||
gitg_command_newv (config->priv->repository,
|
||||
gitg_command_new (config->priv->repository,
|
||||
"config",
|
||||
"--file",
|
||||
cfg,
|
||||
|
|
|
@ -611,7 +611,7 @@ parse_ref_intern (GitgRepository *repository,
|
|||
gchar const *ref,
|
||||
gboolean symbolic)
|
||||
{
|
||||
gchar **ret = gitg_shell_run_sync_with_output (gitg_command_newv (repository,
|
||||
gchar **ret = gitg_shell_run_sync_with_output (gitg_command_new (repository,
|
||||
"rev-parse",
|
||||
"--verify",
|
||||
symbolic ? "--symbolic-full-name" : ref,
|
||||
|
@ -946,7 +946,7 @@ on_loader_end_loading (GitgShell *object,
|
|||
}
|
||||
|
||||
gitg_shell_run (object,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"diff-index",
|
||||
"--no-ext-diff",
|
||||
"--quiet",
|
||||
|
@ -965,8 +965,8 @@ on_loader_end_loading (GitgShell *object,
|
|||
}
|
||||
|
||||
gitg_shell_run (object,
|
||||
gitg_command_new (repository,
|
||||
(gchar const * const *)repository->priv->last_args),
|
||||
gitg_command_newv (repository,
|
||||
(gchar const * const *)repository->priv->last_args),
|
||||
NULL);
|
||||
break;
|
||||
default:
|
||||
|
@ -1388,7 +1388,7 @@ reload_revisions (GitgRepository *repository,
|
|||
repository->priv->load_stage = LOAD_STAGE_STASH;
|
||||
|
||||
return gitg_shell_run (repository->priv->loader,
|
||||
gitg_command_newv (repository,
|
||||
gitg_command_new (repository,
|
||||
"log",
|
||||
"--pretty=format:%H\x01%an\x01%ae\x01%at\x01%s",
|
||||
"--encoding=UTF-8",
|
||||
|
@ -1424,7 +1424,7 @@ load_current_ref (GitgRepository *self)
|
|||
argv[2 + i] = self->priv->last_args[i];
|
||||
}
|
||||
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_new (self, argv),
|
||||
out = gitg_shell_run_sync_with_output (gitg_command_newv (self, argv),
|
||||
FALSE,
|
||||
NULL);
|
||||
|
||||
|
@ -1447,7 +1447,7 @@ load_refs (GitgRepository *self)
|
|||
{
|
||||
gchar **refs;
|
||||
|
||||
refs = gitg_shell_run_sync_with_output (gitg_command_newv (self,
|
||||
refs = gitg_shell_run_sync_with_output (gitg_command_new (self,
|
||||
"for-each-ref",
|
||||
"--format=%(refname) %(objectname) %(*objectname)",
|
||||
"refs",
|
||||
|
|
|
@ -981,7 +981,7 @@ gitg_shell_parse_commands (GitgRepository *repository,
|
|||
|
||||
if (cmd == NULL)
|
||||
{
|
||||
cmd = gitg_command_newv (repository, NULL);
|
||||
cmd = gitg_command_new (repository, NULL);
|
||||
g_ptr_array_add (commands, cmd);
|
||||
|
||||
canenv = TRUE;
|
||||
|
@ -995,12 +995,12 @@ gitg_shell_parse_commands (GitgRepository *repository,
|
|||
else if (canenv && (pos = g_utf8_strchr (argv[i], -1, '=')))
|
||||
{
|
||||
*pos = '\0';
|
||||
gitg_command_add_environmentv (cmd, argv[i], pos + 1, NULL);
|
||||
gitg_command_add_environment (cmd, argv[i], pos + 1, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
canenv = FALSE;
|
||||
gitg_command_add_argumentsv (cmd, argv[i], NULL);
|
||||
gitg_command_add_arguments (cmd, argv[i], NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue