Skip to content

Expose git_merge_file function from libgit2 to repo.rs of git2-rs #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kvzn wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Expose git_merge_file function from libgit2 to repo.rs of git2-rs #635

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57766bc
Expose git_merge_file function from libgit2 to repo.rs of git2-rs
Nov 22, 2020
6ba9e96
Improvements
Nov 24, 2020
2b5b1dd
Improvements
Nov 26, 2020
0736d2c
Improve
Nov 26, 2020
ed71b2d
Fixed bug of smoke_merge_file
kentkrantz Nov 27, 2020
ea795f5
Merge branch 'master' into expose-merge-file
kvzn May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed bug of smoke_merge_file
  • Loading branch information
@kentkrantz
kentkrantz committed Nov 27, 2020
commit ed71b2d601cc1ac41874dd4bd61db25b10108006
74 changes: 47 additions & 27 deletions src/repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3424,6 +3424,8 @@ mod tests {

assert!(index.has_conflicts(), "index should have conflicts");

let mut conflict_count = 0;

let index_conflicts = index.conflicts().unwrap();
for conflict in index_conflicts {
let conflict = conflict.unwrap();
Expand All @@ -3437,41 +3439,56 @@ mod tests {
let theirs_blob;

if let Some(ancestor) = conflict.ancestor {
ancestor_blob = repo
.find_blob(ancestor.id.clone())
.expect("failed to find blob of index entry to make MergeFileInput");
let ancestor_content = ancestor_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(ancestor.path).unwrap());
input.mode(Some(FileMode::from(ancestor.mode.try_into().unwrap())));
input.content(Some(&ancestor_content));
ancestor_input = Some(input);
match repo.find_blob(ancestor.id.clone()) {
Ok(b) => {
ancestor_blob = b;
let ancestor_content = ancestor_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(ancestor.path).unwrap());
input.mode(Some(FileMode::from(ancestor.mode.try_into().unwrap())));
input.content(Some(&ancestor_content));
ancestor_input = Some(input);
}
Err(_e) => {
ancestor_input = None;
}
}
} else {
ancestor_input = None;
}
if let Some(ours) = conflict.our {
ours_blob = repo
.find_blob(ours.id.clone())
.expect("failed to find blob of index entry to make MergeFileInput");
let ours_content = ours_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(ours.path).unwrap());
input.mode(Some(FileMode::from(ours.mode.try_into().unwrap())));
input.content(Some(&ours_content));
ours_input = Some(input);
match repo.find_blob(ours.id.clone()) {
Ok(b) => {
ours_blob = b;
let ours_content = ours_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(ours.path).unwrap());
input.mode(Some(FileMode::from(ours.mode.try_into().unwrap())));
input.content(Some(&ours_content));
ours_input = Some(input);
}
Err(_e) => {
ours_input = None;
}
}
} else {
ours_input = None;
}
if let Some(theirs) = conflict.their {
theirs_blob = repo
.find_blob(theirs.id.clone())
.expect("failed to find blob of index entry to make MergeFileInput");
let theirs_content = theirs_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(theirs.path).unwrap());
input.mode(Some(FileMode::from(theirs.mode.try_into().unwrap())));
input.content(Some(&theirs_content));
theirs_input = Some(input);
match repo.find_blob(theirs.id.clone()) {
Ok(b) => {
theirs_blob = b;
let theirs_content = theirs_blob.content();
let mut input = MergeFileInput::new();
input.path(String::from_utf8(theirs.path).unwrap());
input.mode(Some(FileMode::from(theirs.mode.try_into().unwrap())));
input.content(Some(&theirs_content));
theirs_input = Some(input);
}
Err(_e) => {
theirs_input = None;
}
}
} else {
theirs_input = None;
}
Expand All @@ -3498,7 +3515,10 @@ mod tests {
},
merge_file_result_content
);

conflict_count += 1;
}
assert_eq!(conflict_count, 1, "There should be one conflict!");
}

/// create the following:
Expand Down