30#include <wx/stdpaths.h>
33#include <wx/textdlg.h>
35#include <wx/wupdlock.h>
57#include <wx/dcclient.h>
58#include <wx/progdlg.h>
59#include <wx/settings.h>
108 wxT(
"^.*\\.kicad_pro$" ),
111 wxT(
"^.*\\.kicad_sch$" ),
112 wxT(
"^[^$].*\\.brd$" ),
113 wxT(
"^[^$].*\\.kicad_pcb$" ),
114 wxT(
"^[^$].*\\.kicad_dru$" ),
115 wxT(
"^[^$].*\\.kicad_wks$" ),
116 wxT(
"^[^$].*\\.kicad_mod$" ),
120 wxT(
"^.*\\.kicad_sym$" ),
125 wxT(
"^.*\\.gbrjob$" ),
126 wxT(
"^.*\\.gb[alops]$" ),
127 wxT(
"^.*\\.gt[alops]$" ),
128 wxT(
"^.*\\.g[0-9]{1,2}$" ),
129 wxT(
"^.*\\.gm[0-9]{1,2}$" ),
133 wxT(
"^.*\\.html$" ),
144 wxT(
"^.*\\.kicad_jobset" ),
227 wxSashLayoutWindow( parent,
ID_LEFT_FRAME, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTAB_TRAVERSAL )
238 Bind( wxEVT_FSWATCHER,
241 Bind( wxEVT_SYS_COLOUR_CHANGED,
255 m_filters.emplace_back( wxT(
"^no KiCad files found" ) );
263 Unbind( wxEVT_FSWATCHER,
265 Unbind( wxEVT_SYS_COLOUR_CHANGED,
298 if( tree_data.size() != 1 )
301 wxString prj_filename = tree_data[0]->GetFileName();
303 m_Parent->LoadProject( prj_filename );
315 wxString curr_dir = item_data->GetDir();
317 if( curr_dir.IsEmpty() )
320 curr_dir = wxPathOnly(
m_Parent->GetProjectFileName() );
323 if( curr_dir.IsEmpty() || !wxFileName::DirExists( curr_dir ) )
326 if( !curr_dir.IsEmpty() )
327 curr_dir += wxFileName::GetPathSeparator();
342 wxString prj_dir = wxPathOnly(
m_Parent->GetProjectFileName() );
345 wxString curr_dir = item_data->GetDir();
347 if( curr_dir.IsEmpty() )
350 wxString new_dir = wxGetTextFromUser(
_(
"Directory name:" ),
_(
"Create New Directory" ) );
352 if( new_dir.IsEmpty() )
355 wxString full_dirname = curr_dir + wxFileName::GetPathSeparator() + new_dir;
357 if( !wxMkdir( full_dirname ) )
405 return wxEmptyString;
411 std::vector<wxString> projects;
412 wxString dir_filename;
413 bool haveFile = dir.GetFirst( &dir_filename );
417 wxFileName file( dir_filename );
421 projects.push_back( file.GetName() );
423 haveFile = dir.GetNext( &dir_filename );
434 const wxTreeItemId& aParent,
435 std::vector<wxString>* aProjectNames,
439 wxFileName fn( aName );
442 return wxTreeItemId();
444 if( wxDirExists( aName ) )
452 bool addFile =
false;
454 for(
const wxString& m_filter :
m_filters )
456 wxCHECK2_MSG( reg.Compile( m_filter, wxRE_ICASE ),
continue,
457 wxString::Format(
"Regex %s failed to compile.", m_filter ) );
459 if( reg.Matches( aName ) )
467 return wxTreeItemId();
474 if( ext == wxT(
"" ) )
477 if( reg.Compile( wxString::FromAscii(
"^.*\\." ) + ext + wxString::FromAscii(
"$" ), wxRE_ICASE )
478 && reg.Matches( aName ) )
486 wxString file = wxFileNameFromPath( aName );
487 wxFileName currfile( file );
489 bool showAllSchematics =
m_TreeProject->GetGitRepo() !=
nullptr;
493 && ( currfile.GetName().CmpNoCase(
project.GetName() ) == 0 ) )
495 return wxTreeItemId();
504 return wxTreeItemId();
510 if( !parentTreeItem )
511 return wxTreeItemId();
513 wxDir parentDir( parentTreeItem->
GetDir() );
514 std::vector<wxString> projects =
getProjects( parentDir );
517 return wxTreeItemId();
522 wxTreeItemIdValue cookie;
523 wxTreeItemId kid =
m_TreeProject->GetFirstChild( aParent, cookie );
530 return itemData->GetId();
551 if( fname.GetName().CmpNoCase( currfile.GetName() ) == 0 )
557 return wxTreeItemId();
563 return wxTreeItemId();
590 wxTreeItemId newItemId =
m_TreeProject->AppendItem( aParent, file );
597 wxString fileName = currfile.GetName().Lower();
598 wxString projName =
project.GetName().Lower();
600 if( fileName == projName || fileName.StartsWith( projName +
"-" ) )
604 bool subdir_populated =
false;
615 std::vector<wxString> projects =
getProjects( dir );
616 wxString dir_filename;
617 bool haveFile = dir.GetFirst( &dir_filename );
622 subdir_populated = aRecurse;
628 wxString
path = aName + wxFileName::GetPathSeparator() + dir_filename;
631 haveFile = dir.GetNext( &dir_filename );
640 if( subdir_populated )
654 while(
tp.get_tasks_running() )
656 tp.wait_for( std::chrono::milliseconds( 250 ) );
664 wxString pro_dir =
m_Parent->GetProjectFileName();
682 wxFileName fn = pro_dir;
683 bool prjReset =
false;
694 bool prjOpened = fn.FileExists();
697 if(
Pgm().GetCommonSettings()->m_Git.enableGit
698 && !
Prj().GetLocalSettings().m_GitIntegrationDisabled )
704 const char* canonicalWorkDir = git_repository_workdir(
m_TreeProject->GetGitRepo() );
706 if( canonicalWorkDir )
709 fn.GetPath(), wxString::FromUTF8( canonicalWorkDir ) );
713 m_TreeProject->GitCommon()->SetUsername(
Prj().GetLocalSettings().m_GitRepoUsername );
714 m_TreeProject->GitCommon()->SetSSHKey(
Prj().GetLocalSettings().m_GitSSHKey );
721 if( !prjOpened && !prjReset )
724 prjOpened = fn.FileExists();
744 pro_dir = wxPathOnly(
m_Parent->GetProjectFileName() );
745 wxDir dir( pro_dir );
749 std::vector<wxString> projects =
getProjects( dir );
751 bool haveFile = dir.GetFirst( &filename );
755 if( filename != fn.GetFullName() )
757 wxString
name = dir.GetName() + wxFileName::GetPathSeparator() + filename;
764 haveFile = dir.GetNext( &filename );
781 wxLogTrace(
traceGit,
"PROJECT_TREE_PANE::ReCreateTreePrj: starting timers" );
800 wxTreeItemId curr_item = Event.GetItem();
807 wxFileName prj_dir(
Prj().GetProjectPath(), wxEmptyString );
809 prj_dir.Normalize( wxPATH_NORM_ABSOLUTE | wxPATH_NORM_CASE | wxPATH_NORM_DOTS
810 | wxPATH_NORM_ENV_VARS | wxPATH_NORM_TILDE );
811 git_dir.Normalize( wxPATH_NORM_ABSOLUTE | wxPATH_NORM_CASE | wxPATH_NORM_DOTS
812 | wxPATH_NORM_ENV_VARS | wxPATH_NORM_TILDE );
813 wxString prj_name = prj_dir.GetFullPath();
814 wxString git_name = git_dir.GetFullPath();
816 bool can_switch_to_project =
true;
817 bool can_create_new_directory =
true;
818 bool can_open_this_directory =
true;
819 bool can_edit =
true;
820 bool can_rename =
true;
821 bool can_delete =
true;
822 bool run_jobs =
false;
826 bool vcs_can_init = !vcs_has_repo;
829 bool vcs_can_remove = ( vcs_has_repo && git_name.StartsWith( prj_name ) ) || gitIntegrationDisabled;
832 bool vcs_can_pull = vcs_can_fetch;
833 bool vcs_can_switch = vcs_has_repo;
839 vcs_menu &= libgit_init;
841 if( selection.size() == 0 )
845 if( selection.size() != 1 )
847 can_switch_to_project =
false;
848 can_create_new_directory =
false;
857 can_switch_to_project =
false;
863 can_delete = item->CanDelete();
864 can_rename = item->CanRename();
866 switch( item->GetType() )
874 can_switch_to_project =
false;
878 can_create_new_directory =
false;
879 can_open_this_directory =
false;
884 can_switch_to_project =
false;
891 can_switch_to_project =
false;
892 can_create_new_directory =
false;
893 can_open_this_directory =
false;
906 can_switch_to_project =
false;
907 can_create_new_directory =
false;
908 can_open_this_directory =
false;
918 if( can_switch_to_project )
921 _(
"Close all editors, and switch to the selected project" ),
923 popup_menu.AppendSeparator();
926 if( can_create_new_directory )
932 if( can_open_this_directory )
934 if( selection.size() == 1 )
937 text =
_(
"Reveal in Finder" );
938 help_text =
_(
"Reveals the directory in a Finder window" );
940 text =
_(
"Open Directory in File Explorer" );
941 help_text =
_(
"Opens the directory in the default system file manager" );
947 text =
_(
"Reveal in Finder" );
948 help_text =
_(
"Reveals the directories in a Finder window" );
950 text =
_(
"Open Directories in File Explorer" );
951 help_text =
_(
"Opens the directories in the default system file manager" );
961 if( selection.size() == 1 )
962 help_text =
_(
"Open the file in a Text Editor" );
964 help_text =
_(
"Open files in a Text Editor" );
970 if( run_jobs && selection.size() == 1 )
978 if( selection.size() == 1 )
980 text =
_(
"Rename File..." );
981 help_text =
_(
"Rename file" );
985 text =
_(
"Rename Files..." );
986 help_text =
_(
"Rename files" );
995 if( selection.size() == 1 )
996 help_text =
_(
"Delete the file and its content" );
998 help_text =
_(
"Delete the files and their contents" );
1000 if( can_switch_to_project
1001 || can_create_new_directory
1002 || can_open_this_directory
1006 popup_menu.AppendSeparator();
1020 wxMenu* vcs_submenu =
new wxMenu();
1021 wxMenu* branch_submenu =
new wxMenu();
1022 wxMenuItem* vcs_menuitem =
nullptr;
1025 _(
"Add Project to Version Control..." ),
1026 _(
"Initialize a new repository" ) );
1027 vcs_menuitem->Enable( vcs_can_init );
1031 _(
"Commit changes to the local repository" ) );
1032 vcs_menuitem->Enable( vcs_can_commit );
1034 vcs_menuitem = vcs_submenu->Append(
ID_GIT_PUSH,
_(
"Push" ),
1035 _(
"Push committed local changes to remote repository" ) );
1036 vcs_menuitem->Enable( vcs_can_push );
1038 vcs_menuitem = vcs_submenu->Append(
ID_GIT_PULL,
_(
"Pull" ),
1039 _(
"Pull changes from remote repository into local" ) );
1040 vcs_menuitem->Enable( vcs_can_pull );
1042 vcs_submenu->AppendSeparator();
1045 _(
"Commit changes to the local repository" ) );
1046 vcs_menuitem->Enable( vcs_can_commit );
1048 vcs_submenu->AppendSeparator();
1054 std::vector<wxString> branchNames =
m_TreeProject->GitCommon()->GetBranchNames();
1057 for(
size_t ii = 1; ii < branchNames.size() && ii < 6; ++ii )
1059 wxString msg =
_(
"Switch to branch " ) + branchNames[ii];
1061 vcs_menuitem->Enable( vcs_can_switch );
1065 _(
"Switch to a different branch" ) );
1066 vcs_menuitem->Enable( vcs_can_switch );
1070 vcs_submenu->AppendSeparator();
1072 if( gitIntegrationDisabled )
1074 vcs_menuitem = vcs_submenu->Append(
ID_GIT_REMOVE_VCS,
_(
"Enable Git Integration" ),
1075 _(
"Re-enable Git integration for this project" ) );
1079 vcs_menuitem = vcs_submenu->Append(
ID_GIT_REMOVE_VCS,
_(
"Disable Git Integration" ),
1080 _(
"Disable Git integration for this project" ) );
1083 vcs_menuitem->Enable( vcs_can_remove );
1085 popup_menu.AppendSeparator();
1086 popup_menu.AppendSubMenu( vcs_submenu,
_(
"Version Control" ) );
1089 if( popup_menu.GetMenuItemCount() > 0 )
1090 PopupMenu( &popup_menu );
1098 if( editorname.IsEmpty() )
1100 wxMessageBox(
_(
"No text editor selected in KiCad. Please choose one." ) );
1108 wxString fullFileName = item_data->GetFileName();
1110 if( !fullFileName.IsEmpty() )
1112 ExecuteFile( editorname, fullFileName.wc_str(),
nullptr,
false );
1123 item_data->Delete();
1133 if( tree_data.size() != 1 )
1137 wxString msg = wxString::Format(
_(
"Change filename: '%s'" ),
1138 tree_data[0]->GetFileName() );
1139 wxTextEntryDialog dlg( wxGetTopLevelParent(
this ), msg,
_(
"Change filename" ), buffer );
1141 if( dlg.ShowModal() != wxID_OK )
1144 buffer = dlg.GetValue();
1145 buffer.Trim(
true );
1146 buffer.Trim(
false );
1148 if( buffer.IsEmpty() )
1151 tree_data[0]->Rename( buffer,
true );
1160 if( tree_data.size() != 1 )
1183 std::vector<wxTreeItemId> validItemIds;
1186 for( wxTreeItemId
id : validItemIds )
1205 wxTreeItemId itemId = Event.GetItem();
1215 wxTreeItemIdValue cookie;
1216 wxTreeItemId kid =
m_TreeProject->GetFirstChild( itemId, cookie );
1219 bool subdir_populated =
false;
1222 for( ; kid.IsOk(); kid =
m_TreeProject->GetNextChild( itemId, cookie ) )
1233 wxDir dir( fileName );
1235 if( dir.IsOpened() )
1237 std::vector<wxString> projects =
getProjects( dir );
1238 wxString dir_filename;
1239 bool haveFile = dir.GetFirst( &dir_filename );
1244 wxString
name = fileName + wxFileName::GetPathSeparator() + dir_filename;
1247 haveFile = dir.GetNext( &dir_filename );
1253 subdir_populated =
true;
1262 if( subdir_populated )
1270 wxArrayTreeItemIds selection;
1271 std::vector<PROJECT_TREE_ITEM*> data;
1275 for(
const wxTreeItemId itemId : selection )
1281 wxLogTrace(
traceGit, wxS(
"Null tree item returned for selection, dynamic_cast failed?" ) );
1285 data.push_back( item );
1300 wxString prj_dir = wxPathOnly(
m_Parent->GetProjectFileName() );
1304 if( prj_dir == aSubDir )
1308 wxTreeItemIdValue cookie;
1309 wxTreeItemId root_id =
m_root;
1310 std::stack<wxTreeItemId> subdirs_id;
1312 wxTreeItemId child =
m_TreeProject->GetFirstChild( root_id, cookie );
1316 if( ! child.IsOk() )
1318 if( subdirs_id.empty() )
1325 root_id = subdirs_id.top();
1346 subdirs_id.push( child );
1364 if( !( event.GetChangeType() & ( wxFSW_EVENT_CREATE |
1365 wxFSW_EVENT_DELETE |
1366 wxFSW_EVENT_RENAME |
1367 wxFSW_EVENT_MODIFY ) ) )
1372 const wxFileName& pathModified =
event.GetPath();
1375 if( pathModified.GetFullPath().Contains( wxS(
".history" ) ) )
1378 wxString subdir = pathModified.GetPath();
1379 wxString fn = pathModified.GetFullPath();
1382 if( pathModified.GetFullName().IsEmpty() )
1384 subdir = subdir.BeforeLast(
'/' );
1385 fn = fn.BeforeLast(
'/' );
1390 if( !root_id.IsOk() )
1393 CallAfter( [
this] ()
1395 wxLogTrace(
traceGit, wxS(
"File system event detected, updating tree cache" ) );
1399 wxTreeItemIdValue cookie;
1400 wxTreeItemId kid =
m_TreeProject->GetFirstChild( root_id, cookie );
1402 switch( event.GetChangeType() )
1404 case wxFSW_EVENT_CREATE:
1419 case wxFSW_EVENT_DELETE:
1433 case wxFSW_EVENT_RENAME :
1435 const wxFileName& newpath =
event.GetNewPath();
1436 wxString newdir = newpath.GetPath();
1437 wxString newfn = newpath.GetFullPath();
1461 if( rootData && newpath.Exists() && ( newfn != rootData->
GetFileName() ) )
1467 if( newitem.IsOk() )
1488 wxString prj_dir = wxPathOnly(
m_Parent->GetProjectFileName() );
1490#if defined( _WIN32 )
1499 m_Parent->m_FileWatcherInfo =
_(
"Network path: not monitoring folder changes" );
1505 m_Parent->m_FileWatcherInfo =
_(
"Local path: monitoring folder changes" );
1523 class WatcherLogHandler :
public wxLog
1526 explicit WatcherLogHandler(
bool* err ) :
1534 void DoLogTextAtLevel( wxLogLevel level,
const wxString&
text )
override
1536 if( m_err && ( level == wxLOG_Error || level == wxLOG_FatalError ) )
1544 bool watcherHasError =
false;
1545 WatcherLogHandler tmpLog( &watcherHasError );
1546 wxLog* oldLog = wxLog::SetActiveTarget( &tmpLog );
1552 wxLog::SetActiveTarget( oldLog );
1554 if( watcherHasError )
1562 fn.AssignDir( prj_dir );
1563 fn.DontFollowLink();
1577 TO_UTF8( fn.GetFullPath() ) );
1585 TO_UTF8( fn.GetFullPath() ) );
1590 if( m_TreeProject->IsEmpty() )
1594 wxTreeItemIdValue cookie;
1595 wxTreeItemId root_id = m_root;
1597 std::stack < wxTreeItemId > subdirs_id;
1599 wxTreeItemId kid = m_TreeProject->GetFirstChild( root_id, cookie );
1600 int total_watch_count = 0;
1606 if( subdirs_id.empty() )
1612 root_id = subdirs_id.top();
1614 kid = m_TreeProject->GetFirstChild( root_id, cookie );
1629 if(
path.Contains( wxS(
".history" ) ) )
1631 kid = m_TreeProject->GetNextChild( root_id, cookie );
1637 if( wxFileName::IsDirReadable(
path ) )
1642 fn.AssignDir(
path );
1643 m_watcher->Add( fn );
1644 total_watch_count++;
1648 if( itemData->
IsPopulated() && m_TreeProject->GetChildrenCount( kid ) )
1649 subdirs_id.push( kid );
1653 kid = m_TreeProject->GetNextChild( root_id, cookie );
1660#if defined(DEBUG) && 1
1661 wxArrayString paths;
1662 m_watcher->GetWatchedPaths( &paths );
1665 for(
unsigned ii = 0; ii < paths.GetCount(); ii++ )
1684 std::unique_lock<std::mutex> lock(
m_TreeProject->GitCommon()->m_gitActionMutex, std::try_to_lock );
1686 if( !lock.owns_lock() )
1690 wxProgressDialog progress(
_(
"Please wait" ),
_(
"Waiting for Git operations to finish..." ),
1691 100,
this, wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_SMOOTH );
1694 while ( !lock.try_lock() )
1697 std::this_thread::sleep_for( std::chrono::milliseconds(100) );
1723 wxRect rect( wxPoint( 0, 0 ), GetClientSize() );
1724 wxPaintDC dc(
this );
1726 dc.SetBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_FRAMEBK ) );
1727 dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ), 1 ) );
1729 dc.DrawLine( rect.GetLeft(), rect.GetTop(), rect.GetLeft(), rect.GetBottom() );
1730 dc.DrawLine( rect.GetRight(), rect.GetTop(), rect.GetRight(), rect.GetBottom() );
1744 wxString dir = tree_data->
GetDir();
1748 wxLogError(
"Failed to initialize git project: project directory is empty." );
1753 wxWindow* topLevelParent = wxGetTopLevelParent(
this );
1758 _(
"The selected directory is already a Git project." ) );
1773 dlg.SetTitle(
_(
"Set default remote" ) );
1828 handler.
SetProgressReporter( std::make_unique<WX_PROGRESS_REPORTER>(
this,
_(
"Fetch Remote" ), 1,
1851 handler.
SetProgressReporter( std::make_unique<WX_PROGRESS_REPORTER>(
this,
_(
"Fetch Remote" ), 1,
1871 wxString branchName;
1880 if( retval == wxID_ADD )
1882 else if( retval != wxID_OK )
1887 std::vector<wxString> branches =
m_TreeProject->GitCommon()->GetBranchNames();
1890 if( branchIndex < 0 ||
static_cast<size_t>( branchIndex ) >= branches.size() )
1893 branchName = branches[branchIndex];
1896 wxLogTrace(
traceGit, wxS(
"onGitSwitchBranch: Switching to branch '%s'" ), branchName );
1911 wxLogTrace(
traceGit, wxS(
"onGitRemoveVCS: Git integration %s" ),
1921 std::stack<wxTreeItemId> items;
1924 while( !items.empty() )
1926 wxTreeItemId current = items.top();
1929 m_TreeProject->SetItemState( current, wxTREE_ITEMSTATE_NONE );
1931 wxTreeItemIdValue cookie;
1932 wxTreeItemId child =
m_TreeProject->GetFirstChild( current, cookie );
1934 while( child.IsOk() )
1936 items.push( child );
1944 wxFileName fn(
Prj().GetProjectPath() );
1949 const char* canonicalWorkDir = git_repository_workdir(
m_TreeProject->GetGitRepo() );
1951 if( canonicalWorkDir )
1954 fn.GetPath(), wxString::FromUTF8( canonicalWorkDir ) );
1955 m_TreeProject->GitCommon()->SetProjectDir( symlinkWorkDir );
1970 wxLogTrace(
traceGit, wxS(
"updateGitStatusIcons: Updating git status icons" ) );
1973 if( !lock.owns_lock() )
1975 wxLogTrace(
traceGit, wxS(
"updateGitStatusIcons: Failed to acquire lock for git status icon update" ) );
1982 wxLogTrace(
traceGit, wxS(
"updateGitStatusIcons: Git is disabled or tree control is null" ) );
1986 std::stack<wxTreeItemId> items;
1989 while( !items.empty() )
1991 wxTreeItemId current = items.top();
1996 wxTreeItemIdValue cookie;
1997 wxTreeItemId child =
m_TreeProject->GetFirstChild( current, cookie );
1999 while( child.IsOk() )
2001 items.push( child );
2005 m_TreeProject->SetItemState( child,
static_cast<int>( it->second ) );
2020 wxString filename = wxFileNameFromPath( rootItem->
GetFileName() );
2026 wxLogTrace(
traceGit, wxS(
"updateGitStatusIcons: Git status icons updated" ) );
2032 wxLogTrace(
traceGit, wxS(
"updateTreeCache: Updating tree cache" ) );
2036 if( !lock.owns_lock() )
2038 wxLogTrace(
traceGit, wxS(
"updateTreeCache: Failed to acquire lock for tree cache update" ) );
2044 wxLogTrace(
traceGit, wxS(
"updateTreeCache: Tree control is null" ) );
2055 std::stack<wxTreeItemId> items;
2058 while( !items.empty() )
2070 gitAbsPath.Replace( wxS(
"\\" ), wxS(
"/" ) );
2074 wxTreeItemIdValue cookie;
2075 wxTreeItemId child =
m_TreeProject->GetFirstChild( kid, cookie );
2077 while( child.IsOk() )
2079 items.push( child );
2088 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: Updating git status icons" ) );
2089#if defined( _WIN32 )
2112 if( !lock1.owns_lock() || !lock2.owns_lock() )
2114 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: Failed to acquire locks for git status icon update" ) );
2120 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: No git repository found" ) );
2126 std::unique_lock<std::mutex> gitLock(
m_TreeProject->GitCommon()->m_gitActionMutex, std::try_to_lock );
2128 if( !gitLock.owns_lock() )
2130 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: Failed to acquire git action mutex" ) );
2137 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: Cancelled" ) );
2144 wxFileName rootFilename(
Prj().GetProjectFullName() );
2147 wxFileName relative = rootFilename;
2148 relative.MakeRelativeTo( repoWorkDir );
2149 wxString pathspecStr = relative.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR );
2152 pathspecStr.Replace( wxS(
"\\" ), wxS(
"/" ) );
2156 auto fileStatusMap = statusHandler.
GetFileStatus( pathspecStr );
2157 auto [localChanges, remoteChanges] =
m_TreeProject->GitCommon()->GetDifferentFiles();
2160 bool updated =
false;
2163 for(
const auto& [absPath, fileStatus] : fileStatusMap )
2168 wxLogTrace(
traceGit, wxS(
"File '%s' not found in tree cache" ), absPath );
2172 auto [it, inserted] =
m_gitStatusIcons.try_emplace( iter->second, fileStatus.status );
2173 if( inserted || it->second != fileStatus.status )
2175 it->second = fileStatus.status;
2181 wxLogTrace(
traceGit, wxS(
"updateGitStatusIconMap: Updated git status icons" ) );
2201 if( repo ==
nullptr )
2203 wxMessageBox(
_(
"The selected directory is not a Git project." ) );
2215 std::map<wxString, int> modifiedFiles;
2216 std::set<wxString> selected_files;
2221 selected_files.emplace( item->GetFileName() );
2226 for(
const auto& [absPath, fileStatus] : fileStatusMap )
2236 wxFileName fn( absPath );
2239 wxString relativePath = absPath;
2240 if( relativePath.StartsWith( repoWorkDir ) )
2242 relativePath = relativePath.Mid( repoWorkDir.length() );
2244 relativePath.Replace( wxS(
"\\" ), wxS(
"/" ) );
2250 if( !absPath.StartsWith( projectPath ) )
2265 if( fn.GetPath().Contains(
Prj().GetProjectName() + wxT(
"-backups" ) ) )
2270 modifiedFiles.emplace( relativePath, fileStatus.gitStatus );
2272 else if( selected_files.count( absPath ) )
2274 modifiedFiles.emplace( relativePath, fileStatus.gitStatus );
2283 if( ret != wxID_OK )
2290 wxMessageBox(
_(
"Discarding commit due to empty commit message." ) );
2296 wxMessageBox(
_(
"Discarding commit due to empty file selection." ) );
2306 wxMessageBox( wxString::Format(
_(
"Failed to create commit: %s" ),
2311 wxLogTrace(
traceGit, wxS(
"Created commit" ) );
2331 for(
const auto& [filePath, fileStatus] : fileStatusMap )
2333 if( filePath.EndsWith( aFile ) || filePath == aFile )
2347 wxLogTrace(
traceGit,
"Syncing project" );
2352 wxLogTrace(
traceGit,
"sync: No git repository found" );
2419 wxLogTrace(
traceGit,
"onGitSyncTimer" );
2433 wxLogTrace(
traceGit,
"onGitSyncTimer: No git repository found" );
2440 wxLogTrace(
traceGit,
"onGitSyncTimer: Cancelled" );
2454 wxLogTrace(
traceGit,
"onGitSyncTimer: Restarting git sync timer" );
2477 wxLogTrace(
traceGit,
"onGitStatusTimer" );
wxBitmap KiBitmap(BITMAPS aBitmap, int aHeightTag)
Construct a wxBitmap from an image identifier Returns the image from the active theme if the image ha...
BITMAP_STORE * GetBitmapStore()
static const ADVANCED_CFG & GetCfg()
Get the singleton instance's config, which is shared by all consumers.
void ThemeChanged()
Notifies the store that the icon theme has been changed by the user, so caches must be invalidated.
wxString GetCommitMessage() const
wxString GetAuthorEmail() const
std::vector< wxString > GetSelectedFiles() const
wxString GetAuthorName() const
KIGIT_COMMON::GIT_CONN_TYPE GetRepoType() const
wxString GetRepoSSHPath() const
wxString GetRepoURL() const
wxString GetUsername() const
wxString GetPassword() const
void SetSkipButtonLabel(const wxString &aLabel)
wxString GetBranchName() const
virtual bool IsLibraryAvailable()=0
BranchResult SwitchToBranch(const wxString &aBranchName)
Switch to the specified branch.
CommitResult PerformCommit(const std::vector< wxString > &aFiles, const wxString &aMessage, const wxString &aAuthorName, const wxString &aAuthorEmail)
wxString GetErrorString() const
GitUserConfig GetUserConfig()
Get user configuration (name and email) from git config Falls back to common settings if not found in...
bool IsRepository(const wxString &aPath)
Check if a directory is already a git repository.
InitResult InitializeRepository(const wxString &aPath)
Initialize a new git repository in the specified directory.
bool SetupRemote(const RemoteConfig &aConfig)
Set up a remote for the repository.
void SetProgressReporter(std::unique_ptr< WX_PROGRESS_REPORTER > aProgressReporter)
bool PerformFetch(bool aSkipLock=false)
void PerformRemoveFromIndex()
bool PerformResolveConflict()
wxString GetCurrentBranchName()
Get the current branch name.
void UpdateRemoteStatus(const std::set< wxString > &aLocalChanges, const std::set< wxString > &aRemoteChanges, std::map< wxString, FileStatus > &aFileStatus)
Get status for modified files based on local/remote changes.
wxString GetWorkingDirectory()
Get the repository working directory path.
bool HasChangedFiles()
Check if the repository has any changed files.
std::map< wxString, FileStatus > GetFileStatus(const wxString &aPathspec=wxEmptyString)
Get detailed file status for all files in the specified path.
The main KiCad project manager frame.
void OnChangeWatchedPaths(wxCommandEvent &aEvent)
Called by sending a event with id = ID_INIT_WATCHED_PATHS rebuild the list of watched paths.
PROJECT_TREE_PANE * m_projectTreePane
static git_repository * GetRepositoryForFile(const char *aFilename)
Discover and open the repository that contains the given file.
static wxString ComputeSymlinkPreservingWorkDir(const wxString &aUserProjectPath, const wxString &aCanonicalWorkDir)
Compute a working directory path that preserves symlinks from the user's project path.
static bool RemoveVCS(git_repository *&aRepo, const wxString &aProjectPath=wxEmptyString, bool aRemoveGitDir=false, wxString *aErrors=nullptr)
Remove version control from a directory by freeing the repository and optionally removing the ....
static int CreateBranch(git_repository *aRepo, const wxString &aBranchName)
Create a new branch based on HEAD.
wxString GetGitRootDirectory() const
bool HasPushAndPullRemote() const
bool HasLocalCommits() const
wxString GetErrorString()
git_repository * GetRepo() const
Get a pointer to the git repository.
void SetEllipsedTextField(const wxString &aText, int aFieldId)
Set the text in a field using wxELLIPSIZE_MIDDLE option to adjust the text size to the field size.
static wxString GetDefaultUserProjectsPath()
Gets the default path we point users to create projects.
virtual COMMON_SETTINGS * GetCommonSettings() const
virtual const wxString & GetTextEditor(bool aCanShowFileChooser=true)
Return the path to the preferred text editor application.
The project local settings are things that are attached to a particular project, but also might be pa...
bool m_GitIntegrationDisabled
If true, KiCad will not use Git integration for this project even if a .git directory exists.
bool SaveToFile(const wxString &aDirectory="", bool aForce=false) override
Calls Store() and then writes the contents of the JSON document to a file.
wxString m_GitRepoUsername
Handle one item (a file or a directory name) for the tree file.
void SetRootFile(bool aValue)
const wxString & GetFileName() const
void SetPopulated(bool aValue)
TREE_FILE_TYPE GetType() const
const wxString GetDir() const
void Activate(PROJECT_TREE_PANE *aTreePrjFrame)
PROJECT_TREE_PANE Window to display the tree files.
PROJECT_TREE_ITEM * m_selectedItem
std::unordered_map< wxString, wxTreeItemId > m_gitTreeCache
void onGitFetch(wxCommandEvent &event)
Fetch the latest changes from the git repository.
std::map< wxTreeItemId, KIGIT_COMMON::GIT_STATUS > m_gitStatusIcons
void onGitInitializeProject(wxCommandEvent &event)
Initialize a new git repository in the current project directory.
void onGitSyncProject(wxCommandEvent &event)
Sync the current project with the git repository.
void onDeleteFile(wxCommandEvent &event)
Function onDeleteFile Delete the selected file or directory in the tree project.
void onGitRemoveVCS(wxCommandEvent &event)
Remove the git repository from the current project directory.
void EmptyTreePrj()
Delete all m_TreeProject entries.
void FileWatcherReset()
Reinit the watched paths Should be called after opening a new project to rebuild the list of watched ...
wxString m_gitCurrentBranchName
std::vector< PROJECT_TREE_ITEM * > GetSelectedData()
Function GetSelectedData return the item data from item currently selected (highlighted) Note this is...
void onOpenDirectory(wxCommandEvent &event)
Function onOpenDirectory Handles the right-click menu for opening a directory in the current system f...
void onGitResolveConflict(wxCommandEvent &event)
Resolve conflicts in the git repository.
void onFileSystemEvent(wxFileSystemWatcherEvent &event)
called when a file or directory is modified/created/deleted The tree project is modified when a file ...
wxFileSystemWatcher * m_watcher
void onRight(wxTreeEvent &Event)
Called on a right click on an item.
void onGitCommit(wxCommandEvent &event)
Commit the current project saved changes to the git repository.
void onSelect(wxTreeEvent &Event)
Called on a double click on an item.
PROJECT_TREE * m_TreeProject
PROJECT_TREE_PANE(KICAD_MANAGER_FRAME *parent)
KICAD_MANAGER_FRAME * m_Parent
std::future< void > m_gitSyncTask
void onExpand(wxTreeEvent &Event)
Called on a click on the + or - button of an item with children.
void onGitSyncTimer(wxTimerEvent &event)
void onIdle(wxIdleEvent &aEvent)
Idle event handler, used process the selected items at a point in time when all other events have bee...
void updateTreeCache()
Updates the map of the wxtreeitemid to the name of each file for use in the thread.
void gitStatusTimerHandler()
std::mutex m_gitStatusMutex
void onGitRevertLocal(wxCommandEvent &event)
Revert the local repository to the last commit.
void onGitPullProject(wxCommandEvent &event)
Pull the latest changes from the git repository.
static wxString GetFileExt(TREE_FILE_TYPE type)
friend class PROJECT_TREE_ITEM
void onGitRemoveFromIndex(wxCommandEvent &event)
Remove a file from the git index.
wxTreeItemId findSubdirTreeItem(const wxString &aSubDir)
Function findSubdirTreeItem searches for the item in tree project which is the node of the subdirecto...
void ReCreateTreePrj()
Create or modify the tree showing project file names.
void onThemeChanged(wxSysColourChangedEvent &aEvent)
void onRunSelectedJobsFile(wxCommandEvent &event)
Run a selected jobs file.
void onGitCompare(wxCommandEvent &event)
Compare the current project to a different branch in the git repository.
void onGitStatusTimer(wxTimerEvent &event)
void shutdownFileWatcher()
Shutdown the file watcher.
std::mutex m_gitTreeCacheMutex
wxTreeItemId addItemToProjectTree(const wxString &aName, const wxTreeItemId &aParent, std::vector< wxString > *aProjectNames, bool aRecurse)
Function addItemToProjectTree.
bool hasChangedFiles()
Returns true if the current project has any uncommitted changes.
void onOpenSelectedFileWithTextEditor(wxCommandEvent &event)
Function onOpenSelectedFileWithTextEditor Call the text editor to open the selected file in the tree ...
void onGitAddToIndex(wxCommandEvent &event)
Add a file to the git index.
void updateGitStatusIcons()
Updates the icons shown in the tree project to reflect the current git status.
bool m_gitIconsInitialized
std::future< void > m_gitStatusIconTask
void updateGitStatusIconMap()
This is a threaded call that will change the map of git status icons for use in the main thread.
PROJECT_TREE_ITEM * GetItemIdData(wxTreeItemId aId)
Function GetItemIdData return the item data corresponding to a wxTreeItemId identifier.
void onGitSwitchBranch(wxCommandEvent &event)
Switch to a different branch in the git repository.
void onCreateNewDirectory(wxCommandEvent &event)
Function onCreateNewDirectory Creates a new subdirectory inside the current kicad project directory t...
void onSwitchToSelectedProject(wxCommandEvent &event)
Switch to a other project selected from the tree project (by selecting an other .pro file inside the ...
void onPaint(wxPaintEvent &aEvent)
We don't have uniform borders so we have to draw them ourselves.
void onRenameFile(wxCommandEvent &event)
Function onRenameFile Rename the selected file or directory in the tree project.
void onGitPushProject(wxCommandEvent &event)
Push the current project changes to the git repository.
bool canFileBeAddedToVCS(const wxString &aFilePath)
Returns true if the file has already been added to the repository or false if it has not been added y...
std::vector< wxString > m_filters
PROJECT_TREE This is the class to show (as a tree) the files in the project directory.
virtual const wxString GetProjectPath() const
Return the full path of the project.
virtual PROJECT_LOCAL_SETTINGS & GetLocalSettings() const
void DisplayInfoMessage(wxWindow *aParent, const wxString &aMessage, const wxString &aExtraInfo)
Display an informational message box with aMessage.
void DisplayErrorMessage(wxWindow *aParent, const wxString &aText, const wxString &aExtraInfo)
Display an error message with aMessage.
void DisplayError(wxWindow *aParent, const wxString &aText)
Display an error or warning message box with aMessage.
This file is part of the common library.
EVT_MENU_RANGE(ID_GERBVIEW_DRILL_FILE1, ID_GERBVIEW_DRILL_FILEMAX, GERBVIEW_FRAME::OnDrlFileHistory) EVT_MENU_RANGE(ID_GERBVIEW_ZIP_FILE1
int ExecuteFile(const wxString &aEditorName, const wxString &aFileName, wxProcess *aCallback, bool aFileForKicad)
Call the executable file aEditorName with the parameter aFileName.
GIT_BACKEND * GetGitBackend()
int m_GitIconRefreshInterval
The interval in milliseconds to refresh the git icons in the project tree.
static const std::string LegacySchematicFileExtension
static const std::string HtmlFileExtension
static const wxString GerberFileExtensionsRegex
static const std::string NetlistFileExtension
static const std::string GerberJobFileExtension
static const std::string ReportFileExtension
static const std::string LockFileExtension
static const std::string ProjectFileExtension
static const std::string FootprintPlaceFileExtension
static const std::string LegacyPcbFileExtension
static const std::string LegacyProjectFileExtension
static const std::string KiCadSchematicFileExtension
static const std::string LegacySymbolLibFileExtension
static const std::string LockFilePrefix
static const std::string CsvFileExtension
static const std::string KiCadSymbolLibFileExtension
static const std::string SpiceFileExtension
static const std::string PdfFileExtension
static const std::string TextFileExtension
static const std::string DrawingSheetFileExtension
static const std::string BackupFileSuffix
static const std::string KiCadJobSetFileExtension
static const std::string FootprintAssignmentFileExtension
static const std::string SVGFileExtension
static const std::string DrillFileExtension
static const std::string DesignRulesFileExtension
static const std::string MarkdownFileExtension
static const std::string KiCadFootprintFileExtension
static const std::string ArchiveFileExtension
static const std::string KiCadPcbFileExtension
const wxChar *const tracePathsAndFiles
Flag to enable path and file name debug output.
const wxChar *const traceGit
Flag to enable Git debugging output.
bool LaunchExternal(const wxString &aPath)
Launches the given file or folder in the host OS.
This file contains miscellaneous commonly used macros and functions.
#define KI_FALLTHROUGH
The KI_FALLTHROUGH macro is to be used when switch statement cases should purposely fallthrough from ...
KICOMMON_API wxMenuItem * AddMenuItem(wxMenu *aMenu, int aId, const wxString &aText, const wxBitmapBundle &aImage, wxItemKind aType=wxITEM_NORMAL)
Create and insert a menu item with an icon into aMenu.
bool contains(const _Container &__container, _Value __value)
Returns true if the container contains the given value.
wxDECLARE_EVENT(wxCUSTOM_PANEL_SHOWN_EVENT, wxCommandEvent)
PGM_BASE & Pgm()
The global program "get" accessor.
#define NAMELESS_PROJECT
default name for nameless projects
project_tree_ids
The frame that shows the tree list of files and subdirectories inside the working directory.
@ ID_PROJECT_SWITCH_TO_OTHER
@ ID_GIT_REMOVE_FROM_INDEX
@ ID_GIT_RESOLVE_CONFLICT
@ ID_GIT_INITIALIZE_PROJECT
std::vector< wxString > getProjects(const wxDir &dir)
static const wxChar * s_allowedExtensionsToList[]
#define wxFileSystemWatcher
#define TO_UTF8(wxstring)
Convert a wxString to a UTF8 encoded C string for all wxWidgets build modes.
KIGIT_COMMON::GIT_CONN_TYPE connType
wxString result
Test unit parsing edge cases and error handling.
thread_pool & GetKiCadThreadPool()
Get a reference to the current thread pool.
BS::priority_thread_pool thread_pool
wxLogTrace helper definitions.
Definition of file extensions used in Kicad.