[anjuta/libgit2-glib: 16/18] git: Rename GitCommand to GitProcessCommand
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/libgit2-glib: 16/18] git: Rename GitCommand to GitProcessCommand
- Date: Fri, 12 Jul 2013 05:57:47 +0000 (UTC)
commit 811f0a265dfb75489c01f84fa7c7a8578670e691
Author: James Liggett <jrliggett cox net>
Date: Tue Jul 9 22:41:45 2013 -0700
git: Rename GitCommand to GitProcessCommand
plugins/git/Makefile.am | 4 +-
plugins/git/git-add-command.c | 8 +-
plugins/git/git-add-command.h | 6 +-
plugins/git/git-apply-mailbox-command.c | 12 +-
plugins/git/git-apply-mailbox-command.h | 6 +-
plugins/git/git-apply-mailbox-continue-command.c | 12 +-
plugins/git/git-apply-mailbox-continue-command.h | 6 +-
plugins/git/git-bisect-reset-command.c | 8 +-
plugins/git/git-bisect-reset-command.h | 6 +-
plugins/git/git-bisect-start-command.c | 14 +-
plugins/git/git-bisect-start-command.h | 6 +-
plugins/git/git-bisect-state-command.c | 12 +-
plugins/git/git-bisect-state-command.h | 6 +-
plugins/git/git-branch-checkout-command.c | 8 +-
plugins/git/git-branch-checkout-command.h | 6 +-
plugins/git/git-branch-create-command.c | 14 +-
plugins/git/git-branch-create-command.h | 6 +-
plugins/git/git-branch-delete-command.c | 16 ++--
plugins/git/git-branch-delete-command.h | 6 +-
plugins/git/git-branch-list-command.c | 14 +-
plugins/git/git-branch-list-command.h | 6 +-
plugins/git/git-cat-blob-command.c | 6 +-
plugins/git/git-checkout-files-command.c | 14 +-
plugins/git/git-checkout-files-command.h | 6 +-
plugins/git/git-cherry-pick-command.c | 14 +-
plugins/git/git-cherry-pick-command.h | 6 +-
plugins/git/git-clone-command.c | 10 +-
plugins/git/git-clone-command.h | 6 +-
plugins/git/git-command.h | 86 --------------
plugins/git/git-commit-command.c | 20 ++--
plugins/git/git-commit-command.h | 6 +-
plugins/git/git-diff-command.c | 2 +-
plugins/git/git-diff-tree-command.c | 6 +-
plugins/git/git-fetch-command.c | 8 +-
plugins/git/git-fetch-command.h | 6 +-
plugins/git/git-file-command.h | 2 +-
plugins/git/git-format-patch-command.c | 14 +-
plugins/git/git-format-patch-command.h | 6 +-
plugins/git/git-ignore-command.c | 2 +-
plugins/git/git-init-command.c | 6 +-
plugins/git/git-init-command.h | 6 +-
plugins/git/git-list-tree-command.c | 10 +-
plugins/git/git-list-tree-command.h | 6 +-
plugins/git/git-log-command.c | 30 +++---
plugins/git/git-log-command.h | 6 +-
plugins/git/git-log-message-command.c | 12 +-
plugins/git/git-log-message-command.h | 6 +-
plugins/git/git-merge-command.c | 16 ++--
plugins/git/git-merge-command.h | 6 +-
plugins/git/git-pane.c | 2 +-
.../git/{git-command.c => git-process-command.c} | 117 ++++++++++----------
plugins/git/git-process-command.h | 86 ++++++++++++++
plugins/git/git-pull-command.c | 24 ++--
plugins/git/git-pull-command.h | 6 +-
plugins/git/git-push-command.c | 20 ++--
plugins/git/git-push-command.h | 6 +-
plugins/git/git-raw-output-command.c | 8 +-
plugins/git/git-raw-output-command.h | 6 +-
plugins/git/git-rebase-continue-command.c | 12 +-
plugins/git/git-rebase-continue-command.h | 6 +-
plugins/git/git-rebase-start-command.c | 8 +-
plugins/git/git-rebase-start-command.h | 6 +-
plugins/git/git-ref-command.c | 10 +-
plugins/git/git-ref-command.h | 6 +-
plugins/git/git-remote-add-command.c | 14 +-
plugins/git/git-remote-add-command.h | 6 +-
plugins/git/git-remote-delete-command.c | 10 +-
plugins/git/git-remote-delete-command.h | 6 +-
plugins/git/git-remote-list-command.c | 2 +-
plugins/git/git-remove-command.c | 8 +-
plugins/git/git-remove-command.h | 6 +-
plugins/git/git-reset-files-command.c | 12 +-
plugins/git/git-reset-files-command.h | 6 +-
plugins/git/git-reset-tree-command.c | 14 +-
plugins/git/git-reset-tree-command.h | 6 +-
plugins/git/git-revert-command.c | 12 +-
plugins/git/git-revert-command.h | 6 +-
plugins/git/git-stash-apply-command.c | 12 +-
plugins/git/git-stash-apply-command.h | 6 +-
plugins/git/git-stash-clear-command.c | 4 +-
plugins/git/git-stash-clear-command.h | 6 +-
plugins/git/git-stash-drop-command.c | 10 +-
plugins/git/git-stash-drop-command.h | 6 +-
plugins/git/git-stash-list-command.c | 12 +-
plugins/git/git-stash-list-command.h | 6 +-
plugins/git/git-stash-save-command.c | 12 +-
plugins/git/git-stash-save-command.h | 6 +-
plugins/git/git-stash-show-command.c | 8 +-
plugins/git/git-status-command.c | 10 +-
plugins/git/git-status-command.h | 6 +-
plugins/git/git-tag-create-command.c | 20 ++--
plugins/git/git-tag-create-command.h | 6 +-
plugins/git/git-tag-delete-command.c | 12 +-
plugins/git/git-tag-delete-command.h | 6 +-
plugins/git/git-tag-list-command.c | 2 +-
95 files changed, 543 insertions(+), 544 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 4212584..d4fc517 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -39,8 +39,8 @@ plugin_LTLIBRARIES = libanjuta-git.la
libanjuta_git_la_SOURCES = \
plugin.c \
plugin.h \
- git-command.c \
- git-command.h \
+ git-process-command.c \
+ git-process-command.h \
git-diff-command.c \
git-diff-command.h \
git-status.c \
diff --git a/plugins/git/git-add-command.c b/plugins/git/git-add-command.c
index b2198ae..40ba895 100644
--- a/plugins/git/git-add-command.c
+++ b/plugins/git/git-add-command.c
@@ -58,12 +58,12 @@ git_add_command_run (AnjutaCommand *command)
self = GIT_ADD_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "add");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "add");
if (self->priv->force)
- git_command_add_arg (GIT_COMMAND (command), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-f");
- git_command_add_list_to_args (GIT_COMMAND (command), self->priv->paths);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command), self->priv->paths);
return 0;
}
@@ -106,7 +106,7 @@ git_add_command_new_list (const gchar *working_directory, GList *path_list,
"working-directory", working_directory,
NULL);
- self->priv->paths = git_command_copy_string_list (path_list);
+ self->priv->paths = git_process_command_copy_string_list (path_list);
self->priv->force = force;
return self;
diff --git a/plugins/git/git-add-command.h b/plugins/git/git-add-command.h
index 8aebe66..13cb37f 100644
--- a/plugins/git/git-add-command.h
+++ b/plugins/git/git-add-command.h
@@ -26,7 +26,7 @@
#define _GIT_ADD_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitAddCommandPriv GitAddCommandPriv;
struct _GitAddCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitAddCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitAddCommandPriv *priv;
};
diff --git a/plugins/git/git-apply-mailbox-command.c b/plugins/git/git-apply-mailbox-command.c
index 154c9de..c09c49d 100644
--- a/plugins/git/git-apply-mailbox-command.c
+++ b/plugins/git/git-apply-mailbox-command.c
@@ -59,12 +59,12 @@ git_apply_mailbox_command_run (AnjutaCommand *command)
self = GIT_APPLY_MAILBOX_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "am");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "am");
if (self->priv->add_signoff)
- git_command_add_arg (GIT_COMMAND (command), "--signoff");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--signoff");
- git_command_add_list_to_args (GIT_COMMAND (command),
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command),
self->priv->mailbox_paths);
return 0;
@@ -74,11 +74,11 @@ static void
git_apply_mailbox_command_class_init (GitApplyMailboxCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_apply_mailbox_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_apply_mailbox_command_run;
}
@@ -95,7 +95,7 @@ git_apply_mailbox_command_new (const gchar *working_directory,
"single-line-output", TRUE,
NULL);
- self->priv->mailbox_paths = git_command_copy_string_list (mailbox_paths);
+ self->priv->mailbox_paths = git_process_command_copy_string_list (mailbox_paths);
self->priv->add_signoff = add_signoff;
return self;
diff --git a/plugins/git/git-apply-mailbox-command.h b/plugins/git/git-apply-mailbox-command.h
index dbce740..b918c0f 100644
--- a/plugins/git/git-apply-mailbox-command.h
+++ b/plugins/git/git-apply-mailbox-command.h
@@ -26,7 +26,7 @@
#define _GIT_APPLY_MAILBOX_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitApplyMailboxCommandPriv GitApplyMailboxCommandPriv;
struct _GitApplyMailboxCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitApplyMailboxCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitApplyMailboxCommandPriv *priv;
};
diff --git a/plugins/git/git-apply-mailbox-continue-command.c
b/plugins/git/git-apply-mailbox-continue-command.c
index 20ce7cc..d3e1c57 100644
--- a/plugins/git/git-apply-mailbox-continue-command.c
+++ b/plugins/git/git-apply-mailbox-continue-command.c
@@ -57,18 +57,18 @@ git_apply_mailbox_continue_command_run (AnjutaCommand *command)
self = GIT_APPLY_MAILBOX_CONTINUE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "am");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "am");
switch (self->priv->action)
{
case GIT_APPLY_MAILBOX_CONTINUE_ACTION_RESOLVED:
- git_command_add_arg (GIT_COMMAND (command), "--resolved");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--resolved");
break;
case GIT_APPLY_MAILBOX_CONTINUE_ACTION_SKIP:
- git_command_add_arg (GIT_COMMAND (command), "--skip");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--skip");
break;
case GIT_APPLY_MAILBOX_CONTINUE_ACTION_ABORT:
- git_command_add_arg (GIT_COMMAND (command), "--abort");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--abort");
break;
default:
break;
@@ -81,11 +81,11 @@ static void
git_apply_mailbox_continue_command_class_init (GitApplyMailboxContinueCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_apply_mailbox_continue_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_apply_mailbox_continue_command_run;
}
diff --git a/plugins/git/git-apply-mailbox-continue-command.h
b/plugins/git/git-apply-mailbox-continue-command.h
index 413fb01..97393f2 100644
--- a/plugins/git/git-apply-mailbox-continue-command.h
+++ b/plugins/git/git-apply-mailbox-continue-command.h
@@ -26,7 +26,7 @@
#define _GIT_APPLY_MAILBOX_CONTINUE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitApplyMailboxContinueCommandPriv GitApplyMailboxContinueComman
struct _GitApplyMailboxContinueCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitApplyMailboxContinueCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitApplyMailboxContinueCommandPriv *priv;
};
diff --git a/plugins/git/git-bisect-reset-command.c b/plugins/git/git-bisect-reset-command.c
index ab5f0be..93be232 100644
--- a/plugins/git/git-bisect-reset-command.c
+++ b/plugins/git/git-bisect-reset-command.c
@@ -42,8 +42,8 @@ git_bisect_reset_command_finalize (GObject *object)
static guint
git_bisect_reset_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "bisect");
- git_command_add_arg (GIT_COMMAND (command), "reset");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "bisect");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "reset");
return 0;
}
@@ -52,11 +52,11 @@ static void
git_bisect_reset_command_class_init (GitBisectResetCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_bisect_reset_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_bisect_reset_command_run;
}
diff --git a/plugins/git/git-bisect-reset-command.h b/plugins/git/git-bisect-reset-command.h
index f35fbe5..3d70c43 100644
--- a/plugins/git/git-bisect-reset-command.h
+++ b/plugins/git/git-bisect-reset-command.h
@@ -26,7 +26,7 @@
#define _GIT_BISECT_RESET_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -42,12 +42,12 @@ typedef struct _GitBisectResetCommand GitBisectResetCommand;
struct _GitBisectResetCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBisectResetCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
};
GType git_bisect_reset_command_get_type (void) G_GNUC_CONST;
diff --git a/plugins/git/git-bisect-start-command.c b/plugins/git/git-bisect-start-command.c
index 09a774b..d562933 100644
--- a/plugins/git/git-bisect-start-command.c
+++ b/plugins/git/git-bisect-start-command.c
@@ -60,11 +60,11 @@ git_bisect_start_command_run (AnjutaCommand *command)
self = GIT_BISECT_START_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "bisect");
- git_command_add_arg (GIT_COMMAND (command), "start");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "bisect");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "start");
if (self->priv->bad_revision)
- git_command_add_arg (GIT_COMMAND (command), self->priv->bad_revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->bad_revision);
/* If a good revision was given with no bad revision, put head in for the
* bad revision, because git expects both revisions in this case, so don't
@@ -72,9 +72,9 @@ git_bisect_start_command_run (AnjutaCommand *command)
if (self->priv->good_revision)
{
if (!self->priv->bad_revision)
- git_command_add_arg (GIT_COMMAND (command), "HEAD");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "HEAD");
- git_command_add_arg (GIT_COMMAND (command), self->priv->good_revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->good_revision);
}
return 0;
@@ -84,11 +84,11 @@ static void
git_bisect_start_command_class_init (GitBisectStartCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_bisect_start_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_bisect_start_command_run;
}
diff --git a/plugins/git/git-bisect-start-command.h b/plugins/git/git-bisect-start-command.h
index b5a5455..56d2698 100644
--- a/plugins/git/git-bisect-start-command.h
+++ b/plugins/git/git-bisect-start-command.h
@@ -26,7 +26,7 @@
#define _GIT_BISECT_START_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitBisectStartCommandPriv GitBisectStartCommandPriv;
struct _GitBisectStartCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBisectStartCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBisectStartCommandPriv *priv;
};
diff --git a/plugins/git/git-bisect-state-command.c b/plugins/git/git-bisect-state-command.c
index 93be5c3..e9b7383 100644
--- a/plugins/git/git-bisect-state-command.c
+++ b/plugins/git/git-bisect-state-command.c
@@ -59,22 +59,22 @@ git_bisect_state_command_run (AnjutaCommand *command)
self = GIT_BISECT_STATE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "bisect");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "bisect");
switch (self->priv->state)
{
case GIT_BISECT_STATE_GOOD:
- git_command_add_arg (GIT_COMMAND (command), "good");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "good");
break;
case GIT_BISECT_STATE_BAD:
- git_command_add_arg (GIT_COMMAND (command), "bad");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "bad");
break;
default:
break;
}
if (self->priv->revision)
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -83,11 +83,11 @@ static void
git_bisect_state_command_class_init (GitBisectStateCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_bisect_state_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_bisect_state_command_run;
}
diff --git a/plugins/git/git-bisect-state-command.h b/plugins/git/git-bisect-state-command.h
index 01339b7..4d24a8a 100644
--- a/plugins/git/git-bisect-state-command.h
+++ b/plugins/git/git-bisect-state-command.h
@@ -26,7 +26,7 @@
#define _GIT_BISECT_STATE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -49,12 +49,12 @@ typedef enum
struct _GitBisectStateCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBisectStateCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBisectStateCommandPriv *priv;
};
diff --git a/plugins/git/git-branch-checkout-command.c b/plugins/git/git-branch-checkout-command.c
index be6b5e3..d8da115 100644
--- a/plugins/git/git-branch-checkout-command.c
+++ b/plugins/git/git-branch-checkout-command.c
@@ -57,8 +57,8 @@ git_branch_checkout_command_run (AnjutaCommand *command)
self = GIT_BRANCH_CHECKOUT_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "checkout");
- git_command_add_arg (GIT_COMMAND (command), self->priv->branch_name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "checkout");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->branch_name);
return 0;
}
@@ -67,11 +67,11 @@ static void
git_branch_checkout_command_class_init (GitBranchCheckoutCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_branch_checkout_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_branch_checkout_command_run;
}
diff --git a/plugins/git/git-branch-checkout-command.h b/plugins/git/git-branch-checkout-command.h
index a1ba6e4..e9042d7 100644
--- a/plugins/git/git-branch-checkout-command.h
+++ b/plugins/git/git-branch-checkout-command.h
@@ -26,7 +26,7 @@
#define _GIT_BRANCH_CHECKOUT_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitBranchCheckoutCommandPriv GitBranchCheckoutCommandPriv;
struct _GitBranchCheckoutCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBranchCheckoutCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBranchCheckoutCommandPriv *priv;
};
diff --git a/plugins/git/git-branch-create-command.c b/plugins/git/git-branch-create-command.c
index cfc3eac..ef804a0 100644
--- a/plugins/git/git-branch-create-command.c
+++ b/plugins/git/git-branch-create-command.c
@@ -62,16 +62,16 @@ git_branch_create_command_run (AnjutaCommand *command)
if (self->priv->checkout)
{
- git_command_add_arg (GIT_COMMAND (command), "checkout");
- git_command_add_arg (GIT_COMMAND (command), "-b");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "checkout");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-b");
}
else
- git_command_add_arg (GIT_COMMAND (command), "branch");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "branch");
- git_command_add_arg (GIT_COMMAND (command), self->priv->name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->name);
if (self->priv->revision)
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -80,11 +80,11 @@ static void
git_branch_create_command_class_init (GitBranchCreateCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_branch_create_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_branch_create_command_run;
}
diff --git a/plugins/git/git-branch-create-command.h b/plugins/git/git-branch-create-command.h
index 10c7c85..00f3015 100644
--- a/plugins/git/git-branch-create-command.h
+++ b/plugins/git/git-branch-create-command.h
@@ -26,7 +26,7 @@
#define _GIT_BRANCH_CREATE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitBranchCreateCommandPriv GitBranchCreateCommandPriv;
struct _GitBranchCreateCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBranchCreateCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBranchCreateCommandPriv *priv;
};
diff --git a/plugins/git/git-branch-delete-command.c b/plugins/git/git-branch-delete-command.c
index ddb1e11..4041aef 100644
--- a/plugins/git/git-branch-delete-command.c
+++ b/plugins/git/git-branch-delete-command.c
@@ -59,17 +59,17 @@ git_branch_delete_command_run (AnjutaCommand *command)
self = GIT_BRANCH_DELETE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "branch");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "branch");
if (self->priv->remote)
- git_command_add_arg (GIT_COMMAND (command), "-r");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-r");
if (self->priv->require_merged)
- git_command_add_arg (GIT_COMMAND (command), "-d");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-d");
else
- git_command_add_arg (GIT_COMMAND (command), "-D");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-D");
- git_command_add_list_to_args (GIT_COMMAND (command), self->priv->branches);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command), self->priv->branches);
return 0;
}
@@ -78,11 +78,11 @@ static void
git_branch_delete_command_class_init (GitBranchDeleteCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_branch_delete_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_branch_delete_command_run;
}
@@ -100,7 +100,7 @@ git_branch_delete_command_new (const gchar *working_directory,
"single-line-output", TRUE,
NULL);
- self->priv->branches = git_command_copy_string_list (branches);
+ self->priv->branches = git_process_command_copy_string_list (branches);
self->priv->remote = remote;
self->priv->require_merged = require_merged;
diff --git a/plugins/git/git-branch-delete-command.h b/plugins/git/git-branch-delete-command.h
index 86220bd..97c2beb 100644
--- a/plugins/git/git-branch-delete-command.h
+++ b/plugins/git/git-branch-delete-command.h
@@ -26,7 +26,7 @@
#define _GIT_BRANCH_DELETE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitBranchDeleteCommandPriv GitBranchDeleteCommandPriv;
struct _GitBranchDeleteCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBranchDeleteCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBranchDeleteCommandPriv *priv;
};
diff --git a/plugins/git/git-branch-list-command.c b/plugins/git/git-branch-list-command.c
index eac2131..88e82b3 100644
--- a/plugins/git/git-branch-list-command.c
+++ b/plugins/git/git-branch-list-command.c
@@ -175,15 +175,15 @@ git_branch_list_command_run (AnjutaCommand *command)
self = GIT_BRANCH_LIST_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "branch");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "branch");
switch (self->priv->type)
{
case GIT_BRANCH_TYPE_REMOTE:
- git_command_add_arg (GIT_COMMAND (command), "-r");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-r");
break;
case GIT_BRANCH_TYPE_ALL:
- git_command_add_arg (GIT_COMMAND (command), "-a");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-a");
break;
default:
break;
@@ -199,7 +199,7 @@ git_branch_list_command_data_arrived (AnjutaCommand *command)
}
static void
-git_branch_list_command_handle_output (GitCommand *git_command,
+git_branch_list_command_handle_output (GitProcessCommand *git_process_command,
const gchar *output)
{
GitBranchListCommand *self;
@@ -209,7 +209,7 @@ git_branch_list_command_handle_output (GitCommand *git_command,
GitBranch *branch;
gboolean active;
- self = GIT_BRANCH_LIST_COMMAND (git_command);
+ self = GIT_BRANCH_LIST_COMMAND (git_process_command);
active_match_info = NULL;
regular_match_info = NULL;
@@ -242,7 +242,7 @@ git_branch_list_command_handle_output (GitCommand *git_command,
g_match_info_free (regular_match_info);
self->priv->output = g_list_append (self->priv->output, branch);
- anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_command));
+ anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_process_command));
}
@@ -250,7 +250,7 @@ static void
git_branch_list_command_class_init (GitBranchListCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_branch_list_command_finalize;
diff --git a/plugins/git/git-branch-list-command.h b/plugins/git/git-branch-list-command.h
index 24b9654..95bc53e 100644
--- a/plugins/git/git-branch-list-command.h
+++ b/plugins/git/git-branch-list-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-branch.h"
G_BEGIN_DECLS
@@ -52,12 +52,12 @@ typedef enum
struct _GitBranchListCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitBranchListCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitBranchListCommandPriv *priv;
};
diff --git a/plugins/git/git-cat-blob-command.c b/plugins/git/git-cat-blob-command.c
index fbd50fa..e0b9f64 100644
--- a/plugins/git/git-cat-blob-command.c
+++ b/plugins/git/git-cat-blob-command.c
@@ -58,9 +58,9 @@ git_cat_blob_command_run (AnjutaCommand *command)
self = GIT_CAT_BLOB_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "cat-file");
- git_command_add_arg (GIT_COMMAND (command), "blob");
- git_command_add_arg (GIT_COMMAND (command), self->priv->blob_sha);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "cat-file");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "blob");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->blob_sha);
return 0;
}
diff --git a/plugins/git/git-checkout-files-command.c b/plugins/git/git-checkout-files-command.c
index 7cd65db..5d29222 100644
--- a/plugins/git/git-checkout-files-command.c
+++ b/plugins/git/git-checkout-files-command.c
@@ -39,14 +39,14 @@ git_checkout_files_command_run (AnjutaCommand *command)
self = GIT_CHECKOUT_FILES_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (self), "checkout");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "checkout");
if (self->priv->checkout_all)
- git_command_add_arg (GIT_COMMAND (self), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "-f");
else
{
- git_command_add_arg (GIT_COMMAND (self), "--");
- git_command_add_list_to_args (GIT_COMMAND (self), self->priv->paths);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "--");
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (self), self->priv->paths);
}
return 0;
@@ -75,11 +75,11 @@ static void
git_checkout_files_command_class_init (GitCheckoutFilesCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_checkout_files_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_checkout_files_command_run;
}
@@ -94,7 +94,7 @@ git_checkout_files_command_new (const gchar *working_directory, GList *paths,
"working-directory", working_directory,
NULL);
- self->priv->paths = git_command_copy_string_list (paths);
+ self->priv->paths = git_process_command_copy_string_list (paths);
self->priv->checkout_all = checkout_all;
return self;
diff --git a/plugins/git/git-checkout-files-command.h b/plugins/git/git-checkout-files-command.h
index d9e2b70..53f58d6 100644
--- a/plugins/git/git-checkout-files-command.h
+++ b/plugins/git/git-checkout-files-command.h
@@ -26,7 +26,7 @@
#define _GIT_CHECKOUT_FILES_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitCheckoutFilesCommandPriv GitCheckoutFilesCommandPriv;
struct _GitCheckoutFilesCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitCheckoutFilesCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitCheckoutFilesCommandPriv *priv;
};
diff --git a/plugins/git/git-cherry-pick-command.c b/plugins/git/git-cherry-pick-command.c
index 30789d4..4d987f2 100644
--- a/plugins/git/git-cherry-pick-command.c
+++ b/plugins/git/git-cherry-pick-command.c
@@ -60,18 +60,18 @@ git_cherry_pick_command_run (AnjutaCommand *command)
self = GIT_CHERRY_PICK_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "cherry-pick");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "cherry-pick");
if (self->priv->no_commit)
- git_command_add_arg (GIT_COMMAND (command), "-n");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-n");
if (self->priv->show_source)
- git_command_add_arg (GIT_COMMAND (command), "-x");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-x");
if (self->priv->add_signoff)
- git_command_add_arg (GIT_COMMAND (command), "-s");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-s");
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -80,11 +80,11 @@ static void
git_cherry_pick_command_class_init (GitCherryPickCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_cherry_pick_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_cherry_pick_command_run;
}
diff --git a/plugins/git/git-cherry-pick-command.h b/plugins/git/git-cherry-pick-command.h
index 6119c6b..f9e1eca 100644
--- a/plugins/git/git-cherry-pick-command.h
+++ b/plugins/git/git-cherry-pick-command.h
@@ -26,7 +26,7 @@
#define _GIT_CHERRY_PICK_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitCherryPickCommandPriv GitCherryPickCommandPriv;
struct _GitCherryPickCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitCherryPickCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitCherryPickCommandPriv *priv;
};
diff --git a/plugins/git/git-clone-command.c b/plugins/git/git-clone-command.c
index f1665e2..f3989b6 100644
--- a/plugins/git/git-clone-command.c
+++ b/plugins/git/git-clone-command.c
@@ -39,9 +39,9 @@ git_clone_command_run (AnjutaCommand *command)
self = GIT_CLONE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (self), "clone");
- git_command_add_arg (GIT_COMMAND (self), self->priv->url);
- git_command_add_arg (GIT_COMMAND (self), self->priv->repository_name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "clone");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), self->priv->url);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), self->priv->repository_name);
return 0;
}
@@ -70,11 +70,11 @@ static void
git_clone_command_class_init (GitCloneCommandClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GitCommandClass *parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass *parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_clone_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_clone_command_run;
}
diff --git a/plugins/git/git-clone-command.h b/plugins/git/git-clone-command.h
index f754212..1a0e9ff 100644
--- a/plugins/git/git-clone-command.h
+++ b/plugins/git/git-clone-command.h
@@ -26,7 +26,7 @@
#define _GIT_CLONE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitCloneCommandPriv GitCloneCommandPriv;
struct _GitCloneCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitCloneCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitCloneCommandPriv *priv;
};
diff --git a/plugins/git/git-commit-command.c b/plugins/git/git-commit-command.c
index 5722d4b..3662e25 100644
--- a/plugins/git/git-commit-command.c
+++ b/plugins/git/git-commit-command.c
@@ -44,27 +44,27 @@ git_commit_command_run (AnjutaCommand *command)
self = GIT_COMMIT_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (self), "commit");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "commit");
if (self->priv->amend)
- git_command_add_arg (GIT_COMMAND (self), "--amend");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "--amend");
if (self->priv->author_name && self->priv->author_email)
{
author = g_strdup_printf ("--author=%s <%s>", self->priv->author_name,
self->priv->author_email);
- git_command_add_arg (GIT_COMMAND (self), author);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), author);
g_free (author);
}
- git_command_add_arg (GIT_COMMAND (self), "-m");
- git_command_add_arg (GIT_COMMAND (self), self->priv->log);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "-m");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), self->priv->log);
if (self->priv->resolve_merge)
- git_command_add_arg (GIT_COMMAND (self), "-i");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "-i");
- git_command_add_list_to_args (GIT_COMMAND (self), self->priv->paths);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (self), self->priv->paths);
return 0;
}
@@ -95,11 +95,11 @@ static void
git_commit_command_class_init (GitCommitCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_commit_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_commit_command_run;
}
@@ -118,7 +118,7 @@ git_commit_command_new (const gchar *working_directory, gboolean amend,
"single-line-output", TRUE,
NULL);
- self->priv->paths = git_command_copy_string_list (paths);
+ self->priv->paths = git_process_command_copy_string_list (paths);
self->priv->amend = amend;
self->priv->resolve_merge = resolve_merge;
self->priv->log = g_strdup (log);
diff --git a/plugins/git/git-commit-command.h b/plugins/git/git-commit-command.h
index 64cf0f1..40ea282 100644
--- a/plugins/git/git-commit-command.h
+++ b/plugins/git/git-commit-command.h
@@ -26,7 +26,7 @@
#define _GIT_COMMIT_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitCommitCommandPriv GitCommitCommandPriv;
struct _GitCommitCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitCommitCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitCommitCommandPriv *priv;
};
diff --git a/plugins/git/git-diff-command.c b/plugins/git/git-diff-command.c
index 498b1a7..388271c 100644
--- a/plugins/git/git-diff-command.c
+++ b/plugins/git/git-diff-command.c
@@ -41,7 +41,7 @@ git_diff_command_finalize (GObject *object)
static guint
git_diff_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "diff");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "diff");
return 0;
}
diff --git a/plugins/git/git-diff-tree-command.c b/plugins/git/git-diff-tree-command.c
index 5f8565e..385a00b 100644
--- a/plugins/git/git-diff-tree-command.c
+++ b/plugins/git/git-diff-tree-command.c
@@ -58,9 +58,9 @@ git_diff_tree_command_run (AnjutaCommand *command)
self = GIT_DIFF_TREE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "diff-tree");
- git_command_add_arg (GIT_COMMAND (command), "-p");
- git_command_add_arg (GIT_COMMAND (command), self->priv->sha);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "diff-tree");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-p");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->sha);
return 0;
}
diff --git a/plugins/git/git-fetch-command.c b/plugins/git/git-fetch-command.c
index e79f947..ee1f421 100644
--- a/plugins/git/git-fetch-command.c
+++ b/plugins/git/git-fetch-command.c
@@ -40,8 +40,8 @@ git_fetch_command_finalize (GObject *object)
static guint
git_fetch_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "fetch");
- git_command_add_arg (GIT_COMMAND (command), "-q");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "fetch");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-q");
return 0;
}
@@ -50,11 +50,11 @@ static void
git_fetch_command_class_init (GitFetchCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass *parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass *parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_fetch_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_fetch_command_run;
}
diff --git a/plugins/git/git-fetch-command.h b/plugins/git/git-fetch-command.h
index 6bb5e51..b7be4dd 100644
--- a/plugins/git/git-fetch-command.h
+++ b/plugins/git/git-fetch-command.h
@@ -26,7 +26,7 @@
#define _GIT_FETCH_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -42,12 +42,12 @@ typedef struct _GitFetchCommand GitFetchCommand;
struct _GitFetchCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitFetchCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
};
GType git_fetch_command_get_type (void) G_GNUC_CONST;
diff --git a/plugins/git/git-file-command.h b/plugins/git/git-file-command.h
index 5b53d19..a568f4b 100644
--- a/plugins/git/git-file-command.h
+++ b/plugins/git/git-file-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <libanjuta/anjuta-sync-command.h>
-#include <git-command.h> /* For path list functions */
+#include <git-process-command.h> /* For path list functions */
G_BEGIN_DECLS
diff --git a/plugins/git/git-format-patch-command.c b/plugins/git/git-format-patch-command.c
index e7dec08..bc17b1d 100644
--- a/plugins/git/git-format-patch-command.c
+++ b/plugins/git/git-format-patch-command.c
@@ -61,19 +61,19 @@ git_format_patch_command_run (AnjutaCommand *command)
self = GIT_FORMAT_PATCH_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "format-patch");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "format-patch");
if (self->priv->output_directory)
{
- git_command_add_arg (GIT_COMMAND (command), "-o");
- git_command_add_arg (GIT_COMMAND (command),
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-o");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command),
self->priv->output_directory);
}
if (self->priv->add_signoff)
- git_command_add_arg (GIT_COMMAND (command), "-s");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-s");
- git_command_add_arg (GIT_COMMAND (command), self->priv->branch);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->branch);
return 0;
}
@@ -82,11 +82,11 @@ static void
git_format_patch_command_class_init (GitFormatPatchCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_format_patch_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_format_patch_command_run;
}
diff --git a/plugins/git/git-format-patch-command.h b/plugins/git/git-format-patch-command.h
index 2b35eb4..ea34791 100644
--- a/plugins/git/git-format-patch-command.h
+++ b/plugins/git/git-format-patch-command.h
@@ -26,7 +26,7 @@
#define _GIT_FORMAT_PATCH_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitFormatPatchCommandPriv GitFormatPatchCommandPriv;
struct _GitFormatPatchCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitFormatPatchCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitFormatPatchCommandPriv *priv;
};
diff --git a/plugins/git/git-ignore-command.c b/plugins/git/git-ignore-command.c
index 00ca5aa..36c94a8 100644
--- a/plugins/git/git-ignore-command.c
+++ b/plugins/git/git-ignore-command.c
@@ -134,7 +134,7 @@ git_ignore_command_new_list (const gchar *working_directory, GList *path_list)
"working-directory", working_directory,
NULL);
- self->priv->paths = git_command_copy_string_list (path_list);
+ self->priv->paths = git_process_command_copy_string_list (path_list);
return self;
}
diff --git a/plugins/git/git-init-command.c b/plugins/git/git-init-command.c
index 65228e6..92f45a4 100644
--- a/plugins/git/git-init-command.c
+++ b/plugins/git/git-init-command.c
@@ -42,7 +42,7 @@ git_init_command_finalize (GObject *object)
static guint
git_init_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "init");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "init");
return 0;
}
@@ -51,11 +51,11 @@ static void
git_init_command_class_init (GitInitCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass *parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass *parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_init_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_init_command_run;
}
diff --git a/plugins/git/git-init-command.h b/plugins/git/git-init-command.h
index aa4a2d3..ab6724d 100644
--- a/plugins/git/git-init-command.h
+++ b/plugins/git/git-init-command.h
@@ -26,7 +26,7 @@
#define _GIT_INIT_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -42,12 +42,12 @@ typedef struct _GitInitCommand GitInitCommand;
struct _GitInitCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitInitCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
};
GType git_init_command_get_type (void) G_GNUC_CONST;
diff --git a/plugins/git/git-list-tree-command.c b/plugins/git/git-list-tree-command.c
index da54c2e..df307dd 100644
--- a/plugins/git/git-list-tree-command.c
+++ b/plugins/git/git-list-tree-command.c
@@ -68,14 +68,14 @@ git_list_tree_command_run (AnjutaCommand *command)
self = GIT_LIST_TREE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "ls-tree");
- git_command_add_arg (GIT_COMMAND (command), self->priv->commit_sha);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "ls-tree");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->commit_sha);
return 0;
}
static void
-git_list_tree_command_handle_output (GitCommand *git_command,
+git_list_tree_command_handle_output (GitProcessCommand *git_process_command,
const gchar *output)
{
GitListTreeCommand *self;
@@ -83,7 +83,7 @@ git_list_tree_command_handle_output (GitCommand *git_command,
gchar *blob_sha;
gchar *filename;
- self = GIT_LIST_TREE_COMMAND (git_command);
+ self = GIT_LIST_TREE_COMMAND (git_process_command);
match_info = NULL;
if (g_regex_match (self->priv->blob_regex, output, 0, &match_info))
@@ -106,7 +106,7 @@ static void
git_list_tree_command_class_init (GitListTreeCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_list_tree_command_finalize;
diff --git a/plugins/git/git-list-tree-command.h b/plugins/git/git-list-tree-command.h
index 77ef455..2158ed6 100644
--- a/plugins/git/git-list-tree-command.h
+++ b/plugins/git/git-list-tree-command.h
@@ -26,7 +26,7 @@
#define _GIT_LIST_TREE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitListTreeCommandPriv GitListTreeCommandPriv;
struct _GitListTreeCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitListTreeCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitListTreeCommandPriv *priv;
};
diff --git a/plugins/git/git-log-command.c b/plugins/git/git-log-command.c
index 60759d4..9a2cf40 100644
--- a/plugins/git/git-log-command.c
+++ b/plugins/git/git-log-command.c
@@ -101,9 +101,9 @@ git_log_command_run (AnjutaCommand *command)
self = GIT_LOG_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "rev-list");
- git_command_add_arg (GIT_COMMAND (command), "--topo-order");
- git_command_add_arg (GIT_COMMAND (command), "--pretty=format:parents %P%n"
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rev-list");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--topo-order");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--pretty=format:parents %P%n"
"author %an%n"
"time %at%n"
"short log
%s%n"
@@ -112,28 +112,28 @@ git_log_command_run (AnjutaCommand *command)
if (self->priv->author)
{
filter_arg = g_strdup_printf ("--author=%s", self->priv->author);
- git_command_add_arg (GIT_COMMAND (command), filter_arg);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), filter_arg);
g_free (filter_arg);
}
if (self->priv->grep)
{
filter_arg = g_strdup_printf ("--grep=%s", self->priv->grep);
- git_command_add_arg (GIT_COMMAND (command), filter_arg);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), filter_arg);
g_free (filter_arg);
}
if (self->priv->since_date)
{
filter_arg = g_strdup_printf ("--since=%s", self->priv->since_date);
- git_command_add_arg (GIT_COMMAND (command), filter_arg);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), filter_arg);
g_free (filter_arg);
}
if (self->priv->until_date)
{
filter_arg = g_strdup_printf ("--until=%s", self->priv->until_date);
- git_command_add_arg (GIT_COMMAND (command), filter_arg);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), filter_arg);
g_free (filter_arg);
}
@@ -150,20 +150,20 @@ git_log_command_run (AnjutaCommand *command)
if (self->priv->until_commit)
g_string_append (commit_range, self->priv->until_commit);
- git_command_add_arg (GIT_COMMAND (command), commit_range->str);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), commit_range->str);
g_string_free (commit_range, TRUE);
}
if (self->priv->branch)
- git_command_add_arg (GIT_COMMAND (command), self->priv->branch);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->branch);
else
- git_command_add_arg (GIT_COMMAND (command), "HEAD");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "HEAD");
if (self->priv->path)
{
- git_command_add_arg (GIT_COMMAND (command), "--");
- git_command_add_arg (GIT_COMMAND (command), self->priv->path);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->path);
}
/* Start the data processing task */
@@ -189,11 +189,11 @@ git_log_command_notify_complete (AnjutaCommand *command, guint return_code)
}
static void
-git_log_command_handle_output (GitCommand *git_command, const gchar *output)
+git_log_command_handle_output (GitProcessCommand *git_process_command, const gchar *output)
{
GitLogCommand *self;
- self = GIT_LOG_COMMAND (git_command);
+ self = GIT_LOG_COMMAND (git_process_command);
git_log_data_command_push_line (self->priv->data_command, output);
}
@@ -202,7 +202,7 @@ static void
git_log_command_class_init (GitLogCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_log_command_finalize;
diff --git a/plugins/git/git-log-command.h b/plugins/git/git-log-command.h
index a708d71..80d023f 100644
--- a/plugins/git/git-log-command.h
+++ b/plugins/git/git-log-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <stdlib.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-log-data-command.h"
#include "git-revision.h"
@@ -46,12 +46,12 @@ typedef struct _GitLogCommandPriv GitLogCommandPriv;
struct _GitLogCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitLogCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitLogCommandPriv *priv;
};
diff --git a/plugins/git/git-log-message-command.c b/plugins/git/git-log-message-command.c
index 465e370..410bd94 100644
--- a/plugins/git/git-log-message-command.c
+++ b/plugins/git/git-log-message-command.c
@@ -73,9 +73,9 @@ git_log_message_command_run (AnjutaCommand *command)
revision = g_strdup_printf ("%s^..%s", self->priv->sha, self->priv->sha);
- git_command_add_arg (GIT_COMMAND (command), "rev-list");
- git_command_add_arg (GIT_COMMAND (command), "--pretty=raw");
- git_command_add_arg (GIT_COMMAND (command), revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rev-list");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--pretty=raw");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), revision);
g_free (revision);
@@ -83,12 +83,12 @@ git_log_message_command_run (AnjutaCommand *command)
}
static void
-git_log_message_command_handle_output (GitCommand *git_command,
+git_log_message_command_handle_output (GitProcessCommand *git_process_command,
const gchar *output)
{
GitLogMessageCommand *self;
- self = GIT_LOG_MESSAGE_COMMAND (git_command);
+ self = GIT_LOG_MESSAGE_COMMAND (git_process_command);
/* It is possible that we could encounter multiple objects, usually with
* merges. */
@@ -111,7 +111,7 @@ static void
git_log_message_command_class_init (GitLogMessageCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_log_message_command_finalize;
diff --git a/plugins/git/git-log-message-command.h b/plugins/git/git-log-message-command.h
index 2abb9db..0bc58eb 100644
--- a/plugins/git/git-log-message-command.h
+++ b/plugins/git/git-log-message-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <stdlib.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-revision.h"
G_BEGIN_DECLS
@@ -45,12 +45,12 @@ typedef struct _GitLogMessageCommandPriv GitLogMessageCommandPriv;
struct _GitLogMessageCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitLogMessageCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitLogMessageCommandPriv *priv;
};
diff --git a/plugins/git/git-merge-command.c b/plugins/git/git-merge-command.c
index 12a3cb0..25c9d20 100644
--- a/plugins/git/git-merge-command.c
+++ b/plugins/git/git-merge-command.c
@@ -61,21 +61,21 @@ git_merge_command_run (AnjutaCommand *command)
self = GIT_MERGE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "merge");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "merge");
if (self->priv->no_commit)
- git_command_add_arg (GIT_COMMAND (command), "--no-commit");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--no-commit");
if (self->priv->squash)
- git_command_add_arg (GIT_COMMAND (command), "--squash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--squash");
if (self->priv->log)
{
- git_command_add_arg (GIT_COMMAND (command), "-m");
- git_command_add_arg (GIT_COMMAND (command), self->priv->log);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-m");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->log);
}
- git_command_add_arg (GIT_COMMAND (command), self->priv->branch);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->branch);
return 0;
}
@@ -84,11 +84,11 @@ static void
git_merge_command_class_init (GitMergeCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_merge_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_merge_command_run;
}
diff --git a/plugins/git/git-merge-command.h b/plugins/git/git-merge-command.h
index 13cf5fa..21dc891 100644
--- a/plugins/git/git-merge-command.h
+++ b/plugins/git/git-merge-command.h
@@ -26,7 +26,7 @@
#define _GIT_MERGE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitMergeCommandPriv GitMergeCommandPriv;
struct _GitMergeCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitMergeCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitMergeCommandPriv *priv;
};
diff --git a/plugins/git/git-pane.c b/plugins/git/git-pane.c
index 95ff136..5be6de6 100644
--- a/plugins/git/git-pane.c
+++ b/plugins/git/git-pane.c
@@ -117,7 +117,7 @@ git_pane_on_command_info_arrived (AnjutaCommand *command, Git *plugin)
GQueue *info;
gchar *message;
- info = git_command_get_info_queue (GIT_COMMAND (command));
+ info = git_process_command_get_info_queue (GIT_PROCESS_COMMAND (command));
while (g_queue_peek_head (info))
{
diff --git a/plugins/git/git-command.c b/plugins/git/git-process-command.c
similarity index 76%
rename from plugins/git/git-command.c
rename to plugins/git/git-process-command.c
index e3ee0d1..b4aea9d 100644
--- a/plugins/git/git-command.c
+++ b/plugins/git/git-process-command.c
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "git-command.h"
+#include "git-process-command.h"
#define ERROR_REGEX "^(?:warning|fatal|error): (.*)"
#define PROGRESS_REGEX "(\\d{1,3}(?=%))"
@@ -37,7 +37,7 @@ enum
PROP_STRIP_NEWLINES
};
-struct _GitCommandPriv
+struct _GitProcessCommandPriv
{
AnjutaLauncher *launcher;
GList *args;
@@ -52,17 +52,17 @@ struct _GitCommandPriv
gboolean strip_newlines;
};
-G_DEFINE_TYPE (GitCommand, git_command, ANJUTA_TYPE_SYNC_COMMAND);
+G_DEFINE_TYPE (GitProcessCommand, git_process_command, ANJUTA_TYPE_SYNC_COMMAND);
static void
-git_command_multi_line_output_arrived (AnjutaLauncher *launcher,
+git_process_command_multi_line_output_arrived (AnjutaLauncher *launcher,
AnjutaLauncherOutputType
output_type,
- const gchar *chars, GitCommand
*self)
+ const gchar *chars,
GitProcessCommand *self)
{
- GitCommandClass *klass;
+ GitProcessCommandClass *klass;
gchar *utf8_output;
- klass = GIT_COMMAND_GET_CLASS (self);
+ klass = GIT_PROCESS_COMMAND_GET_CLASS (self);
utf8_output = g_locale_to_utf8 (chars, -1, NULL, NULL, NULL);
if (utf8_output)
@@ -72,12 +72,12 @@ git_command_multi_line_output_arrived (AnjutaLauncher *launcher,
case ANJUTA_LAUNCHER_OUTPUT_STDOUT:
if (klass->output_handler)
{
- GIT_COMMAND_GET_CLASS (self)->output_handler (self,
+ GIT_PROCESS_COMMAND_GET_CLASS (self)->output_handler (self,
utf8_output);
}
break;
case ANJUTA_LAUNCHER_OUTPUT_STDERR:
- GIT_COMMAND_GET_CLASS (self)->error_handler (self, utf8_output);
+ GIT_PROCESS_COMMAND_GET_CLASS (self)->error_handler (self, utf8_output);
break;
default:
break;
@@ -149,11 +149,11 @@ split_lines (const gchar *string, gboolean strip_newlines)
}
static void
-git_command_single_line_output_arrived (AnjutaLauncher *launcher,
+git_process_command_single_line_output_arrived (AnjutaLauncher *launcher,
AnjutaLauncherOutputType
output_type,
- const gchar *chars,
GitCommand *self)
+ const gchar *chars,
GitProcessCommand *self)
{
- void (*output_handler) (GitCommand *git_command, const gchar *output);
+ void (*output_handler) (GitProcessCommand *git_process_command, const gchar *output);
gchar **lines;
gchar **current_line;
gchar *utf8_output;
@@ -162,10 +162,10 @@ git_command_single_line_output_arrived (AnjutaLauncher *launcher,
switch (output_type)
{
case ANJUTA_LAUNCHER_OUTPUT_STDOUT:
- output_handler = GIT_COMMAND_GET_CLASS (self)->output_handler;
+ output_handler = GIT_PROCESS_COMMAND_GET_CLASS (self)->output_handler;
break;
case ANJUTA_LAUNCHER_OUTPUT_STDERR:
- output_handler = GIT_COMMAND_GET_CLASS (self)->error_handler;
+ output_handler = GIT_PROCESS_COMMAND_GET_CLASS (self)->error_handler;
break;
default:
output_handler = NULL;
@@ -195,7 +195,7 @@ git_command_single_line_output_arrived (AnjutaLauncher *launcher,
}
static void
-git_command_launch (GitCommand *self)
+git_process_command_launch (GitProcessCommand *self)
{
gchar **args;
GList *current_arg;
@@ -216,9 +216,9 @@ git_command_launch (GitCommand *self)
}
if (self->priv->single_line_output)
- callback = (AnjutaLauncherOutputCallback) git_command_single_line_output_arrived;
+ callback = (AnjutaLauncherOutputCallback) git_process_command_single_line_output_arrived;
else
- callback = (AnjutaLauncherOutputCallback) git_command_multi_line_output_arrived;
+ callback = (AnjutaLauncherOutputCallback) git_process_command_multi_line_output_arrived;
if (!anjuta_launcher_execute_v (self->priv->launcher,
self->priv->working_directory,
@@ -227,7 +227,7 @@ git_command_launch (GitCommand *self)
callback,
self))
{
- git_command_append_error (self, "Command execution failed.");
+ git_process_command_append_error (self, "Command execution failed.");
anjuta_command_notify_complete (ANJUTA_COMMAND (self), 1);
}
@@ -236,17 +236,17 @@ git_command_launch (GitCommand *self)
}
static void
-git_command_start (AnjutaCommand *command)
+git_process_command_start (AnjutaCommand *command)
{
/* We consider the command to be complete when the launcher notifies us of
* the child git process's completion, instead of when ::run returns. In
* this case, execute the command if ::run retruns 0. */
if (ANJUTA_COMMAND_GET_CLASS (command)->run (command) == 0)
- git_command_launch (GIT_COMMAND (command));
+ git_process_command_launch (GIT_PROCESS_COMMAND (command));
}
static void
-git_command_error_handler (GitCommand *self, const gchar *output)
+git_process_command_error_handler (GitProcessCommand *self, const gchar *output)
{
GMatchInfo *match_info;
gchar *error;
@@ -292,7 +292,7 @@ git_command_error_handler (GitCommand *self, const gchar *output)
if (g_regex_match (self->priv->status_regex, output, 0, &match_info))
{
status = g_match_info_fetch (match_info, 1);
- git_command_push_info (self, status);
+ git_process_command_push_info (self, status);
g_free (status);
g_match_info_free (match_info);
@@ -308,16 +308,16 @@ git_command_error_handler (GitCommand *self, const gchar *output)
if (delimiter)
{
clean_output = g_strndup (output, (delimiter - output));
- git_command_send_output_to_info (self, clean_output);
+ git_process_command_send_output_to_info (self, clean_output);
g_free (clean_output);
}
else
- git_command_send_output_to_info (self, output);
+ git_process_command_send_output_to_info (self, output);
}
}
static void
-git_command_clear_args_list (GitCommand *self)
+git_process_command_clear_args_list (GitProcessCommand *self)
{
g_list_foreach (self->priv->args, (GFunc) g_free, NULL);
g_list_free (self->priv->args);
@@ -325,8 +325,8 @@ git_command_clear_args_list (GitCommand *self)
}
static void
-git_command_child_exited (AnjutaLauncher *launcher, gint child_pid, gint status,
- gulong time, GitCommand *self)
+git_process_command_child_exited (AnjutaLauncher *launcher, gint child_pid, gint status,
+ gulong time, GitProcessCommand *self)
{
if (strlen (self->priv->error_string->str) > 0)
{
@@ -335,22 +335,22 @@ git_command_child_exited (AnjutaLauncher *launcher, gint child_pid, gint status,
}
/* Clear the argument list to make the command reusable */
- git_command_clear_args_list (self);
+ git_process_command_clear_args_list (self);
anjuta_command_notify_complete (ANJUTA_COMMAND (self),
(guint) WEXITSTATUS (status));
}
static void
-git_command_init (GitCommand *self)
+git_process_command_init (GitProcessCommand *self)
{
- self->priv = g_new0 (GitCommandPriv, 1);
+ self->priv = g_new0 (GitProcessCommandPriv, 1);
self->priv->launcher = anjuta_launcher_new ();
anjuta_launcher_set_encoding (self->priv->launcher, NULL);
anjuta_launcher_set_check_passwd_prompt (self->priv->launcher, FALSE);
g_signal_connect (G_OBJECT (self->priv->launcher), "child-exited",
- G_CALLBACK (git_command_child_exited),
+ G_CALLBACK (git_process_command_child_exited),
self);
self->priv->error_regex = g_regex_new (ERROR_REGEX, 0, 0, NULL);
@@ -361,14 +361,14 @@ git_command_init (GitCommand *self)
}
static void
-git_command_finalize (GObject *object)
+git_process_command_finalize (GObject *object)
{
- GitCommand *self;
+ GitProcessCommand *self;
GList *current_info;
- self = GIT_COMMAND (object);
+ self = GIT_PROCESS_COMMAND (object);
- git_command_clear_args_list (self);
+ git_process_command_clear_args_list (self);
current_info = self->priv->info_queue->head;
@@ -387,16 +387,16 @@ git_command_finalize (GObject *object)
g_free (self->priv->working_directory);
g_free (self->priv);
- G_OBJECT_CLASS (git_command_parent_class)->finalize (object);
+ G_OBJECT_CLASS (git_process_command_parent_class)->finalize (object);
}
static void
-git_command_set_property (GObject *object, guint prop_id, const GValue *value,
+git_process_command_set_property (GObject *object, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
- GitCommand *self;
+ GitProcessCommand *self;
- self = GIT_COMMAND (object);
+ self = GIT_PROCESS_COMMAND (object);
switch (prop_id)
{
@@ -417,12 +417,12 @@ git_command_set_property (GObject *object, guint prop_id, const GValue *value,
}
static void
-git_command_get_property (GObject *object, guint prop_id, GValue *value,
+git_process_command_get_property (GObject *object, guint prop_id, GValue *value,
GParamSpec *pspec)
{
- GitCommand *self;
+ GitProcessCommand *self;
- self = GIT_COMMAND (object);
+ self = GIT_PROCESS_COMMAND (object);
switch (prop_id)
{
@@ -436,17 +436,17 @@ git_command_get_property (GObject *object, guint prop_id, GValue *value,
}
static void
-git_command_class_init (GitCommandClass *klass)
+git_process_command_class_init (GitProcessCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
- object_class->finalize = git_command_finalize;
- object_class->set_property = git_command_set_property;
- object_class->get_property = git_command_get_property;
- command_class->start = git_command_start;
+ object_class->finalize = git_process_command_finalize;
+ object_class->set_property = git_process_command_set_property;
+ object_class->get_property = git_process_command_get_property;
+ command_class->start = git_process_command_start;
klass->output_handler = NULL;
- klass->error_handler = git_command_error_handler;
+ klass->error_handler = git_process_command_error_handler;
g_object_class_install_property (object_class, PROP_WORKING_DIRECTORY,
g_param_spec_string
("working-directory",
@@ -479,14 +479,14 @@ git_command_class_init (GitCommandClass *klass)
void
-git_command_add_arg (GitCommand *self, const gchar *arg)
+git_process_command_add_arg (GitProcessCommand *self, const gchar *arg)
{
self->priv->args = g_list_append (self->priv->args, g_strdup (arg));
self->priv->num_args++;
}
void
-git_command_add_list_to_args (GitCommand *self, GList *list)
+git_process_command_add_list_to_args (GitProcessCommand *self, GList *list)
{
GList *current_arg;
@@ -503,7 +503,7 @@ git_command_add_list_to_args (GitCommand *self, GList *list)
}
void
-git_command_append_error (GitCommand *self, const gchar *error_line)
+git_process_command_append_error (GitProcessCommand *self, const gchar *error_line)
{
if (strlen (self->priv->error_string->str) > 0)
g_string_append_printf (self->priv->error_string, "\n%s", error_line);
@@ -512,20 +512,20 @@ git_command_append_error (GitCommand *self, const gchar *error_line)
}
void
-git_command_push_info (GitCommand *self, const gchar *info)
+git_process_command_push_info (GitProcessCommand *self, const gchar *info)
{
g_queue_push_tail (self->priv->info_queue, g_strdup (info));
anjuta_command_notify_data_arrived (ANJUTA_COMMAND (self));
}
GQueue *
-git_command_get_info_queue (GitCommand *self)
+git_process_command_get_info_queue (GitProcessCommand *self)
{
return self->priv->info_queue;
}
void
-git_command_send_output_to_info (GitCommand *git_command, const gchar *output)
+git_process_command_send_output_to_info (GitProcessCommand *git_command, const gchar *output)
{
gchar *newline;
gchar *info_string;
@@ -538,11 +538,11 @@ git_command_send_output_to_info (GitCommand *git_command, const gchar *output)
else
info_string = g_strdup (output);
- git_command_push_info (git_command, info_string);
+ git_process_command_push_info (git_command, info_string);
}
GList *
-git_command_copy_string_list (GList *list)
+git_process_command_copy_string_list (GList *list)
{
GList *current_path;
GList *new_list;
@@ -560,9 +560,8 @@ git_command_copy_string_list (GList *list)
}
void
-git_command_set_check_passwd_prompt (GitCommand *git_command,
- gboolean check)
+git_process_command_set_check_passwd_prompt (GitProcessCommand *self, gboolean check)
{
- anjuta_launcher_set_check_passwd_prompt (git_command->priv->launcher, check);
+ anjuta_launcher_set_check_passwd_prompt (self->priv->launcher, check);
}
diff --git a/plugins/git/git-process-command.h b/plugins/git/git-process-command.h
new file mode 100644
index 0000000..30124f5
--- /dev/null
+++ b/plugins/git/git-process-command.h
@@ -0,0 +1,86 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * anjuta
+ * Copyright (C) James Liggett 2008 <jrliggett cox net>
+ *
+ * anjuta is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * anjuta is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with anjuta. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GIT_PROCESS_COMMAND_H_
+#define _GIT_PROCESS_COMMAND_H_
+
+#include <glib-object.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <libanjuta/anjuta-sync-command.h>
+#include <libanjuta/anjuta-launcher.h>
+#include <libanjuta/anjuta-utils.h>
+
+G_BEGIN_DECLS
+
+#define GIT_TYPE_COMMAND (git_process_command_get_type ())
+#define GIT_PROCESS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_COMMAND,
GitProcessCommand))
+#define GIT_PROCESS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_COMMAND,
GitProcessCommandClass))
+#define GIT_IS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_COMMAND))
+#define GIT_IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_COMMAND))
+#define GIT_PROCESS_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_COMMAND,
GitProcessCommandClass))
+
+typedef struct _GitProcessCommandClass GitProcessCommandClass;
+typedef struct _GitProcessCommand GitProcessCommand;
+typedef struct _GitProcessCommandPriv GitProcessCommandPriv;
+
+struct _GitProcessCommandClass
+{
+ AnjutaSyncCommandClass parent_class;
+
+ /* Virtual methods */
+ void (*output_handler) (GitProcessCommand *git_process_command, const gchar *output);
+ void (*error_handler) (GitProcessCommand *git_process_command, const gchar *output);
+};
+
+struct _GitProcessCommand
+{
+ AnjutaSyncCommand parent_instance;
+
+ GitProcessCommandPriv *priv;
+};
+
+GType git_process_command_get_type (void) G_GNUC_CONST;
+void git_process_command_add_arg (GitProcessCommand *self, const gchar *arg);
+void git_process_command_add_list_to_args (GitProcessCommand *self, GList *list);
+void git_process_command_append_error (GitProcessCommand *self, const gchar *error_line);
+void git_process_command_push_info (GitProcessCommand *self, const gchar *info);
+GQueue *git_process_command_get_info_queue (GitProcessCommand *self);
+
+/* Generic output handlers */
+void git_process_command_send_output_to_info (GitProcessCommand *git_command,
+ const gchar *output);
+
+/* Static helper methods */
+GList *git_process_command_copy_string_list (GList *path_list);
+
+/* Password handling */
+void git_process_command_set_check_passwd_prompt (GitProcessCommand *self,
+ gboolean check);
+
+G_END_DECLS
+
+#endif /* _GIT_PROCESS_COMMAND_H_ */
diff --git a/plugins/git/git-pull-command.c b/plugins/git/git-pull-command.c
index dfe5ed9..36c7b37 100644
--- a/plugins/git/git-pull-command.c
+++ b/plugins/git/git-pull-command.c
@@ -42,7 +42,7 @@ static void
git_pull_command_init (GitPullCommand *self)
{
self->priv = g_new0 (GitPullCommandPriv, 1);
- git_command_set_check_passwd_prompt (GIT_COMMAND (self), TRUE);
+ git_process_command_set_check_passwd_prompt (GIT_PROCESS_COMMAND (self), TRUE);
}
static void
@@ -65,30 +65,30 @@ git_pull_command_run (AnjutaCommand *command)
self = GIT_PULL_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "pull");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "pull");
if (self->priv->rebase)
- git_command_add_arg (GIT_COMMAND (command), "--rebase");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--rebase");
if (self->priv->no_commit)
- git_command_add_arg (GIT_COMMAND (command), "--no-commit");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--no-commit");
if (self->priv->squash)
- git_command_add_arg (GIT_COMMAND (command), "--squash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--squash");
if (self->priv->commit_fast_forward)
- git_command_add_arg (GIT_COMMAND (command), "--no-ff");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--no-ff");
if (self->priv->append_fetch_data)
- git_command_add_arg (GIT_COMMAND (command), "-a");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-a");
if (self->priv->force)
- git_command_add_arg (GIT_COMMAND (command), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-f");
if (self->priv->no_follow_tags)
- git_command_add_arg (GIT_COMMAND (command), "--no-tags");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--no-tags");
- git_command_add_arg (GIT_COMMAND (command), self->priv->url);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->url);
return 0;
}
@@ -97,11 +97,11 @@ static void
git_pull_command_class_init (GitPullCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_pull_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_pull_command_run;
}
diff --git a/plugins/git/git-pull-command.h b/plugins/git/git-pull-command.h
index 1231365..effe3c3 100644
--- a/plugins/git/git-pull-command.h
+++ b/plugins/git/git-pull-command.h
@@ -26,7 +26,7 @@
#define _GIT_PULL_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitPullCommandPriv GitPullCommandPriv;
struct _GitPullCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitPullCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitPullCommandPriv *priv;
};
diff --git a/plugins/git/git-push-command.c b/plugins/git/git-push-command.c
index fd60da8..351aa2c 100644
--- a/plugins/git/git-push-command.c
+++ b/plugins/git/git-push-command.c
@@ -39,7 +39,7 @@ static void
git_push_command_init (GitPushCommand *self)
{
self->priv = g_new0 (GitPushCommandPriv, 1);
- git_command_set_check_passwd_prompt (GIT_COMMAND (self), TRUE);
+ git_process_command_set_check_passwd_prompt (GIT_PROCESS_COMMAND (self), TRUE);
}
static void
@@ -63,21 +63,21 @@ git_push_command_run (AnjutaCommand *command)
self = GIT_PUSH_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "push");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "push");
if (self->priv->push_all)
- git_command_add_arg (GIT_COMMAND (command), "--all");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--all");
if (self->priv->push_tags)
- git_command_add_arg (GIT_COMMAND (command), "--tags");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--tags");
if (self->priv->force)
- git_command_add_arg (GIT_COMMAND (command), "--force");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--force");
- git_command_add_arg (GIT_COMMAND (command), self->priv->url);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->url);
if (self->priv->refs)
- git_command_add_list_to_args (GIT_COMMAND (command), self->priv->refs);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command), self->priv->refs);
return 0;
}
@@ -86,11 +86,11 @@ static void
git_push_command_class_init (GitPushCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_push_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_push_command_run;
}
@@ -111,7 +111,7 @@ git_push_command_new (const gchar *working_directory,
NULL);
self->priv->url = g_strdup (url);
- self->priv->refs = git_command_copy_string_list (refs);
+ self->priv->refs = git_process_command_copy_string_list (refs);
self->priv->push_all = push_all;
self->priv->push_tags = push_tags;
self->priv->force = force;
diff --git a/plugins/git/git-push-command.h b/plugins/git/git-push-command.h
index fc7d613..ce5f7c9 100644
--- a/plugins/git/git-push-command.h
+++ b/plugins/git/git-push-command.h
@@ -26,7 +26,7 @@
#define _GIT_PUSH_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitPushCommandPriv GitPushCommandPriv;
struct _GitPushCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitPushCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitPushCommandPriv *priv;
};
diff --git a/plugins/git/git-raw-output-command.c b/plugins/git/git-raw-output-command.c
index 469d21c..1242a2d 100644
--- a/plugins/git/git-raw-output-command.c
+++ b/plugins/git/git-raw-output-command.c
@@ -61,22 +61,22 @@ git_raw_output_command_finalize (GObject *object)
}
static void
-git_raw_output_command_handle_output (GitCommand *git_command,
+git_raw_output_command_handle_output (GitProcessCommand *git_process_command,
const gchar *output)
{
GitRawOutputCommand *self;
- self = GIT_RAW_OUTPUT_COMMAND (git_command);
+ self = GIT_RAW_OUTPUT_COMMAND (git_process_command);
g_queue_push_tail (self->priv->output_queue, g_strdup (output));
- anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_command));
+ anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_process_command));
}
static void
git_raw_output_command_class_init (GitRawOutputCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
object_class->finalize = git_raw_output_command_finalize;
parent_class->output_handler = git_raw_output_command_handle_output;
diff --git a/plugins/git/git-raw-output-command.h b/plugins/git/git-raw-output-command.h
index 9115a84..9fda5b4 100644
--- a/plugins/git/git-raw-output-command.h
+++ b/plugins/git/git-raw-output-command.h
@@ -26,7 +26,7 @@
#define _GIT_RAW_OUTPUT_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRawOutputCommandPriv GitRawOutputCommandPriv;
struct _GitRawOutputCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRawOutputCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRawOutputCommandPriv *priv;
};
diff --git a/plugins/git/git-rebase-continue-command.c b/plugins/git/git-rebase-continue-command.c
index bceddaf..588cef4 100644
--- a/plugins/git/git-rebase-continue-command.c
+++ b/plugins/git/git-rebase-continue-command.c
@@ -57,18 +57,18 @@ git_rebase_continue_command_run (AnjutaCommand *command)
self = GIT_REBASE_CONTINUE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "rebase");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rebase");
switch (self->priv->action)
{
case GIT_REBASE_CONTINUE_ACTION_CONTINUE:
- git_command_add_arg (GIT_COMMAND (command), "--continue");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--continue");
break;
case GIT_REBASE_CONTINUE_ACTION_SKIP:
- git_command_add_arg (GIT_COMMAND (command), "--skip");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--skip");
break;
case GIT_REBASE_CONTINUE_ACTION_ABORT:
- git_command_add_arg (GIT_COMMAND (command), "--abort");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--abort");
break;
default:
break;
@@ -81,11 +81,11 @@ static void
git_rebase_continue_command_class_init (GitRebaseContinueCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_rebase_continue_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_rebase_continue_command_run;
}
diff --git a/plugins/git/git-rebase-continue-command.h b/plugins/git/git-rebase-continue-command.h
index 40b8514..5715d1a 100644
--- a/plugins/git/git-rebase-continue-command.h
+++ b/plugins/git/git-rebase-continue-command.h
@@ -26,7 +26,7 @@
#define _GIT_REBASE_CONTINUE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRebaseContinueCommandPriv GitRebaseContinueCommandPriv;
struct _GitRebaseContinueCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRebaseContinueCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRebaseContinueCommandPriv *priv;
};
diff --git a/plugins/git/git-rebase-start-command.c b/plugins/git/git-rebase-start-command.c
index bfac7b9..d70ab08 100644
--- a/plugins/git/git-rebase-start-command.c
+++ b/plugins/git/git-rebase-start-command.c
@@ -58,8 +58,8 @@ git_rebase_start_command_run (AnjutaCommand *command)
self = GIT_REBASE_START_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "rebase");
- git_command_add_arg (GIT_COMMAND (command), self->priv->remote_branch);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rebase");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->remote_branch);
return 0;
}
@@ -68,11 +68,11 @@ static void
git_rebase_start_command_class_init (GitRebaseStartCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_rebase_start_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_rebase_start_command_run;
}
diff --git a/plugins/git/git-rebase-start-command.h b/plugins/git/git-rebase-start-command.h
index 8f5c6ae..5184c41 100644
--- a/plugins/git/git-rebase-start-command.h
+++ b/plugins/git/git-rebase-start-command.h
@@ -26,7 +26,7 @@
#define _GIT_REBASE_START_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRebaseStartCommandPriv GitRebaseStartCommandPriv;
struct _GitRebaseStartCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRebaseStartCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRebaseStartCommandPriv *priv;
};
diff --git a/plugins/git/git-ref-command.c b/plugins/git/git-ref-command.c
index 8e609d8..6f1818b 100644
--- a/plugins/git/git-ref-command.c
+++ b/plugins/git/git-ref-command.c
@@ -88,8 +88,8 @@ git_ref_command_finalize (GObject *object)
static guint
git_ref_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "show-ref");
- git_command_add_arg (GIT_COMMAND (command), "--dereference");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "show-ref");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--dereference");
return 0;
}
@@ -122,7 +122,7 @@ git_ref_command_insert_ref (GitRefCommand *self, const gchar *sha, GitRef *ref)
}
static void
-git_ref_command_handle_output (GitCommand *git_command, const gchar *output)
+git_ref_command_handle_output (GitProcessCommand *git_process_command, const gchar *output)
{
GitRefCommand *self;
GMatchInfo *branch_match_info;
@@ -132,7 +132,7 @@ git_ref_command_handle_output (GitCommand *git_command, const gchar *output)
gchar *name;
GitRef *ref;
- self = GIT_REF_COMMAND (git_command);
+ self = GIT_REF_COMMAND (git_process_command);
branch_match_info = NULL;
tag_match_info = NULL;
@@ -405,7 +405,7 @@ static void
git_ref_command_class_init (GitRefCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_ref_command_finalize;
diff --git a/plugins/git/git-ref-command.h b/plugins/git/git-ref-command.h
index 0d34f07..e8c896a 100644
--- a/plugins/git/git-ref-command.h
+++ b/plugins/git/git-ref-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-ref.h"
G_BEGIN_DECLS
@@ -45,12 +45,12 @@ typedef struct _GitRefCommandPriv GitRefCommandPriv;
struct _GitRefCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRefCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRefCommandPriv *priv;
};
diff --git a/plugins/git/git-remote-add-command.c b/plugins/git/git-remote-add-command.c
index 52df961..bbae63b 100644
--- a/plugins/git/git-remote-add-command.c
+++ b/plugins/git/git-remote-add-command.c
@@ -60,14 +60,14 @@ git_remote_add_command_run (AnjutaCommand *command)
self = GIT_REMOTE_ADD_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "remote");
- git_command_add_arg (GIT_COMMAND (command), "add");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "remote");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "add");
if (self->priv->fetch)
- git_command_add_arg (GIT_COMMAND (command), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-f");
- git_command_add_arg (GIT_COMMAND (command), self->priv->name);
- git_command_add_arg (GIT_COMMAND (command), self->priv->url);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->url);
return 0;
}
@@ -76,11 +76,11 @@ static void
git_remote_add_command_class_init (GitRemoteAddCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_remote_add_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_remote_add_command_run;
}
diff --git a/plugins/git/git-remote-add-command.h b/plugins/git/git-remote-add-command.h
index 20f7ce4..d565e01 100644
--- a/plugins/git/git-remote-add-command.h
+++ b/plugins/git/git-remote-add-command.h
@@ -26,7 +26,7 @@
#define _GIT_REMOTE_ADD_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRemoteAddCommandPriv GitRemoteAddCommandPriv;
struct _GitRemoteAddCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRemoteAddCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRemoteAddCommandPriv *priv;
};
diff --git a/plugins/git/git-remote-delete-command.c b/plugins/git/git-remote-delete-command.c
index 5c9f740..7fa36eb 100644
--- a/plugins/git/git-remote-delete-command.c
+++ b/plugins/git/git-remote-delete-command.c
@@ -57,9 +57,9 @@ git_remote_delete_command_run (AnjutaCommand *command)
self = GIT_REMOTE_DELETE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "remote");
- git_command_add_arg (GIT_COMMAND (command), "rm");
- git_command_add_arg (GIT_COMMAND (command), self->priv->name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "remote");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rm");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->name);
return 0;
}
@@ -68,11 +68,11 @@ static void
git_remote_delete_command_class_init (GitRemoteDeleteCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_remote_delete_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_remote_delete_command_run;
}
diff --git a/plugins/git/git-remote-delete-command.h b/plugins/git/git-remote-delete-command.h
index 94841d9..5bf726d 100644
--- a/plugins/git/git-remote-delete-command.h
+++ b/plugins/git/git-remote-delete-command.h
@@ -26,7 +26,7 @@
#define _GIT_REMOTE_DELETE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRemoteDeleteCommandPriv GitRemoteDeleteCommandPriv;
struct _GitRemoteDeleteCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRemoteDeleteCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRemoteDeleteCommandPriv *priv;
};
diff --git a/plugins/git/git-remote-list-command.c b/plugins/git/git-remote-list-command.c
index d9deccb..202e71f 100644
--- a/plugins/git/git-remote-list-command.c
+++ b/plugins/git/git-remote-list-command.c
@@ -54,7 +54,7 @@ git_remote_list_command_finalize (GObject *object)
static guint
git_remote_list_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "remote");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "remote");
return 0;
}
diff --git a/plugins/git/git-remove-command.c b/plugins/git/git-remove-command.c
index 56db3cf..4f89b23 100644
--- a/plugins/git/git-remove-command.c
+++ b/plugins/git/git-remove-command.c
@@ -58,12 +58,12 @@ git_remove_command_run (AnjutaCommand *command)
self = GIT_REMOVE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "rm");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "rm");
if (self->priv->force)
- git_command_add_arg (GIT_COMMAND (command), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-f");
- git_command_add_list_to_args (GIT_COMMAND (command), self->priv->paths);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command), self->priv->paths);
return 0;
}
@@ -106,7 +106,7 @@ git_remove_command_new_list (const gchar *working_directory, GList *path_list,
"working-directory", working_directory,
NULL);
- self->priv->paths = git_command_copy_string_list (path_list);
+ self->priv->paths = git_process_command_copy_string_list (path_list);
self->priv->force = force;
return self;
diff --git a/plugins/git/git-remove-command.h b/plugins/git/git-remove-command.h
index 5f8a8e6..f0ea322 100644
--- a/plugins/git/git-remove-command.h
+++ b/plugins/git/git-remove-command.h
@@ -26,7 +26,7 @@
#define _GIT_REMOVE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRemoveCommandPriv GitRemoveCommandPriv;
struct _GitRemoveCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRemoveCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRemoveCommandPriv *priv;
};
diff --git a/plugins/git/git-reset-files-command.c b/plugins/git/git-reset-files-command.c
index 6e1ff2e..bf0a82f 100644
--- a/plugins/git/git-reset-files-command.c
+++ b/plugins/git/git-reset-files-command.c
@@ -39,9 +39,9 @@ git_reset_files_command_run (AnjutaCommand *command)
self = GIT_RESET_FILES_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (self), "reset");
- git_command_add_arg (GIT_COMMAND (self), self->priv->revision);
- git_command_add_list_to_args (GIT_COMMAND (self), self->priv->paths);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), "reset");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (self), self->priv->revision);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (self), self->priv->paths);
return 0;
}
@@ -70,11 +70,11 @@ static void
git_reset_files_command_class_init (GitResetFilesCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_reset_files_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_reset_files_command_run;
}
@@ -90,7 +90,7 @@ git_reset_files_command_new (const gchar *working_directory,
"single-line-output", TRUE,
NULL);
- self->priv->paths = git_command_copy_string_list (paths);
+ self->priv->paths = git_process_command_copy_string_list (paths);
self->priv->revision = g_strdup (revision);
return self;
diff --git a/plugins/git/git-reset-files-command.h b/plugins/git/git-reset-files-command.h
index a33731b..0d6fff1 100644
--- a/plugins/git/git-reset-files-command.h
+++ b/plugins/git/git-reset-files-command.h
@@ -26,7 +26,7 @@
#define _GIT_RESET_FILES_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -45,12 +45,12 @@ typedef struct _GitResetFilesCommandPriv GitResetFilesCommandPriv;
struct _GitResetFilesCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitResetFilesCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitResetFilesCommandPriv *priv;
};
diff --git a/plugins/git/git-reset-tree-command.c b/plugins/git/git-reset-tree-command.c
index e1cb580..501a1b6 100644
--- a/plugins/git/git-reset-tree-command.c
+++ b/plugins/git/git-reset-tree-command.c
@@ -39,24 +39,24 @@ git_reset_tree_command_run (AnjutaCommand *command)
self = GIT_RESET_TREE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "reset");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "reset");
switch (self->priv->mode)
{
case GIT_RESET_TREE_MODE_MIXED:
- git_command_add_arg (GIT_COMMAND (command), "--mixed");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--mixed");
break;
case GIT_RESET_TREE_MODE_SOFT:
- git_command_add_arg (GIT_COMMAND (command), "--soft");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--soft");
break;
case GIT_RESET_TREE_MODE_HARD:
- git_command_add_arg (GIT_COMMAND (command), "--hard");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--hard");
break;
default:
break;
}
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -84,11 +84,11 @@ static void
git_reset_tree_command_class_init (GitResetTreeCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_reset_tree_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_reset_tree_command_run;
}
diff --git a/plugins/git/git-reset-tree-command.h b/plugins/git/git-reset-tree-command.h
index ff42656..697d69c 100644
--- a/plugins/git/git-reset-tree-command.h
+++ b/plugins/git/git-reset-tree-command.h
@@ -26,7 +26,7 @@
#define _GIT_RESET_TREE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -45,12 +45,12 @@ typedef struct _GitResetTreeCommandPriv GitResetTreeCommandPriv;
struct _GitResetTreeCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitResetTreeCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitResetTreeCommandPriv *priv;
};
diff --git a/plugins/git/git-revert-command.c b/plugins/git/git-revert-command.c
index c2b9b1d..a4ff89a 100644
--- a/plugins/git/git-revert-command.c
+++ b/plugins/git/git-revert-command.c
@@ -58,13 +58,13 @@ git_revert_command_run (AnjutaCommand *command)
self = GIT_REVERT_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "revert");
- git_command_add_arg (GIT_COMMAND (command), "--no-edit");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "revert");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--no-edit");
if (self->priv->no_commit)
- git_command_add_arg (GIT_COMMAND (command), "-n");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-n");
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -73,11 +73,11 @@ static void
git_revert_command_class_init (GitRevertCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_revert_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_revert_command_run;
}
diff --git a/plugins/git/git-revert-command.h b/plugins/git/git-revert-command.h
index fa0c7ed..4b2c29d 100644
--- a/plugins/git/git-revert-command.h
+++ b/plugins/git/git-revert-command.h
@@ -26,7 +26,7 @@
#define _GIT_REVERT_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitRevertCommandPriv GitRevertCommandPriv;
struct _GitRevertCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitRevertCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitRevertCommandPriv *priv;
};
diff --git a/plugins/git/git-stash-apply-command.c b/plugins/git/git-stash-apply-command.c
index 481611a..e91519c 100644
--- a/plugins/git/git-stash-apply-command.c
+++ b/plugins/git/git-stash-apply-command.c
@@ -53,13 +53,13 @@ git_stash_apply_command_run (AnjutaCommand *command)
self = GIT_STASH_APPLY_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "apply");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "apply");
if (self->priv->restore_index)
- git_command_add_arg (GIT_COMMAND (command), "--index");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--index");
- git_command_add_arg (GIT_COMMAND (command), self->priv->stash);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->stash);
return 0;
}
@@ -68,11 +68,11 @@ static void
git_stash_apply_command_class_init (GitStashApplyCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_stash_apply_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_stash_apply_command_run;
}
diff --git a/plugins/git/git-stash-apply-command.h b/plugins/git/git-stash-apply-command.h
index f653970..a054e21 100644
--- a/plugins/git/git-stash-apply-command.h
+++ b/plugins/git/git-stash-apply-command.h
@@ -21,7 +21,7 @@
#define _GIT_STASH_APPLY_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -38,12 +38,12 @@ typedef struct _GitStashApplyCommandPriv GitStashApplyCommandPriv;
struct _GitStashApplyCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStashApplyCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitStashApplyCommandPriv *priv;
};
diff --git a/plugins/git/git-stash-clear-command.c b/plugins/git/git-stash-clear-command.c
index 1e8170c..6886434 100644
--- a/plugins/git/git-stash-clear-command.c
+++ b/plugins/git/git-stash-clear-command.c
@@ -42,8 +42,8 @@ git_stash_clear_command_finalize (GObject *object)
static guint
git_stash_clear_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "clear");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "clear");
return 0;
}
diff --git a/plugins/git/git-stash-clear-command.h b/plugins/git/git-stash-clear-command.h
index 1f2f7b2..e346140 100644
--- a/plugins/git/git-stash-clear-command.h
+++ b/plugins/git/git-stash-clear-command.h
@@ -26,7 +26,7 @@
#define _GIT_STASH_CLEAR_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -42,12 +42,12 @@ typedef struct _GitStashClearCommand GitStashClearCommand;
struct _GitStashClearCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStashClearCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
};
GType git_stash_clear_command_get_type (void) G_GNUC_CONST;
diff --git a/plugins/git/git-stash-drop-command.c b/plugins/git/git-stash-drop-command.c
index 6e2dab2..3a4bd05 100644
--- a/plugins/git/git-stash-drop-command.c
+++ b/plugins/git/git-stash-drop-command.c
@@ -58,9 +58,9 @@ git_stash_drop_command_run (AnjutaCommand *command)
self = GIT_STASH_DROP_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "drop");
- git_command_add_arg (GIT_COMMAND (command), self->priv->stash);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "drop");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->stash);
return 0;
}
@@ -69,11 +69,11 @@ static void
git_stash_drop_command_class_init (GitStashDropCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass *parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass *parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_stash_drop_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_stash_drop_command_run;
}
diff --git a/plugins/git/git-stash-drop-command.h b/plugins/git/git-stash-drop-command.h
index c875f2d..9cdf272 100644
--- a/plugins/git/git-stash-drop-command.h
+++ b/plugins/git/git-stash-drop-command.h
@@ -26,7 +26,7 @@
#define _GIT_STASH_DROP_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitStashDropCommandPriv GitStashDropCommandPriv;
struct _GitStashDropCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStashDropCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitStashDropCommandPriv *priv;
};
diff --git a/plugins/git/git-stash-list-command.c b/plugins/git/git-stash-list-command.c
index ea21a76..5978442 100644
--- a/plugins/git/git-stash-list-command.c
+++ b/plugins/git/git-stash-list-command.c
@@ -72,13 +72,13 @@ git_stash_list_command_finalize (GObject *object)
static guint
git_stash_list_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "list");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "list");
return 0;
}
static void
-git_stash_list_command_handle_output (GitCommand *git_command,
+git_stash_list_command_handle_output (GitProcessCommand *git_process_command,
const gchar *output)
{
GitStashListCommand *self;
@@ -88,7 +88,7 @@ git_stash_list_command_handle_output (GitCommand *git_command,
gchar *stash_message;
GitStash *stash;
- self = GIT_STASH_LIST_COMMAND (git_command);
+ self = GIT_STASH_LIST_COMMAND (git_process_command);
match_info = NULL;
stash_id = NULL;
@@ -108,7 +108,7 @@ git_stash_list_command_handle_output (GitCommand *git_command,
g_free (stash_message);
g_queue_push_head (self->priv->output, stash);
- anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_command));
+ anjuta_command_notify_data_arrived (ANJUTA_COMMAND (git_process_command));
}
if (match_info)
@@ -182,7 +182,7 @@ static void
git_stash_list_command_class_init (GitStashListCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_stash_list_command_finalize;
diff --git a/plugins/git/git-stash-list-command.h b/plugins/git/git-stash-list-command.h
index 198cd24..54f3554 100644
--- a/plugins/git/git-stash-list-command.h
+++ b/plugins/git/git-stash-list-command.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-stash.h"
G_BEGIN_DECLS
@@ -45,12 +45,12 @@ typedef struct _GitStashListCommandPriv GitStashListCommandPriv;
struct _GitStashListCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStashListCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitStashListCommandPriv *priv;
};
diff --git a/plugins/git/git-stash-save-command.c b/plugins/git/git-stash-save-command.c
index bb9bbe6..398f6df 100644
--- a/plugins/git/git-stash-save-command.c
+++ b/plugins/git/git-stash-save-command.c
@@ -53,14 +53,14 @@ git_stash_save_command_run (AnjutaCommand *command)
self = GIT_STASH_SAVE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "save");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "save");
if (self->priv->keep_index)
- git_command_add_arg (GIT_COMMAND (command), "--keep-index");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--keep-index");
if (self->priv->message)
- git_command_add_arg (GIT_COMMAND (command), self->priv->message);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->message);
return 0;
}
@@ -69,11 +69,11 @@ static void
git_stash_save_command_class_init (GitStashSaveCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass *command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_stash_save_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_stash_save_command_run;
}
diff --git a/plugins/git/git-stash-save-command.h b/plugins/git/git-stash-save-command.h
index 2de5c41..54fb28c 100644
--- a/plugins/git/git-stash-save-command.h
+++ b/plugins/git/git-stash-save-command.h
@@ -21,7 +21,7 @@
#define _GIT_STASH_SAVE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -38,12 +38,12 @@ typedef struct _GitStashSaveCommandPriv GitStashSaveCommandPriv;
struct _GitStashSaveCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStashSaveCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitStashSaveCommandPriv *priv;
};
diff --git a/plugins/git/git-stash-show-command.c b/plugins/git/git-stash-show-command.c
index 66f9a4a..a25b09b 100644
--- a/plugins/git/git-stash-show-command.c
+++ b/plugins/git/git-stash-show-command.c
@@ -58,10 +58,10 @@ git_stash_show_command_run (AnjutaCommand *command)
self = GIT_STASH_SHOW_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "stash");
- git_command_add_arg (GIT_COMMAND (command), "show");
- git_command_add_arg (GIT_COMMAND (command), "-p");
- git_command_add_arg (GIT_COMMAND (command), self->priv->stash);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "stash");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "show");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-p");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->stash);
return 0;
}
diff --git a/plugins/git/git-status-command.c b/plugins/git/git-status-command.c
index 53d6b76..eeb81c7 100644
--- a/plugins/git/git-status-command.c
+++ b/plugins/git/git-status-command.c
@@ -42,14 +42,14 @@ G_DEFINE_TYPE (GitStatusCommand, git_status_command, GIT_TYPE_COMMAND);
static guint
git_status_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "status");
- git_command_add_arg (GIT_COMMAND (command), "--porcelain");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "status");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "--porcelain");
return 0;
}
static void
-git_status_command_handle_output (GitCommand *git_command, const gchar *output)
+git_status_command_handle_output (GitProcessCommand *git_process_command, const gchar *output)
{
GitStatusCommand *self;
GMatchInfo *match_info;
@@ -57,7 +57,7 @@ git_status_command_handle_output (GitCommand *git_command, const gchar *output)
gchar *status;
gchar *path;
- self = GIT_STATUS_COMMAND (git_command);
+ self = GIT_STATUS_COMMAND (git_process_command);
status_object = NULL;
if (g_regex_match (self->priv->status_regex, output, 0, &match_info))
@@ -299,7 +299,7 @@ static void
git_status_command_class_init (GitStatusCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_status_command_finalize;
diff --git a/plugins/git/git-status-command.h b/plugins/git/git-status-command.h
index cf08d2d..551990b 100644
--- a/plugins/git/git-status-command.h
+++ b/plugins/git/git-status-command.h
@@ -26,7 +26,7 @@
#define _GIT_STATUS_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
#include "git-status.h"
G_BEGIN_DECLS
@@ -53,12 +53,12 @@ typedef enum
struct _GitStatusCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitStatusCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitStatusCommandPriv *priv;
};
diff --git a/plugins/git/git-tag-create-command.c b/plugins/git/git-tag-create-command.c
index e1d6206..abf2580 100644
--- a/plugins/git/git-tag-create-command.c
+++ b/plugins/git/git-tag-create-command.c
@@ -63,25 +63,25 @@ git_tag_create_command_run (AnjutaCommand *command)
self = GIT_TAG_CREATE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "tag");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "tag");
if (self->priv->log)
{
- git_command_add_arg (GIT_COMMAND (command), "-a");
- git_command_add_arg (GIT_COMMAND (command), "-m");
- git_command_add_arg (GIT_COMMAND (command), self->priv->log);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-a");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-m");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->log);
}
if (self->priv->sign)
- git_command_add_arg (GIT_COMMAND (command), "-s");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-s");
if (self->priv->force)
- git_command_add_arg (GIT_COMMAND (command), "-f");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-f");
- git_command_add_arg (GIT_COMMAND (command), self->priv->name);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->name);
if (self->priv->revision)
- git_command_add_arg (GIT_COMMAND (command), self->priv->revision);
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), self->priv->revision);
return 0;
}
@@ -90,11 +90,11 @@ static void
git_tag_create_command_class_init (GitTagCreateCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_tag_create_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_tag_create_command_run;
}
diff --git a/plugins/git/git-tag-create-command.h b/plugins/git/git-tag-create-command.h
index 361e5d7..9241386 100644
--- a/plugins/git/git-tag-create-command.h
+++ b/plugins/git/git-tag-create-command.h
@@ -26,7 +26,7 @@
#define _GIT_TAG_CREATE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitTagCreateCommandPriv GitTagCreateCommandPriv;
struct _GitTagCreateCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitTagCreateCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitTagCreateCommandPriv *priv;
};
diff --git a/plugins/git/git-tag-delete-command.c b/plugins/git/git-tag-delete-command.c
index 1c7de7c..769080a 100644
--- a/plugins/git/git-tag-delete-command.c
+++ b/plugins/git/git-tag-delete-command.c
@@ -57,10 +57,10 @@ git_tag_delete_command_run (AnjutaCommand *command)
self = GIT_TAG_DELETE_COMMAND (command);
- git_command_add_arg (GIT_COMMAND (command), "tag");
- git_command_add_arg (GIT_COMMAND (command), "-d");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "tag");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "-d");
- git_command_add_list_to_args (GIT_COMMAND (command), self->priv->tags);
+ git_process_command_add_list_to_args (GIT_PROCESS_COMMAND (command), self->priv->tags);
return 0;
}
@@ -69,11 +69,11 @@ static void
git_tag_delete_command_class_init (GitTagDeleteCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- GitCommandClass* parent_class = GIT_COMMAND_CLASS (klass);
+ GitProcessCommandClass* parent_class = GIT_PROCESS_COMMAND_CLASS (klass);
AnjutaCommandClass* command_class = ANJUTA_COMMAND_CLASS (klass);
object_class->finalize = git_tag_delete_command_finalize;
- parent_class->output_handler = git_command_send_output_to_info;
+ parent_class->output_handler = git_process_command_send_output_to_info;
command_class->run = git_tag_delete_command_run;
}
@@ -89,7 +89,7 @@ git_tag_delete_command_new (const gchar *working_directory,
"single-line-output", TRUE,
NULL);
- self->priv->tags = git_command_copy_string_list (tags);
+ self->priv->tags = git_process_command_copy_string_list (tags);
return self;
}
diff --git a/plugins/git/git-tag-delete-command.h b/plugins/git/git-tag-delete-command.h
index 03026ef..3b80441 100644
--- a/plugins/git/git-tag-delete-command.h
+++ b/plugins/git/git-tag-delete-command.h
@@ -26,7 +26,7 @@
#define _GIT_TAG_DELETE_COMMAND_H_
#include <glib-object.h>
-#include "git-command.h"
+#include "git-process-command.h"
G_BEGIN_DECLS
@@ -43,12 +43,12 @@ typedef struct _GitTagDeleteCommandPriv GitTagDeleteCommandPriv;
struct _GitTagDeleteCommandClass
{
- GitCommandClass parent_class;
+ GitProcessCommandClass parent_class;
};
struct _GitTagDeleteCommand
{
- GitCommand parent_instance;
+ GitProcessCommand parent_instance;
GitTagDeleteCommandPriv *priv;
};
diff --git a/plugins/git/git-tag-list-command.c b/plugins/git/git-tag-list-command.c
index 4fe20e8..fd1da4f 100644
--- a/plugins/git/git-tag-list-command.c
+++ b/plugins/git/git-tag-list-command.c
@@ -54,7 +54,7 @@ git_tag_list_command_finalize (GObject *object)
static guint
git_tag_list_command_run (AnjutaCommand *command)
{
- git_command_add_arg (GIT_COMMAND (command), "tag");
+ git_process_command_add_arg (GIT_PROCESS_COMMAND (command), "tag");
return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
