1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
/* -*- 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-merge-command.h"
struct _GitMergeCommandPriv
{
gchar *branch;
gchar *log;
gboolean no_commit;
gboolean squash;
};
G_DEFINE_TYPE (GitMergeCommand, git_merge_command, GIT_TYPE_COMMAND);
static void
git_merge_command_init (GitMergeCommand *self)
{
self->priv = g_new0 (GitMergeCommandPriv, 1);
}
static void
git_merge_command_finalize (GObject *object)
{
GitMergeCommand *self;
self = GIT_MERGE_COMMAND (object);
g_free (self->priv->branch);
g_free (self->priv->log);
g_free (self->priv);
G_OBJECT_CLASS (git_merge_command_parent_class)->finalize (object);
}
static guint
git_merge_command_run (AnjutaCommand *command)
{
GitMergeCommand *self;
self = GIT_MERGE_COMMAND (command);
git_command_add_arg (GIT_COMMAND (command), "merge");
if (self->priv->no_commit)
git_command_add_arg (GIT_COMMAND (command), "--no-commit");
if (self->priv->squash)
git_command_add_arg (GIT_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_command_add_arg (GIT_COMMAND (command), self->priv->branch);
return 0;
}
static void
git_merge_command_class_init (GitMergeCommandClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
GitCommandClass* parent_class = GIT_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;
command_class->run = git_merge_command_run;
}
GitMergeCommand *
git_merge_command_new (const gchar *working_directory, const gchar *branch,
const gchar *log, gboolean no_commit, gboolean squash)
{
GitMergeCommand *self;
self = g_object_new (GIT_TYPE_MERGE_COMMAND,
"working-directory", working_directory,
"single-line-output", TRUE,
NULL);
self->priv->branch = g_strdup (branch);
self->priv->log = g_strdup (log);
self->priv->no_commit = no_commit;
self->priv->squash = squash;
return self;
}
|
