Compare commits
1 commit
1fa3aae2c0
...
750e194318
| Author | SHA1 | Date | |
|---|---|---|---|
| 750e194318 |
3 changed files with 1 additions and 84 deletions
|
|
@ -45,15 +45,6 @@ enum Commands {
|
||||||
issue_id: String,
|
issue_id: String,
|
||||||
description: Option<String>,
|
description: Option<String>,
|
||||||
},
|
},
|
||||||
|
|
||||||
/// Sync entomologist data with remote. This fetches from the remote,
|
|
||||||
/// merges the remote entomologist data branch with the local one,
|
|
||||||
/// and pushes the result back to the remote.
|
|
||||||
Sync {
|
|
||||||
/// Name of the git remote to sync with.
|
|
||||||
#[arg(default_value_t = String::from("origin"))]
|
|
||||||
remote: String,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_command(args: &Args, issues_dir: &std::path::Path) -> anyhow::Result<()> {
|
fn handle_command(args: &Args, issues_dir: &std::path::Path) -> anyhow::Result<()> {
|
||||||
|
|
@ -164,25 +155,6 @@ fn handle_command(args: &Args, issues_dir: &std::path::Path) -> anyhow::Result<(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Commands::Sync { remote } => {
|
|
||||||
if args.issues_dir.is_some() {
|
|
||||||
return Err(anyhow::anyhow!(
|
|
||||||
"`sync` operates on a branch, don't specify `issues_dir`"
|
|
||||||
));
|
|
||||||
}
|
|
||||||
// FIXME: Kinda bogus to re-do this thing we just did in
|
|
||||||
// `main()`. Maybe `main()` shouldn't create the worktree,
|
|
||||||
// maybe we should do it here in `handle_command()`?
|
|
||||||
// That way also each command could decide if it wants a
|
|
||||||
// read-only worktree or a read/write one.
|
|
||||||
let branch = match &args.issues_branch {
|
|
||||||
Some(branch) => branch,
|
|
||||||
None => "entomologist-data",
|
|
||||||
};
|
|
||||||
entomologist::git::sync(issues_dir, remote, branch)?;
|
|
||||||
println!("synced {:?} with {:?}", branch, remote);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
|
||||||
56
src/git.rs
56
src/git.rs
|
|
@ -126,62 +126,6 @@ pub fn git_commit_file(file: &std::path::Path) -> Result<(), GitError> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn git_fetch(dir: &std::path::Path, remote: &str) -> Result<(), GitError> {
|
|
||||||
let result = std::process::Command::new("git")
|
|
||||||
.args(["fetch", remote])
|
|
||||||
.current_dir(dir)
|
|
||||||
.output()?;
|
|
||||||
if !result.status.success() {
|
|
||||||
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
|
|
||||||
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
|
|
||||||
return Err(GitError::Oops);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), GitError> {
|
|
||||||
// We do all the work in a directory that's (FIXME) hopefully a
|
|
||||||
// worktree. If anything goes wrong we just fail out and ask the
|
|
||||||
// human to fix it by hand :-/
|
|
||||||
// 1. `git fetch`
|
|
||||||
// 2. `git merge REMOTE/BRANCH`
|
|
||||||
// 3. `git push REMOTE BRANCH`
|
|
||||||
|
|
||||||
git_fetch(dir, remote)?;
|
|
||||||
|
|
||||||
// Merge remote branch into local.
|
|
||||||
let result = std::process::Command::new("git")
|
|
||||||
.args(["merge", &format!("{}/{}", remote, branch)])
|
|
||||||
.current_dir(dir)
|
|
||||||
.output()?;
|
|
||||||
if !result.status.success() {
|
|
||||||
println!(
|
|
||||||
"Sync failed! Merge error! Help, a human needs to fix the mess in {:?}",
|
|
||||||
dir
|
|
||||||
);
|
|
||||||
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
|
|
||||||
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
|
|
||||||
return Err(GitError::Oops);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Push merged branch to remote.
|
|
||||||
let result = std::process::Command::new("git")
|
|
||||||
.args(["push", remote, branch])
|
|
||||||
.current_dir(dir)
|
|
||||||
.output()?;
|
|
||||||
if !result.status.success() {
|
|
||||||
println!(
|
|
||||||
"Sync failed! Push error! Help, a human needs to fix the mess in {:?}",
|
|
||||||
dir
|
|
||||||
);
|
|
||||||
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
|
|
||||||
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
|
|
||||||
return Err(GitError::Oops);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn git_log_oldest_timestamp(
|
pub fn git_log_oldest_timestamp(
|
||||||
path: &std::path::Path,
|
path: &std::path::Path,
|
||||||
) -> Result<chrono::DateTime<chrono::Local>, GitError> {
|
) -> Result<chrono::DateTime<chrono::Local>, GitError> {
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,7 @@ impl Issue {
|
||||||
let mut dir = std::path::PathBuf::from(&self.dir);
|
let mut dir = std::path::PathBuf::from(&self.dir);
|
||||||
dir.push("comments");
|
dir.push("comments");
|
||||||
if !dir.exists() {
|
if !dir.exists() {
|
||||||
|
println!("creating {}", dir.to_string_lossy());
|
||||||
std::fs::create_dir(&dir)?;
|
std::fs::create_dir(&dir)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue