mo2/mob
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/mob.git synced 2026-07-27 14:07:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

tasks will now delete their own git folders

Browse Source 
git will check for uncommitted changes before deleting
added --ignore-uncommitted-changes
This commit is contained in:
isanae
2020-05-25 02:19:39 -04:00
parent 863d8be99e
commit ac3fa98e51
18 changed files with 177 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/git.cpp
+52 -18
View File
@@ -12,6 +12,32 @@ git::git(ops o)
{
}
void git::delete_directory(const context& cx, const fs::path& p)
{
git g(no_op);
g.root(p);
if (!conf::ignore_uncommitted())
{
if (g.has_uncommitted_changes())
{
cx.bail_out(context::redownload,
"will not delete {}, has uncommitted changes; "
"see --ignore-uncommitted-changes", p);
}
if (g.has_stashed_changes())
{
cx.bail_out(context::redownload,
"will not delete {}, has stashed changes; "
"see --ignore-uncommitted-changes", p);
}
}
cx.trace(context::redownload, "deleting directory controlled by git{}", p);
op::delete_directory(cx, p, op::optional);
}
void git::set_credentials(
const fs::path& repo,
const std::string& username, const std::string& email)
@@ -215,30 +241,14 @@ void git::do_add_submodule()
execute_and_join();
}
void git::delete_root_if_needed()
{
if (conf::redownload() || conf::reextract())
{
if (fs::exists(root_))
{
cx().trace(context::rebuild, "deleting directory controlled by git");
op::delete_directory(cx(), root_, op::optional);
}
}
}
void git::do_clone_or_pull()
{
delete_root_if_needed();
if (!do_clone())
do_pull();
}
bool git::do_clone()
{
delete_root_if_needed();
const fs::path dot_git = root_ / ".git";
if (fs::exists(dot_git))
{
@@ -278,8 +288,6 @@ bool git::do_clone()
void git::do_pull()
{
delete_root_if_needed();
if (revert_ts_)
do_revert_ts();
@@ -482,6 +490,32 @@ bool git::is_repo()
return (execute_and_join() == 0);
}
bool git::has_uncommitted_changes()
{
process_ = make_process()
.flags(process::allow_failure)
.stdout_flags(process::keep_in_string)
.arg("status")
.arg("-s")
.arg("--porcelain")
.cwd(root_);
execute_and_join();
return (process_.stdout_string() != "");
}
bool git::has_stashed_changes()
{
process_ = make_process()
.flags(process::allow_failure)
.stderr_level(context::level::trace)
.arg("stash show")
.cwd(root_);
return (execute_and_join() == 0);
}
void git::init()
{
process_ = make_process()