-
-
Notifications
You must be signed in to change notification settings - Fork 261
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
124 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
use crate::{ | ||
config, | ||
config::tree::{keys, Key, Push, Section}, | ||
}; | ||
|
||
impl Push { | ||
/// The `push.default` key | ||
pub const DEFAULT: Default = Default::new_with_validate("default", &config::Tree::PUSH, validate::Default); | ||
} | ||
|
||
impl Section for Push { | ||
fn name(&self) -> &str { | ||
"push" | ||
} | ||
|
||
fn keys(&self) -> &[&dyn Key] { | ||
&[&Self::DEFAULT] | ||
} | ||
} | ||
|
||
/// The `remote.<name>.tagOpt` key type. | ||
pub type Default = keys::Any<validate::Default>; | ||
|
||
mod default { | ||
use std::borrow::Cow; | ||
|
||
use crate::{ | ||
bstr::{BStr, ByteSlice}, | ||
config, | ||
config::tree::push::Default, | ||
push, | ||
}; | ||
|
||
impl Default { | ||
/// Try to interpret `value` as `push.default`. | ||
pub fn try_into_default( | ||
&'static self, | ||
value: Cow<'_, BStr>, | ||
) -> Result<push::Default, config::key::GenericErrorWithValue> { | ||
Ok(match value.as_ref().as_bytes() { | ||
b"nothing" => push::Default::Nothing, | ||
b"current" => push::Default::Current, | ||
b"upstream" | b"tracking" => push::Default::Upstream, | ||
b"simple" => push::Default::Simple, | ||
b"matching" => push::Default::Matching, | ||
_ => return Err(config::key::GenericErrorWithValue::from_value(self, value.into_owned())), | ||
}) | ||
} | ||
} | ||
} | ||
|
||
mod validate { | ||
pub struct Default; | ||
use std::{borrow::Cow, error::Error}; | ||
|
||
use crate::{bstr::BStr, config::tree::keys::Validate}; | ||
|
||
impl Validate for Default { | ||
fn validate(&self, value: &BStr) -> Result<(), Box<dyn Error + Send + Sync + 'static>> { | ||
super::Push::DEFAULT.try_into_default(Cow::Borrowed(value))?; | ||
Ok(()) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -187,6 +187,8 @@ pub mod tag; | |
|
||
/// | ||
pub mod progress; | ||
/// | ||
pub mod push; | ||
|
||
/// | ||
pub mod diff; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/// All possible values of `push.default`. | ||
#[derive(Default, Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash, Debug)] | ||
pub enum Default { | ||
/// Do not push anything unless a refspec is provided explicitly. | ||
/// | ||
/// This is for safety. | ||
Nothing, | ||
/// Push the current branch to update a remote branch with the same name. | ||
Current, | ||
/// Push the current branch to the branch it would fetch from and merge with, | ||
/// i.e. what is configured in `branch.<name>.merge`, retrievable with | ||
/// the `@{upstream}` refspec. | ||
Upstream, | ||
/// Push the current branch with the same name to the remote. | ||
/// This is the same as [`Current`](Default::Current), but fails if | ||
/// `branch.<name>.merge` is set to a branch that is named differently. | ||
#[default] | ||
Simple, | ||
/// Push *all* branches to their similarly named counterpart on the remote. | ||
Matching, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters