ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

git_backend: leverage read_extra_metadata_table() in write_commit()

Browse source 
And use the readonly table for lookup, which allows us to extract a helper
method to add/save entry.
This commit is contained in:
Yuya Nishihara 2023-05-19 18:32:12 +09:00
parent 14243a85a0
commit 8a0fcfb032
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/git_backend.rs
View file

@ -513,11 +513,8 @@ impl Backend for GitBackend {
}
let parent_refs = parents.iter().collect_vec();
let extras = serialize_extras(&contents);
let mut mut_table = self
.extra_metadata_store
.get_head()
.unwrap()
.start_mutation();
let table = self.read_extra_metadata_table()?;
let mut mut_table = table.start_mutation();
let id = loop {
let git_id = locked_repo
.commit(
@ -533,7 +530,7 @@ impl Backend for GitBackend {
source: Box::new(err),
})?;
let id = CommitId::from_bytes(git_id.as_bytes());
match mut_table.get_value(id.as_bytes()) {
match table.get_value(id.as_bytes()) {
Some(existing_extras) if existing_extras != extras => {
// It's possible a commit already exists with the same commit id but different
// change id. Adjust the timestamp until this is no longer the case.