use super::utils::repo;
use git2::{build::CheckoutBuilder, ObjectType, Status};
use scopetime::scope_time;
use std::{fs, path::Path};
pub fn reset_stage(repo_path: &str, path: &Path) -> bool {
scope_time!("reset_stage");
let repo = repo(repo_path);
let head = repo.head();
if let Ok(reference) = head {
let obj = repo
.find_object(
reference.target().unwrap(),
Some(ObjectType::Commit),
)
.unwrap();
repo.reset_default(Some(&obj), &[path]).is_ok()
} else {
repo.reset_default(None, &[path]).is_ok()
}
}
pub fn reset_workdir_file(repo_path: &str, path: &str) -> bool {
scope_time!("reset_workdir_file");
let repo = repo(repo_path);
if let Ok(status) = repo.status_file(Path::new(path)) {
let removed_file_wd = if status == Status::WT_NEW
|| (status == Status::WT_MODIFIED | Status::INDEX_NEW)
{
fs::remove_file(Path::new(repo_path).join(path)).is_ok()
} else {
false
};
if status == Status::WT_NEW {
return removed_file_wd;
}
let mut checkout_opts = CheckoutBuilder::new();
checkout_opts
.update_index(true) .allow_conflicts(true)
.force()
.path(path);
repo.checkout_index(None, Some(&mut checkout_opts)).is_ok()
} else {
false
}
}
pub fn reset_workdir_folder(repo_path: &str, path: &str) -> bool {
scope_time!("reset_workdir_folder");
let repo = repo(repo_path);
let mut checkout_opts = CheckoutBuilder::new();
checkout_opts
.update_index(true) .allow_conflicts(true)
.remove_untracked(true)
.force()
.path(path);
repo.checkout_index(None, Some(&mut checkout_opts)).is_ok()
}
#[cfg(test)]
mod tests {
use super::{
reset_stage, reset_workdir_file, reset_workdir_folder,
};
use crate::sync::{
status::{get_status, StatusType},
tests::{
debug_cmd_print, get_statuses, repo_init, repo_init_empty,
},
utils::{commit, stage_add_all, stage_add_file},
};
use std::{
fs::{self, File},
io::{Error, Write},
path::Path,
};
static HUNK_A: &str = r"
1 start
2
3
4
5
6 middle
7
8
9
0
1 end";
static HUNK_B: &str = r"
1 start
2 newa
3
4
5
6 middle
7
8
9
0 newb
1 end";
#[test]
fn test_reset_only_unstaged() {
let (_td, repo) = repo_init();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
let res = get_status(repo_path, StatusType::WorkingDir);
assert_eq!(res.len(), 0);
let file_path = root.join("bar.txt");
{
File::create(&file_path)
.unwrap()
.write_all(HUNK_A.as_bytes())
.unwrap();
}
debug_cmd_print(repo_path, "git status");
stage_add_file(repo_path, Path::new("bar.txt"));
debug_cmd_print(repo_path, "git status");
{
File::create(&file_path)
.unwrap()
.write_all(HUNK_B.as_bytes())
.unwrap();
}
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (1, 1));
let res = reset_workdir_file(repo_path, "bar.txt");
assert_eq!(res, true);
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (0, 1));
}
#[test]
fn test_reset_untracked_in_subdir() {
let (_td, repo) = repo_init();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
{
fs::create_dir(&root.join("foo")).unwrap();
File::create(&root.join("foo/bar.txt"))
.unwrap()
.write_all(b"test\nfoo")
.unwrap();
}
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (1, 0));
let res = reset_workdir_file(repo_path, "foo/bar.txt");
assert_eq!(res, true);
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (0, 0));
}
#[test]
fn test_reset_folder() -> Result<(), Error> {
let (_td, repo) = repo_init();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
{
fs::create_dir(&root.join("foo"))?;
File::create(&root.join("foo/file1.txt"))?
.write_all(b"file1")?;
File::create(&root.join("foo/file2.txt"))?
.write_all(b"file1")?;
File::create(&root.join("file3.txt"))?
.write_all(b"file3")?;
}
assert!(stage_add_all(repo_path, "*"));
commit(repo_path, "msg").unwrap();
{
File::create(&root.join("foo/file1.txt"))?
.write_all(b"file1\nadded line")?;
fs::remove_file(&root.join("foo/file2.txt"))?;
File::create(&root.join("foo/file4.txt"))?
.write_all(b"file4")?;
File::create(&root.join("foo/file5.txt"))?
.write_all(b"file5")?;
File::create(&root.join("file3.txt"))?
.write_all(b"file3\nadded line")?;
}
assert_eq!(get_statuses(repo_path), (5, 0));
stage_add_file(repo_path, Path::new("foo/file5.txt"));
assert_eq!(get_statuses(repo_path), (4, 1));
assert!(reset_workdir_folder(repo_path, "foo"));
assert_eq!(get_statuses(repo_path), (1, 1));
Ok(())
}
#[test]
fn test_reset_untracked_in_subdir_and_index() {
let (_td, repo) = repo_init();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
let file = "foo/bar.txt";
{
fs::create_dir(&root.join("foo")).unwrap();
File::create(&root.join(file))
.unwrap()
.write_all(b"test\nfoo")
.unwrap();
}
debug_cmd_print(repo_path, "git status");
debug_cmd_print(repo_path, "git add .");
debug_cmd_print(repo_path, "git status");
{
File::create(&root.join(file))
.unwrap()
.write_all(b"test\nfoo\nnewend")
.unwrap();
}
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (1, 1));
let res = reset_workdir_file(repo_path, file);
assert_eq!(res, true);
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (0, 1));
}
#[test]
fn unstage_in_empty_repo() {
let file_path = Path::new("foo.txt");
let (_td, repo) = repo_init_empty();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
File::create(&root.join(file_path))
.unwrap()
.write_all(b"test\nfoo")
.unwrap();
assert_eq!(get_statuses(repo_path), (1, 0));
assert_eq!(stage_add_file(repo_path, file_path), true);
assert_eq!(get_statuses(repo_path), (0, 1));
assert_eq!(reset_stage(repo_path, file_path), true);
assert_eq!(get_statuses(repo_path), (1, 0));
}
}