blob: bbf059aa2e1c4d1848d83fe74ce7cc7893781969 (
plain)
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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
/***************************************************************************
* Copyright (C) 2008 by Rajko Albrecht ral@alwins-world.de *
* http://kdesvn.alwins-world.de/ *
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
* This program 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, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "conflictdescription.hpp"
#include "svnqt_defines.hpp"
#include <svn_wc.h>
namespace svn {
ConflictDescription::ConflictDescription()
:m_pool()
{
init();
}
ConflictDescription::~ConflictDescription()
{
}
ConflictDescription::ConflictDescription(const svn_wc_conflict_description_t*conflict)
:m_pool()
{
init();
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
if (!conflict) {
return;
}
m_baseFile=QString::FROMUTF8(conflict->base_file);
m_mergedFile=QString::FROMUTF8(conflict->merged_file);
m_mimeType=QString::FROMUTF8(conflict->mime_type);
m_myFile=QString::FROMUTF8(conflict->my_file);
m_Path=QString::FROMUTF8(conflict->path);
m_propertyName=QString::FROMUTF8(conflict->property_name);
m_theirFile=QString::FROMUTF8(conflict->their_file);
switch(conflict->action) {
case svn_wc_conflict_action_edit:
m_action=ConflictEdit;
break;
case svn_wc_conflict_action_add:
m_action=ConflictAdd;
break;
case svn_wc_conflict_action_delete:
m_action=ConflictDelete;
break;
}
switch (conflict->kind) {
case svn_wc_conflict_kind_text:
m_Type=ConflictText;
break;
case svn_wc_conflict_kind_property:
m_Type=ConflictProperty;
break;
}
m_nodeKind=conflict->node_kind;
m_binary=conflict->is_binary;
switch (conflict->reason) {
case svn_wc_conflict_reason_edited:
m_reason=ReasonEdited;
break;
case svn_wc_conflict_reason_obstructed:
m_reason=ReasonObstructed;
break;
case svn_wc_conflict_reason_deleted:
m_reason=ReasonDeleted;
break;
case svn_wc_conflict_reason_missing:
m_reason=ReasonMissing;
break;
case svn_wc_conflict_reason_unversioned:
m_reason=ReasonUnversioned;
break;
}
#else
Q_UNUSED(conflict);
#endif
}
ConflictDescription::ConflictDescription(const ConflictDescription&)
:m_pool()
{
}
}
svn::ConflictDescription::ConflictAction svn::ConflictDescription::action() const
{
return m_action;
}
const QString&svn::ConflictDescription::baseFile() const
{
return m_baseFile;
}
/*!
\fn svn::ConflictDescription::init()
*/
void svn::ConflictDescription::init()
{
m_baseFile=m_Path=m_mergedFile=m_propertyName=m_theirFile=m_myFile=m_mimeType=QString::null;
m_action=ConflictEdit;
m_Type=ConflictText;
m_reason=ReasonEdited;
m_binary=false;
m_nodeKind = svn_node_unknown;
}
bool svn::ConflictDescription::binary() const
{
return m_binary;
}
const QString& svn::ConflictDescription::mergedFile() const
{
return m_mergedFile;
}
const QString& svn::ConflictDescription::mimeType() const
{
return m_mimeType;
}
const QString& svn::ConflictDescription::myFile() const
{
return m_myFile;
}
svn_node_kind_t svn::ConflictDescription::nodeKind() const
{
return m_nodeKind;
}
const QString& svn::ConflictDescription::Path() const
{
return m_Path;
}
const QString& svn::ConflictDescription::propertyName() const
{
return m_propertyName;
}
svn::ConflictDescription::ConflictReason svn::ConflictDescription::reason() const
{
return m_reason;
}
const QString& svn::ConflictDescription::theirFile() const
{
return m_theirFile;
}
svn::ConflictDescription::ConflictType svn::ConflictDescription::Type() const
{
return m_Type;
}
|
