Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 19:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

More git plugin refactor and some fixes.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-01-25 01:45:46 -03:00
parent 3893d137b7
commit 71089a5298
5 changed files with 107 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tools/ecode/plugins/git/git.hpp
View File

@@ -99,18 +99,25 @@ class Git {
SMM = git_xy( 'm', ANY ), // staged modified submodule
};
struct GitStatusReport {
GitStatus status = GitStatus::NotSet;
GitStatusType type = GitStatusType::Untracked;
GitStatusChar symbol = GitStatusChar::Unknown;
bool operator==( const GitStatusReport& other ) const {
return status == other.status && symbol == other.symbol && type == other.type;
}
};
struct DiffFile {
std::string file;
int inserts{ 0 };
int deletes{ 0 };
GitStatus status;
GitStatusType statusType;
GitStatusChar statusChar{ GitStatusChar::Unknown };
GitStatusReport report;
bool operator==( const DiffFile& other ) const {
return file == other.file && inserts == other.inserts && deletes == other.deletes &&
status == other.status && statusType == other.statusType &&
statusChar == other.statusChar;
report == other.report;
}
};
@@ -199,6 +206,8 @@ class Git {
std::string branch( const std::string& projectDir = "" );
std::unordered_map<std::string, std::string> branches( const std::vector<std::string>& repos );
Status status( bool recurseSubmodules, const std::string& projectDir = "" );
Result add( std::vector<std::string> files, const std::string& projectDir = "" );
@@ -279,19 +288,14 @@ class Git {
Result gitSimple( const std::string& cmd, const std::string& projectDir );
GitStatusReport statusFromShortStatusStr( const std::string_view& statusStr );
protected:
std::string mGitPath;
std::string mProjectPath;
std::string mGitFolder;
std::vector<std::string> mSubModules;
bool mSubModulesUpdated{ false };
struct GitStatusReport {
GitStatus gitStatus = GitStatus::NotSet;
GitStatusChar gitStatusChar = GitStatusChar::Unknown;
GitStatusType gitStatusType = GitStatusType::Untracked;
};
GitStatusReport statusFromShortStatusStr( const std::string_view& statusStr );
};
} // namespace ecode