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
|
/*
* Port for usage with qt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
/*
* ====================================================================
* Copyright (c) 2002-2005 The RapidSvn Group. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library (in the file LGPL.txt); if not,
* write to the Free Software Foundation, Inc., 51 Franklin St,
* Fifth Floor, Boston, MA 02110-1301 USA
*
* This software consists of voluntary contributions made by many
* individuals. For exact contribution history, see the revision
* history and logs, available at http://rapidsvn.tigris.org/.
* ====================================================================
*/
#if defined( _MSC_VER) && _MSC_VER <= 1200
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
#include "svnqt/client_impl.h"
// Subversion api
#include "svn_client.h"
#include "svn_path.h"
#include "svnqt/exception.h"
#include "svnqt/pool.h"
#include "svnqt/status.h"
#include "svnqt/svnqt_defines.h"
#include "svnqt/helper.h"
#include "diff_data.h"
#include <tqfile.h>
#include <tqstringlist.h>
#include <apr_xlate.h>
namespace svn
{
TQByteArray
Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException)
{
return diff_peg(tmpPath,path,relativeTo,
revision1,revision2,peg_revision,
depth,ignoreAncestry,noDiffDeleted,ignore_contenttype,
StringArray(),StringArray());
}
TQByteArray
Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype,
const StringArray&extra,const StringArray&changelists) throw (ClientException)
{
Pool pool;
svn_error_t * error;
const apr_array_header_t * options;
// svn_client_diff needs an options array, even if it is empty
options = extra.array(pool);
DiffData ddata(tmpPath,path,revision1,path,revision2);
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
tqDebug("pegged diff4 call");
error = svn_client_diff_peg4(
options,
path.cstr(),
peg_revision,ddata.r1().revision(),ddata.r2().revision(),
relativeTo.length()>0?relativeTo.cstr():TQByteArray(0),
internal::DepthToSvn(depth),
ignoreAncestry,noDiffDeleted,ignore_contenttype,
APR_LOCALE_CHARSET,
ddata.outFile(),ddata.errFile(),
changelists.array(pool),
*m_context,
pool
);
#else
Q_UNUSED(relativeTo);
Q_UNUSED(changelists);
bool recurse = depth==DepthInfinity;
error = svn_client_diff_peg3(
options,
path.cstr(),
peg_revision,ddata.r1().revision(),ddata.r2().revision(),
recurse?1:0,ignoreAncestry,noDiffDeleted,ignore_contenttype,
APR_LOCALE_CHARSET,
ddata.outFile(),ddata.errFile(),
*m_context,
pool
);
#endif
if (error != NULL)
{
throw ClientException (error);
}
return ddata.content();
}
TQByteArray
Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo,
const Revision & revision1, const Revision & revision2,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException)
{
return diff(tmpPath,path1,path2,relativeTo,
revision1,revision2,
depth,ignoreAncestry,noDiffDeleted,ignore_contenttype,
StringArray(),StringArray());
}
TQByteArray
Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo,
const Revision & revision1, const Revision & revision2,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype,
const StringArray&extra,const StringArray&changelists) throw (ClientException)
{
Pool pool;
svn_error_t * error;
const apr_array_header_t * options;
// svn_client_diff needs an options array, even if it is empty
options = extra.array(pool);
DiffData ddata(tmpPath,path1,revision1,path2,revision2);
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
error = svn_client_diff4(options,
path1.cstr (), ddata.r1().revision (),
path2.cstr (), ddata.r2().revision (),
relativeTo.length()>0?relativeTo.cstr():TQByteArray(0),
internal::DepthToSvn(depth), ignoreAncestry, noDiffDeleted, ignore_contenttype,
APR_LOCALE_CHARSET,
ddata.outFile(),ddata.errFile(),
changelists.array(pool),
*m_context,
pool);
#else
Q_UNUSED(changelists);
Q_UNUSED(relativeTo);
bool recurse = depth==DepthInfinity;
// run diff
error = svn_client_diff3 (options,
path1.cstr (), ddata.r1().revision (),
path2.cstr (), ddata.r2().revision (),
recurse?1:0, ignoreAncestry, noDiffDeleted, ignore_contenttype,
APR_LOCALE_CHARSET,
ddata.outFile(),ddata.errFile(),
*m_context,
pool);
#endif
if (error != NULL)
{
throw ClientException (error);
}
return ddata.content();
}
}
|
