summaryrefslogtreecommitdiffstats
path: root/asyncgit/src/sync/hunks.rs
diff options
context:
space:
mode:
Diffstat (limited to 'asyncgit/src/sync/hunks.rs')
-rw-r--r--asyncgit/src/sync/hunks.rs296
1 files changed, 148 insertions, 148 deletions
diff --git a/asyncgit/src/sync/hunks.rs b/asyncgit/src/sync/hunks.rs
index fd77d772..9cc9b2f0 100644
--- a/asyncgit/src/sync/hunks.rs
+++ b/asyncgit/src/sync/hunks.rs
@@ -1,187 +1,187 @@
use super::{
- diff::{get_diff_raw, HunkHeader},
- utils::repo,
+ diff::{get_diff_raw, HunkHeader},
+ utils::repo,
};
use crate::{
- error::{Error, Result},
- hash,
+ error::{Error, Result},
+ hash,
};
use git2::{ApplyLocation, ApplyOptions, Diff};
use scopetime::scope_time;
///
pub fn stage_hunk(
- repo_path: &str,
- file_path: &str,
- hunk_hash: u64,
+ repo_path: &str,
+ file_path: &str,
+ hunk_hash: u64,
) -> Result<()> {
- scope_time!("stage_hunk");
+ scope_time!("stage_hunk");
- let repo = repo(repo_path)?;
+ let repo = repo(repo_path)?;
- let diff = get_diff_raw(&repo, file_path, false, false, None)?;
+ let diff = get_diff_raw(&repo, file_path, false, false, None)?;
- let mut opt = ApplyOptions::new();
- opt.hunk_callback(|hunk| {
- hunk.map_or(false, |hunk| {
- let header = HunkHeader::from(hunk);
- hash(&header) == hunk_hash
- })
- });
+ let mut opt = ApplyOptions::new();
+ opt.hunk_callback(|hunk| {
+ hunk.map_or(false, |hunk| {
+ let header = HunkHeader::from(hunk);
+ hash(&header) == hunk_hash
+ })
+ });
- repo.apply(&diff, ApplyLocation::Index, Some(&mut opt))?;
+ repo.apply(&diff, ApplyLocation::Index, Some(&mut opt))?;
- Ok(())
+ Ok(())
}
/// this will fail for an all untracked file
pub fn reset_hunk(
- repo_path: &str,
- file_path: &str,
- hunk_hash: u64,
+ repo_path: &str,
+ file_path: &str,
+ hunk_hash: u64,
) -> Result<()> {
- scope_time!("reset_hunk");
+ scope_time!("reset_hunk");
- let repo = repo(repo_path)?;
+ let repo = repo(repo_path)?;
- let diff = get_diff_raw(&repo, file_path, false, false, None)?;
+ let diff = get_diff_raw(&repo, file_path, false, false, None)?;
- let hunk_index = find_hunk_index(&diff, hunk_hash);
- if let Some(hunk_index) = hunk_index {
- let mut hunk_idx = 0;
- let mut opt = ApplyOptions::new();
- opt.hunk_callback(|_hunk| {
- let res = hunk_idx == hunk_index;
- hunk_idx += 1;
- res
- });
+ let hunk_index = find_hunk_index(&diff, hunk_hash);
+ if let Some(hunk_index) = hunk_index {
+ let mut hunk_idx = 0;
+ let mut opt = ApplyOptions::new();
+ opt.hunk_callback(|_hunk| {
+ let res = hunk_idx == hunk_index;
+ hunk_idx += 1;
+ res
+ });
- let diff = get_diff_raw(&repo, file_path, false, true, None)?;
+ let diff = get_diff_raw(&repo, file_path, false, true, None)?;
- repo.apply(&diff, ApplyLocation::WorkDir, Some(&mut opt))?;
+ repo.apply(&diff, ApplyLocation::WorkDir, Some(&mut opt))?;
- Ok(())
- } else {
- Err(Error::Generic("hunk not found".to_string()))
- }
+ Ok(())
+ } else {
+ Err(Error::Generic("hunk not found".to_string()))
+ }
}
fn find_hunk_index(diff: &Diff, hunk_hash: u64) -> Option<usize> {
- let mut result = None;
-
- let mut hunk_count = 0;
-
- let foreach_result = diff.foreach(
- &mut |_, _| true,
- None,
- Some(&mut |_, hunk| {
- let header = HunkHeader::from(hunk);
- if hash(&header) == hunk_hash {
- result = Some(hunk_count);
- }
- hunk_count += 1;
- true
- }),
- None,
- );
-
- if foreach_result.is_ok() {
- result
- } else {
- None
- }
+ let mut result = None;
+
+ let mut hunk_count = 0;
+
+ let foreach_result = diff.foreach(
+ &mut |_, _| true,
+ None,
+ Some(&mut |_, hunk| {
+ let header = HunkHeader::from(hunk);
+ if hash(&header) == hunk_hash {
+ result = Some(hunk_count);
+ }
+ hunk_count += 1;
+ true
+ }),
+ None,
+ );
+
+ if foreach_result.is_ok() {
+ result
+ } else {
+ None
+ }
}
///
pub fn unstage_hunk(
- repo_path: &str,
- file_path: &str,
- hunk_hash: u64,
+ repo_path: &str,
+ file_path: &str,
+ hunk_hash: u64,
) -> Result<bool> {
- scope_time!("revert_hunk");
-
- let repo = repo(repo_path)?;
-
- let diff = get_diff_raw(&repo, file_path, true, false, None)?;
- let diff_count_positive = diff.deltas().len();
-
- let hunk_index = find_hunk_index(&diff, hunk_hash);
- let hunk_index = hunk_index.map_or_else(
- || Err(Error::Generic("hunk not found".to_string())),
- Ok,
- )?;
-
- let diff = get_diff_raw(&repo, file_path, true, true, None)?;
-
- if diff.deltas().len() != diff_count_positive {
- return Err(Error::Generic(format!(
- "hunk error: {}!={}",
- diff.deltas().len(),
- diff_count_positive
- )));
- }
-
- let mut count = 0;
- {
- let mut hunk_idx = 0;
- let mut opt = ApplyOptions::new();
- opt.hunk_callback(|_hunk| {
- let res = if hunk_idx == hunk_index {
- count += 1;
- true
- } else {
- false
- };
-
- hunk_idx += 1;
-
- res
- });
-
- repo.apply(&diff, ApplyLocation::Index, Some(&mut opt))?;
- }
-
- Ok(count == 1)
+ scope_time!("revert_hunk");
+
+ let repo = repo(repo_path)?;
+
+ let diff = get_diff_raw(&repo, file_path, true, false, None)?;
+ let diff_count_positive = diff.deltas().len();
+
+ let hunk_index = find_hunk_index(&diff, hunk_hash);
+ let hunk_index = hunk_index.map_or_else(
+ || Err(Error::Generic("hunk not found".to_string())),
+ Ok,
+ )?;
+
+ let diff = get_diff_raw(&repo, file_path, true, true, None)?;
+
+ if diff.deltas().len() != diff_count_positive {
+ return Err(Error::Generic(format!(
+ "hunk error: {}!={}",
+ diff.deltas().len(),
+ diff_count_positive
+ )));
+ }
+
+ let mut count = 0;
+ {
+ let mut hunk_idx = 0;
+ let mut opt = ApplyOptions::new();
+ opt.hunk_callback(|_hunk| {
+ let res = if hunk_idx == hunk_index {
+ count += 1;
+ true
+ } else {
+ false
+ };
+
+ hunk_idx += 1;
+
+ res
+ });
+
+ repo.apply(&diff, ApplyLocation::Index, Some(&mut opt))?;
+ }
+
+ Ok(count == 1)
}
#[cfg(test)]
mod tests {
- use super::*;
- use crate::{
- error::Result,
- sync::{diff::get_diff, tests::repo_init_empty},
- };
- use std::{
- fs::{self, File},
- io::Write,
- path::Path,
- };
-
- #[test]
- fn reset_untracked_file_which_will_not_find_hunk() -> Result<()> {
- let file_path = Path::new("foo/foo.txt");
- let (_td, repo) = repo_init_empty()?;
- let root = repo.path().parent().unwrap();
- let repo_path = root.as_os_str().to_str().unwrap();
-
- let sub_path = root.join("foo/");
-
- fs::create_dir_all(&sub_path)?;
- File::create(&root.join(file_path))?.write_all(b"test")?;
-
- let diff = get_diff(
- sub_path.to_str().unwrap(),
- file_path.to_str().unwrap(),
- false,
- )?;
-
- assert!(reset_hunk(
- repo_path,
- file_path.to_str().unwrap(),
- diff.hunks[0].header_hash,
- )
- .is_err());
-
- Ok(())
- }
+ use super::*;
+ use crate::{
+ error::Result,
+ sync::{diff::get_diff, tests::repo_init_empty},
+ };
+ use std::{
+ fs::{self, File},
+ io::Write,
+ path::Path,
+ };
+
+ #[test]
+ fn reset_untracked_file_which_will_not_find_hunk() -> Result<()> {
+ let file_path = Path::new("foo/foo.txt");
+ let (_td, repo) = repo_init_empty()?;
+ let root = repo.path().parent().unwrap();
+ let repo_path = root.as_os_str().to_str().unwrap();
+
+ let sub_path = root.join("foo/");
+
+ fs::create_dir_all(&sub_path)?;
+ File::create(&root.join(file_path))?.write_all(b"test")?;
+
+ let diff = get_diff(
+ sub_path.to_str().unwrap(),
+ file_path.to_str().unwrap(),
+ false,
+ )?;
+
+ assert!(reset_hunk(
+ repo_path,
+ file_path.to_str().unwrap(),
+ diff.hunks[0].header_hash,
+ )
+ .is_err());
+
+ Ok(())
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 06:49:00 +0000