GNOME.org
 

anjuta r4782 - in trunk: . plugins/git

Author: jrliggett
Date: Sat Feb 21 23:26:00 2009
New Revision: 4782
URL: http://svn.gnome.org/viewvc/anjuta?rev=4782&view=rev

Log:
* plugins/git/Makefile.am:
	* plugins/git/git-vcs-interface.c (git_ivcs_iface_init),
	(git_ivcs_add), (git_ivcs_checkout),
	(on_diff_command_data_arrived), (git_ivcs_diff),
	(on_status_command_data_arrived), (git_ivcs_query_status),
	(git_ivcs_remove):
	* plugins/git/git-vcs-interface.h:
	* plugins/git/git.plugin.in:
	* plugins/git/plugin.c:
	Implement the beginnings of IAnjutaVcs for the git plugin. Checkout and 
	operation canceling aren't supported yet. Everything else should work.

Added:
   trunk/plugins/git/git-vcs-interface.c
   trunk/plugins/git/git-vcs-interface.h
Modified:
   trunk/ChangeLog
   trunk/plugins/git/Makefile.am
   trunk/plugins/git/git.plugin.in
   trunk/plugins/git/plugin.c

Modified: trunk/plugins/git/Makefile.am
==============================================================================
--- trunk/plugins/git/Makefile.am	(original)
+++ trunk/plugins/git/Makefile.am	Sat Feb 21 23:26:00 2009
@@ -177,7 +177,9 @@
 	git-cat-blob-command.c \
 	git-cat-blob-command.h \
 	git-cat-file-menu.c \
-	git-cat-file-menu.h
+	git-cat-file-menu.h \
+	git-vcs-interface.c \
+	git-vcs-interface.h
 
 libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 

