feat(core): implement Git repository operations with gRPC services
- Add advertise_refs functionality for Git protocol communication - Implement archive service with TAR/ZIP format support and streaming - Create blame service for Git file annotation with line tracking - Add branch management including create, delete, rename and compare operations - Implement merge checking with conflict detection and fast-forward handling - Add cherry-pick functionality for applying commits between branches - Integrate gix library for Git repository operations and object handling - Add comprehensive test suite covering all Git operations - Implement proper error handling and repository validation - Add pagination support for large result sets - Create protobuf definitions for all Git operations and data structures - Add build system for gRPC code generation and dependency management
This commit is contained in:
zhenyi
@@ -0,0 +1,111 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::error::GitResult;
|
||||
use crate::pb::{CheckMergeRequest, MergeResult, merge_result};
|
||||
|
||||
impl GitBare {
|
||||
pub fn check_merge(&self, request: CheckMergeRequest) -> GitResult<MergeResult> {
|
||||
let target = match request.target.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => "HEAD".into(),
|
||||
};
|
||||
let source = match request.source.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => "HEAD".into(),
|
||||
};
|
||||
|
||||
let repo = self.gix_repo()?;
|
||||
let target_id = repo.rev_parse_single(target.as_str())?;
|
||||
let source_id = repo.rev_parse_single(source.as_str())?;
|
||||
|
||||
if target_id == source_id {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusAlreadyUpToDate as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(target_id.to_string())),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Already up to date"),
|
||||
});
|
||||
}
|
||||
|
||||
let merge_base = repo
|
||||
.merge_base(target_id.detach(), source_id.detach())
|
||||
.ok()
|
||||
.map(|id| id.to_string());
|
||||
|
||||
if let Some(ref base) = merge_base {
|
||||
if *base == target_id.to_string() {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusFastForward as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(base.clone())),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Fast-forward"),
|
||||
});
|
||||
}
|
||||
if *base == source_id.to_string() {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusAlreadyUpToDate as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(base.clone())),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Already up to date"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
let merge_base_oid = merge_base.as_ref().map(|b| self.oid_to_pb(b.clone()));
|
||||
|
||||
let result = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
self.bare_dir.to_string_lossy().as_ref(),
|
||||
"merge-tree",
|
||||
"--write-tree",
|
||||
"--no-messages",
|
||||
"-z",
|
||||
&target,
|
||||
&source,
|
||||
],
|
||||
)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&result.stdout).into_owned();
|
||||
|
||||
if result.status.success() {
|
||||
Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusMerged as i32,
|
||||
commit: None,
|
||||
merge_base: merge_base_oid,
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: stdout.trim().to_string(),
|
||||
})
|
||||
} else {
|
||||
let conflicts = stdout
|
||||
.split('\0')
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(|path| crate::pb::MergeConflict {
|
||||
path: path.to_string(),
|
||||
..Default::default()
|
||||
})
|
||||
.collect();
|
||||
Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusConflicts as i32,
|
||||
commit: None,
|
||||
merge_base: merge_base_oid,
|
||||
conflicts,
|
||||
stats: None,
|
||||
message: String::from("Merge conflicts detected"),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,173 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::error::{GitError, GitResult};
|
||||
use crate::pb::{MergeRequest, MergeResult, merge_result};
|
||||
|
||||
impl GitBare {
|
||||
pub fn merge(&self, request: MergeRequest) -> GitResult<MergeResult> {
|
||||
let target_branch = request.target_branch.clone();
|
||||
let source_revision = match request.source.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => return Err(GitError::InvalidArgument("source is required".into())),
|
||||
};
|
||||
|
||||
let repo = self.gix_repo()?;
|
||||
|
||||
let branch_ref = format!("refs/heads/{}", target_branch);
|
||||
let target_id = repo
|
||||
.find_reference(branch_ref.as_str())
|
||||
.ok()
|
||||
.and_then(|mut r| r.peel_to_id().ok())
|
||||
.map(|id| id.to_string())
|
||||
.ok_or_else(|| GitError::RefNotFound(target_branch.clone()))?;
|
||||
|
||||
let source_id = repo.rev_parse_single(source_revision.as_str())?.to_string();
|
||||
|
||||
if target_id == source_id {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusAlreadyUpToDate as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(target_id)),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Already up to date"),
|
||||
});
|
||||
}
|
||||
|
||||
let target_oid = gix::hash::ObjectId::from_hex(target_id.as_bytes())
|
||||
.map_err(|e| GitError::InvalidOid(e.to_string()))?;
|
||||
let source_oid = gix::hash::ObjectId::from_hex(source_id.as_bytes())
|
||||
.map_err(|e| GitError::InvalidOid(e.to_string()))?;
|
||||
|
||||
let merge_base = repo
|
||||
.merge_base(target_oid, source_oid)
|
||||
.ok()
|
||||
.map(|id| id.to_string());
|
||||
|
||||
let ff_mode = request
|
||||
.options
|
||||
.as_ref()
|
||||
.map(|o| o.fast_forward)
|
||||
.unwrap_or(0);
|
||||
let ff_only =
|
||||
ff_mode == crate::pb::merge_options::FastForwardMode::MergeFastForwardModeOnly as i32;
|
||||
|
||||
if let Some(ref base) = merge_base {
|
||||
if *base == target_id {
|
||||
let no_ff = ff_mode
|
||||
== crate::pb::merge_options::FastForwardMode::MergeFastForwardModeNoFf as i32;
|
||||
|
||||
if !no_ff {
|
||||
self.update_branch_ref(&target_branch, &source_id, Some(&target_id), false)?;
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusFastForward as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(base.clone())),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: format!("Fast-forward to {}", source_id),
|
||||
});
|
||||
}
|
||||
}
|
||||
if *base == source_id {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusAlreadyUpToDate as i32,
|
||||
commit: None,
|
||||
merge_base: Some(self.oid_to_pb(base.clone())),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Already up to date"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if ff_only {
|
||||
return Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusAborted as i32,
|
||||
commit: None,
|
||||
merge_base: merge_base.map(|b| self.oid_to_pb(b)),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message: String::from("Not possible to fast-forward"),
|
||||
});
|
||||
}
|
||||
|
||||
let bare = self.bare_dir.to_string_lossy().into_owned();
|
||||
let result = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
bare.as_str(),
|
||||
"merge-tree",
|
||||
"--write-tree",
|
||||
"--no-messages",
|
||||
"-z",
|
||||
target_id.as_str(),
|
||||
source_id.as_str(),
|
||||
],
|
||||
)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&result.stdout).into_owned();
|
||||
|
||||
if result.status.success() {
|
||||
let merged_tree = stdout.trim().to_string();
|
||||
let message = if !request.message.is_empty() {
|
||||
request.message.clone()
|
||||
} else {
|
||||
format!("Merge '{}' into {}", source_revision, target_branch)
|
||||
};
|
||||
|
||||
let parents = vec![target_id.clone(), source_id.clone()];
|
||||
let commit_id = self.commit_tree(
|
||||
&merged_tree,
|
||||
&parents,
|
||||
&message,
|
||||
request.committer.as_ref(),
|
||||
request.committer.as_ref(),
|
||||
)?;
|
||||
|
||||
self.update_branch_ref(&target_branch, &commit_id, Some(&target_id), false)?;
|
||||
|
||||
Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusMerged as i32,
|
||||
commit: Some(self.get_commit(crate::pb::GetCommitRequest {
|
||||
repository: request.repository,
|
||||
revision: Some(crate::pb::ObjectSelector {
|
||||
selector: Some(crate::pb::object_selector::Selector::Revision(
|
||||
crate::pb::ObjectName {
|
||||
revision: commit_id,
|
||||
},
|
||||
)),
|
||||
}),
|
||||
include_stats: false,
|
||||
include_raw: false,
|
||||
})?),
|
||||
merge_base: merge_base.map(|b| self.oid_to_pb(b)),
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message,
|
||||
})
|
||||
} else {
|
||||
let conflicts = stdout
|
||||
.split('\0')
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(|path| crate::pb::MergeConflict {
|
||||
path: path.to_string(),
|
||||
..Default::default()
|
||||
})
|
||||
.collect();
|
||||
Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusConflicts as i32,
|
||||
commit: None,
|
||||
merge_base: merge_base.map(|b| self.oid_to_pb(b)),
|
||||
conflicts,
|
||||
stats: None,
|
||||
message: String::from("Merge conflicts detected"),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::error::{GitError, GitResult};
|
||||
use crate::paginate;
|
||||
use crate::pb::{ListMergeConflictsRequest, ListMergeConflictsResponse, MergeConflict};
|
||||
|
||||
impl GitBare {
|
||||
pub fn list_merge_conflicts(
|
||||
&self,
|
||||
request: ListMergeConflictsRequest,
|
||||
) -> GitResult<ListMergeConflictsResponse> {
|
||||
let target = match request.target.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => return Err(GitError::InvalidArgument("target is required".into())),
|
||||
};
|
||||
let source = match request.source.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => return Err(GitError::InvalidArgument("source is required".into())),
|
||||
};
|
||||
|
||||
let result = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
self.bare_dir.to_string_lossy().as_ref(),
|
||||
"merge-tree",
|
||||
"--write-tree",
|
||||
"--name-only",
|
||||
"-z",
|
||||
target.as_str(),
|
||||
source.as_str(),
|
||||
],
|
||||
)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&result.stdout);
|
||||
|
||||
if result.status.success() {
|
||||
return Ok(ListMergeConflictsResponse {
|
||||
conflicts: vec![],
|
||||
page_info: Some(crate::pb::PageInfo {
|
||||
next_page_token: String::new(),
|
||||
has_next_page: false,
|
||||
total_count: 0,
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
let mut conflicts: Vec<MergeConflict> = stdout
|
||||
.split('\0')
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(|path| MergeConflict {
|
||||
path: path.to_string(),
|
||||
..Default::default()
|
||||
})
|
||||
.collect();
|
||||
|
||||
paginate::apply_sort(&mut conflicts, 0);
|
||||
let (conflicts, page_info) = paginate::paginate(&conflicts, request.pagination.as_ref());
|
||||
Ok(ListMergeConflictsResponse {
|
||||
conflicts,
|
||||
page_info: Some(page_info),
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
pub mod check_merge;
|
||||
pub mod do_merge;
|
||||
pub mod list_merge_conflicts;
|
||||
pub mod rebase;
|
||||
pub mod resolve_merge_conflicts;
|
||||
+192
@@ -0,0 +1,192 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::commit::create_commit::command_ok;
|
||||
use crate::error::{GitError, GitResult};
|
||||
use crate::pb::{RebaseRequest, RebaseResult, rebase_result};
|
||||
|
||||
impl GitBare {
|
||||
pub fn rebase(&self, request: RebaseRequest) -> GitResult<RebaseResult> {
|
||||
let branch = request.branch.clone();
|
||||
let upstream_revision = match request.upstream.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => return Err(GitError::InvalidArgument("upstream is required".into())),
|
||||
};
|
||||
|
||||
let repo = self.gix_repo()?;
|
||||
let branch_ref = format!("refs/heads/{}", branch);
|
||||
let branch_tip = repo
|
||||
.find_reference(branch_ref.as_str())
|
||||
.ok()
|
||||
.and_then(|mut r| r.peel_to_id().ok())
|
||||
.map(|id| id.to_string())
|
||||
.ok_or_else(|| GitError::RefNotFound(branch.clone()))?;
|
||||
|
||||
let upstream_id = repo
|
||||
.rev_parse_single(upstream_revision.as_str())?
|
||||
.to_string();
|
||||
|
||||
if branch_tip == upstream_id {
|
||||
return Ok(RebaseResult {
|
||||
status: rebase_result::Status::RebaseResultStatusAlreadyUpToDate as i32,
|
||||
head: None,
|
||||
conflicts: vec![],
|
||||
});
|
||||
}
|
||||
|
||||
let result = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
self.bare_dir.to_string_lossy().as_ref(),
|
||||
"rev-list",
|
||||
"--reverse",
|
||||
&format!("{}..{}", upstream_id, branch_tip),
|
||||
],
|
||||
)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
if !result.status.success() {
|
||||
return Err(GitError::CommandFailed {
|
||||
status_code: result.status.code(),
|
||||
stderr: String::from_utf8_lossy(&result.stderr).into_owned(),
|
||||
});
|
||||
}
|
||||
|
||||
let commits: Vec<String> = String::from_utf8_lossy(&result.stdout)
|
||||
.lines()
|
||||
.map(str::trim)
|
||||
.filter(|l| !l.is_empty())
|
||||
.map(String::from)
|
||||
.collect();
|
||||
|
||||
if commits.is_empty() {
|
||||
return Ok(RebaseResult {
|
||||
status: rebase_result::Status::RebaseResultStatusAlreadyUpToDate as i32,
|
||||
head: None,
|
||||
conflicts: vec![],
|
||||
});
|
||||
}
|
||||
|
||||
let mut current_tip = upstream_id.clone();
|
||||
for commit_hex in &commits {
|
||||
current_tip =
|
||||
self.rebase_one_commit(commit_hex, ¤t_tip, request.committer.as_ref())?;
|
||||
}
|
||||
|
||||
self.update_branch_ref(&branch, ¤t_tip, Some(&branch_tip), false)?;
|
||||
|
||||
Ok(RebaseResult {
|
||||
status: rebase_result::Status::RebaseResultStatusRebased as i32,
|
||||
head: Some(self.get_commit(crate::pb::GetCommitRequest {
|
||||
repository: request.repository,
|
||||
revision: Some(crate::pb::ObjectSelector {
|
||||
selector: Some(crate::pb::object_selector::Selector::Revision(
|
||||
crate::pb::ObjectName {
|
||||
revision: current_tip,
|
||||
},
|
||||
)),
|
||||
}),
|
||||
include_stats: false,
|
||||
include_raw: false,
|
||||
})?),
|
||||
conflicts: vec![],
|
||||
})
|
||||
}
|
||||
|
||||
fn rebase_one_commit(
|
||||
&self,
|
||||
commit_hex: &str,
|
||||
new_parent: &str,
|
||||
committer: Option<&crate::pb::Signature>,
|
||||
) -> GitResult<String> {
|
||||
let repo = self.gix_repo()?;
|
||||
let id = repo.rev_parse_single(commit_hex)?;
|
||||
let obj = id
|
||||
.object()?
|
||||
.try_into_commit()
|
||||
.map_err(|e| GitError::Gix(e.to_string()))?;
|
||||
let message = obj.message_raw()?.to_string();
|
||||
let author = obj.author().ok();
|
||||
|
||||
let bare = self.bare_dir.to_string_lossy().into_owned();
|
||||
let tmp_index = tempfile::Builder::new()
|
||||
.prefix("gitks-rebase-")
|
||||
.tempfile_in(&self.bare_dir)?;
|
||||
let idx_path = tmp_index.path().to_string_lossy().into_owned();
|
||||
|
||||
let read_tree = duct::cmd("git", ["--git-dir", bare.as_str(), "read-tree", new_parent])
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
command_ok(read_tree)?;
|
||||
|
||||
let diff = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
bare.as_str(),
|
||||
"format-patch",
|
||||
"--stdout",
|
||||
"--full-index",
|
||||
"--binary",
|
||||
"-1",
|
||||
commit_hex,
|
||||
],
|
||||
)
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
let patch_data = command_ok(diff)?;
|
||||
|
||||
let apply = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
bare.as_str(),
|
||||
"apply",
|
||||
"--cached",
|
||||
"--allow-empty",
|
||||
"-",
|
||||
],
|
||||
)
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdin_bytes(patch_data.as_bytes())
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
if !apply.status.success() {
|
||||
return Err(GitError::Internal(format!(
|
||||
"rebase apply failed for {}: {}",
|
||||
commit_hex,
|
||||
String::from_utf8_lossy(&apply.stderr)
|
||||
)));
|
||||
}
|
||||
|
||||
let write_tree = duct::cmd("git", ["--git-dir", bare.as_str(), "write-tree"])
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
let tree_id = command_ok(write_tree)?.trim().to_string();
|
||||
|
||||
let parents = vec![new_parent.to_string()];
|
||||
self.commit_tree(
|
||||
&tree_id,
|
||||
&parents,
|
||||
&message,
|
||||
author
|
||||
.as_ref()
|
||||
.map(|a| crate::commit::get_commit::gix_sig_to_pb(a))
|
||||
.as_ref(),
|
||||
committer,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::commit::create_commit::command_ok;
|
||||
use crate::error::{GitError, GitResult};
|
||||
use crate::pb::{MergeResult, ResolveMergeConflictsRequest, merge_result};
|
||||
|
||||
impl GitBare {
|
||||
pub fn resolve_merge_conflicts(
|
||||
&self,
|
||||
request: ResolveMergeConflictsRequest,
|
||||
) -> GitResult<MergeResult> {
|
||||
let target_branch = request.target_branch.clone();
|
||||
let source_revision = match request.source.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex,
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => name.revision,
|
||||
None => return Err(GitError::InvalidArgument("source is required".into())),
|
||||
};
|
||||
|
||||
let repo = self.gix_repo()?;
|
||||
let branch_ref = format!("refs/heads/{}", target_branch);
|
||||
let target_id = repo
|
||||
.find_reference(branch_ref.as_str())
|
||||
.ok()
|
||||
.and_then(|mut r| r.peel_to_id().ok())
|
||||
.map(|id| id.to_string())
|
||||
.ok_or_else(|| GitError::RefNotFound(target_branch.clone()))?;
|
||||
|
||||
let source_id = repo.rev_parse_single(source_revision.as_str())?.to_string();
|
||||
|
||||
let bare = self.bare_dir.to_string_lossy().into_owned();
|
||||
let tmp_index = tempfile::Builder::new()
|
||||
.prefix("gitks-resolve-")
|
||||
.tempfile_in(&self.bare_dir)?;
|
||||
let idx_path = tmp_index.path().to_string_lossy().into_owned();
|
||||
|
||||
let read_tree = duct::cmd(
|
||||
"git",
|
||||
["--git-dir", bare.as_str(), "read-tree", target_id.as_str()],
|
||||
)
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
command_ok(read_tree)?;
|
||||
|
||||
for resolution in &request.resolutions {
|
||||
let hash = duct::cmd(
|
||||
"git",
|
||||
["--git-dir", bare.as_str(), "hash-object", "-w", "--stdin"],
|
||||
)
|
||||
.stdin_bytes(resolution.content.clone())
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
let blob = command_ok(hash)?.trim().to_string();
|
||||
|
||||
let update = duct::cmd(
|
||||
"git",
|
||||
[
|
||||
"--git-dir",
|
||||
bare.as_str(),
|
||||
"update-index",
|
||||
"--add",
|
||||
"--cacheinfo",
|
||||
"100644",
|
||||
&blob,
|
||||
&resolution.path,
|
||||
],
|
||||
)
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.env("GIT_WORK_TREE", bare.as_str())
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
command_ok(update)?;
|
||||
}
|
||||
|
||||
let write_tree = duct::cmd("git", ["--git-dir", bare.as_str(), "write-tree"])
|
||||
.env("GIT_INDEX_FILE", &idx_path)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()?;
|
||||
let tree_id = command_ok(write_tree)?.trim().to_string();
|
||||
|
||||
let message = if !request.message.is_empty() {
|
||||
request.message.clone()
|
||||
} else {
|
||||
format!(
|
||||
"Merge '{}' into {} (resolved conflicts)",
|
||||
source_revision, target_branch
|
||||
)
|
||||
};
|
||||
|
||||
let parents = vec![target_id.clone(), source_id.clone()];
|
||||
let commit_id = self.commit_tree(
|
||||
&tree_id,
|
||||
&parents,
|
||||
&message,
|
||||
request.committer.as_ref(),
|
||||
request.committer.as_ref(),
|
||||
)?;
|
||||
|
||||
self.update_branch_ref(&target_branch, &commit_id, Some(&target_id), false)?;
|
||||
|
||||
Ok(MergeResult {
|
||||
status: merge_result::Status::MergeResultStatusMerged as i32,
|
||||
commit: Some(self.get_commit(crate::pb::GetCommitRequest {
|
||||
repository: request.repository,
|
||||
revision: Some(crate::pb::ObjectSelector {
|
||||
selector: Some(crate::pb::object_selector::Selector::Revision(
|
||||
crate::pb::ObjectName {
|
||||
revision: commit_id,
|
||||
},
|
||||
)),
|
||||
}),
|
||||
include_stats: false,
|
||||
include_raw: false,
|
||||
})?),
|
||||
merge_base: None,
|
||||
conflicts: vec![],
|
||||
stats: None,
|
||||
message,
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user