1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
use gix_error::ResultExt;
use crate::{
Result,
bstr::{BString, ByteSlice},
config::tree::{Author, Committer, Key, User, gitoxide, keys},
};
/// Identity handling.
///
/// # Deviation
///
/// There is no notion of a default user like in git, and instead failing to provide a user
/// is fatal. That way, we enforce correctness and force application developers to take care
/// of this issue. Use [`Repository::committer_or_set_fallback()`][crate::Repository::committer_or_set_fallback]
/// to install an application fallback without overriding an already configured user identity.
impl crate::Repository {
/// Return the committer as configured by this repository, which is determined by…
///
/// * …the `GIT_COMMITTER_(NAME|EMAIL)` environment variables…
/// * …the git configuration `committer.name|email`…
/// * …the configuration for `user.name|email` as fallback…
/// * …the `EMAIL` environment variable as an email-only fallback…
/// * …the `gitoxide.committer.(name|email)Fallback` configuration as a last resort…
///
/// …and in that order, with name and email resolved independently. `GIT_COMMITTER_DATE` controls the time separately.
/// Returns `None` if no committer name or email was configured, or `Some(Err(…))` if the committer date could not be
/// parsed.
///
/// # Note
///
/// The values are cached when the repository is instantiated.
pub fn committer(&self) -> Option<Result<gix_actor::SignatureRef<'_>>> {
let p = self.config.personas();
Ok(gix_actor::SignatureRef {
name: p
.committer
.name
.as_ref()
.or(p.user.name.as_ref())
.or(p.committer_fallback.name.as_ref())
.map(AsRef::as_ref)?,
email: p
.committer
.email
.as_ref()
.or(p.user.email.as_ref())
.or(p.committer_fallback.email.as_ref())
.map(AsRef::as_ref)?,
time: p.committer.time.as_ref().map(AsRef::as_ref)?,
})
.into()
}
/// Return the configured committer, or install `name` and `email` as fallback in memory on this instance if no complete
/// committer can be resolved. The fallback is then returned and future calls to [`committer()`](Self::committer()) will
/// return it as well.
///
/// If either part of the committer is missing, both fallback values are installed. Environment, `committer.*`, and
/// `user.*` values still take precedence individually.
pub fn committer_or_set_fallback(
&mut self,
name: impl gix_utils::AsBStr,
email: impl gix_utils::AsBStr,
) -> Result<gix_actor::SignatureRef<'_>> {
if self.committer().is_none() {
let mut config = gix_config::File::new(gix_config::file::Metadata::api());
config.set_raw_value(gitoxide::Committer::NAME_FALLBACK, name)?;
config.set_raw_value(gitoxide::Committer::EMAIL_FALLBACK, email)?;
let mut repo_config = self.config_snapshot_mut();
repo_config.append(config).or_erased()?;
}
Ok(self.committer().expect("committer was just set").or_erased()?)
}
/// Return the configured committer or install a generic fallback in memory on this instance.
///
/// This is equivalent to calling [`committer_or_set_fallback()`](Self::committer_or_set_fallback()) with
/// `no name configured <noEmailAvailable@example.com>`.
pub fn committer_or_set_generic_fallback(&mut self) -> Result<gix_actor::SignatureRef<'_>> {
self.committer_or_set_fallback("no name configured", "noEmailAvailable@example.com")
}
/// Return the author as configured by this repository, which is determined by…
///
/// * …the `GIT_AUTHOR_(NAME|EMAIL)` environment variables…
/// * …the git configuration `author.name|email`…
/// * …the configuration for `user.name|email` as fallback…
/// * …the `EMAIL` environment variable as an email-only fallback…
/// * …the `gitoxide.author.(name|email)Fallback` configuration as a last resort…
///
/// …and in that order, with name and email resolved independently. `GIT_AUTHOR_DATE` controls the time separately.
/// Returns `None` if there was nothing configured.
///
/// # Note
///
/// The values are cached when the repository is instantiated.
pub fn author(&self) -> Option<Result<gix_actor::SignatureRef<'_>>> {
let p = self.config.personas();
Ok(gix_actor::SignatureRef {
name: p
.author
.name
.as_ref()
.or(p.user.name.as_ref())
.or(p.author_fallback.name.as_ref())
.map(AsRef::as_ref)?,
email: p
.author
.email
.as_ref()
.or(p.user.email.as_ref())
.or(p.author_fallback.email.as_ref())
.map(AsRef::as_ref)?,
time: p.author.time.as_ref().map(AsRef::as_ref)?,
})
.into()
}
}
#[derive(Debug, Clone)]
pub(crate) struct Entity {
pub name: Option<BString>,
pub email: Option<BString>,
pub time: Option<String>,
}
#[derive(Debug, Clone)]
pub(crate) struct Personas {
user: Entity,
committer: Entity,
committer_fallback: Entity,
author: Entity,
author_fallback: Entity,
}
impl Personas {
pub fn from_config_and_env(config: &gix_config::File) -> Self {
let parse_date = |key: &str, date: &keys::Any| -> Option<String> {
debug_assert_eq!(
key,
date.logical_name(),
"BUG: drift of expected name and actual name of the key (we hardcode it to save an allocation)"
);
config
.string(key)
.and_then(|config_date| {
config_date
.to_str()
.ok()
.and_then(|date| gix_date::parse(date, Some(gix_date::Zoned::now())).ok())
})
.or_else(|| Some(gix_date::Time::now_local_or_utc()))
.map(|time| time.format_or_unix(gix_date::time::Format::Raw))
};
let committer_date = parse_date("gitoxide.commit.committerDate", &gitoxide::Commit::COMMITTER_DATE);
let author_date = parse_date("gitoxide.commit.authorDate", &gitoxide::Commit::AUTHOR_DATE);
Personas {
user: Entity {
name: config.string(User::NAME),
email: config
.string(User::EMAIL)
.or_else(|| config.string(gitoxide::User::EMAIL_FALLBACK)),
time: None,
},
committer: Entity {
name: config.string(Committer::NAME),
email: config.string(Committer::EMAIL),
time: committer_date,
},
committer_fallback: Entity {
name: config.string(gitoxide::Committer::NAME_FALLBACK),
email: config.string(gitoxide::Committer::EMAIL_FALLBACK),
time: None,
},
author: Entity {
name: config.string(Author::NAME),
email: config.string(Author::EMAIL),
time: author_date,
},
author_fallback: Entity {
name: config.string(gitoxide::Author::NAME_FALLBACK),
email: config.string(gitoxide::Author::EMAIL_FALLBACK),
time: None,
},
}
}
}