Migrate `sigrefs` to use `git::repository`
This set of changes migrates the sigrefs code to use the traits
defined in git::repository.
Each commit migrates a single trait, and ensures that all tests pass at each step.
The final commit then removes the now unused code.
16 files changed
+391
-686
e1867632
→
33fd4967
modified crates/radicle/src/storage.rs
@@ -436,7 +436,7 @@ impl Deref for Remote {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/git.rs
@@ -32,7 +32,7 @@ use crate::git::fmt::{
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1074,56 +1074,127 @@ impl Repository {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs.rs
@@ -19,6 +19,7 @@ use thiserror::Error;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -78,8 +79,8 @@ impl Refs {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -96,8 +97,8 @@ impl Refs {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -114,8 +115,8 @@ impl Refs {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -348,10 +349,10 @@ pub struct RefsAt {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -425,7 +426,7 @@ impl SignedRefs {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -437,7 +438,7 @@ impl SignedRefs {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -449,7 +450,7 @@ impl SignedRefs {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/git.rs
@@ -2,13 +2,52 @@
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -102,162 +141,3 @@ impl Committer {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
deleted crates/radicle/src/storage/refs/sigrefs/git/object.rs
@@ -1,102 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
deleted crates/radicle/src/storage/refs/sigrefs/git/object/error.rs
@@ -1,146 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
deleted crates/radicle/src/storage/refs/sigrefs/git/reference.rs
@@ -1,51 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
deleted crates/radicle/src/storage/refs/sigrefs/git/reference/error.rs
@@ -1,29 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
modified crates/radicle/src/storage/refs/sigrefs/read.rs
@@ -16,8 +16,8 @@ use radicle_git_metadata::commit::CommitData;
|
|
|
|
|
|
| + | |
|
|
| - | |
|
|
|
|
|
@@ -128,7 +128,7 @@ impl std::fmt::Display for FeatureLevels {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -304,7 +304,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -440,7 +440,7 @@ pub(super) struct CommitReader<'a, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -466,15 +466,10 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -509,7 +504,7 @@ struct TreeReader<'a, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -517,40 +512,42 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -573,7 +570,7 @@ struct IdentityRootReader<'a, 'b, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -590,11 +587,11 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/read/error.rs
@@ -6,7 +6,8 @@ use radicle_git_metadata::commit;
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -16,7 +17,7 @@ pub enum Read {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -48,7 +49,7 @@ pub enum Commit {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -66,7 +67,7 @@ impl fmt::Display for Parent {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -75,9 +76,9 @@ impl fmt::Display for Parent {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -104,7 +105,7 @@ pub enum MissingBlobs {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/read/iter.rs
@@ -1,6 +1,6 @@
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -18,7 +18,7 @@ impl<'a, R> Walk<'a, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
@@ -1,5 +1,7 @@
| - | |
| + | |
|
|
| + | |
| + | |
|
|
|
|
|
@@ -12,13 +14,16 @@ use radicle_git_metadata::commit::trailers::OwnedTrailer;
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -29,20 +34,20 @@ pub struct MockRepository {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -164,53 +169,77 @@ impl MockRepository {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -3,8 +3,6 @@ pub mod error;
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -13,14 +11,14 @@ use radicle_git_metadata::commit::{CommitData, headers::Headers, trailers::Owned
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -72,7 +70,7 @@ pub struct SignedRefsWriter<'a, R, S> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -179,8 +177,15 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -227,7 +232,7 @@ struct CommitWriter<'a, R, S> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -310,7 +315,7 @@ struct TreeWriter<'a, R, S> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -327,17 +332,11 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -372,7 +371,7 @@ struct HeadReader<'a, 'b, 'c, R, V> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -400,7 +399,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/write/error.rs
@@ -1,7 +1,8 @@
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -12,7 +13,7 @@ pub enum Write {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,7 +23,7 @@ pub enum Commit {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -32,7 +33,7 @@ pub enum Tree {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -41,7 +42,7 @@ pub enum Tree {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -10,27 +10,30 @@ use radicle_git_metadata::commit::trailers::OwnedTrailer;
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -200,89 +203,119 @@ impl HasRepoId for MockRepository {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle/src/test/storage.rs
@@ -152,16 +152,29 @@ impl MockRepository {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -174,6 +187,14 @@ impl self::refs::sigrefs::git::reference::Reader for MockRepository {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|