[anjuta/git-shell] git: Implement the Apply Stash pane

[James Liggett <jrliggett src gnome org>]

commit 8085f48c9d14f6ab122f2b95cae5b460304a7387
Author: James Liggett <jrliggett cox net>
Date:   Tue Jul 27 22:17:06 2010 -0700

    git: Implement the Apply Stash pane

 plugins/git/Makefile.am            |    4 ++-
 plugins/git/git-apply-stash-pane.c |   56 ++++++++++++++++++++++++++++++++++++
 plugins/git/git-apply-stash-pane.h |   28 ++++++++++++++++++
 plugins/git/plugin.c               |    9 ++++++
 4 files changed, 96 insertions(+), 1 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 4c1c994..4c7eeb0 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -205,7 +205,9 @@ libanjuta_git_la_SOURCES = \
 	git-stash-pane.h \
 	git-stash-pane.c \
 	git-stash-changes-pane.c \
-	git-stash-changes-pane.h
+	git-stash-changes-pane.h \
+	git-apply-stash-pane.c \
+	git-apply-stash-pane.h
 
 libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
diff --git a/plugins/git/git-apply-stash-pane.c b/plugins/git/git-apply-stash-pane.c
new file mode 100644
index 0000000..22731a7
--- /dev/null
+++ b/plugins/git/git-apply-stash-pane.c
@@ -0,0 +1,56 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * git-shell-test
+ * Copyright (C) James Liggett 2010 <jrliggett cox net>
+ * 
+ * git-shell-test is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * git-shell-test 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "git-apply-stash-pane.h"
+
+void
+on_apply_stash_button_clicked (GtkAction *action, Git *plugin)
+{
+	gchar *stash;
+	GitStashApplyCommand *apply_command;
+
+	stash = git_stash_pane_get_selected_stash_id (GIT_STASH_PANE (plugin->stash_pane));
+	
+	if (stash)
+	{
+		apply_command = git_stash_apply_command_new (plugin->project_root_directory,
+		                                             FALSE, stash);
+		g_free (stash);
+
+		git_pane_create_message_view (plugin);
+
+		g_signal_connect (G_OBJECT (apply_command), "command-finished",
+		                  G_CALLBACK (git_pane_report_errors),
+		                  plugin);
+
+
+		g_signal_connect (G_OBJECT (apply_command), "command-finished",
+		                  G_CALLBACK (g_object_unref),
+		                  NULL);
+
+		g_signal_connect (G_OBJECT (apply_command), "data-arrived",
+		                  G_CALLBACK (git_pane_on_command_info_arrived),
+		                  plugin);
+
+		anjuta_command_start (ANJUTA_COMMAND (apply_command));
+	}
+	else
+		anjuta_util_dialog_error (NULL, _("No stash selected."));
+}
+ 
\ No newline at end of file
diff --git a/plugins/git/git-apply-stash-pane.h b/plugins/git/git-apply-stash-pane.h
new file mode 100644
index 0000000..9a93f09
--- /dev/null
+++ b/plugins/git/git-apply-stash-pane.h
@@ -0,0 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * git-shell-test
+ * Copyright (C) James Liggett 2010 <jrliggett cox net>
+ * 
+ * git-shell-test is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * git-shell-test 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _GIT_APPLY_STASH_PANE_H_
+#define _GIT_APPLY_STASH_PANE_H_
+
+#include "git-stash-apply-command.h"
+#include "git-stash-pane.h"
+
+void on_apply_stash_button_clicked (GtkAction *action, Git *plugin);
+
+#endif
\ No newline at end of file
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 48a6d9d..434c32a 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -45,6 +45,7 @@
 #include "git-delete-tags-pane.h"
 #include "git-stash-pane.h"
 #include "git-stash-changes-pane.h"
+#include "git-apply-stash-pane.h"
 
 AnjutaCommandBarEntry branch_entries[] =
 {
@@ -266,6 +267,14 @@ AnjutaCommandBarEntry stash_entries[] =
 		GTK_STOCK_SAVE,
 		G_CALLBACK (on_stash_changes_button_clicked)
 	},
+	{
+		ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+		"ApplyStash",
+		N_("Apply selected stash"),
+		N_("Apply stashed changes back into the working tree"),
+		GTK_STOCK_APPLY,
+		G_CALLBACK (on_apply_stash_button_clicked)
+	}
 	
 };