Added: trunk/plugins/git/git-vcs-interface.c
==============================================================================
--- (empty file)
+++ trunk/plugins/git/git-vcs-interface.c	Sat Feb 21 23:26:00 2009
@@ -0,0 +1,291 @@
+/* -*- 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.
+ */
+
+#include "git-vcs-interface.h"
+
+void
+git_ivcs_iface_init (IAnjutaVcsIface *iface)
+{
+	iface->add = git_ivcs_add;
+	iface->checkout = git_ivcs_checkout;
+	iface->diff = git_ivcs_diff;
+	iface->query_status = git_ivcs_query_status;
+	iface->remove = git_ivcs_remove;
+}
+
+void
+git_ivcs_add (IAnjutaVcs *obj, GList *files, AnjutaAsyncNotify *notify,
+			  GError **err)
+{
+	gchar *project_root_directory;
+	GList *path_list;
+	GitAddCommand *add_command;
+	
+	project_root_directory = ANJUTA_PLUGIN_GIT (obj)->project_root_directory;
+	
+	if (project_root_directory)
+	{
+		path_list = anjuta_util_convert_gfile_list_to_relative_path_list (files,
+		                                                                  project_root_directory);
+		add_command = git_add_command_new_list (project_root_directory,
+		                                        path_list, FALSE);
+		
+		anjuta_util_glist_strings_free (path_list);
+		
+		g_signal_connect (G_OBJECT (add_command), "command-finished", 
+		                  G_CALLBACK (g_object_unref), 
+		                  NULL);
+		
+		if (notify)
+		{
+			g_signal_connect_swapped (G_OBJECT (add_command), "command-finished",
+			                          G_CALLBACK (anjuta_async_notify_notify_finished),
+			                          notify);
+		}
+		
+		anjuta_command_start (ANJUTA_COMMAND (add_command));
+	}
+	
+}
+
+void
+git_ivcs_checkout (IAnjutaVcs *obj, 
+				   const gchar *repository_location, GFile *dest,
+				   GCancellable *cancel,
+				   AnjutaAsyncNotify *notify, GError **err)
+{
+	/* TODO */
+}
+
+static void
+on_diff_command_data_arrived (AnjutaCommand *command, 
+							  IAnjutaVcsDiffCallback callback)
+{
+	GQueue *output;
+	gchar *line;
+	
+	output = git_raw_output_command_get_output (GIT_RAW_OUTPUT_COMMAND (command));
+	
+	while (g_queue_peek_head (output))
+	{
+		line = g_queue_pop_head (output);
+		callback (g_object_get_data (G_OBJECT (command), "file"), line,
+				  g_object_get_data (G_OBJECT (command), "user-data"));
+		g_free (line);
+	}
+}
+
+void 
+git_ivcs_diff (IAnjutaVcs *obj, GFile* file,  
+			   IAnjutaVcsDiffCallback callback, gpointer user_data,  
+			   GCancellable* cancel, AnjutaAsyncNotify *notify,
+			   GError **err)
+{
+	gchar *project_root_directory;
+	GitDiffCommand *diff_command;
+	
+	project_root_directory = ANJUTA_PLUGIN_GIT (obj)->project_root_directory;
+	
+	if (project_root_directory)
+	{
+		diff_command = git_diff_command_new (project_root_directory);
+		
+		g_object_set_data_full (G_OBJECT (diff_command), "file", 
+		                        g_object_ref (file),
+		                        (GDestroyNotify) g_object_unref);
+		g_object_set_data (G_OBJECT (diff_command), "user-data", user_data);
+		
+		g_signal_connect (G_OBJECT (diff_command), "command-finished", 
+		                  G_CALLBACK (g_object_unref),
+		                  NULL);
+		
+		g_signal_connect (G_OBJECT (diff_command), "data-arrived",
+		                  G_CALLBACK (on_diff_command_data_arrived),
+		                  callback);
+		
+/* FIXME: Reenable when canceling is implemented. */
+#if 0
+		if (cancel)
+		{
+			g_signal_connect_swapped (G_OBJECT (cancel), "cancelled",
+			                          G_CALLBACK (anjuta_command_cancel),
+			                          diff_command);
+		}
+#endif
+		
+		if (notify)
+		{
+			g_signal_connect_swapped (G_OBJECT (diff_command), "command-finished",
+			                          G_CALLBACK (anjuta_async_notify_notify_finished),
+			                          notify);
+		}
+		
+		anjuta_command_start (ANJUTA_COMMAND (diff_command));
+	}
+}
+
+static void
+on_status_command_data_arrived (AnjutaCommand *command, 
+								IAnjutaVcsStatusCallback callback)
+{
+	GQueue *status_queue;
+	GitStatus *status;
+	GFile *parent_file;
+	gchar *parent_path;
+	gchar *status_relative_path;
+	gchar *path;
+	GFile *file;
+	GFile *given_file;
+	
+	status_queue = git_status_command_get_status_queue (GIT_STATUS_COMMAND (command));
+	
+	while (g_queue_peek_head (status_queue))
+	{
+		status = g_queue_pop_head (status_queue);
+		parent_file = g_object_get_data (G_OBJECT (command), "parent-file");
+		parent_path = g_file_get_path (parent_file);
+		status_relative_path = git_status_get_path (status);
+		path = g_strconcat (parent_path, G_DIR_SEPARATOR_S,
+		              		status_relative_path, NULL);
+		g_free (parent_path);
+		file = g_file_new_for_path (path);
+		given_file = g_object_get_data (G_OBJECT (command), "file");
+		
+		/* Since git only works on directories, and clients only ask for files,
+		 * only emit the callback if this is the file that was asked for. */
+		if (g_file_equal (file, given_file))
+		{
+			callback (file, 
+					  git_status_get_vcs_status (status),
+					  g_object_get_data (G_OBJECT (command), "user-data"));
+			
+			g_object_unref (file);
+		}
+		
+		g_object_unref (status);
+		g_free (status_relative_path);
+		g_free (path);
+	}
+}
+
+void 
+git_ivcs_query_status (IAnjutaVcs *obj, GFile *file, 
+					   IAnjutaVcsStatusCallback callback,
+					   gpointer user_data, GCancellable *cancel,
+					   AnjutaAsyncNotify *notify, GError **err)
+{
+	gchar *project_root_directory;
+	GFile *project_root_file;
+	GFile *parent_file;
+	gchar *path;
+	GitStatusCommand *status_command;
+	
+	project_root_directory = ANJUTA_PLUGIN_GIT (obj)->project_root_directory;
+	
+	if (project_root_directory)
+	{
+		project_root_file = g_file_new_for_path (project_root_directory);
+		
+		/* It is assumed that clients will only get the status of individual 
+		 * files, but git only works on directories. So give git the path of 
+		 * the given file's parent folder. */
+		parent_file = g_file_get_parent (file);
+		path = g_file_get_path (parent_file);
+		status_command = git_status_command_new (path, 
+		                                         ~0);
+		
+		g_free (path);
+		
+		g_object_set_data (G_OBJECT (status_command), "user-data", user_data);
+		g_object_set_data_full (G_OBJECT (status_command), 
+		                        "parent-file", 
+		                        g_object_ref (parent_file), 
+		                        (GDestroyNotify) g_object_unref);
+		g_object_set_data (G_OBJECT (status_command), "file", file);
+		
+		g_object_unref (project_root_file);
+		g_object_unref (parent_file);
+		
+		g_signal_connect (G_OBJECT (status_command), "data-arrived",
+		                  G_CALLBACK (on_status_command_data_arrived),
+		                  callback);
+		
+		g_signal_connect (G_OBJECT (status_command), "command-finished",
+		                  G_CALLBACK (g_object_unref),
+		                  NULL);
+		
+#if 0
+		if (cancel)
+		{
+			g_signal_connect_swapped (G_OBJECT (cancel), "cancelled",
+			                          G_CALLBACK (anjuta_command_cancel),
+			                          status_command);
+		}
+#endif
+		
+		if (notify)
+		{
+			g_signal_connect_swapped (G_OBJECT (status_command), "command-finished",
+			                          G_CALLBACK (anjuta_async_notify_notify_finished),
+			                          notify);
+		}
+		
+		anjuta_command_start (ANJUTA_COMMAND (status_command));
+	}
+	
+}
+
+void 
+git_ivcs_remove (IAnjutaVcs *obj, GList *files, 
+				 AnjutaAsyncNotify *notify, GError **err)
+{
+	gchar *project_root_directory;
+	GList *path_list;
+	GitRemoveCommand *remove_command;
+	
+	project_root_directory = ANJUTA_PLUGIN_GIT (obj)->project_root_directory;
+	
+	if (project_root_directory)
+	{
+		path_list = anjuta_util_convert_gfile_list_to_relative_path_list (files,
+		                                                                  project_root_directory);
+		remove_command = git_remove_command_new_list (project_root_directory,
+		                                              path_list, FALSE);
+		
+		anjuta_util_glist_strings_free (path_list);
+		
+		g_signal_connect (G_OBJECT (remove_command), "command-finished", 
+		                  G_CALLBACK (g_object_unref), 
+		                  NULL);
+		
+		if (notify)
+		{
+			g_signal_connect_swapped (G_OBJECT (remove_command), "command-finished",
+			                          G_CALLBACK (anjuta_async_notify_notify_finished),
+			                          notify);
+		}
+		
+		anjuta_command_start (ANJUTA_COMMAND (remove_command));
+	}
+}
\ No newline at end of file

