adapt to changes in git-config

Byron · Byron · commit 1c2e755e517b · 2022-11-24T18:35:11.000+01:00
diff --git a/cargo-smart-release/src/command/release/git.rs b/cargo-smart-release/src/command/release/git.rs
@@ -100,7 +100,9 @@ pub fn push_tags_and_head(
                 .into_remote(git::remote::Direction::Push)
                 .ok_or_else(|| anyhow!("Cannot push in uninitialized repo"))??
                 .name()
-                .expect("configured remotes have a name"),
+                .expect("configured remotes have a name")
+                .as_bstr()
+                .to_string(),
         )
         .arg("HEAD");
     for tag_name in tag_names {
diff --git a/gitoxide-core/src/organize.rs b/gitoxide-core/src/organize.rs
@@ -104,7 +104,7 @@ fn find_origin_remote(repo: &Path) -> anyhow::Result<Option<git_url::Url>> {
     let config = git::config::File::from_path_no_includes(non_bare.as_path(), local)
         .or_else(|_| git::config::File::from_path_no_includes(repo.join("config").as_path(), local))?;
     Ok(config
-        .string("remote", Some("origin"), "url")
+        .string_by_key("remote.origin.url")
         .map(|url| git_url::Url::from_bytes(url.as_ref()))
         .transpose()?)
 }
diff --git a/gitoxide-core/src/repository/config.rs b/gitoxide-core/src/repository/config.rs
@@ -1,12 +1,12 @@
 use anyhow::{bail, Result};
+use git::bstr::{BStr, BString};
 use git_repository as git;
-use git_repository::bstr::BString;
 
 use crate::OutputFormat;
 
 pub fn list(
     repo: git::Repository,
-    filters: Vec<String>,
+    filters: Vec<BString>,
     overrides: Vec<BString>,
     format: OutputFormat,
     mut out: impl std::io::Write,
@@ -52,18 +52,18 @@ pub fn list(
 
 struct Filter {
     name: String,
-    subsection: Option<String>,
+    subsection: Option<BString>,
 }
 
 impl Filter {
-    fn new(input: String) -> Self {
-        match git::config::parse::key(&input) {
+    fn new(input: BString) -> Self {
+        match git::config::parse::key(<_ as AsRef<BStr>>::as_ref(&input)) {
             Some(key) => Filter {
                 name: key.section_name.into(),
                 subsection: key.subsection_name.map(ToOwned::to_owned),
             },
             None => Filter {
-                name: input,
+                name: input.to_string(),
                 subsection: None,
             },
         }
@@ -77,7 +77,7 @@ impl Filter {
         }
         match (self.subsection.as_deref(), section.header().subsection_name()) {
             (Some(filter), Some(name)) => {
-                if !git::glob::wildmatch(filter.as_bytes().into(), name, ignore_case) {
+                if !git::glob::wildmatch(filter.as_slice().into(), name, ignore_case) {
                     return false;
                 }
             }
diff --git a/src/plumbing/options/mod.rs b/src/plumbing/options/mod.rs
@@ -106,6 +106,9 @@ pub enum Subcommands {
 }
 
 pub mod config {
+    use git::bstr::BString;
+    use git_repository as git;
+
     /// Print all entries in a configuration file or access other sub-commands
     #[derive(Debug, clap::Parser)]
     #[clap(subcommand_required(false))]
@@ -114,7 +117,8 @@ pub mod config {
         ///
         /// Typical filters are `branch` or `remote.origin` or `remote.or*` - git-style globs are supported
         /// and comparisons are case-insensitive.
-        pub filter: Vec<String>,
+        #[clap(parse(try_from_os_str = git::env::os_str_to_bstring))]
+        pub filter: Vec<BString>,
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ fn find_origin_remote(repo: &Path) -> anyhow::Result<Option<git_url::Url>> {`
`104`	`104`	`let config = git::config::File::from_path_no_includes(non_bare.as_path(), local)`
`105`	`105`	`.or_else(\|_\| git::config::File::from_path_no_includes(repo.join("config").as_path(), local))?;`
`106`	`106`	`Ok(config`
`107`		`- .string("remote", Some("origin"), "url")`
	`107`	`+ .string_by_key("remote.origin.url")`
`108`	`108`	`.map(\|url\| git_url::Url::from_bytes(url.as_ref()))`
`109`	`109`	`.transpose()?)`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ pub enum Subcommands {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`pub mod config {`
	`109`	`+ use git::bstr::BString;`
	`110`	`+ use git_repository as git;`
	`111`	`+`
`109`	`112`	`/// Print all entries in a configuration file or access other sub-commands`
`110`	`113`	`#[derive(Debug, clap::Parser)]`
`111`	`114`	`#[clap(subcommand_required(false))]`
`@@ -114,7 +117,8 @@ pub mod config {`
`114`	`117`	`///`
`115`	`118`	/// Typical filters are `branch` or `remote.origin` or `remote.or*` - git-style globs are supported
`116`	`119`	`/// and comparisons are case-insensitive.`
`117`		`- pub filter: Vec<String>,`
	`120`	`+ #[clap(parse(try_from_os_str = git::env::os_str_to_bstring))]`
	`121`	`+ pub filter: Vec<BString>,`
`118`	`122`	`}`
`119`	`123`	`}`
`120`	`124`