mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 20:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

git_backend: extract helper that converts git2::Commit to backend::Commit

Browse source 
The root parent id is filled by caller because empty parents list is more
convenient while walking ancestors.
This commit is contained in:
Yuya Nishihara 2023-05-20 17:39:35 +09:00
parent 0149e7b311
commit e6addf7905
1 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
lib/src/git_backend.rs
View file

@ -146,6 +146,40 @@ impl GitBackend {
} }
} }
fn commit_from_git_without_root_parent(commit: &git2::Commit) -> Commit {
// We reverse the bits of the commit id to create the change id. We don't want
// to use the first bytes unmodified because then it would be ambiguous
// if a given hash prefix refers to the commit id or the change id. It
// would have been enough to pick the last 16 bytes instead of the
// leading 16 bytes to address that. We also reverse the bits to make it less
// likely that users depend on any relationship between the two ids.
let change_id = ChangeId::new(
commit.id().as_bytes()[4..HASH_LENGTH]
.iter()
.rev()
.map(|b| b.reverse_bits())
.collect(),
);
let parents = commit
.parent_ids()
.map(|oid| CommitId::from_bytes(oid.as_bytes()))
.collect_vec();
let tree_id = TreeId::from_bytes(commit.tree_id().as_bytes());
let description = commit.message().unwrap_or("<no message>").to_owned();
let author = signature_from_git(commit.author());
let committer = signature_from_git(commit.committer());
Commit {
parents,
predecessors: vec![],
root_tree: tree_id,
change_id,
description,
author,
committer,
}
}
fn signature_from_git(signature: git2::Signature) -> Signature { fn signature_from_git(signature: git2::Signature) -> Signature {
let name = signature.name().unwrap_or("<no name>").to_owned(); let name = signature.name().unwrap_or("<no name>").to_owned();
let email = signature.email().unwrap_or("<no email>").to_owned(); let email = signature.email().unwrap_or("<no email>").to_owned();
@ -456,39 +490,9 @@ impl Backend for GitBackend {
let commit = locked_repo let commit = locked_repo
.find_commit(git_commit_id) .find_commit(git_commit_id)
.map_err(|err| map_not_found_err(err, id))?; .map_err(|err| map_not_found_err(err, id))?;
// We reverse the bits of the commit id to create the change id. We don't want let mut commit = commit_from_git_without_root_parent(&commit);
// to use the first bytes unmodified because then it would be ambiguous if commit.parents.is_empty() {
// if a given hash prefix refers to the commit id or the change id. It commit.parents.push(self.root_commit_id.clone());
// would have been enough to pick the last 16 bytes instead of the
// leading 16 bytes to address that. We also reverse the bits to make it less
// likely that users depend on any relationship between the two ids.
let change_id = ChangeId::new(
commit.id().as_bytes()[4..HASH_LENGTH]
.iter()
.rev()
.map(|b| b.reverse_bits())
.collect(),
);
let mut parents = commit
.parent_ids()
.map(|oid| CommitId::from_bytes(oid.as_bytes()))
.collect_vec();
if parents.is_empty() {
parents.push(self.root_commit_id.clone());
};
let tree_id = TreeId::from_bytes(commit.tree_id().as_bytes());
let description = commit.message().unwrap_or("<no message>").to_owned();
let author = signature_from_git(commit.author());
let committer = signature_from_git(commit.committer());
let mut commit = Commit {
parents,
predecessors: vec![],
root_tree: tree_id,
change_id,
description,
author,
committer,
}; };
let table = self.cached_extra_metadata_table()?; let table = self.cached_extra_metadata_table()?;