1 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
4 * Copyright (C) James Liggett 2008 <jrliggett@cox.net>
6 * anjuta is free software.
8 * You may redistribute it and/or modify it under the terms of the
9 * GNU General Public License, as published by the Free Software
10 * Foundation; either version 2 of the License, or (at your option)
13 * anjuta is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
16 * See the GNU General Public License for more details.
18 * You should have received a copy of the GNU General Public License
19 * along with anjuta. If not, write to:
20 * The Free Software Foundation, Inc.,
21 * 51 Franklin Street, Fifth Floor
22 * Boston, MA 02110-1301, USA.
25 #include "git-merge-command.h"
27 struct _GitMergeCommandPriv
35 G_DEFINE_TYPE (GitMergeCommand
, git_merge_command
, GIT_TYPE_COMMAND
);
38 git_merge_command_init (GitMergeCommand
*self
)
40 self
->priv
= g_new0 (GitMergeCommandPriv
, 1);
44 git_merge_command_finalize (GObject
*object
)
46 GitMergeCommand
*self
;
48 self
= GIT_MERGE_COMMAND (object
);
50 g_free (self
->priv
->branch
);
51 g_free (self
->priv
->log
);
54 G_OBJECT_CLASS (git_merge_command_parent_class
)->finalize (object
);
58 git_merge_command_run (AnjutaCommand
*command
)
60 GitMergeCommand
*self
;
62 self
= GIT_MERGE_COMMAND (command
);
64 git_command_add_arg (GIT_COMMAND (command
), "merge");
66 if (self
->priv
->no_commit
)
67 git_command_add_arg (GIT_COMMAND (command
), "--no-commit");
69 if (self
->priv
->squash
)
70 git_command_add_arg (GIT_COMMAND (command
), "--squash");
74 git_command_add_arg (GIT_COMMAND (command
), "-m");
75 git_command_add_arg (GIT_COMMAND (command
), self
->priv
->log
);
78 git_command_add_arg (GIT_COMMAND (command
), self
->priv
->branch
);
84 git_merge_command_class_init (GitMergeCommandClass
*klass
)
86 GObjectClass
* object_class
= G_OBJECT_CLASS (klass
);
87 GitCommandClass
* parent_class
= GIT_COMMAND_CLASS (klass
);
88 AnjutaCommandClass
* command_class
= ANJUTA_COMMAND_CLASS (klass
);
90 object_class
->finalize
= git_merge_command_finalize
;
91 parent_class
->output_handler
= git_command_send_output_to_info
;
92 command_class
->run
= git_merge_command_run
;
97 git_merge_command_new (const gchar
*working_directory
, const gchar
*branch
,
98 const gchar
*log
, gboolean no_commit
, gboolean squash
)
100 GitMergeCommand
*self
;
102 self
= g_object_new (GIT_TYPE_MERGE_COMMAND
,
103 "working-directory", working_directory
,
104 "single-line-output", TRUE
,
107 self
->priv
->branch
= g_strdup (branch
);
108 self
->priv
->log
= g_strdup (log
);
109 self
->priv
->no_commit
= no_commit
;
110 self
->priv
->squash
= squash
;