@@ -22,14 +22,14 @@ pub mod sig;
22
22
pub fn traverse_commit_graph (
23
23
repo : & gix:: Repository ,
24
24
no_bots : Option < MyRegex > ,
25
- max_churn_pool_size : Option < usize > ,
25
+ min_churn_pool_size : Option < usize > ,
26
26
no_merges : bool ,
27
27
) -> Result < GitMetrics > {
28
28
let mut time_of_most_recent_commit = None ;
29
29
let mut time_of_first_commit = None ;
30
30
let mut number_of_commits_by_signature: HashMap < Sig , usize > = HashMap :: new ( ) ;
31
31
let mailmap = repo. open_mailmap ( ) ;
32
- let has_commit_graph_traversal_ended = Arc :: new ( AtomicBool :: default ( ) ) ;
32
+ let is_traversal_complete = Arc :: new ( AtomicBool :: default ( ) ) ;
33
33
let total_number_of_commits = Arc :: new ( AtomicUsize :: default ( ) ) ;
34
34
35
35
let num_threads = std:: thread:: available_parallelism ( )
@@ -51,9 +51,9 @@ pub fn traverse_commit_graph(
51
51
repo,
52
52
& mailmap,
53
53
no_bots. clone ( ) ,
54
- & has_commit_graph_traversal_ended ,
54
+ & is_traversal_complete ,
55
55
& total_number_of_commits,
56
- max_churn_pool_size ,
56
+ min_churn_pool_size ,
57
57
) ?;
58
58
59
59
let author_threads = can_use_author_threads
@@ -104,7 +104,7 @@ pub fn traverse_commit_graph(
104
104
}
105
105
106
106
total_number_of_commits. store ( count, Ordering :: SeqCst ) ;
107
- has_commit_graph_traversal_ended . store ( true , Ordering :: SeqCst ) ;
107
+ is_traversal_complete . store ( true , Ordering :: SeqCst ) ;
108
108
109
109
drop ( churn_tx) ;
110
110
@@ -174,7 +174,7 @@ fn get_churn_channel(
174
174
repo : & gix:: Repository ,
175
175
mailmap : & gix:: mailmap:: Snapshot ,
176
176
bot_regex_pattern : Option < MyRegex > ,
177
- has_commit_graph_traversal_ended : & Arc < AtomicBool > ,
177
+ is_traversal_complete : & Arc < AtomicBool > ,
178
178
total_number_of_commits : & Arc < AtomicUsize > ,
179
179
max_churn_pool_size : Option < usize > ,
180
180
) -> Result < ( JoinHandle < Result < ChurnPair > > , Sender < ObjectId > ) > {
@@ -183,47 +183,47 @@ fn get_churn_channel(
183
183
let repo = repo. clone ( ) ;
184
184
let mailmap = mailmap. clone ( ) ;
185
185
let bot_regex_pattern = bot_regex_pattern. clone ( ) ;
186
- let has_commit_graph_traversal_ended = has_commit_graph_traversal_ended . clone ( ) ;
186
+ let is_traversal_complete = is_traversal_complete . clone ( ) ;
187
187
let total_number_of_commits = total_number_of_commits. clone ( ) ;
188
188
move || -> Result < _ > {
189
189
let mut number_of_commits_by_file_path = NumberOfCommitsByFilepath :: new ( ) ;
190
- let mut number_of_diffs_computed = 0 ;
190
+ let mut diffs_computed = 0 ;
191
191
while let Ok ( commit_id) = rx. recv ( ) {
192
192
let commit = repo. find_object ( commit_id) ?. into_commit ( ) ;
193
193
if is_bot_commit ( & commit, & mailmap, bot_regex_pattern. as_ref ( ) ) ? {
194
194
continue ;
195
195
}
196
196
compute_diff_with_parent ( & mut number_of_commits_by_file_path, & commit, & repo) ?;
197
- number_of_diffs_computed += 1 ;
197
+ diffs_computed += 1 ;
198
198
if should_break (
199
- has_commit_graph_traversal_ended . load ( Ordering :: Relaxed ) ,
199
+ is_traversal_complete . load ( Ordering :: Relaxed ) ,
200
200
total_number_of_commits. load ( Ordering :: Relaxed ) ,
201
201
max_churn_pool_size,
202
- number_of_diffs_computed ,
202
+ diffs_computed ,
203
203
) {
204
204
break ;
205
205
}
206
206
}
207
207
208
- Ok ( ( number_of_commits_by_file_path, number_of_diffs_computed ) )
208
+ Ok ( ( number_of_commits_by_file_path, diffs_computed ) )
209
209
}
210
210
} ) ;
211
211
212
212
Ok ( ( thread, tx) )
213
213
}
214
214
215
215
fn should_break (
216
- has_commit_graph_traversal_ended : bool ,
216
+ is_traversal_complete : bool ,
217
217
total_number_of_commits : usize ,
218
- max_churn_pool_size_opt : Option < usize > ,
219
- number_of_diffs_computed : usize ,
218
+ min_churn_pool_size_opt : Option < usize > ,
219
+ diffs_computed : usize ,
220
220
) -> bool {
221
- if !has_commit_graph_traversal_ended {
221
+ if !is_traversal_complete {
222
222
return false ;
223
223
}
224
224
225
- max_churn_pool_size_opt . is_none_or ( |max_churn_pool_size | {
226
- number_of_diffs_computed >= max_churn_pool_size . min ( total_number_of_commits)
225
+ min_churn_pool_size_opt . is_none_or ( |min_churn_pool_size | {
226
+ diffs_computed >= min_churn_pool_size . min ( total_number_of_commits)
227
227
} )
228
228
}
229
229
0 commit comments