gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-24 05:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor - move branch generation to a function

Browse Source
This commit is contained in:
Kiril Videlov 2024-10-20 12:48:07 +02:00
parent 1b3b8fdb41
commit fc51c61bf0
No known key found for this signature in database
GPG Key ID: A4C733025427C471
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
crates/gitbutler-stack-api/src/stack_ext.rs
View File

@ -229,28 +229,13 @@ impl StackExt for Stack {
}
let commit = ctx.repository().find_commit(self.head())?;
let (author, _committer) = ctx.repository().signatures()?;
// Get the author initials, splitting by any whitespace
let initials = author
.name()
.map(|s| {
format!(
"{}-",
s.split_whitespace()
.map(|word| word.chars().next().unwrap_or(' '))
.collect::<String>()
)
})
.unwrap_or("".to_owned())
.to_lowercase();
let branch_name = format!("{}{}-1", initials, "branch");
let mut reference = PatchReference {
target: commit.into(),
name: if let Some(refname) = self.upstream.as_ref() {
refname.branch().to_string()
} else {
normalize_branch_name(&branch_name)?
let (author, _committer) = ctx.repository().signatures()?;
generate_branch_name(author)?
},
description: None,
};
@ -806,3 +791,34 @@ fn remote_reference_exists(
.ok()
.unwrap_or(false))
}
fn generate_branch_name(author: git2::Signature) -> Result<String> {
// Get the author initials, splitting by any whitespace
let initials = author
.name()
.map(|s| {
format!(
"{}-",
s.split_whitespace()
.map(|word| word.chars().next().unwrap_or(' '))
.collect::<String>()
)
})
.unwrap_or("".to_owned())
.to_lowercase();
let branch_name = format!("{}{}-1", initials, "branch");
normalize_branch_name(&branch_name)
}
#[cfg(test)]
mod test {
use super::*;
use git2::{Signature, Time};
#[test]
fn gen_name() -> Result<()> {
let author = Signature::new("Foo Bar", "fb@example.com", &Time::new(0, 0))?;
assert_eq!(generate_branch_name(author)?, "fb-branch-1");
Ok(())
}
}