Drop support for custom mailmap path/spec
- Id
- 45c237e25277dba3f36bb75fff8da83b232d7d5d
- Author
- Caio
- Commit time
- 2024-02-29T13:22:56+01:00
Modified caca/src/config.rs
pub rename_similarity_threshold: Option<f32>,
pub metadata_config: Option<MetadataConfig>,
// TODO merge mailmap_config / global_mailmap
- pub mailmap_config: MailmapConfig,
pub global_mailmap: Option<PathBuf>,
pub feed_size: Option<NonZeroUsize>,
pub log_size: NonZeroUsize,
spec: "HEAD".to_string(),
// gitconfig is not quite .ini eh
filename: PathBuf::from(".config/caca.ini"),
- }
- }
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct MailmapConfig {
- pub spec: String,
- pub filename: PathBuf,
-}
-
-impl Default for MailmapConfig {
- fn default() -> Self {
- Self {
- spec: "HEAD".to_string(),
- filename: PathBuf::from(".mailmap"),
}
}
}
Modified caca/src/main.rs
rename_similarity_threshold: Some(0.7),
repo_object_cache_size: Some(20 * 1024 * 1024),
metadata_config: Some(config::MetadataConfig::default()),
- mailmap_config: config::MailmapConfig::default(),
global_mailmap: None,
feed_size: NonZeroUsize::new(40),
log_size: NonZeroUsize::new(30).unwrap(),
Modified caca/src/repo/mod.rs
}
let (mailmap_version, mailmap) = urso
- .rev_parse(&config.mailmap_config.spec)
+ .rev_parse("HEAD")
.and_then(|id| {
- urso.get_file_contents(id, &config.mailmap_config.filename, &mut buf)
- .map(|_| {
- tracing::debug!(repo=?urso.git_dir(), object=?id, "mailmap found");
- (Some(id), Mailmap::from_bytes(&buf))
- })
+ urso.get_file_contents(id, ".mailmap", &mut buf).map(|_| {
+ tracing::debug!(repo=?urso.git_dir(), object=?id, "mailmap found");
+ (Some(id), Mailmap::from_bytes(&buf))
+ })
})
.unwrap_or((None, Mailmap::default()));