Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Git plugin: Allow to silence the logs. Auto-Hide treeview scrollbars. Fix file diff when file is staged.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-01-28 14:00:12 -03:00
parent 1399d23770
commit eb825f668e
5 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,8 +70,11 @@ int Git::git( const std::string& args, const std::string& projectDir, std::strin
p.readAllStdOut( buf );
int retCode = 0;
p.join( &retCode );
Log::info( "GitPlugin cmd in %s (%d): %s %s", clock.getElapsedTime().toString(), retCode,
mGitPath, args );
if ( mLogLevel == LogLevel::Info ||
( mLogLevel >= LogLevel::Warning && retCode != EXIT_SUCCESS ) ) {
Log::instance()->writef( mLogLevel, "GitPlugin cmd in %s (%d): %s %s",
clock.getElapsedTime().toString(), retCode, mGitPath, args );
}
return retCode;
}
@@ -219,8 +222,9 @@ Git::Result Git::reset( std::vector<std::string> files, const std::string& proje
return gitSimple( String::format( "reset -q HEAD -- %s", asList( files ) ), projectDir );
}
Git::Result Git::diff( const std::string& file, const std::string& projectDir ) {
return gitSimple( String::format( "diff \"%s\"", file ), projectDir );
Git::Result Git::diff( const std::string& file, bool isStaged, const std::string& projectDir ) {
return gitSimple( String::format( "diff%s \"%s\"", isStaged ? " --staged" : "", file ),
projectDir );
}
Git::Result Git::createBranch( const std::string& branchName, bool _checkout,