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
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
|
//
// ====================================================================
// 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_diff.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"
#if defined( PYSVN_HAS_CLIENT_COPY4 ) || defined( PYSVN_HAS_CLIENT_COPY5 ) || defined( PYSVN_HAS_CLIENT_COPY6 ) || defined( PYSVN_HAS_CLIENT_COPY7 )
Py::Object pysvn_client::cmd_copy2( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_sources },
{ true, name_dest_url_or_path },
{ false, name_copy_as_child },
{ false, name_make_parents },
{ false, name_revprops },
#if defined( PYSVN_HAS_CLIENT_COPY5 )
{ false, name_ignore_externals },
#endif
#if defined( PYSVN_HAS_CLIENT_COPY7 )
{ false, name_metadata_only },
{ false, name_pin_externals },
{ false, name_externals_to_pin },
#endif
{ false, NULL }
};
FunctionArguments args( "copy2", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_COPY6 )
CommitInfoResult commit_info( pool );
#else
pysvn_commit_info_t *commit_info = NULL;
#endif
std::string type_error_message;
try
{
type_error_message = "expecting list for sources (arg 1)";
Py::List list_all_sources = args.getArg( name_sources );
apr_array_header_t *all_sources =
apr_array_make( pool, list_all_sources.length(), sizeof(svn_client_copy_source_t *) );
for( unsigned int index=0; index<list_all_sources.length(); index++ )
{
type_error_message = "expecting tuple in list for sources (arg 1)";
Py::Tuple tuple_src_rev_pegrev( list_all_sources[ index ] );
std::string src_url_or_path;
svn_opt_revision_t *revision = reinterpret_cast<svn_opt_revision_t *>( apr_palloc( pool, sizeof( svn_opt_revision_t ) ) );
svn_opt_revision_t *peg_revision = reinterpret_cast<svn_opt_revision_t *>( apr_palloc( pool, sizeof( svn_opt_revision_t ) ) );
if( tuple_src_rev_pegrev.length() > 3 )
{
std::string msg = "copy2() expecting tuple with 2 or 3 values in sources list";
throw Py::AttributeError( msg );
}
type_error_message = "expecting string for 1st tuple value in sources list";
Py::String py_src_url_or_path( tuple_src_rev_pegrev[0] );
src_url_or_path = py_src_url_or_path.as_std_string( name_utf8 );
std::string norm_src_url_or_path( svnNormalisedIfPath( src_url_or_path, pool ) );
bool is_url = is_svn_url( norm_src_url_or_path );
if( tuple_src_rev_pegrev.length() >= 2 )
{
Py::Object obj( tuple_src_rev_pegrev[1] );
if( pysvn_revision::check( obj ) )
{
pysvn_revision *rev = static_cast<pysvn_revision *>( obj.ptr() );
*revision = rev->getSvnRevision();
revisionKindCompatibleCheck( is_url, *revision,
"sources list 2nd tuple value", "sources list 1st tuple value" );
}
else
{
std::string msg = "copy2() expecting revision for 2nd tuple value in sources list";
throw Py::AttributeError( msg );
}
}
else
{
if( is_url )
{
revision->kind = svn_opt_revision_head;
}
else
{
revision->kind = svn_opt_revision_working;
}
}
if( tuple_src_rev_pegrev.length() >= 3 )
{
Py::Object obj( tuple_src_rev_pegrev[2] );
if( pysvn_revision::check( obj ) )
{
pysvn_revision *rev = static_cast<pysvn_revision *>( obj.ptr() );
*peg_revision = rev->getSvnRevision();
revisionKindCompatibleCheck( is_url, *peg_revision,
"sources list 2nd tuple value", "sources list 1st tuple value" );
}
else
{
std::string msg = "copy2() expecting revision for 3rd tuple value in sources list";
throw Py::AttributeError( msg );
}
}
else
{
*peg_revision = *revision;
}
svn_client_copy_source_t *source = reinterpret_cast<svn_client_copy_source_t *>( apr_palloc( pool, sizeof(*source) ) );
source->path = apr_pstrdup( pool, norm_src_url_or_path.c_str() );
source->revision = revision;
source->peg_revision = peg_revision;
APR_ARRAY_PUSH( all_sources, svn_client_copy_source_t *) = source;
}
type_error_message = "expecting string for dest_url_or_path";
Py::String dest_path( args.getUtf8String( name_dest_url_or_path ) );
type_error_message = "expecting boolean for keyword copy_as_child";
bool copy_as_child = args.getBoolean( name_copy_as_child, false );
type_error_message = "expecting boolean for keyword make_parents";
bool make_parents = args.getBoolean( name_make_parents, 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 );
}
}
#if defined( PYSVN_HAS_CLIENT_COPY5 )
type_error_message = "expecting boolean for keyword ignore_externals";
bool ignore_externals = args.getBoolean( name_ignore_externals, false );
#endif
#if defined( PYSVN_HAS_CLIENT_COPY7 )
bool metadata_only = args.getBoolean( name_metadata_only, false );
bool pin_externals = args.getBoolean( name_pin_externals, false );
apr_hash_t *externals_to_pin = NULL;
if( pin_externals && args.hasArg( name_externals_to_pin ) )
{
// apr_hash_t key=abspath_or_url, value=apr_array_header_t from
// svn_wc_parse_externals_description3()
externals_to_pin = apr_hash_make( pool );
type_error_message = "expecting list of (path_or_url, description) for externals_to_pin";
Py::List py_externals_to_pin( args.getArg( name_externals_to_pin ) );
for( int index=0; index<py_externals_to_pin.size(); ++index )
{
Py::Tuple py_tuple( py_externals_to_pin[ index ] );
if( py_tuple.size() != 2 )
{
throw Py::ValueError( "Expecting list of tuples of (abspath_or_url, externals_spec)" );
}
Py::String py_path_or_url( py_tuple[0] );
std::string path_or_url( py_path_or_url.as_std_string( name_utf8 ) );
if( !is_svn_url( path_or_url ) )
{
const char *abspath = NULL;
svn_error_t *error = svn_dirent_get_absolute( &abspath, path_or_url.c_str(), pool );
if( error != NULL )
{
throw SvnException( error );
}
path_or_url = abspath;
}
Py::String py_desc( py_tuple[1] );
std::string desc( py_desc.as_std_string( name_utf8 ) );
apr_array_header_t *hash_value = NULL;
svn_error_t *error = svn_wc_parse_externals_description3( &hash_value, path_or_url.c_str(), desc.c_str(), FALSE, pool );
if( error != NULL )
{
throw SvnException( error );
}
svn_string_t *hash_key = svn_string_ncreate( path_or_url.c_str(), path_or_url.size(), pool );
apr_hash_set( externals_to_pin, hash_key, APR_HASH_KEY_STRING, hash_value );
}
}
#endif
std::string norm_dest_path( svnNormalisedIfPath( dest_path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_COPY7 )
svn_error_t *error = svn_client_copy7
(
all_sources,
norm_dest_path.c_str(),
copy_as_child,
make_parents,
ignore_externals,
metadata_only,
pin_externals,
externals_to_pin,
revprops,
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_COPY6 )
svn_error_t *error = svn_client_copy6
(
all_sources,
norm_dest_path.c_str(),
copy_as_child,
make_parents,
ignore_externals,
revprops,
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_COPY5 )
svn_error_t *error = svn_client_copy5
(
&commit_info,
all_sources,
norm_dest_path.c_str(),
copy_as_child,
make_parents,
ignore_externals,
revprops,
m_context,
pool
);
#else
svn_error_t *error = svn_client_copy4
(
&commit_info,
all_sources,
norm_dest_path.c_str(),
copy_as_child,
make_parents,
revprops,
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 );
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
#if defined( PYSVN_HAS_CLIENT_COPY6 )
return toObject( commit_info, m_wrapper_commit_info, m_commit_info_style );
#else
return toObject( commit_info, m_commit_info_style );
#endif
}
#endif
Py::Object pysvn_client::cmd_copy( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_src_url_or_path },
{ true, name_dest_url_or_path },
{ false, name_src_revision },
{ false, NULL }
};
FunctionArguments args( "copy", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
pysvn_commit_info_t *commit_info = NULL;
std::string type_error_message;
try
{
type_error_message = "expecting string for src_path (arg 1)";
Py::String src_path( args.getUtf8String( name_src_url_or_path ) );
type_error_message = "expecting string for dest_path (arg 2)";
Py::String dest_path( args.getUtf8String( name_dest_url_or_path ) );
type_error_message = "expecting revision for keyword src_revision";
svn_opt_revision_t revision;
if( is_svn_url( src_path ) )
revision = args.getRevision( name_src_revision, svn_opt_revision_head );
else
revision = args.getRevision( name_src_revision, svn_opt_revision_working );
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_COPY3 )
// behavior changed
svn_error_t *error = svn_client_copy3 // ignore deprecation warning - support old Client().copy()
(
&commit_info,
norm_src_path.c_str(),
&revision,
norm_dest_path.c_str(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_COPY2 )
svn_error_t *error = svn_client_copy2
(
&commit_info, // commit info type changed
norm_src_path.c_str(),
&revision,
norm_dest_path.c_str(),
m_context,
pool
);
#else
svn_error_t *error = svn_client_copy
(
&commit_info,
norm_src_path.c_str(),
&revision,
norm_dest_path.c_str(),
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 );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return toObject( commit_info, m_commit_info_style );
}
#if defined( PYSVN_HAS_CLIENT_MOVE5 ) || defined( PYSVN_HAS_CLIENT_MOVE6 ) || defined( PYSVN_HAS_CLIENT_MOVE7 )
Py::Object pysvn_client::cmd_move2( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_sources },
{ true, name_dest_url_or_path },
{ false, name_force },
{ false, name_move_as_child },
{ false, name_make_parents },
{ false, name_revprops },
#if defined( PYSVN_HAS_CLIENT_MOVE7 )
{ false, name_allow_mixed_revisions },
{ false, name_metadata_only },
#endif
{ false, NULL }
};
FunctionArguments args( "move2", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_MOVE6 ) || defined( PYSVN_HAS_CLIENT_MOVE7 )
CommitInfoResult commit_info( pool );
#else
pysvn_commit_info_t *commit_info = NULL;
#endif
std::string type_error_message;
try
{
type_error_message = "expecting list for sources (arg 1)";
Py::List list_all_sources = args.getArg( name_sources );
apr_array_header_t *all_sources =
apr_array_make( pool, list_all_sources.length(), sizeof(const char *) );
for( unsigned int index=0; index<list_all_sources.length(); index++ )
{
type_error_message = "expecting string in sources list";
Py::String py_src_url_or_path( list_all_sources[ index ] );
std::string src_url_or_path;
src_url_or_path = py_src_url_or_path.as_std_string( name_utf8 );
std::string norm_src_url_or_path( svnNormalisedIfPath( src_url_or_path, pool ) );
const char *src_path_copy = apr_pstrdup( pool, norm_src_url_or_path.c_str() );
APR_ARRAY_PUSH( all_sources, const char *) = src_path_copy;
}
type_error_message = "expecting string for dest_url_or_path";
Py::String dest_path( args.getUtf8String( name_dest_url_or_path ) );
#if !defined( PYSVN_HAS_CLIENT_MOVE6 ) && !defined( PYSVN_HAS_CLIENT_MOVE7 )
type_error_message = "expecting boolean for keyword force";
bool force = args.getBoolean( name_force, false );
#endif
type_error_message = "expecting boolean for keyword move_as_child";
bool move_as_child = args.getBoolean( name_move_as_child, false );
type_error_message = "expecting boolean for keyword make_parents";
bool make_parents = args.getBoolean( name_make_parents, false );
#if defined( PYSVN_HAS_CLIENT_MOVE7 )
type_error_message = "expecting boolean for keyword allow_mixed_revisions";
bool allow_mixed_revisions = args.getBoolean( name_allow_mixed_revisions, false );
type_error_message = "expecting boolean for keyword metadata_only";
bool metadata_only = args.getBoolean( name_metadata_only, false );
#endif
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 );
}
}
try
{
std::string norm_dest_path( svnNormalisedIfPath( dest_path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
// behavior changed
#if defined( PYSVN_HAS_CLIENT_MOVE7 )
svn_error_t *error = svn_client_move7
(
all_sources,
norm_dest_path.c_str(),
move_as_child,
make_parents,
allow_mixed_revisions,
metadata_only,
revprops,
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_MOVE6 )
svn_error_t *error = svn_client_move6
(
all_sources,
norm_dest_path.c_str(),
move_as_child,
make_parents,
revprops,
commit_info.callback(),
commit_info.baton(),
m_context,
pool
);
#else
svn_error_t *error = svn_client_move5
(
&commit_info,
all_sources,
norm_dest_path.c_str(),
force,
move_as_child,
make_parents,
revprops,
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 );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
#if defined( PYSVN_HAS_CLIENT_MOVE6 ) || defined( PYSVN_HAS_CLIENT_MOVE7 )
return toObject( commit_info, m_wrapper_commit_info, m_commit_info_style );
#else
return toObject( commit_info, m_commit_info_style );
#endif
}
#endif
Py::Object pysvn_client::cmd_move( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_src_url_or_path },
{ true, name_dest_url_or_path },
{ false, name_force },
{ false, NULL }
};
FunctionArguments args( "move", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
pysvn_commit_info_t *commit_info = NULL;
std::string type_error_message;
try
{
type_error_message = "expecting string for src_url_or_path (arg 1)";
Py::String src_path( args.getUtf8String( name_src_url_or_path ) );
type_error_message = "expecting string for dest_url_or_path (arg 2)";
Py::String dest_path( args.getUtf8String( name_dest_url_or_path ) );
#ifndef PYSVN_HAS_CLIENT_MOVE2
svn_opt_revision_t revision;
revision.kind = svn_opt_revision_head;
#endif
type_error_message = "expecting boolean for keyword force";
bool force = args.getBoolean( name_force, false );
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_MOVE4 )
// behavior changed
svn_error_t *error = svn_client_move4 // ignore deprecation warning - support old Client().move()
(
&commit_info,
norm_src_path.c_str(),
norm_dest_path.c_str(),
force,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_MOVE3 )
svn_error_t *error = svn_client_move3
(
&commit_info, // changed type
norm_src_path.c_str(),
norm_dest_path.c_str(),
force,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_MOVE2 )
svn_error_t *error = svn_client_move2
(
&commit_info,
norm_src_path.c_str(),
norm_dest_path.c_str(),
force,
m_context,
pool
);
#else
svn_error_t *error = svn_client_move
(
&commit_info,
norm_src_path.c_str(),
&revision,
norm_dest_path.c_str(),
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 );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return toObject( commit_info, m_commit_info_style );
}
|
