Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-14 23:12:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Git status: Detect staged and non-staged for a single file and generate two different statuses.

Browse Source 
Generate events for row mouse clicks.
This commit is contained in:
Martín Lucas Golini
2024-01-26 09:46:00 -03:00
parent dd4de3e7b2
commit bed3581364
5 changed files with 113 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/tools/ecode/plugins/git/git.cpp
View File

@@ -478,82 +478,21 @@ Git::Status Git::status( bool recurseSubmodules, const std::string& projectDir )
static constexpr auto STATUS_CMD = "-c color.status=never status -b -u -s";
Status s;
std::string buf;
if ( EXIT_SUCCESS != git( DIFF_CMD, projectDir, buf ) )
return s;
getSubModules( projectDir );
LuaPattern subModulePattern( "^Entering '(.*)'" );
auto parseNumStat = [&s, &buf, &projectDir, this, &subModulePattern]() {
LuaPattern pattern( "(%d+)%s+(%d+)%s+(.+)" );
std::string subModulePath = "";
readAllLines( buf, [&]( const std::string_view& line ) {
LuaPattern::Range matches[4];
if ( subModulePattern.matches( line.data(), 0, matches, line.size() ) ) {
subModulePath = String::trim(
line.substr( matches[1].start, matches[1].end - matches[1].start ) );
FileSystem::dirAddSlashAtEnd( subModulePath );
} else if ( pattern.matches( line.data(), 0, matches, line.size() ) ) {
auto inserted = line.substr( matches[1].start, matches[1].end - matches[1].start );
auto deleted = line.substr( matches[2].start, matches[2].end - matches[2].start );
auto file = line.substr( matches[3].start, matches[3].end - matches[3].start );
int inserts;
int deletes;
if ( String::fromString( inserts, inserted ) &&
String::fromString( deletes, deleted ) && ( inserts || deletes ) ) {
auto filePath = subModulePath + file;
auto repo = repoName( filePath, projectDir );
auto repoIt = s.files.find( repo );
GitStatusReport status = { GitStatus::NotSet, GitStatusType::Untracked,
GitStatusChar::Untracked };
if ( repoIt != s.files.end() ) {
bool found = false;
for ( auto& fileIt : repoIt->second ) {
if ( fileIt.file == filePath ) {
fileIt.inserts = inserts;
fileIt.deletes = deletes;
found = true;
break;
}
}
if ( !found ) {
s.files[repo].push_back(
{ std::move( filePath ), inserts, deletes, status } );
}
} else {
s.files.insert(
{ repo, { { std::move( filePath ), inserts, deletes, status } } } );
}
s.totalInserts += inserts;
s.totalDeletions += deletes;
}
}
} );
};
parseNumStat();
git( DIFF_STAGED_CMD, projectDir, buf );
parseNumStat();
bool submodules = hasSubmodules( projectDir );
if ( recurseSubmodules && submodules ) {
gitSubmodules( DIFF_CMD, projectDir, buf );
parseNumStat();
gitSubmodules( DIFF_STAGED_CMD, projectDir, buf );
parseNumStat();
}
LuaPattern subModulePattern( "^Entering '(.*)'" );
bool modifiedSubmodule = false;
auto parseStatus = [&s, &buf, &modifiedSubmodule, &projectDir, this, &subModulePattern]() {
std::string subModulePath = "";
LuaPattern pattern( "^([mMARTUD?%s][mMARTUD?%s])%s(.*)" );
size_t changesCount = countLines( buf );
if ( changesCount > 1000 )
return;
readAllLines( buf, [&]( const std::string_view& line ) {
LuaPattern::Range matches[3];
if ( subModulePattern.matches( line.data(), 0, matches, line.size() ) ) {
@@ -576,11 +515,14 @@ Git::Status Git::status( bool recurseSubmodules, const std::string& projectDir )
return;
}
bool isStagedAndModified =
status.type == GitStatusType::Staged && statusStr[1] != ' ';
auto filePath = subModulePath + file;
auto repo = repoName( filePath, projectDir );
auto repoIt = s.files.find( repo );
bool found = false;
if ( repoIt != s.files.end() ) {
bool found = false;
for ( auto& fileIt : repoIt->second ) {
if ( fileIt.file == filePath ) {
fileIt.report = status;
@@ -588,16 +530,23 @@ Git::Status Git::status( bool recurseSubmodules, const std::string& projectDir )
break;
}
}
if ( !found )
}
if ( !found ) {
s.files[repo].push_back( { std::move( filePath ), 0, 0, status } );
if ( isStagedAndModified ) {
status.type = GitStatusType::Changed;
s.files[repo].push_back( { std::move( filePath ), 0, 0, status } );
} else {
s.files.insert( { repo, { { std::move( filePath ), 0, 0, status } } } );
}
}
}
} );
};
git( STATUS_CMD, projectDir, buf );
if ( EXIT_SUCCESS != git( STATUS_CMD, projectDir, buf ) )
return s;
parseStatus();
if ( modifiedSubmodule && recurseSubmodules && submodules ) {
@@ -605,6 +554,70 @@ Git::Status Git::status( bool recurseSubmodules, const std::string& projectDir )
parseStatus();
}
auto parseNumStat = [&s, &buf, &projectDir, this, &subModulePattern]( bool isStaged ) {
LuaPattern pattern( "(%d+)%s+(%d+)%s+(.+)" );
std::string subModulePath = "";
readAllLines( buf, [&]( const std::string_view& line ) {
LuaPattern::Range matches[4];
if ( subModulePattern.matches( line.data(), 0, matches, line.size() ) ) {
subModulePath = String::trim(
line.substr( matches[1].start, matches[1].end - matches[1].start ) );
FileSystem::dirAddSlashAtEnd( subModulePath );
} else if ( pattern.matches( line.data(), 0, matches, line.size() ) ) {
auto inserted = line.substr( matches[1].start, matches[1].end - matches[1].start );
auto deleted = line.substr( matches[2].start, matches[2].end - matches[2].start );
auto file = line.substr( matches[3].start, matches[3].end - matches[3].start );
int inserts;
int deletes;
if ( String::fromString( inserts, inserted ) &&
String::fromString( deletes, deleted ) && ( inserts || deletes ) ) {
auto filePath = subModulePath + file;
auto repo = repoName( filePath, projectDir );
auto repoIt = s.files.find( repo );
GitStatusReport status = { GitStatus::NotSet, GitStatusType::Untracked,
GitStatusChar::Untracked };
bool found = false;
if ( repoIt != s.files.end() ) {
for ( auto& fileIt : repoIt->second ) {
if ( fileIt.file == filePath ) {
if ( isStaged && fileIt.report.type != Git::GitStatusType::Staged )
continue;
if ( !isStaged && fileIt.report.type == Git::GitStatusType::Staged )
continue;
fileIt.inserts = inserts;
fileIt.deletes = deletes;
found = true;
break;
}
}
}
if ( !found ) {
s.files[repo].push_back(
{ std::move( filePath ), inserts, deletes, status } );
}
s.totalInserts += inserts;
s.totalDeletions += deletes;
}
}
} );
};
if ( EXIT_SUCCESS != git( DIFF_CMD, projectDir, buf ) )
return s;
parseNumStat( false );
git( DIFF_STAGED_CMD, projectDir, buf );
parseNumStat( true );
if ( recurseSubmodules && submodules ) {
gitSubmodules( DIFF_CMD, projectDir, buf );
parseNumStat( false );
gitSubmodules( DIFF_STAGED_CMD, projectDir, buf );
parseNumStat( true );
}
for ( auto& [_, repo] : s.files ) {
for ( auto& val : repo ) {
if ( val.report.symbol == GitStatusChar::Added && val.inserts == 0 ) {