Py::Object pysvn_client::cmd_proplist( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_url_or_path },
{ false, name_revision },
{ false, name_recurse },
#if defined( PYSVN_HAS_CLIENT_PROPLIST2 )
{ false, name_peg_revision },
#endif
#if defined( PYSVN_HAS_CLIENT_PROPLIST3 )
{ false, name_depth },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "proplist", args_desc, a_args, a_kws );
args.check();
Py::List path_list( toListOfStrings( args.getArg( name_url_or_path ) ) );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_PROPLIST3 )
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_files, svn_depth_empty );
#else
bool recurse = args.getBoolean( name_recurse, false );
#endif
bool is_revision_setup = false;
bool is_url = false;
svn_opt_revision_t revision_url;
svn_opt_revision_t revision_file;
if( args.hasArg( name_revision ) )
{
revision_url = args.getRevision( name_revision );
revision_file = revision_url;
}
else
{
revision_url.kind = svn_opt_revision_head;
revision_file.kind = svn_opt_revision_working;
}
#if defined( PYSVN_HAS_CLIENT_PROPLIST2 )
svn_opt_revision_t peg_revision_url;
svn_opt_revision_t peg_revision_file;
if( args.hasArg( name_peg_revision ) )
{
peg_revision_url = args.getRevision( name_peg_revision );
peg_revision_file = peg_revision_url;
}
else
{
peg_revision_url = revision_url;
peg_revision_file = revision_file;
}
#endif
Py::List list_of_proplists;
for( Py::List::size_type i=0; i<path_list.length(); i++ )
{
Py::String path_str( asUtf8String( path_list[i] ) );
std::string path( path_str.as_std_string() );
std::string norm_path( svnNormalisedIfPath( path, pool ) );
svn_opt_revision_t revision;
svn_opt_revision_t peg_revision;
if( !is_revision_setup )
if( is_svn_url( path ) )
{
revision = revision_url;
#if defined( PYSVN_HAS_CLIENT_PROPLIST2 )
peg_revision = peg_revision_url;
#endif
is_url = true;
}
else
{
revision = revision_file;
#if defined( PYSVN_HAS_CLIENT_PROPLIST2 )
peg_revision = peg_revision_file;
#endif
}
else if( is_svn_url( path ) && !is_url )
{
throw Py::AttributeError( "cannot mix URL and PATH in name_path" );
}
try
{
const char *norm_path_c_str= norm_path.c_str();
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_PROPLIST3 )
ProplistReceiveBaton proplist_baton( &permission, pool, list_of_proplists );
svn_error_t *error = svn_client_proplist3
(
norm_path_c_str,
&peg_revision,
&revision,
depth,
changelists,
proplist_receiver_c,
reinterpret_cast<void *>( &proplist_baton ),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_PROPLIST2 )
apr_array_header_t *props = NULL;
svn_error_t *error = svn_client_proplist2
(
&props,
norm_path_c_str,
&peg_revision,
&revision,
recurse,
m_context,
pool
);
#else
apr_array_header_t *props = NULL;
svn_error_t *error = svn_client_proplist
(
&props,
norm_path_c_str,
&revision,
recurse,
m_context,
pool
);
#endif
permission.allowThisThread();
if( error != NULL )
throw SvnException( error );
#if !defined( PYSVN_HAS_CLIENT_PROPLIST3 )
proplistToObject( list_of_proplists, props, pool );
#endif
}
catch( SvnException &e )
{
// use callback error over ClientException
m_context.checkForError( m_module.client_error );
throw_client_error( e );
}
}
return list_of_proplists;
}
Py::Object pysvn_client::cmd_propset( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_prop_name },
{ true, name_prop_value },
{ true, name_url_or_path },
{ false, name_revision },
{ false, name_recurse },
#if defined( PYSVN_HAS_CLIENT_PROPSET2 )
{ false, name_skip_checks },
#endif
#if defined( PYSVN_HAS_CLIENT_PROPSET3 )
{ false, name_depth },
{ false, name_base_revision_for_url },
{ false, name_changelists },
{ false, name_revprops },
#endif
{ false, NULL }
};
FunctionArguments args( "propset", args_desc, a_args, a_kws );
args.check();
std::string propname( args.getUtf8String( name_prop_name ) );
std::string propval( args.getUtf8String( name_prop_value ) );
std::string path( args.getUtf8String( name_url_or_path ) );
svn_opt_revision_t revision;
if( is_svn_url( path ) )
revision = args.getRevision( name_revision, svn_opt_revision_head );
else
revision = args.getRevision( name_revision, svn_opt_revision_working );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_PROPSET3 )
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_revnum_t base_revision_for_url = args.getInteger( name_base_revision_for_url, 0 );
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_files, svn_depth_empty );
apr_hash_t *revprops = NULL;
if( args.hasArg( name_revprops ) )
{
Py::Object py_revprop = args.getArg( name_revprops );
if( !py_revprop.isNone() )
{
revprops = hashOfStringsFromDistOfStrings( py_revprop, pool );
}
}
#else
bool recurse = args.getBoolean( name_recurse, false );
#endif
#if defined( PYSVN_HAS_CLIENT_PROPSET2 )
bool skip_checks = args.getBoolean( name_skip_checks, false );
#endif
#if defined( PYSVN_HAS_CLIENT_PROPSET3 )
pysvn_commit_info_t *commit_info = NULL;
#endif
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
const svn_string_t *svn_propval = svn_string_ncreate( propval.c_str(), propval.size(), pool );
#if defined( PYSVN_HAS_CLIENT_PROPSET3 )
svn_error_t *error = svn_client_propset3
(
&commit_info,
propname.c_str(),
svn_propval,
norm_path.c_str(),
depth,
skip_checks,
base_revision_for_url,
changelists,
revprops,
m_context.ctx(),
pool
);
#elif defined( PYSVN_HAS_CLIENT_PROPSET2 )
svn_error_t *error = svn_client_propset2
(
propname.c_str(),
svn_propval,
norm_path.c_str(),
recurse,
skip_checks,
m_context.ctx(),
pool
);
#else
svn_error_t *error = svn_client_propset
(
propname.c_str(),
svn_propval,
norm_path.c_str(),
recurse,
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_PROPSET3 )
return toObject( commit_info );
#else
return Py::None();
#endif
}
Py::Object pysvn_client::cmd_add_to_changelist( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_path },
{ true, name_changelist },
{ false, name_depth },
{ false, name_changelists },
{ false, NULL }
};
FunctionArguments args( "add_to_changelist", args_desc, a_args, a_kws );
args.check();
std::string type_error_message;
SvnPool pool( m_context );
try
{
apr_array_header_t *targets = targetsFromStringOrList( args.getArg( name_path ), pool );
std::string changelist( args.getUtf8String( name_changelist ) );
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_depth_t depth = args.getDepth( name_depth, svn_depth_files );
try
{
checkThreadPermission();
PythonAllowThreads permission( m_context );
svn_error_t *error = svn_client_add_to_changelist
(
targets,
changelist.c_str(),
depth,
changelists,
m_context,
pool
);
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 Py::None();
}
Py::Object pysvn_client::cmd_propget( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_prop_name },
{ true, name_url_or_path },
{ false, name_revision },
{ false, name_recurse },
#if defined( PYSVN_HAS_CLIENT_PROPGET2 )
{ false, name_peg_revision },
#endif
#if defined( PYSVN_HAS_CLIENT_PROPGET3 )
{ false, name_depth },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "propget", args_desc, a_args, a_kws );
args.check();
std::string propname( args.getUtf8String( name_prop_name ) );
std::string path( args.getUtf8String( name_url_or_path ) );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_PROPGET3 )
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_files, svn_depth_empty );
#else
bool recurse = args.getBoolean( name_recurse, false );
#endif
svn_opt_revision_t revision;
if( is_svn_url( path ) )
revision = args.getRevision( name_revision, svn_opt_revision_head );
else
revision = args.getRevision( name_revision, svn_opt_revision_working );
#if defined( PYSVN_HAS_CLIENT_PROPGET2 )
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision );
#endif
bool is_url = is_svn_url( path );
#if defined( PYSVN_HAS_CLIENT_PROPGET2 )
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
#endif
revisionKindCompatibleCheck( is_url, revision, name_revision, name_url_or_path );
apr_hash_t *props = NULL;
#if defined( PYSVN_HAS_CLIENT_PROPGET3 )
svn_revnum_t actual_revnum = 0;
#endif
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_PROPGET3 )
svn_error_t *error = svn_client_propget3
(
&props,
propname.c_str(),
norm_path.c_str(),
&peg_revision,
&revision,
&actual_revnum,
depth,
changelists,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_PROPGET2 )
svn_error_t *error = svn_client_propget2
(
&props,
propname.c_str(),
norm_path.c_str(),
&peg_revision,
&revision,
recurse,
m_context,
pool
);
#else
svn_error_t *error = svn_client_propget
(
&props,
propname.c_str(),
norm_path.c_str(),
&revision,
recurse,
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 propsToObject( props, pool );
}
// PYSVN_HAS_CLIENT_LOG, PYSVN_HAS_CLIENT_LOG2, PYSVN_HAS_CLIENT_LOG3 version
Py::Object pysvn_client::cmd_log( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_url_or_path },
{ false, name_revision_start },
{ false, name_revision_end },
{ false, name_discover_changed_paths },
{ false, name_strict_node_history },
#if defined( PYSVN_HAS_CLIENT_LOG2 ) || defined( PYSVN_HAS_CLIENT_LOG3 )
{ false, name_limit },
#endif
#if defined( PYSVN_HAS_CLIENT_LOG3 )
{ false, name_peg_revision },
#endif
#if defined( PYSVN_HAS_CLIENT_LOG4 )
{ false, name_include_merged_revisions },
{ false, name_revprops },
#endif
{ false, NULL }
};
FunctionArguments args( "log", args_desc, a_args, a_kws );
args.check();
svn_opt_revision_t revision_start = args.getRevision( name_revision_start, svn_opt_revision_head );
svn_opt_revision_t revision_end = args.getRevision( name_revision_end, svn_opt_revision_number );
bool discover_changed_paths = args.getBoolean( name_discover_changed_paths, false );
bool strict_node_history = args.getBoolean( name_strict_node_history, true );
int limit = args.getInteger( name_limit, 0 );
#if defined( PYSVN_HAS_CLIENT_LOG3 )
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, svn_opt_revision_unspecified );
#endif
#if defined( PYSVN_HAS_CLIENT_LOG4 )
svn_boolean_t include_merged_revisions = args.getBoolean( name_include_merged_revisions, false );
apr_array_header_t *revprops = NULL;
Py::Object py_revprop = args.getArg( name_revprops );
if( py_revprop is not None )
{
revprops = arrayOfStringsFromListOfStrings( py_revprop. pool );
}
#endif
Py::Object url_or_path_obj = args.getArg( name_url_or_path );
Py::List url_or_path_list;
if( url_or_path_obj.isList() )
{
url_or_path_list = url_or_path_obj;
}
else
{
Py::List py_list;
py_list.append( url_or_path_obj );
url_or_path_list = py_list;
}
for( size_t i=0; i<url_or_path_list.size(); i++ )
{
Py::Bytes py_path( asUtf8Bytes( url_or_path_list[ i ] ) );
std::string path( py_path.as_std_string() );
bool is_url = is_svn_url( path );
// std::cout << "peg_revision " << peg_revision.kind << " " << peg_revision.value.number << std::endl;
// std::cout << "revision_start " << revision_start.kind << " " << revision_start.value.number << std::endl;
// std::cout << "revision_end " << revision_end.kind << " " << revision_end.value.number << std::endl;
#if defined( PYSVN_HAS_CLIENT_LOG3 )
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
#endif
revisionKindCompatibleCheck( is_url, revision_start, name_revision_start, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_end, name_revision_end, name_url_or_path );
}
SvnPool pool( m_context );
apr_array_header_t *targets = targetsFromStringOrList( url_or_path_list, pool );
#if defined( PYSVN_HAS_CLIENT_LOG4 )
Log4Baton baton( permission, pool );
#else
std::list<LogEntryInfo> all_entries;
#endif
try
{
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_LOG4 )
svn_error_t *error = svn_client_log4
(
targets,
&peg_revision,
&revision_start,
&revision_end,
limit,
discover_changed_paths,
strict_node_history,
include_merged_revisions,
revprops,
logReceiver,
&all_entries,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_LOG3 )
svn_error_t *error = svn_client_log3
(
targets,
&peg_revision,
&revision_start,
&revision_end,
limit,
discover_changed_paths,
strict_node_history,
logReceiver,
&all_entries,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_LOG2 )
svn_error_t *error = svn_client_log2
(
targets,
&revision_start,
&revision_end,
limit,
discover_changed_paths,
strict_node_history,
logReceiver,
&all_entries,
m_context,
pool
);
#else
svn_error_t *error = svn_client_log
(
targets,
&revision_start,
&revision_end,
discover_changed_paths,
strict_node_history,
logReceiver,
&all_entries,
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 );
}
apr_time_t now = apr_time_now();
// convert the entries into python objects
Py::List entries_list;
std::list<LogEntryInfo>::const_iterator entry_it = all_entries.begin();
while( entry_it != all_entries.end() )
{
const LogEntryInfo &entry = *entry_it;
++entry_it;
Py::Dict entry_dict;
entry_dict[name_author] = Py::String( entry.m_author, name_utf8 );
entry_dict[name_date] = toObject( convertStringToTime( entry.m_date, now, pool ) );
entry_dict[name_message] = Py::String( entry.m_message, name_utf8 );
entry_dict[name_revision] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, entry.m_revision ) );
Py::List changed_paths_list;
std::list<LogChangePathInfo>::const_iterator changed_paths_it = entry.m_changed_paths.begin();
while( changed_paths_it != entry.m_changed_paths.end() )
{
const LogChangePathInfo &change_entry = *changed_paths_it;
++changed_paths_it;
Py::Dict changed_entry_dict;
changed_entry_dict[name_path] = Py::String( change_entry.m_path, name_utf8 );
changed_entry_dict[name_action] = Py::String( &change_entry.m_action, 1 );
changed_entry_dict[name_copyfrom_path] = utf8_string_or_none( change_entry.m_copy_from_path );
if( SVN_IS_VALID_REVNUM( change_entry.m_copy_from_revision ) )
changed_entry_dict[name_copyfrom_revision] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, change_entry.m_copy_from_revision ) );
else
changed_entry_dict[name_copyfrom_revision] = Py::None();
changed_paths_list.append( m_wrapper_log_changed_path.wrapDict( changed_entry_dict ) );
}
entry_dict[name_changed_paths] = changed_paths_list;
entries_list.append( m_wrapper_log.wrapDict( entry_dict ) );
}
return entries_list;
}
Py::Object pysvn_client::cmd_get_changelist( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_path },
{ false, name_depth },
{ false, name_changelists },
{ false, NULL }
};
FunctionArguments args( "get_changelists", args_desc, a_args, a_kws );
args.check();
std::string type_error_message;
SvnPool pool( m_context );
try
{
std::string path( args.getUtf8String( name_path ) );
std::string norm_path( svnNormalisedIfPath( path, pool ) );
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
//for (int j = 0; j < changelists->nelts; ++j)
//{
// const char *name = ((const char **)changelists->elts)[j];
// std::cout << "QQQ: get changelist=" << name << std::endl;
//}
}
svn_depth_t depth = args.getDepth( name_depth, svn_depth_files );
Py::List changelist_list;
try
{
checkThreadPermission();
PythonAllowThreads permission( m_context );
ChangelistBaton baton( &permission, pool, changelist_list );
svn_error_t *error = svn_client_get_changelists
(
norm_path.c_str(),
changelists,
depth,
changelistReceiver,
reinterpret_cast<void *>( &baton ),
m_context,
pool
);
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 changelist_list;
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return Py::None();
}
// PYSVN_HAS_CLIENT_LOG4 version
Py::Object pysvn_client::cmd_log( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_url_or_path },
{ false, name_revision_start },
{ false, name_revision_end },
{ false, name_discover_changed_paths },
{ false, name_strict_node_history },
{ false, name_limit },
{ false, name_peg_revision },
{ false, name_include_merged_revisions },
{ false, name_revprops },
{ false, NULL }
};
FunctionArguments args( "log", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
svn_opt_revision_t revision_start = args.getRevision( name_revision_start, svn_opt_revision_head );
svn_opt_revision_t revision_end = args.getRevision( name_revision_end, svn_opt_revision_number );
bool discover_changed_paths = args.getBoolean( name_discover_changed_paths, false );
bool strict_node_history = args.getBoolean( name_strict_node_history, true );
int limit = args.getInteger( name_limit, 0 );
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, svn_opt_revision_unspecified );
svn_boolean_t include_merged_revisions = args.getBoolean( name_include_merged_revisions, false );
apr_array_header_t *revprops = NULL;
if( args.hasArg( name_revprops ) )
{
Py::Object py_revprop = args.getArg( name_revprops );
if( !py_revprop.isNone() )
{
revprops = arrayOfStringsFromListOfStrings( py_revprop, pool );
}
}
Py::Object url_or_path_obj = args.getArg( name_url_or_path );
Py::List url_or_path_list;
if( url_or_path_obj.isList() )
{
url_or_path_list = url_or_path_obj;
}
else
{
Py::List py_list;
py_list.append( url_or_path_obj );
url_or_path_list = py_list;
}
for( size_t i=0; i<url_or_path_list.size(); i++ )
{
Py::Bytes py_path( asUtf8Bytes( url_or_path_list[ i ] ) );
std::string path( py_path.as_std_string() );
bool is_url = is_svn_url( path );
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_start, name_revision_start, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_end, name_revision_end, name_url_or_path );
}
apr_array_header_t *targets = targetsFromStringOrList( url_or_path_list, pool );
Py::List log_list;
try
{
checkThreadPermission();
PythonAllowThreads permission( m_context );
Log4Baton baton( &permission, pool, log_list );
baton.m_wrapper_log = &m_wrapper_log;
baton.m_wrapper_log_changed_path = &m_wrapper_log_changed_path;
#if defined( PYSVN_HAS_CLIENT_LOG5 )
apr_array_header_t *revision_ranges = apr_array_make( pool, 0, sizeof(svn_opt_revision_range_t *) );
svn_opt_revision_range_t *range = reinterpret_cast<svn_opt_revision_range_t *>( apr_palloc( pool, sizeof(*range) ) );
range->start = revision_start;
range->end = revision_end;
APR_ARRAY_PUSH( revision_ranges, svn_opt_revision_range_t * ) = range;
svn_error_t *error = svn_client_log5
(
targets,
&peg_revision,
revision_ranges,
limit,
discover_changed_paths,
strict_node_history,
include_merged_revisions,
revprops,
log4Receiver,
reinterpret_cast<void *>( &baton ),
m_context,
pool
);
#else
svn_error_t *error = svn_client_log4
(
targets,
&peg_revision,
&revision_start,
&revision_end,
limit,
discover_changed_paths,
strict_node_history,
include_merged_revisions,
revprops,
log4Receiver,
reinterpret_cast<void *>( &baton ),
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 log_list;
}
Py::Object pysvn_client::cmd_info2( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_url_or_path },
{ false, name_revision },
{ false, name_peg_revision},
{ false, name_recurse },
#if defined( PYSVN_HAS_CLIENT_INFO2 )
{ false, name_depth },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "info2", args_desc, a_args, a_kws );
args.check();
std::string path( args.getUtf8String( name_url_or_path ) );
svn_opt_revision_kind kind = svn_opt_revision_unspecified;
if( is_svn_url( path ) )
kind = svn_opt_revision_head;
svn_opt_revision_t revision = args.getRevision( name_revision, kind );
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_INFO2 )
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_empty );
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
bool is_url = is_svn_url( path );
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision, name_revision, name_url_or_path );
Py::List info_list;
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
InfoReceiveBaton info_baton( &permission, info_list, m_wrapper_info, m_wrapper_lock, m_wrapper_wc_info );
#if defined( PYSVN_HAS_CLIENT_INFO2 )
svn_error_t *error =
svn_client_info2
(
norm_path.c_str(),
&peg_revision,
&revision,
info_receiver_c,
reinterpret_cast<void *>( &info_baton ),
depth,
changelists,
m_context,
pool
);
#else
svn_error_t *error =
svn_client_info
(
norm_path.c_str(),
&peg_revision,
&revision,
info_receiver_c,
reinterpret_cast<void *>( &info_baton ),
recurse,
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 info_list;
}
Py::Object pysvn_client::cmd_status( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_path },
{ false, name_recurse },
{ false, name_get_all },
{ false, name_update },
{ false, name_ignore },
#if defined( PYSVN_HAS_CLIENT_STATUS2 )
{ false, name_ignore_externals },
#endif
#if defined( PYSVN_HAS_CLIENT_STATUS3 )
{ false, name_depth },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "status", args_desc, a_args, a_kws );
args.check();
Py::String path( args.getUtf8String( name_path ) );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_STATUS3 )
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_immediates );
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
bool get_all = args.getBoolean( name_get_all, true );
bool update = args.getBoolean( name_update, false );
bool ignore = args.getBoolean( name_ignore, false );
#if defined( PYSVN_HAS_CLIENT_STATUS2 )
bool ignore_externals = args.getBoolean( name_ignore_externals, false );
#endif
apr_hash_t *status_hash = NULL;
Py::List entries_list;
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
svn_revnum_t revnum;
svn_opt_revision_t rev = { svn_opt_revision_head, {0} };
StatusEntriesBaton baton;
status_hash = apr_hash_make( pool );
baton.hash = status_hash;
baton.pool = pool;
#if defined( PYSVN_HAS_CLIENT_STATUS4 )
svn_error_t *error = svn_client_status4
(
&revnum, // revnum
norm_path.c_str(), // path
&rev,
StatusEntriesFunc, // status func
&baton, // status baton
depth,
get_all,
update,
!ignore,
ignore_externals,
changelists,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_STATUS3 )
svn_error_t *error = svn_client_status3
(
&revnum, // revnum
norm_path.c_str(), // path
&rev,
StatusEntriesFunc, // status func
&baton, // status baton
depth,
get_all,
update,
!ignore,
ignore_externals,
changelists,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_STATUS2 )
svn_error_t *error = svn_client_status2
(
&revnum, // revnum
norm_path.c_str(), // path
&rev,
StatusEntriesFunc, // status func
&baton, // status baton
recurse,
get_all,
update,
!ignore,
ignore_externals,
m_context,
pool
);
#else
svn_error_t *error = svn_client_status
(
&revnum, // revnum
norm_path.c_str(), // path
&rev,
StatusEntriesFunc, // status func
&baton, // status baton
recurse,
get_all,
update,
!ignore,
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 );
}
apr_array_header_t *statusarray = svn_sort__hash( status_hash, svn_sort_compare_items_as_paths, pool );
// Loop over array, printing each name/status-structure
for (int i = statusarray->nelts-1; i >= 0; i--)
{
const svn_sort__item_t *item = &APR_ARRAY_IDX( statusarray, i, const svn_sort__item_t );
pysvn_wc_status_t *status = (pysvn_wc_status_t *)item->value;
entries_list.append( toObject(
Py::String( osNormalisedPath( (const char *)item->key, pool ), "UTF-8" ),
*status,
pool,
m_wrapper_status,
m_wrapper_entry,
m_wrapper_lock ) );
}
return entries_list;
}
Py::Object pysvn_client::cmd_diff_summarize_peg( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_url_or_path },
{ false, name_peg_revision },
{ false, name_revision_start },
{ false, name_revision_end },
{ false, name_recurse },
{ false, name_ignore_ancestry },
#if defined( PYSVN_HAS_CLIENT_DIFF_SUMMARIZE_PEG2 )
{ false, name_depth },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "diff_summarize_peg", args_desc, a_args, a_kws );
args.check();
std::string path( args.getUtf8String( name_url_or_path ) );
svn_opt_revision_t revision_start = args.getRevision( name_revision_start, svn_opt_revision_base );
svn_opt_revision_t revision_end = args.getRevision( name_revision_end, svn_opt_revision_working );
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision_end );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_DIFF_SUMMARIZE_PEG2 )
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_files );
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
bool ignore_ancestry = args.getBoolean( name_ignore_ancestry, true );
bool is_url = is_svn_url( path );
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_start, name_revision_start, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_end, name_revision_end, name_url_or_path );
Py::List diff_list;
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
DiffSummarizeBaton diff_baton( &permission, diff_list );
diff_baton.m_wrapper_diff_summary = &m_wrapper_diff_summary;
#if defined( PYSVN_HAS_CLIENT_DIFF_SUMMARIZE_PEG2 )
svn_error_t *error = svn_client_diff_summarize_peg2
(
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
depth,
ignore_ancestry,
changelists,
diff_summarize_c,
reinterpret_cast<void *>( &diff_baton ),
m_context,
pool
);
#else
svn_error_t *error = svn_client_diff_summarize_peg
(
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
recurse,
ignore_ancestry,
diff_summarize_c,
reinterpret_cast<void *>( &diff_baton ),
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 );
}
// cannot convert to Unicode as we have no idea of the encoding of the bytes
return diff_list;
}
Py::Object pysvn_client::cmd_diff_peg( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_tmp_path },
{ true, name_url_or_path },
{ false, name_peg_revision },
{ false, name_revision_start },
{ false, name_revision_end },
{ false, name_recurse },
{ false, name_ignore_ancestry },
{ false, name_diff_deleted },
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG2 )
{ false, name_ignore_content_type },
#endif
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG3 )
{ false, name_header_encoding },
{ false, name_diff_options },
#endif
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG4 )
{ false, name_depth },
{ false, name_relative_to_dir },
{ false, name_changelists },
#endif
{ false, NULL }
};
FunctionArguments args( "diff_peg", args_desc, a_args, a_kws );
args.check();
std::string tmp_path( args.getUtf8String( name_tmp_path ) );
std::string path( args.getUtf8String( name_url_or_path ) );
svn_opt_revision_t revision_start = args.getRevision( name_revision_start, svn_opt_revision_base );
svn_opt_revision_t revision_end = args.getRevision( name_revision_end, svn_opt_revision_working );
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision_end );
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG4 )
svn_depth_t depth = args.getDepth( name_depth, name_recurse, svn_depth_infinity, svn_depth_infinity, svn_depth_files );
std::string std_relative_to_dir;
const char *relative_to_dir = NULL;
if( args.hasArg( name_relative_to_dir ) )
{
std_relative_to_dir = args.getBytes( name_relative_to_dir );
relative_to_dir = std_relative_to_dir.c_str();
}
apr_array_header_t *changelists = NULL;
if( args.hasArg( name_changelists ) )
{
changelists = arrayOfStringsFromListOfStrings( args.getArg( name_changelists ), pool );
}
#else
bool recurse = args.getBoolean( name_recurse, true );
#endif
bool ignore_ancestry = args.getBoolean( name_ignore_ancestry, true );
bool diff_deleted = args.getBoolean( name_diff_deleted, true );
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG2 )
bool ignore_content_type = args.getBoolean( name_ignore_content_type, false );
#endif
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG3 )
std::string header_encoding( args.getUtf8String( name_header_encoding, empty_string ) );
const char *header_encoding_ptr = APR_LOCALE_CHARSET;
if( !header_encoding.empty() )
header_encoding_ptr = header_encoding.c_str();
apr_array_header_t *options = NULL;
if( args.hasArg( name_diff_options ) )
{
options = arrayOfStringsFromListOfStrings( args.getArg( name_diff_options ), pool );
}
else
{
options = apr_array_make( pool, 0, sizeof( const char * ) );
}
#else
apr_array_header_t *options = apr_array_make( pool, 0, sizeof( const char * ) );
#endif
bool is_url = is_svn_url( path );
revisionKindCompatibleCheck( is_url, peg_revision, name_peg_revision, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_start, name_revision_start, name_url_or_path );
revisionKindCompatibleCheck( is_url, revision_end, name_revision_end, name_url_or_path );
svn_stringbuf_t *stringbuf = NULL;
try
{
std::string norm_tmp_path( svnNormalisedIfPath( tmp_path, pool ) );
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
pysvn_apr_file output_file( pool );
pysvn_apr_file error_file( pool );
output_file.open_unique_file( norm_tmp_path );
error_file.open_unique_file( norm_tmp_path );
// std::cout << "peg_revision " << peg_revision.kind << " " << peg_revision.value.number << std::endl;
// std::cout << "revision_start " << revision_start.kind << " " << revision_start.value.number << std::endl;
// std::cout << "revision_end " << revision_end.kind << " " << revision_end.value.number << std::endl;
#if defined( PYSVN_HAS_CLIENT_DIFF_PEG4 )
svn_error_t *error = svn_client_diff_peg4
(
options,
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
relative_to_dir,
depth,
ignore_ancestry,
!diff_deleted,
ignore_content_type,
header_encoding_ptr,
output_file.file(),
error_file.file(),
changelists,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_DIFF_PEG3 )
svn_error_t *error = svn_client_diff_peg3
(
options,
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
recurse,
ignore_ancestry,
!diff_deleted,
ignore_content_type,
header_encoding_ptr,
output_file.file(),
error_file.file(),
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_DIFF_PEG2 )
svn_error_t *error = svn_client_diff_peg2
(
options,
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
recurse,
ignore_ancestry,
!diff_deleted,
ignore_content_type,
output_file.file(),
error_file.file(),
m_context,
pool
);
#else
svn_error_t *error = svn_client_diff_peg
(
options,
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
recurse,
ignore_ancestry,
!diff_deleted,
output_file.file(),
error_file.file(),
m_context,
pool
);
#endif
permission.allowThisThread();
if( error != NULL )
throw SvnException( error );
output_file.close();
output_file.open_tmp_file();
error = svn_stringbuf_from_aprfile( &stringbuf, output_file.file(), pool );
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 );
}
// cannot convert to Unicode as we have no idea of the encoding of the bytes
return Py::String( stringbuf->data, (int)stringbuf->len );
}
