diff options
Diffstat (limited to 'asyncgit/src/sync/branch/merge_ff.rs')
| -rw-r--r-- | asyncgit/src/sync/branch/merge_ff.rs | 236 |
1 files changed, 118 insertions, 118 deletions
diff --git a/asyncgit/src/sync/branch/merge_ff.rs b/asyncgit/src/sync/branch/merge_ff.rs index 4ce6853f..f4e94d99 100644 --- a/asyncgit/src/sync/branch/merge_ff.rs +++ b/asyncgit/src/sync/branch/merge_ff.rs @@ -2,143 +2,143 @@ use super::BranchType; use crate::{ - error::{Error, Result}, - sync::utils, + error::{Error, Result}, + sync::utils, }; use scopetime::scope_time; /// pub fn branch_merge_upstream_fastforward( - repo_path: &str, - branch: &str, + repo_path: &str, + branch: &str, ) -> Result<()> { - scope_time!("branch_merge_upstream"); + scope_time!("branch_merge_upstream"); - let repo = utils::repo(repo_path)?; + let repo = utils::repo(repo_path)?; - let branch = repo.find_branch(branch, BranchType::Local)?; - let upstream = branch.upstream()?; + let branch = repo.find_branch(branch, BranchType::Local)?; + let upstream = branch.upstream()?; - let upstream_commit = - upstream.into_reference().peel_to_commit()?; + let upstream_commit = + upstream.into_reference().peel_to_commit()?; - let annotated = - repo.find_annotated_commit(upstream_commit.id())?; + let annotated = + repo.find_annotated_commit(upstream_commit.id())?; - let (analysis, pref) = repo.merge_analysis(&[&annotated])?; + let (analysis, pref) = repo.merge_analysis(&[&annotated])?; - if !analysis.is_fast_forward() { - return Err(Error::Generic( - "fast forward merge not possible".into(), - )); - } + if !analysis.is_fast_forward() { + return Err(Error::Generic( + "fast forward merge not possible".into(), + )); + } - if pref.is_no_fast_forward() { - return Err(Error::Generic("fast forward not wanted".into())); - } + if pref.is_no_fast_forward() { + return Err(Error::Generic("fast forward not wanted".into())); + } - //TODO: support merge on unborn - if analysis.is_unborn() { - return Err(Error::Generic("head is unborn".into())); - } + //TODO: support merge on unborn + if analysis.is_unborn() { + return Err(Error::Generic("head is unborn".into())); + } - repo.checkout_tree(upstream_commit.as_object(), None)?; + repo.checkout_tree(upstream_commit.as_object(), None)?; - repo.head()?.set_target(annotated.id(), "")?; + repo.head()?.set_target(annotated.id(), "")?; - Ok(()) + Ok(()) } #[cfg(test)] pub mod test { - use super::*; - use crate::sync::{ - remotes::{fetch, push::push}, - tests::{ - debug_cmd_print, get_commit_ids, repo_clone, - repo_init_bare, write_commit_file, - }, - }; - - #[test] - fn test_merge_fastforward() { - let (r1_dir, _repo) = repo_init_bare().unwrap(); - - let (clone1_dir, clone1) = - repo_clone(r1_dir.path().to_str().unwrap()).unwrap(); - - let (clone2_dir, clone2) = - repo_clone(r1_dir.path().to_str().unwrap()).unwrap(); - - // clone1 - - let commit1 = - write_commit_file(&clone1, "test.txt", "test", "commit1"); - - push( - clone1_dir.path().to_str().unwrap(), - "origin", - "master", - false, - false, - None, - None, - ) - .unwrap(); - - // clone2 - debug_cmd_print( - clone2_dir.path().to_str().unwrap(), - "git pull --ff", - ); - - let commit2 = write_commit_file( - &clone2, - "test2.txt", - "test", - "commit2", - ); - - push( - clone2_dir.path().to_str().unwrap(), - "origin", - "master", - false, - false, - None, - None, - ) - .unwrap(); - - // clone1 again - - let bytes = fetch( - clone1_dir.path().to_str().unwrap(), - "master", - None, - None, - ) - .unwrap(); - assert!(bytes > 0); - - let bytes = fetch( - clone1_dir.path().to_str().unwrap(), - "master", - None, - None, - ) - .unwrap(); - assert_eq!(bytes, 0); - - branch_merge_upstream_fastforward( - clone1_dir.path().to_str().unwrap(), - "master", - ) - .unwrap(); - - let commits = get_commit_ids(&clone1, 10); - assert_eq!(commits.len(), 2); - assert_eq!(commits[1], commit1); - assert_eq!(commits[0], commit2); - } + use super::*; + use crate::sync::{ + remotes::{fetch, push::push}, + tests::{ + debug_cmd_print, get_commit_ids, repo_clone, + repo_init_bare, write_commit_file, + }, + }; + + #[test] + fn test_merge_fastforward() { + let (r1_dir, _repo) = repo_init_bare().unwrap(); + + let (clone1_dir, clone1) = + repo_clone(r1_dir.path().to_str().unwrap()).unwrap(); + + let (clone2_dir, clone2) = + repo_clone(r1_dir.path().to_str().unwrap()).unwrap(); + + // clone1 + + let commit1 = + write_commit_file(&clone1, "test.txt", "test", "commit1"); + + push( + clone1_dir.path().to_str().unwrap(), + "origin", + "master", + false, + false, + None, + None, + ) + .unwrap(); + + // clone2 + debug_cmd_print( + clone2_dir.path().to_str().unwrap(), + "git pull --ff", + ); + + let commit2 = write_commit_file( + &clone2, + "test2.txt", + "test", + "commit2", + ); + + push( + clone2_dir.path().to_str().unwrap(), + "origin", + "master", + false, + false, + None, + None, + ) + .unwrap(); + + // clone1 again + + let bytes = fetch( + clone1_dir.path().to_str().unwrap(), + "master", + None, + None, + ) + .unwrap(); + assert!(bytes > 0); + + let bytes = fetch( + clone1_dir.path().to_str().unwrap(), + "master", + None, + None, + ) + .unwrap(); + assert_eq!(bytes, 0); + + branch_merge_upstream_fastforward( + clone1_dir.path().to_str().unwrap(), + "master", + ) + .unwrap(); + + let commits = get_commit_ids(&clone1, 10); + assert_eq!(commits.len(), 2); + assert_eq!(commits[1], commit1); + assert_eq!(commits[0], commit2); + } } |