[anjuta] git: Implement the Cherry Pick pane
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] git: Implement the Cherry Pick pane
- Date: Sun, 19 Dec 2010 23:25:09 +0000 (UTC)
commit 99f5afb085503a75c8efd41e00372d4374b2631e
Author: James Liggett <jrliggett cox net>
Date: Sun Dec 19 15:11:30 2010 -0800
git: Implement the Cherry Pick pane
plugins/git/Makefile.am | 4 +-
plugins/git/anjuta-git.ui | 146 ++++++++++++++++++++++++++++++
plugins/git/git-cherry-pick-pane.c | 175 ++++++++++++++++++++++++++++++++++++
plugins/git/git-cherry-pick-pane.h | 60 ++++++++++++
plugins/git/plugin.c | 9 ++
5 files changed, 393 insertions(+), 1 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 70aad1c..4aee0b9 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -223,7 +223,9 @@ libanjuta_git_la_SOURCES = \
git-revert-pane.c \
git-revert-pane.h \
git-reset-pane.c \
- git-reset-pane.h
+ git-reset-pane.h \
+ git-cherry-pick-pane.c \
+ git-cherry-pick-pane.h
libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index a0f0833..afe2244 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -2975,4 +2975,150 @@
</packing>
</child>
</object>
+ <object class="GtkVBox" id="cherry_pick_pane">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="AnjutaDropEntry" id="revision_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â?¢</property>
+ <property name="help_text">Drop or enter revision here</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Commit to cherry pick:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="no_commit_check">
+ <property name="label" translatable="yes">Do not commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_source_check">
+ <property name="label" translatable="yes">Show source revision in log message</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="signoff_check">
+ <property name="label" translatable="yes">Append signed-of- by line</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
</interface>
diff --git a/plugins/git/git-cherry-pick-pane.c b/plugins/git/git-cherry-pick-pane.c
new file mode 100644
index 0000000..35e791f
--- /dev/null
+++ b/plugins/git/git-cherry-pick-pane.c
@@ -0,0 +1,175 @@
+/* -*- 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-cherry-pick-pane.h"
+
+struct _GitCherryPickPanePriv
+{
+ GtkBuilder *builder;
+};
+
+G_DEFINE_TYPE (GitCherryPickPane, git_cherry_pick_pane, GIT_TYPE_PANE);
+
+static void
+on_ok_button_clicked (GtkButton *button, GitCherryPickPane *self)
+{
+ Git *plugin;
+ AnjutaEntry *revision_entry;
+ GtkToggleButton *no_commit_check;
+ GtkToggleButton *show_source_check;
+ GtkToggleButton *signoff_check;
+ gchar *revision;
+ GitCherryPickCommand *cherry_pick_command;
+
+ plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
+ revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "revision_entry"));
+ no_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
+ "no_commit_check"));
+ show_source_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
+ "show_source_check"));
+ signoff_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
+ "signoff_check"));
+ revision = anjuta_entry_dup_text (revision_entry);
+
+ if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
+ GTK_WIDGET (revision_entry), revision,
+ _("Please enter a revision.")))
+ {
+ g_free (revision);
+ return;
+ }
+
+ cherry_pick_command = git_cherry_pick_command_new (plugin->project_root_directory,
+ revision,
+ gtk_toggle_button_get_active (no_commit_check),
+ gtk_toggle_button_get_active (show_source_check),
+ gtk_toggle_button_get_active (signoff_check));
+
+ git_pane_create_message_view (plugin);
+
+ g_signal_connect (G_OBJECT (cherry_pick_command), "data-arrived",
+ G_CALLBACK (git_pane_on_command_info_arrived),
+ plugin);
+
+ g_signal_connect (G_OBJECT (cherry_pick_command), "command-finished",
+ G_CALLBACK (git_pane_report_errors),
+ plugin);
+
+
+ g_signal_connect (G_OBJECT (cherry_pick_command), "command-finished",
+ G_CALLBACK (g_object_unref),
+ NULL);
+
+ anjuta_command_start (ANJUTA_COMMAND (cherry_pick_command));
+
+ g_free (revision);
+
+ git_pane_remove_from_dock (GIT_PANE (self));
+}
+
+
+static void
+git_cherry_pick_pane_init (GitCherryPickPane *self)
+{
+ gchar *objects[] = {"cherry_pick_pane",
+ NULL};
+ GError *error = NULL;
+ GtkWidget *ok_button;
+ GtkWidget *cancel_button;
+
+
+ self->priv = g_new0 (GitCherryPickPanePriv, 1);
+ self->priv->builder = gtk_builder_new ();
+
+ if (!gtk_builder_add_objects_from_file (self->priv->builder, BUILDER_FILE,
+ objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "ok_button"));
+ cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "cancel_button"));
+
+ g_signal_connect (G_OBJECT (ok_button), "clicked",
+ G_CALLBACK (on_ok_button_clicked),
+ self);
+
+ g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ G_CALLBACK (git_pane_remove_from_dock),
+ self);
+}
+
+static void
+git_cherry_pick_pane_finalize (GObject *object)
+{
+ GitCherryPickPane *self;
+
+ self = GIT_CHERRY_PICK_PANE (object);
+
+ g_object_unref (self->priv->builder);
+ g_free (self->priv);
+
+ G_OBJECT_CLASS (git_cherry_pick_pane_parent_class)->finalize (object);
+}
+
+static GtkWidget *
+git_cherry_pick_pane_get_widget (AnjutaDockPane *pane)
+{
+ GitCherryPickPane *self;
+
+ self = GIT_CHERRY_PICK_PANE (pane);
+
+ return GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "cherry_pick_pane"));
+}
+
+static void
+git_cherry_pick_pane_class_init (GitCherryPickPaneClass *klass)
+{
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
+ AnjutaDockPaneClass *pane_class = ANJUTA_DOCK_PANE_CLASS (klass);
+
+ object_class->finalize = git_cherry_pick_pane_finalize;
+ pane_class->get_widget = git_cherry_pick_pane_get_widget;
+ pane_class->refresh = NULL;
+}
+
+
+AnjutaDockPane *
+git_cherry_pick_pane_new (Git *plugin)
+{
+ return g_object_new (GIT_TYPE_CHERRY_PICK_PANE, "plugin", plugin, NULL);
+}
+
+void
+on_cherry_pick_button_clicked (GtkAction *action, Git *plugin)
+{
+ AnjutaDockPane *pane;
+
+ pane = git_cherry_pick_pane_new (plugin);
+
+ anjuta_dock_add_pane (ANJUTA_DOCK (plugin->dock), "CherryPick",
+ _("Cherry Pick"), NULL, pane, GDL_DOCK_BOTTOM, NULL,
+ 0, NULL);
+}
\ No newline at end of file
diff --git a/plugins/git/git-cherry-pick-pane.h b/plugins/git/git-cherry-pick-pane.h
new file mode 100644
index 0000000..8c21138
--- /dev/null
+++ b/plugins/git/git-cherry-pick-pane.h
@@ -0,0 +1,60 @@
+/* -*- 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_CHERRY_PICK_PANE_H_
+#define _GIT_CHERRY_PICK_PANE_H_
+
+#include <glib-object.h>
+#include <libanjuta/anjuta-entry.h>
+#include "git-pane.h"
+#include "plugin.h"
+#include "git-cherry-pick-command.h"
+
+G_BEGIN_DECLS
+
+#define GIT_TYPE_CHERRY_PICK_PANE (git_cherry_pick_pane_get_type ())
+#define GIT_CHERRY_PICK_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_CHERRY_PICK_PANE, GitCherryPickPane))
+#define GIT_CHERRY_PICK_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_CHERRY_PICK_PANE, GitCherryPickPaneClass))
+#define GIT_IS_CHERRY_PICK_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_CHERRY_PICK_PANE))
+#define GIT_IS_CHERRY_PICK_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_CHERRY_PICK_PANE))
+#define GIT_CHERRY_PICK_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_CHERRY_PICK_PANE, GitCherryPickPaneClass))
+
+typedef struct _GitCherryPickPaneClass GitCherryPickPaneClass;
+typedef struct _GitCherryPickPane GitCherryPickPane;
+typedef struct _GitCherryPickPanePriv GitCherryPickPanePriv;
+
+struct _GitCherryPickPaneClass
+{
+ GitPaneClass parent_class;
+};
+
+struct _GitCherryPickPane
+{
+ GitPane parent_instance;
+
+ GitCherryPickPanePriv *priv;
+};
+
+GType git_cherry_pick_pane_get_type (void) G_GNUC_CONST;
+AnjutaDockPane *git_cherry_pick_pane_new (Git *plugin);
+void on_cherry_pick_button_clicked (GtkAction *action, Git *plugin);
+
+G_END_DECLS
+
+#endif /* _GIT_RESET_PANE_H_ */
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 46ec83b..efc126f 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -53,6 +53,7 @@
#include "git-log-pane.h"
#include "git-reset-pane.h"
#include "git-revert-pane.h"
+#include "git-cherry-pick-pane.h"
AnjutaCommandBarEntry branch_entries[] =
{
@@ -374,6 +375,14 @@ static AnjutaCommandBarEntry log_entries[] =
G_CALLBACK (on_commit_diff_button_clicked)
},
{
+ ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+ "CherryPick",
+ N_("Cherry pick"),
+ N_("Merge an individual commit from another branch"),
+ NULL,
+ G_CALLBACK (on_cherry_pick_button_clicked)
+ },
+ {
ANJUTA_COMMAND_BAR_ENTRY_FRAME,
"NULL",
N_("Reset/Revert"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
