diff options
Diffstat (limited to 'crates/shirabe/src/util/hg.rs')
| -rw-r--r-- | crates/shirabe/src/util/hg.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs index f95f15d5..00fee240 100644 --- a/crates/shirabe/src/util/hg.rs +++ b/crates/shirabe/src/util/hg.rs @@ -5,8 +5,7 @@ use crate::io::IOInterface; use crate::io::IOInterfaceImmutable; use crate::util::ProcessExecutor; use crate::util::Url; -use shirabe_pcre::Preg; -use shirabe_php_shim::{php_regex, rawurlencode}; +use shirabe_php_shim::{php_regex, preg_match2, rawurlencode}; use std::sync::OnceLock; static VERSION: OnceLock<Option<String>> = OnceLock::new(); @@ -56,11 +55,12 @@ impl Hg { } // Try with the authentication information available - let matched = Preg::is_match3( + let matched = preg_match2( php_regex!( r"{^(?P<proto>ssh|https?)://(?:(?P<user>[^:@]+)(?::(?P<pass>[^:@]+))?@)?(?P<host>[^/]+)(?P<path>/.*)?}mi" ), &url, + 0, ); if let Some(matches) = matched @@ -151,9 +151,10 @@ impl Hg { &mut output, None, ) == 0 - && let Some(matches) = Preg::is_match3( + && let Some(matches) = preg_match2( php_regex!(r"/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/"), &output, + 0, ) { return matches.get(1).map(str::to_string); |