Added: trunk/plugins/git/git-vcs-interface.h
==============================================================================
--- (empty file)
+++ trunk/plugins/git/git-vcs-interface.h	Sat Feb 21 23:26:00 2009
@@ -0,0 +1,58 @@
+/* -*- 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_VCS_INTERFACE_H_
+#define _GIT_VCS_INTERFACE_H_
+
+#include <libanjuta/anjuta-utils.h>
+#include <libanjuta/interfaces/ianjuta-vcs.h>
+
+#include "git-add-command.h"
+#include "git-diff-command.h"
+#include "git-status-command.h"
+#include "git-remove-command.h"
+
+#include "git-ui-utils.h"
+
+void git_ivcs_iface_init (IAnjutaVcsIface *iface);
+void git_ivcs_add (IAnjutaVcs *obj, GList *files, 
+				   AnjutaAsyncNotify *notify, GError **err);
+void git_ivcs_checkout (IAnjutaVcs *obj, 
+						const gchar *repository_location, GFile *dest,
+						GCancellable *cancel,
+						AnjutaAsyncNotify *notify, GError **err);
+void git_ivcs_diff (IAnjutaVcs *obj, GFile* file,  
+					IAnjutaVcsDiffCallback callback, gpointer user_data,  
+					GCancellable* cancel, AnjutaAsyncNotify *notify,
+					GError **err);
+void git_ivcs_query_status (IAnjutaVcs *obj, GFile *file, 
+							IAnjutaVcsStatusCallback callback,
+							gpointer user_data, GCancellable *cancel,
+							AnjutaAsyncNotify *notify, GError **err);
+void git_ivcs_remove (IAnjutaVcs *obj, GList *files, 
+					  AnjutaAsyncNotify *notify, GError **err);
+
+
+#endif 
+ 
\ No newline at end of file

Modified: trunk/plugins/git/git.plugin.in
==============================================================================
--- trunk/plugins/git/git.plugin.in	(original)
+++ trunk/plugins/git/git.plugin.in	Sat Feb 21 23:26:00 2009
@@ -3,3 +3,7 @@
 Icon=anjuta-git-plugin-48.png
 _Name=Git
 _Description=Git version control
+Interfaces=IAnjutaVcs
+
+[Vcs]
+System=Git

Modified: trunk/plugins/git/plugin.c
==============================================================================
--- trunk/plugins/git/plugin.c	(original)
+++ trunk/plugins/git/plugin.c	Sat Feb 21 23:26:00 2009
@@ -20,6 +20,7 @@
 */
 
 #include "plugin.h"
+#include "git-vcs-interface.h"
 #include "git-diff-dialog.h"
 #include "git-commit-dialog.h"
 #include "git-add-dialog.h"
@@ -711,5 +712,8 @@
 	klass->dispose = git_dispose;
 }
 
-ANJUTA_PLUGIN_BOILERPLATE (Git, git);
+ANJUTA_PLUGIN_BEGIN (Git, git);
+ANJUTA_PLUGIN_ADD_INTERFACE (git_ivcs, IANJUTA_TYPE_VCS);
+ANJUTA_PLUGIN_END;
+
 ANJUTA_SIMPLE_PLUGIN (Git, git);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]