admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dry run (fixes #22)

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-08-26 16:12:59 +03:00
parent 043a2bc89f
commit 71c071d5db
10 changed files with 297 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/git.rs
View File

@@ -1,3 +1,4 @@
use super::executor::Executor;
use super::terminal::Terminal;
use super::utils::{which, Check};
use failure::Error;
@@ -34,8 +35,7 @@ impl Git {
if let Some(git) = &self.git {
let output = Command::new(&git)
.arg("rev-parse")
.arg("--show-toplevel")
.args(&["rev-parse", "--show-toplevel"])
.current_dir(path)
.output();
@@ -57,7 +57,7 @@ impl Git {
None
}
pub fn pull<P: AsRef<Path>>(&self, path: P, terminal: &mut Terminal) -> Option<(String, bool)> {
pub fn pull<P: AsRef<Path>>(&self, path: P, terminal: &mut Terminal, dry_run: bool) -> Option<(String, bool)> {
let path = path.as_ref();
terminal.print_separator(format!("Pulling {}", path.display()));
@@ -65,20 +65,15 @@ impl Git {
let git = self.git.as_ref().unwrap();
let success = || -> Result<(), Error> {
Command::new(git)
.arg("pull")
.arg("--rebase")
.arg("--autostash")
Executor::new(git, dry_run)
.args(&["pull", "--rebase", "--autostash"])
.current_dir(&path)
.spawn()?
.wait()?
.check()?;
Command::new(git)
.arg("submodule")
.arg("update")
.arg("--init")
.arg("--recursive")
Executor::new(git, dry_run)
.args(&["submodule", "update", "--init", "--recursive"])
.current_dir(&path)
.spawn()?
.wait()?