git: Add push() builder

src/git.rs

@@ -8,13 +8,15 @@ mod branch;
 mod cherry_pick;
 mod fetch;
 mod log;
+mod push;
 mod rev_list;
 mod switch;
 
 pub use branch::{branch, StartingPoint};
 pub use cherry_pick::cherry_pick;
 pub use fetch::fetch;
 pub use log::log;
+pub use push::push;
 pub use rev_list::rev_list;
 pub use switch::switch;
 
@@ -49,6 +51,7 @@ impl Format {
 
 pub struct Branch<T: Into<String>>(pub T);
 pub struct Commit<T: Into<String>>(pub T);
+pub struct Remote<T: Into<String>>(pub T);
 
 pub trait GitCmd: Sized {
     // FIXME: Spawn needs to check the exit code and encode that in its return type - non-zero should be Err

src/git/push.rs

@@ -0,0 +1,40 @@
+use std::process::Command;
+
+use super::{Branch, GitCmd, Remote};
+
+#[derive(Default)]
+pub struct Push {
+    upstream: Option<String>,
+    refspecs: Vec<String>,
+}
+
+pub fn push() -> Push {
+    Push::default()
+}
+
+impl Push {
+    pub fn upstream<T: Into<String>>(self, Remote(upstream): Remote<T>) -> Push {
+        Push {
+            upstream: Some(upstream.into()),
+            ..self
+        }
+    }
+
+    pub fn branch<T: Into<String>>(self, Branch(branch): Branch<T>) -> Push {
+        let mut refspecs = self.refspecs;
+        refspecs.push(branch.into());
+
+        Push { refspecs, ..self }
+    }
+}
+
+impl GitCmd for Push {
+    fn setup(self, cmd: &mut Command) {
+        cmd.arg("push");
+
+        self.upstream.map(|remote| cmd.arg("-u").arg(remote));
+        self.refspecs.iter().for_each(|r| {
+            cmd.arg(r);
+        });
+    }
+}

src/upstream.rs

@@ -196,10 +196,11 @@ pub async fn prepare_commits(
     })?;
 
     info!("pushing branch...");
-    std::process::Command::new("git")
-        .args(["push", "-u", "origin", "HEAD"])
-        .spawn()?
-        .wait_with_output()?;
+    git::push()
+        .upstream(git::Remote("origin"))
+        // TODO: Rename? This should be .refspec()?
+        .branch(git::Branch("HEAD"))
+        .spawn()?;
 
     if let Some(token) = token {
         info!("creating pull-request...");