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
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
|
use std::collections::{HashSet, VecDeque};
use structopt::clap;
use crate::cli;
use crate::config;
use crate::features;
use crate::git_config;
macro_rules! set_options {
([$( ($option_name:expr, $field_ident:ident) ),* ],
$opt:expr, $builtin_features:expr, $git_config:expr, $arg_matches:expr) => {
let mut option_names = HashSet::new();
$(
if !$crate::config::user_supplied_option($option_name, $arg_matches) {
if let Some(value) = $crate::options::get::get_option_value(
$option_name,
&$builtin_features,
$opt,
$git_config
) {
$opt.$field_ident = value;
}
};
option_names.insert($option_name);
)*
option_names.extend(&[
"diff-highlight", // Does not exist as a flag on config
"diff-so-fancy", // Does not exist as a flag on config
"features",
"no-gitconfig",
]);
let expected_option_names = $crate::cli::Opt::get_option_or_flag_names();
if option_names != expected_option_names {
$crate::config::delta_unreachable(
&format!("Error processing options.\nUnhandled names: {:?}\nInvalid names: {:?}.\n",
&expected_option_names - &option_names,
&option_names - &expected_option_names));
}
};
}
pub fn set_options(
opt: &mut cli::Opt,
git_config: &mut Option<git_config::GitConfig>,
arg_matches: &clap::ArgMatches,
) {
if let Some(git_config) = git_config {
if opt.no_gitconfig {
git_config.enabled = false;
}
}
let builtin_features = features::make_builtin_features();
opt.features = gather_features(
opt,
builtin_features.keys().into_iter().collect(),
git_config,
);
// Handle options which default to an arbitrary git config value.
// TODO: incorporate this logic into the set_options macro.
if !config::user_supplied_option("whitespace-error-style", arg_matches) {
opt.whitespace_error_style = if let Some(git_config) = git_config {
git_config.get::<String>("color.diff.whitespace")
} else {
None
}
.unwrap_or_else(|| "magenta reverse".to_string())
}
set_options!(
[
("24-bit-color", true_color),
("color-only", color_only),
("commit-decoration-style", commit_decoration_style),
("commit-style", commit_style),
("dark", dark),
("file-added-label", file_added_label),
("file-decoration-style", file_decoration_style),
("file-modified-label", file_modified_label),
("file-removed-label", file_removed_label),
("file-renamed-label", file_renamed_label),
("file-style", file_style),
("hunk-header-decoration-style", hunk_header_decoration_style),
("hunk-header-style", hunk_header_style),
("keep-plus-minus-markers", keep_plus_minus_markers),
("light", light),
("max-line-distance", max_line_distance),
// Hack: minus-style must come before minus-*emph-style because the latter default
// dynamically to the value of the former.
("minus-style", minus_style),
("minus-emph-style", minus_emph_style),
(
"minus-empty-line-marker-style",
minus_empty_line_marker_style
),
("minus-non-emph-style", minus_non_emph_style),
("minus-non-emph-style", minus_non_emph_style),
("navigate", navigate),
("line-numbers", line_numbers),
("line-numbers-left-format", line_numbers_left_format),
("line-numbers-left-style", line_numbers_left_style),
("line-numbers-minus-style", line_numbers_minus_style),
("line-numbers-plus-style", line_numbers_plus_style),
("line-numbers-right-format", line_numbers_right_format),
("line-numbers-right-style", line_numbers_right_style),
("line-numbers-zero-style", line_numbers_zero_style),
("paging", paging_mode),
// Hack: plus-style must come before plus-*emph-style because the latter default
// dynamically to the value of the former.
("plus-style", plus_style),
("plus-emph-style", plus_emph_style),
("plus-empty-line-marker-style", plus_empty_line_marker_style),
("plus-non-emph-style", plus_non_emph_style),
("raw", raw),
("syntax-theme", syntax_theme),
("tabs", tab_width),
("whitespace-error-style", whitespace_error_style),
("width", width),
("word-diff-regex", tokenization_regex),
("zero-style", zero_style)
],
opt,
builtin_features,
git_config,
arg_matches
);
}
/// Features are processed differently from all other options. The role of this function is to
/// collect all configuration related to features and summarize it as a single list
/// (space-separated string) of enabled features. The list is arranged in order of increasing
/// priority in the sense that, when searching for a option value, one starts at the right-hand end
/// and moves leftward, examining each feature in turn until a feature that associates a value with
/// the option name is encountered. This search is documented in
/// `get_option_value::get_option_value`.
///
/// The feature list comprises features deriving from the following sources, listed in order of
/// decreasing priority:
///
/// 1. Suppose the command-line has `--features "a b"`. Then
/// - `b`, followed by b's "ordered descendents"
/// - `a`, followed by a's "ordered descendents"
///
/// 2. Suppose the command line enables two builtin features via `--navigate --diff-so-fancy`. Then
/// - `diff-so-fancy`
/// - `navigate`
///
/// 3. Suppose the main [delta] section has `features = d e`. Then
/// - `e`, followed by e's "ordered descendents"
/// - `d`, followed by d's "ordered descendents"
///
/// 4. Suppose the main [delta] section has `diff-highlight = true` followed by `raw = true`.
/// Then
/// - `diff-highlight`
/// - `raw`
///
/// The "ordered descendents" of a feature `f` is a list of features obtained via a pre-order
/// traversal of the feature tree rooted at `f`. This tree arises because it is allowed for a
/// feature to contain a (key, value) pair that itself enables features.
///
/// If a feature has already been included at higher priority, and is encountered again, it is
/// ignored.
///
/// Thus, for example:
///
/// delta --features "my-navigate-settings" --navigate => "navigate my-navigate-settings"
///
/// In the following configuration, the feature names indicate their priority, with `a` having
/// highest priority:
///
/// delta --g --features "d a"
///
/// [delta "a"]
/// features = c b
///
/// [delta "d"]
/// features = f e
fn gather_features<'a>(
opt: &cli::Opt,
builtin_feature_names: Vec<&String>,
git_config: &Option<git_config::GitConfig>,
) -> String {
let mut features = VecDeque::new();
// Gather features from command line.
if let Some(git_config) = git_config {
for feature in split_feature_string(&opt.features.to_lowercase()) {
gather_features_recursively(feature, &mut features, &builtin_feature_names, git_config);
}
} else {
for feature in split_feature_string(&opt.features.to_lowercase()) {
features.push_front(feature.to_string());
}
}
// Gather builtin feature flags supplied on command line.
// TODO: Iterate over programatically-obtained names of builtin features.
if opt.raw {
features.push_front("raw".to_string());
}
if opt.color_only {
features.push_front("color-only".to_string());
}
if opt.diff_highlight {
features.push_front("diff-highlight".to_string());
}
if opt.diff_so_fancy {
features.push_front("diff-so-fancy".to_string());
}
if opt.line_numbers {
features.push_front("line-numbers".to_string());
}
if opt.navigate {
features.push_front("navigate".to_string());
}
if let Some(git_config) = git_config {
// Gather features from [delta] section if --features was not passed.
if opt.features.is_empty() {
if let Some(feature_string) = git_config.get::<String>(&format!("delta.features")) {
for feature in split_feature_string(&feature_string.to_lowercase()) {
gather_features_recursively(
feature,
&mut features,
&builtin_feature_names,
git_config,
|