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
|
//
// ====================================================================
// Copyright (c) 2003-2006 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.
//
// ====================================================================
//
#ifdef _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 "svn_config.h"
#include "svn_time.h"
static const char name_utf8[] = "utf-8";
static const std::string str_URL( "URL" );
static const std::string str_checksum( "checksum" );
static const std::string str_comment( "comment" );
static const std::string str_commit_author( "commit_author" );
static const std::string str_commit_revision( "commit_revision" );
static const std::string str_commit_time( "commit_time" );
static const std::string str_conflict_new( "conflict_new" );
static const std::string str_conflict_old( "conflict_old" );
static const std::string str_conflict_work( "conflict_work" );
static const std::string str_copy_from_revision( "copy_from_revision" );
static const std::string str_copy_from_url( "copy_from_url" );
static const std::string str_copyfrom_rev( "copyfrom_rev" );
static const std::string str_copyfrom_url( "copyfrom_url" );
static const std::string str_creation_date( "creation_date" );
static const std::string str_entry( "entry" );
static const std::string str_expiration_date( "expiration_date" );
static const std::string str_is_absent( "is_absent" );
static const std::string str_is_copied( "is_copied" );
static const std::string str_is_dav_comment( "is_dav_comment" );
static const std::string str_is_deleted( "is_deleted" );
static const std::string str_is_locked( "is_locked" );
static const std::string str_is_switched( "is_switched" );
static const std::string str_is_versioned( "is_versioned" );
static const std::string str_kind( "kind" );
static const std::string str_last_changed_author( "last_changed_author" );
static const std::string str_last_changed_date( "last_changed_date" );
static const std::string str_last_changed_rev( "last_changed_rev" );
static const std::string str_lock( "lock" );
static const std::string str_lock_comment( "lock_comment" );
static const std::string str_lock_creation_date( "lock_creation_date" );
static const std::string str_lock_owner( "lock_owner" );
static const std::string str_lock_token( "lock_token" );
static const std::string str_name( "name" );
static const std::string str_owner( "owner" );
static const std::string str_path( "path" );
static const std::string str_prejfile( "prejfile" );
static const std::string str_prop_status( "prop_status" );
static const std::string str_prop_time( "prop_time" );
static const std::string str_properties_time( "properties_time" );
static const std::string str_property_reject_file( "property_reject_file" );
static const std::string str_repos( "repos" );
static const std::string str_repos_UUID( "repos_UUID" );
static const std::string str_repos_lock( "repos_lock" );
static const std::string str_repos_prop_status( "repos_prop_status" );
static const std::string str_repos_root_URL( "repos_root_URL" );
static const std::string str_repos_text_status( "repos_text_status" );
static const std::string str_rev( "rev" );
static const std::string str_revision( "revision" );
static const std::string str_schedule( "schedule" );
static const std::string str_text_status( "text_status" );
static const std::string str_text_time( "text_time" );
static const std::string str_token( "token" );
static const std::string str_url( "url" );
static const std::string str_uuid( "uuid" );
static const std::string str_wc_info( "wc_info" );
#include <iostream>
//------------------------------------------------------------
//
// DictWrapper
//
//------------------------------------------------------------
DictWrapper::DictWrapper( Py::Dict result_wrappers, const std::string &wrapper_name )
: m_wrapper_name( wrapper_name )
, m_have_wrapper( false )
, m_wrapper()
{
if( result_wrappers.hasKey( wrapper_name ) )
{
m_wrapper = result_wrappers[ wrapper_name ];
m_have_wrapper = true;
}
}
DictWrapper::~DictWrapper()
{
}
Py::Object DictWrapper::wrapDict( Py::Dict result ) const
{
if( m_have_wrapper )
{
Py::Tuple args( 1 );
args[0] = result;
try
{
return m_wrapper.apply( args );
}
catch( Py::Exception &e )
{
std::cerr << "pysvn: unhandled exception calling " << m_wrapper_name << std::endl;
PyErr_Print();
e.clear();
return Py::None();
}
}
else
{
return result;
}
}
//------------------------------------------------------------
//
// Converters
//
//------------------------------------------------------------
Py::Object utf8_string_or_none( const char *str )
{
if( str == NULL )
return Py::None();
else
return Py::String( str, name_utf8 );
}
Py::Object path_string_or_none( const char *str, SvnPool &pool )
{
if( str == NULL )
return Py::None();
else
return Py::String( osNormalisedPath( str, pool ), name_utf8 );
}
Py::Object utf8_string_or_none( const std::string &str )
{
if( !str.empty() )
return Py::String( str, name_utf8 );
else
return Py::None();
}
apr_time_t convertStringToTime( const std::string &text, apr_time_t now, SvnPool &pool )
{
svn_boolean_t matched = 0;
apr_time_t result = 0;
svn_error_t *error = svn_parse_date
(
&matched,
&result,
text.c_str(),
now,
pool
);
if( error != NULL || !matched )
{
return 0;
}
return result;
}
Py::Object toObject( apr_time_t t )
{
return Py::Float( double( t )/1000000 );
}
#if defined( PYSVN_HAS_SVN_COMMIT_INFO_T )
Py::Object toObject( pysvn_commit_info_t *commit_info )
{
if( commit_info == NULL || !SVN_IS_VALID_REVNUM( commit_info->revision ) )
return Py::None();
return Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, commit_info->revision ) );
}
#else
Py::Object toObject( pysvn_commit_info_t *commit_info )
{
if( commit_info == NULL || !SVN_IS_VALID_REVNUM( commit_info->revision ) )
return Py::None();
return Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, commit_info->revision ) );
}
#endif
Py::Object toObject
(
Py::String path,
pysvn_wc_status_t &svn_status,
SvnPool &pool,
const DictWrapper &wrapper_status,
const DictWrapper &wrapper_entry,
const DictWrapper &wrapper_lock
)
{
Py::Dict status;
status[ str_path ] = path;
if( svn_status.entry == NULL )
{
status[ str_entry ] = Py::None();
}
else
{
//status[ str_entry ] = Py::asObject( new pysvn_entry( svn_status.entry, m_context ) );
status[ str_entry ] = toObject( *svn_status.entry, pool, wrapper_entry );
}
if( svn_status.repos_lock == NULL )
{
status[ str_repos_lock ] = Py::None();
}
#if defined( PYSVN_HAS_CLIENT_STATUS2 )
else
{
status[ str_repos_lock ] = toObject( *svn_status.repos_lock, wrapper_lock );
}
#endif
long is_versioned = (long)(svn_status.text_status > svn_wc_status_unversioned);
status[ str_is_versioned ] = Py::Int( is_versioned );
status[ str_is_locked ] = Py::Int( svn_status.locked );
status[ str_is_copied ] = Py::Int( svn_status.copied );
status[ str_is_switched ] = Py::Int( svn_status.switched );
status[ str_prop_status ] = toEnumValue( svn_status.prop_status );
status[ str_text_status ] = toEnumValue( svn_status.text_status );
status[ str_repos_prop_status ] = toEnumValue( svn_status.repos_prop_status );
status[ str_repos_text_status ] = toEnumValue( svn_status.repos_text_status );
return wrapper_status.wrapDict( status );
}
Py::Object toObject
(
const svn_wc_entry_t &svn_entry,
SvnPool &pool,
const DictWrapper &wrapper_entry
)
{
Py::Dict entry;
entry[ str_checksum ] = utf8_string_or_none( svn_entry.checksum );
entry[ str_commit_author ] = utf8_string_or_none( svn_entry.cmt_author );
entry[ str_commit_revision ] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, svn_entry.cmt_rev ) );
entry[ str_commit_time ] = toObject( svn_entry.cmt_date );
entry[ str_conflict_new ] = path_string_or_none( svn_entry.conflict_new, pool );
entry[ str_conflict_old ] = path_string_or_none( svn_entry.conflict_old, pool );
entry[ str_conflict_work ] = path_string_or_none( svn_entry.conflict_wrk, pool );
entry[ str_copy_from_revision ] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, svn_entry.copyfrom_rev ) );
entry[ str_copy_from_url ] = utf8_string_or_none( svn_entry.copyfrom_url );
entry[ str_is_absent ] = Py::Int( svn_entry.absent );
entry[ str_is_copied ] = Py::Int( svn_entry.copied );
entry[ str_is_deleted ] = Py::Int( svn_entry.deleted );
entry[ str_kind ] = toEnumValue( svn_entry.kind );
entry[ str_name ] = path_string_or_none( svn_entry.name, pool );
entry[ str_properties_time ] = toObject( svn_entry.prop_time );
entry[ str_property_reject_file ] = path_string_or_none( svn_entry.prejfile, pool );
entry[ str_repos ] = utf8_string_or_none( svn_entry.repos );
entry[ str_revision ] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, svn_entry.revision ) );
entry[ str_schedule ] = toEnumValue( svn_entry.schedule );
entry[ str_text_time ] = toObject( svn_entry.text_time );
entry[ str_url ] = utf8_string_or_none( svn_entry.url );
entry[ str_uuid ] = utf8_string_or_none( svn_entry.uuid );
#ifdef PYSVN_HAS_CLIENT_STATUS2
entry[ str_lock_token ] = utf8_string_or_none( svn_entry.lock_token );
entry[ str_lock_owner ] = utf8_string_or_none( svn_entry.lock_owner );
entry[ str_lock_comment ] = utf8_string_or_none( svn_entry.lock_comment );
entry[ str_lock_creation_date ] = toObject( svn_entry.lock_creation_date );
#endif
return wrapper_entry.wrapDict( entry );
}
#ifdef PYSVN_HAS_CLIENT_INFO
Py::Object toObject
(
const svn_info_t &info,
const DictWrapper &wrapper_info,
const DictWrapper &wrapper_lock,
const DictWrapper &wrapper_wc_info
)
{
Py::Dict py_info;
// Where the item lives in the repository.
py_info[str_URL] = utf8_string_or_none( info.URL );
// The revision of the object. If path_or_url is a working-copy
// path, then this is its current working revnum. If path_or_url
// is a URL, then this is the repos revision that path_or_url lives in.
py_info[str_rev] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, info.rev ) );
// The node's kind.
py_info[str_kind] = toEnumValue( info.kind );
// The root URL of the repository.
py_info[str_repos_root_URL] = utf8_string_or_none( info.repos_root_URL );
// The repository's UUID.
py_info[str_repos_UUID] = utf8_string_or_none( info.repos_UUID );
// The last revision in which this object changed.
py_info[str_last_changed_rev] = Py::asObject(
new pysvn_revision( svn_opt_revision_number, 0, info.last_changed_rev ) );
// The date of the last_changed_rev.
py_info[str_last_changed_date] = toObject( info.last_changed_date );
// The author of the last_changed_rev.
py_info[str_last_changed_author] = utf8_string_or_none( info.last_changed_author );
#ifdef PYSVN_HAS_CLIENT_LOCK
// An exclusive lock, if present. Could be either local or remote.
if( info.lock == NULL )
{
py_info[str_lock] = Py::None();
}
else
{
py_info[str_lock] = toObject( *info.lock, wrapper_lock );
}
#endif
// Whether or not to ignore the next 10 wc-specific fields.
if( info.has_wc_info == 0 )
{
py_info[str_wc_info] = Py::None();
}
else
{
Py::Dict py_wc_info;
py_wc_info[str_schedule] = toEnumValue( info.schedule );
py_wc_info[str_copyfrom_url] = utf8_string_or_none( info.copyfrom_url );
py_wc_info[str_copyfrom_rev] = Py::asObject(
new pysvn_revision( svn_opt_revision_number, 0, info.copyfrom_rev ) );
py_wc_info[str_text_time] = toObject( info.text_time );
py_wc_info[str_prop_time] = toObject( info.prop_time );
py_wc_info[str_checksum] = utf8_string_or_none( info.checksum );
py_wc_info[str_conflict_old] = utf8_string_or_none( info.conflict_old );
py_wc_info[str_conflict_new] = utf8_string_or_none( info.conflict_new );
py_wc_info[str_conflict_work] = utf8_string_or_none( info.conflict_wrk );
py_wc_info[str_prejfile] = utf8_string_or_none( info.prejfile );
py_info[str_wc_info] = wrapper_wc_info.wrapDict( py_wc_info );
}
return wrapper_info.wrapDict( py_info );
}
#endif
#ifdef PYSVN_HAS_CLIENT_LOCK
Py::Object toObject
(
const svn_lock_t &lock,
const DictWrapper &wrapper_lock
)
{
Py::Dict py_lock;
py_lock[str_path] = utf8_string_or_none( lock.path );
py_lock[str_token] = utf8_string_or_none( lock.token );
py_lock[str_owner] = utf8_string_or_none( lock.owner );
py_lock[str_comment] = utf8_string_or_none( lock.comment );
py_lock[str_is_dav_comment] = Py::Int( lock.is_dav_comment != 0 );
if( lock.creation_date == 0 )
{
py_lock[str_creation_date] = Py::None();
}
else
{
py_lock[str_creation_date] = toObject( lock.creation_date );
}
if( lock.expiration_date == 0 )
{
py_lock[str_expiration_date] = Py::None();
}
else
{
py_lock[str_expiration_date] = toObject( lock.expiration_date );
}
return wrapper_lock.wrapDict( py_lock );
}
#endif
Py::Object propsToObject( apr_hash_t *props, SvnPool &pool )
{
Py::Dict py_prop_dict;
for( apr_hash_index_t *hi = apr_hash_first( pool, props ); hi; hi = apr_hash_next( hi ) )
{
const void *key = NULL;
void *val = NULL;
apr_hash_this (hi, &key, NULL, &val);
const svn_string_t *propval = (const svn_string_t *)val;
py_prop_dict[ Py::String( (const char *)key ) ] = Py::String( propval->data, (int)propval->len );
}
return py_prop_dict;
}
void proplistToObject( Py::List &py_path_propmap_list, apr_array_header_t *props, SvnPool &pool )
{
for (int j = 0; j < props->nelts; ++j)
{
svn_client_proplist_item_t *item = ((svn_client_proplist_item_t **)props->elts)[j];
Py::Object py_prop_dict( propsToObject( item->prop_hash, pool ) );
std::string node_name( item->node_name->data, item->node_name->len );
Py::Tuple py_path_proplist( 2 );
py_path_proplist[0] = Py::String( osNormalisedPath( node_name, pool ) );
py_path_proplist[1] = py_prop_dict;
py_path_propmap_list.append( py_path_proplist );
}
}
Py::Object revnumListToObject( apr_array_header_t *revs, SvnPool &pool )
{
Py::List py_list;
for (int j = 0; j < revs->nelts; ++j)
{
svn_revnum_t revnum = ((svn_revnum_t *)revs->elts)[j];
Py::Object py_rev( Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, revnum ) ) );
py_list.append( py_rev );
}
return py_list;
}
Py::String asUtf8String( Py::Object obj )
{
Py::String any( obj );
Py::String utf8( any.encode( name_utf8 ) );
return utf8;
}
apr_array_header_t *targetsFromStringOrList( Py::Object arg, SvnPool &pool )
{
int num_targets = 1;
if( arg.isList() )
{
Py::List paths( arg );
num_targets = paths.length();
}
apr_array_header_t *targets = apr_array_make( pool, num_targets, sizeof( const char * ) );
std::string type_error_message;
try
{
if( arg.isList() )
{
Py::List path_list( arg );
for( Py::List::size_type i=0; i<path_list.length(); i++ )
{
type_error_message = "expecting path list members to be strings (arg 1)";
Py::String path_str( asUtf8String( path_list[i] ) );
std::string norm_path( svnNormalisedIfPath( path_str.as_std_string(), pool ) );
*(char **)apr_array_push( targets ) = apr_pstrdup( pool, norm_path.c_str() );
}
}
else
{
type_error_message = "expecting path to be a string (arg 1)";
Py::String path_str( asUtf8String( arg ) );
std::string norm_path( svnNormalisedIfPath( path_str.as_std_string(), pool ) );
*(char **)apr_array_push( targets ) = apr_pstrdup( pool, norm_path.c_str() );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return targets;
}
apr_array_header_t *arrayOfStringsFromListOfStrings( Py::Object arg, SvnPool &pool )
{
Py::List paths( arg );
int num_targets = paths.length();
apr_array_header_t *array = apr_array_make( pool, num_targets, sizeof( const char * ) );
std::string type_error_message;
try
{
Py::List path_list( arg );
for( Py::List::size_type i=0; i<path_list.length(); i++ )
{
type_error_message = "expecting list members to be strings";
Py::String str( asUtf8String( path_list[i] ) );
*(char **)apr_array_push( array ) = apr_pstrdup( pool, str.as_std_string().c_str() );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return array;
}
Py::List toListOfStrings( Py::Object obj )
{
Py::List list;
if( obj.isList() )
list = obj;
else
list.append( obj );
// check all members of the list are strings
for( Py::List::size_type i=0; i<list.length(); i++ )
{
Py::String path_str( list[i] );
}
return list;
}
|