apr_array_header_t *svn_support_blame_call(char *file_path,
int revision,
apr_pool_t *subpool)
{
svn_error_t *err;
svn_opt_revision_t peg_rev,start,end;
svn_diff_file_options_t *diff_options;
// -- Initialisation des révisions --
if (revision != -1) {
peg_rev.kind = end.kind = svn_opt_revision_number;
peg_rev.value.number = end.value.number = revision;
}
else {
peg_rev.kind = svn_opt_revision_unspecified;
end.kind = svn_opt_revision_head;
}
start.kind = svn_opt_revision_number;
start.value.number = 1;
// -- Initialisation des diff_options --
diff_options = svn_diff_file_options_create(pool);
// -- Initialisation du tableau et du buffer de résultats --
apr_array_header_t *list_result = apr_array_make(pool, 1, sizeof (const char *));
svn_stringbuf_t *res = svn_stringbuf_create("",pool);
err = svn_client_blame4(file_path,
&peg_rev,
&start,
&end,
diff_options,
FALSE, // ignore_mime_type
FALSE, // include_merged_revisions
blame_callback,
res,
ctx,
pool);
if (err) {
svn_handle_error2(err, stderr, FALSE, "svn_support_blame: ");
svn_pool_destroy(subpool);
return NULL;
}
svn_cstring_split_append(list_result,res->data,"\n",FALSE,pool);
svn_pool_destroy(subpool);
return list_result;
}
svn_error_t *
svn_client_blame3(const char *target,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *start,
const svn_opt_revision_t *end,
const svn_diff_file_options_t *diff_options,
svn_boolean_t ignore_mime_type,
svn_client_blame_receiver_t receiver,
void *receiver_baton,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_client_blame_receiver2_t receiver2;
void *receiver2_baton;
wrap_blame_receiver(&receiver2, &receiver2_baton, receiver, receiver_baton,
pool);
return svn_client_blame4(target, peg_revision, start, end, diff_options,
ignore_mime_type, FALSE, receiver2, receiver2_baton,
ctx, pool);
}
Py::Object pysvn_client::cmd_annotate( 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 },
#if defined( PYSVN_HAS_CLIENT_ANNOTATE2 )
{ false, name_peg_revision },
#endif
#if defined( PYSVN_HAS_CLIENT_ANNOTATE3 )
{ false, name_ignore_space },
{ false, name_ignore_eol_style },
{ false, name_ignore_mime_type },
#endif
#if defined( PYSVN_HAS_CLIENT_ANNOTATE4 )
{ false, name_include_merged_revisions },
#endif
{ false, NULL }
};
FunctionArguments args( "annotate", args_desc, a_args, a_kws );
args.check();
std::string path( args.getUtf8String( name_url_or_path, empty_string ) );
svn_opt_revision_t revision_start = args.getRevision( name_revision_start, svn_opt_revision_number );
svn_opt_revision_t revision_end = args.getRevision( name_revision_end, svn_opt_revision_head );
#if defined( PYSVN_HAS_CLIENT_ANNOTATE2 )
svn_opt_revision_t peg_revision = args.getRevision( name_peg_revision, revision_end );
#endif
#if defined( PYSVN_HAS_CLIENT_ANNOTATE3 )
svn_diff_file_ignore_space_t ignore_space = svn_diff_file_ignore_space_none;
if( args.hasArg( name_ignore_space ) )
{
Py::ExtensionObject< pysvn_enum_value<svn_diff_file_ignore_space_t> > py_ignore_space( args.getArg( name_ignore_space ) );
ignore_space = svn_diff_file_ignore_space_t( py_ignore_space.extensionObject()->m_value );
}
svn_boolean_t ignore_eol_style = args.getBoolean( name_ignore_eol_style, false );
svn_boolean_t ignore_mime_type = args.getBoolean( name_ignore_mime_type, false );
#endif
#if defined( PYSVN_HAS_CLIENT_ANNOTATE4 )
svn_boolean_t include_merged_revisions = args.getBoolean( name_include_merged_revisions, false );
#endif
SvnPool pool( m_context );
#if defined( PYSVN_HAS_CLIENT_ANNOTATE3 )
svn_diff_file_options_t *diff_options = svn_diff_file_options_create( pool );
diff_options->ignore_space = ignore_space;
diff_options->ignore_eol_style = ignore_eol_style;
#endif
bool is_url = is_svn_url( path );
#if defined( PYSVN_HAS_CLIENT_ANNOTATE2 )
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 );
std::list<AnnotatedLineInfo> all_entries;
try
{
std::string norm_path( svnNormalisedIfPath( path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
#if defined( PYSVN_HAS_CLIENT_ANNOTATE4 )
svn_error_t *error = svn_client_blame4
(
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
diff_options,
ignore_mime_type,
include_merged_revisions,
annotate_receiver,
&all_entries,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_ANNOTATE3 )
svn_error_t *error = svn_client_blame3
(
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
diff_options,
ignore_mime_type,
annotate_receiver,
&all_entries,
m_context,
pool
);
#elif defined( PYSVN_HAS_CLIENT_ANNOTATE2 )
svn_error_t *error = svn_client_blame2
(
norm_path.c_str(),
&peg_revision,
&revision_start,
&revision_end,
annotate_receiver,
&all_entries,
m_context,
pool
);
#else
svn_error_t *error = svn_client_blame
(
norm_path.c_str(),
&revision_start,
&revision_end,
annotate_receiver,
&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 );
}
// convert the entries into python objects
Py::List entries_list;
std::list<AnnotatedLineInfo>::const_iterator entry_it = all_entries.begin();
while( entry_it != all_entries.end() )
{
const AnnotatedLineInfo &entry = *entry_it;
++entry_it;
Py::Dict entry_dict;
entry_dict[name_author] = Py::String( entry.m_author, name_utf8 );
entry_dict[name_date] = Py::String( entry.m_date );
entry_dict[name_line] = Py::String( entry.m_line );
entry_dict[name_number] = Py::Int( long( entry.m_line_no ) );
entry_dict[name_revision] = Py::asObject( new pysvn_revision( svn_opt_revision_number, 0, entry.m_revision ) );
entries_list.append( entry_dict );
}
return entries_list;
}
