facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

configs: fix issue with config removal

Browse Source 
Summary:
The config verifier would remove items from the values list if they
were disallowed. To do this, it iterated through the values list backwards,
removing bad items.  In some cases it stored the index of a bad value for later
use, but because it was iterating backwards and removing things, the indexed it
stored might not be correct by the time the loop is done. To fix this, let's go
back to iterating forwards.

Reviewed By: quark-zju

Differential Revision: D25539737

fbshipit-source-id: 87663f3c162c690f3961b8075814f3467916cb4b
This commit is contained in:
Durham Goode 2020-12-15 08:02:25 -08:00 committed by Facebook GitHub Bot
parent f8190ccadd
commit d04c074d89
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eden/scm/lib/configparser/src/config.rs
View File

@ -450,11 +450,10 @@ impl ConfigSet {
let mut last_value = None;
let mut values_copy = values.clone();
// Iterate in reverse so we can remove items from the end of values.
values_copy.reverse();
let mut removals = 0;
for (index, value) in values_copy.iter().enumerate() {
// Convert the reverse index into the original index.
let index = values_copy.len() - index - 1;
// Convert the index into the original index.
let index = index - removals;
// Get the filename of the value's rc location
let location: String = match value
@ -475,6 +474,7 @@ impl ConfigSet {
// If it's a disallowed value from a subset, remove it.
if disallowed && subset_locations.contains(&location) {
values.remove(index);
removals += 1;
continue;
}
@ -482,16 +482,11 @@ impl ConfigSet {
super_value = value.value().clone();
super_index = index;
} else {
// Since we're iterating in reverse, take the first subset value and the
// first value we see (i.e. the last value in the original order which is value
// that will be exposed to people reading the config).
if sub_value.is_none() && subset_locations.contains(&location) {
if subset_locations.contains(&location) {
sub_value = value.value().clone();
}
if last_value.is_none() {
last_value = value.value().clone();
}
last_value = value.value().clone();
}
}