move git-ref-format to under radicle-git-ext

Signed-off-by: Han Xu <keepsimple@gmail.com>
This commit is contained in:
Han Xu
2023-02-21 20:19:30 -08:00
parent f06bc38c26
commit 59515f68e8
61 changed files with 102 additions and 109 deletions
+4 -4
View File
@@ -5,7 +5,7 @@
use std::{fmt, path::Path};
use git_ext::{error::is_not_found_err, Oid};
use git_ext::{error::is_not_found_err, ref_format, Oid};
use std_ext::result::ResultExt as _;
use crate::{
@@ -89,7 +89,7 @@ impl<'a> refdb::Read for &'a Read {
fn find_reference<Ref>(&self, reference: Ref) -> Result<Option<Reference>, Self::FindRef>
where
Ref: AsRef<git_ref_format::RefStr>,
Ref: AsRef<ref_format::RefStr>,
{
let reference = self
.raw
@@ -101,7 +101,7 @@ impl<'a> refdb::Read for &'a Read {
fn find_references<Pat>(&self, reference: Pat) -> Result<Self::References, Self::FindRefs>
where
Pat: AsRef<git_ref_format::refspec::PatternStr>,
Pat: AsRef<ref_format::refspec::PatternStr>,
{
Ok(References {
inner: ReferencesGlob {
@@ -113,7 +113,7 @@ impl<'a> refdb::Read for &'a Read {
fn find_reference_oid<Ref>(&self, reference: Ref) -> Result<Option<Oid>, Self::FindRefOid>
where
Ref: AsRef<git_ref_format::RefStr>,
Ref: AsRef<ref_format::RefStr>,
{
self.raw
.refname_to_id(reference.as_ref().as_str())
+8 -5
View File
@@ -7,8 +7,11 @@ use std::path::Path;
use either::Either;
use git_ext::{error::is_not_found_err, Oid};
use git_ref_format::{Qualified, RefStr, RefString};
use git_ext::{
error::is_not_found_err,
ref_format::{self, Qualified, RefStr, RefString},
Oid,
};
use crate::{
odb,
@@ -103,21 +106,21 @@ impl<'a> refdb::Read for &'a Write {
fn find_reference<Ref>(&self, reference: Ref) -> Result<Option<Reference>, Self::FindRef>
where
Ref: AsRef<git_ref_format::RefStr>,
Ref: AsRef<ref_format::RefStr>,
{
self.read_only().find_reference(reference)
}
fn find_references<Pat>(&self, reference: Pat) -> Result<Self::References, Self::FindRefs>
where
Pat: AsRef<git_ref_format::refspec::PatternStr>,
Pat: AsRef<ref_format::refspec::PatternStr>,
{
self.read_only().find_references(reference)
}
fn find_reference_oid<Ref>(&self, reference: Ref) -> Result<Option<Oid>, Self::FindRefOid>
where
Ref: AsRef<git_ref_format::RefStr>,
Ref: AsRef<ref_format::RefStr>,
{
self.read_only().find_reference_oid(reference)
}
+1 -1
View File
@@ -5,7 +5,7 @@
use std::path::Path;
use git_ref_format::refspec::PatternString;
use git_ext::ref_format::refspec::PatternString;
pub trait Pattern {
fn matches<P: AsRef<Path>>(&self, path: P) -> bool;
+1 -2
View File
@@ -3,8 +3,7 @@
use std::error::Error;
use git_ext::Oid;
use git_ref_format::RefStr;
use git_ext::{ref_format::RefStr, Oid};
use super::{Commit, Object, Read, Tree, TreeBuilder};
+2 -3
View File
@@ -19,8 +19,7 @@
use std::fmt::Debug;
use git_ext::Oid;
use git_ref_format::RefString;
use git_ext::{ref_format::RefString, Oid};
pub mod iter;
pub use iter::{References, ReferencesGlob};
@@ -104,7 +103,7 @@ pub mod error {
#[error("reference name did contain valid UTF-8 bytes")]
InvalidUtf8,
#[error(transparent)]
RefString(#[from] git_ref_format::Error),
RefString(#[from] radicle_git_ext::ref_format::Error),
}
#[derive(Debug, Error)]
+4 -2
View File
@@ -3,8 +3,10 @@
use std::error::Error;
use git_ext::Oid;
use git_ref_format::{refspec, RefStr};
use git_ext::{
ref_format::{refspec, RefStr},
Oid,
};
use super::Reference;
+4 -2
View File
@@ -3,8 +3,10 @@
use std::error::Error;
use git_ext::Oid;
use git_ref_format::{Qualified, RefString};
use git_ext::{
ref_format::{Qualified, RefString},
Oid,
};
use super::read::Read;