Added smart pull to parent git checker

main
Michal 2 years ago
parent 1cf7d8f546
commit 2549b48a1e

2
Cargo.lock generated

@ -4,7 +4,7 @@ version = 3
[[package]] [[package]]
name = "Malachite" name = "Malachite"
version = "1.4.0" version = "2.0.0"
dependencies = [ dependencies = [
"clap", "clap",
"colored", "colored",

@ -30,11 +30,13 @@ fn main() {
if Path::exists("../.git".as_ref()) { if Path::exists("../.git".as_ref()) {
info!("Parent directory is a git directory, pulling latest mlc.toml. It is advised you run mlc pull/update in all malachite directories"); info!("Parent directory is a git directory, pulling latest mlc.toml. It is advised you run mlc pull/update in all malachite directories");
let config = read_cfg(verbose);
let dir = env::current_dir().unwrap(); let dir = env::current_dir().unwrap();
env::set_current_dir("../").unwrap(); env::set_current_dir("../").unwrap();
log!(verbose, "Current dir: {:?}", env::current_dir().unwrap()); log!(verbose, "Current dir: {:?}", env::current_dir().unwrap());
if read_cfg(args.verbose).smart_pull { if config.smart_pull {
log!(verbose, "Smart pull"); log!(verbose, "Smart pull");
Command::new("git") Command::new("git")
.args(&["remote", "update"]) .args(&["remote", "update"])
@ -47,6 +49,7 @@ fn main() {
.unwrap() .unwrap()
.contains("Your branch is behind") .contains("Your branch is behind")
{ {
info!("Branch out of date, pulling changes");
Command::new("git") Command::new("git")
.arg("pull") .arg("pull")
.spawn() .spawn()
@ -64,8 +67,9 @@ fn main() {
.unwrap() .unwrap()
.wait() .wait()
.unwrap(); .unwrap();
env::set_current_dir(dir).unwrap();
} }
env::set_current_dir(dir).unwrap();
log!(verbose, "Current dir: {:?}", env::current_dir().unwrap());
} }
match args.subcommand.unwrap_or(Operation::Clone) { match args.subcommand.unwrap_or(Operation::Clone) {

@ -36,6 +36,7 @@ fn do_the_pulling(repos: Vec<String>, verbose: bool, smart_pull: bool, build_on_
.to_string() .to_string()
.contains("Your branch is behind") .contains("Your branch is behind")
{ {
info!("Branch out of date, pulling changes");
Command::new("git") Command::new("git")
.arg("pull") .arg("pull")
.spawn() .spawn()

Loading…
Cancel
Save