realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Git: fix error message formatting

Browse Source
This commit is contained in:
Jon Evans 2025-02-08 16:49:56 -05:00
parent df70ce72b4
commit 172b77039f
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kicad/project_tree_pane.cpp
View File

@ -2254,7 +2254,8 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_repository_index( &index, repo ) != 0 )
{
wxMessageBox( _( "Failed to get repository index: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to get repository index: %s" ),
giterr_last()->message ) );
return;
}
@ -2262,7 +2263,8 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
{
if( git_index_add_bypath( index, file.mb_str() ) != 0 )
{
wxMessageBox( _( "Failed to add file to index: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to add file to index: %s" ),
giterr_last()->message ) );
git_index_free( index );
return;
}
@ -2270,14 +2272,16 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_index_write( index ) != 0 )
{
wxMessageBox( _( "Failed to write index: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to write index: %s" ),
giterr_last()->message ) );
git_index_free( index );
return;
}
if (git_index_write_tree( &tree_id, index ) != 0)
if( git_index_write_tree( &tree_id, index ) != 0)
{
wxMessageBox( _( "Failed to write tree: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to write tree: %s" ),
giterr_last()->message ) );
git_index_free( index );
return;
}
@ -2286,7 +2290,8 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_tree_lookup( &tree, repo, &tree_id ) != 0 )
{
wxMessageBox( _( "Failed to lookup tree: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to lookup tree: %s" ),
giterr_last()->message ) );
return;
}
@ -2294,14 +2299,16 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_repository_head( &headRef, repo ) != 0 )
{
wxMessageBox( _( "Failed to get HEAD reference: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to get HEAD reference: %s" ),
giterr_last()->message ) );
git_index_free( index );
return;
}
if( git_reference_peel( (git_object**) &parent, headRef, GIT_OBJECT_COMMIT ) != 0 )
{
wxMessageBox( _( "Failed to get commit: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to get commit: %s" ),
giterr_last()->message ) );
git_reference_free( headRef );
git_index_free( index );
return;
@ -2317,7 +2324,8 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_signature_now( &author, author_name.mb_str(), author_email.mb_str() ) != 0 )
{
wxMessageBox( _( "Failed to create author signature: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to create author signature: %s" ),
giterr_last()->message ) );
return;
}
@ -2352,7 +2360,8 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree,
1, parents ) != 0 )
{
wxMessageBox( _( "Failed to create commit: %s" ), giterr_last()->message );
wxMessageBox( wxString::Format( _( "Failed to create commit: %s" ),
giterr_last()->message ) );
return;
}