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
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
|
//
// ====================================================================
// Copyright (c) 2003-2009 Barry A Scott. All rights reserved.
//
// This software is licensed as described in the file LICENSE.txt,
// which you should have received as part of this distribution.
//
// ====================================================================
//
//
// pysvn_client_cmd_export.cpp
//
#if defined( _MSC_VER )
// disable warning C4786: symbol greater than 255 character,
// nessesary to ignore as <map> causes lots of warning
#pragma warning(disable: 4786)
#endif
#include "pysvn.hpp"
#include "pysvn_static_strings.hpp"
static const char *g_utf_8 = "utf-8";
Py::Object pysvn_client::cmd_export( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_src_url_or_path },
{ true, name_dest_path },
{ false, name_force },
{ false, name_revision },
#if defined( PYSVN_HAS_CLIENT_EXPORT2 )
{ false, name_native_eol },
#endif
#if defined( PYSVN_HAS_CLIENT_EXPORT3 )
{ false, name_ignore_externals },
{ false, name_recurse },
{ false, name_peg_revision },
#endif
#if defined( PYSVN_HAS_CLIENT_EXPORT4 )
{ false, name_depth },
#endif
#if defined( PYSVN_HAS_CLIENT_EXPORT5 )
{ false, name_ignore_keywords },
#endif
{ false, NULL }
};
FunctionArguments args( "export", args_desc, a_args, a_kws );
args.check();
std::string src_path( args.getUtf8String( name_src_url_or_path ) );
std::string dest_path( args.getUtf8String( name_dest_path ) );
bool is_url = is_svn_url( src_path );
bool force = args.getBoolean( name_force, false );
svn_opt_revision_t revision;
if( is_url )
revision = args.getRevision( name_revision, svn_opt_revision_head );
else
revision = args.getRevision( name_revision, svn_opt_revision_working );
#if defined( PYSVN_HAS_CLIENT_EXPORT2 )
const char *native_eol = NULL;
if( args.hasArg( name_native_eol ) )
{
Py::Object native_eol_obj = args.getArg( name_native_eol );
if( native_eol_obj != Py::None() )
{
Py::String eol_py_str( native_eol_obj );
std::string eol_str = eol_py_str.as_std_string( g_utf_8 );
if( eol_str == "CR" )
native_eol = "CR";
else if( eol_str == "CRLF" )
native_eol = "CRLF";
else if( eol_str == "LF" )
native_eol = "LF";
else
throw Py::ValueError( "native_eol must be one of None, \"LF\", \"CRLF\" or \"CR\"" );
}
}
#endif
#if defined( PYSVN_HAS_CLIENT_EXPORT3 )
#if defined( PYSVN_HAS_CLIENT_EXPORT4 )
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_files );
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
bool ignore_externals = args.getBoolean( name_ignore_externals, false );
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision );
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
#endif
#if defined( PYSVN_HAS_CLIENT_EXPORT5 )
bool ignore_keywords = args.getBoolean( name_ignore_keywords, false );
#endif
revisionKindCompatibleCheck( is_url, revision, name_revision, name_url_or_path );
svn_revnum_t revnum = 0;
SvnPool pool( m_context );
try
{
std::string norm_src_path( svnNormalisedIfPath( src_path, pool ) );
std::string norm_dest_path( svnNormalisedIfPath( dest_path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_EXPORT5 )
svn_error_t * error = svn_client_export5
(
&revnum,
norm_src_path.c_str(),
norm_dest_path.c_str(),
&peg_revision,
&revision,
force,
ignore_externals,
ignore_keywords,
depth,
native_eol,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_EXPORT4 )
svn_error_t * error = svn_client_export4
(
&revnum,
norm_src_path.c_str(),
dest_path.c_str(),
&peg_revision,
&revision,
force,
ignore_externals,
depth,
native_eol,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_EXPORT3 )
svn_error_t * error = svn_client_export3
(
&revnum,
norm_src_path.c_str(),
dest_path.c_str(),
&peg_revision,
&revision,
force,
ignore_externals,
recurse,
native_eol,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_EXPORT2 )
svn_error_t * error = svn_client_export2
(
&revnum,
norm_src_path.c_str(),
dest_path.c_str(),
&revision,
force,
native_eol,
m_context,
pool
);
#else
svn_error_t * error = svn_client_export
(
&revnum,
norm_src_path.c_str(),
dest_path.c_str(),
&revision,
force,
m_context,
pool
);
#endif
permission.allowThisThread();
if( error != NULL )
throw SvnException( error );
}
catch( SvnException &e )
{
// use callback error over ClientException
m_context.checkForError( m_module.client_error );
throw_client_error( e );
}
return Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, revnum ) );
}
Py::Object pysvn_client::cmd_import( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_path },
{ true, name_url },
{ true, name_log_message },
{ false, name_recurse },
#if defined( PYSVN_HAS_CLIENT_IMPORT2 )
{ false, name_ignore },
#endif
#if defined( PYSVN_HAS_CLIENT_IMPORT3 )
{ false, name_depth },
{ false, name_ignore_unknown_node_types },
{ false, name_revprops },
#endif
#if defined( PYSVN_HAS_CLIENT_IMPORT5 )
{ false, name_autoprops },
#endif
{ false, NULL }
};
FunctionArguments args( "import_", args_desc, a_args, a_kws );
args.check();
std::string path( args.getUtf8String( name_path ) );
std::string url( args.getUtf8String( name_url ) );
std::string message( args.getUtf8String( name_log_message ) );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_IMPORT3 )
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_files );
bool ignore_unknown_node_types = args.getBoolean( name_ignore_unknown_node_types, false );
apr_hash_t *revprops = NULL;
if( args.hasArg( name_revprops ) )
{
Py::Object py_revprop = args.getArg( name_revprops );
if( !py_revprop.isNone() )
{
revprops = hashOfStringsFromDictOfStrings( py_revprop, pool );
}
}
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
#if defined( PYSVN_HAS_CLIENT_IMPORT2 )
bool ignore = args.getBoolean( name_ignore, false );
#endif
#if defined( PYSVN_HAS_CLIENT_IMPORT5 )
bool autoprops = args.getBoolean( name_autoprops, true );
#endif
#if defined( PYSVN_HAS_CLIENT_IMPORT4 )
CommitInfoResult commit_info( pool );
#else
pysvn_commit_info_t *commit_info = NULL;
#endif
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
std::string norm_url( svnNormalisedUrl( url, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
m_context.setLogMessage( message.c_str() );
#if defined( PYSVN_HAS_CLIENT_IMPORT5 )
svn_error_t *error = svn_client_import5
(
norm_path.c_str(),
norm_url.c_str(),
depth,
!ignore,
!autoprops,
ignore_unknown_node_types,
revprops,
NULL, // filter_callback
NULL, // filter_baton
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_IMPORT4 )
svn_error_t *error = svn_client_import4
(
norm_path.c_str(),
norm_url.c_str(),
depth,
!ignore,
ignore_unknown_node_types,
revprops,
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_IMPORT3 )
svn_error_t *error = svn_client_import3
(
&commit_info, // changed type
norm_path.c_str(),
norm_url.c_str(),
depth,
!ignore,
ignore_unknown_node_types,
revprops,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_IMPORT2 )
svn_error_t *error = svn_client_import2
(
&commit_info, // changed type
norm_path.c_str(),
url.c_str(),
!recurse, // non_recursive
!ignore,
m_context,
pool
);
#else
svn_error_t *error = svn_client_import
(
&commit_info,
norm_path.c_str(),
url.c_str(),
!recurse, // non_recursive
m_context,
pool
);
#endif
permission.allowThisThread();
if( error != NULL )
throw SvnException( error );
}
catch( SvnException &e )
{
// use callback error over ClientException
m_context.checkForError( m_module.client_error );
throw_client_error( e );
}
#if defined( PYSVN_HAS_CLIENT_IMPORT4 )
return toObject( commit_info, m_wrapper_commit_info, m_commit_info_style );
#else
return toObject( commit_info, m_commit_info_style );
#endif
}
|
