@@ -22,14 +22,14 @@ pub mod sig;
2222pub fn traverse_commit_graph (
2323 repo : & gix:: Repository ,
2424 no_bots : Option < MyRegex > ,
25- max_churn_pool_size : Option < usize > ,
25+ min_churn_pool_size : Option < usize > ,
2626 no_merges : bool ,
2727) -> Result < GitMetrics > {
2828 let mut time_of_most_recent_commit = None ;
2929 let mut time_of_first_commit = None ;
3030 let mut number_of_commits_by_signature: HashMap < Sig , usize > = HashMap :: new ( ) ;
3131 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 ( ) ) ;
3333 let total_number_of_commits = Arc :: new ( AtomicUsize :: default ( ) ) ;
3434
3535 let num_threads = std:: thread:: available_parallelism ( )
@@ -51,9 +51,9 @@ pub fn traverse_commit_graph(
5151 repo,
5252 & mailmap,
5353 no_bots. clone ( ) ,
54- & has_commit_graph_traversal_ended ,
54+ & is_traversal_complete ,
5555 & total_number_of_commits,
56- max_churn_pool_size ,
56+ min_churn_pool_size ,
5757 ) ?;
5858
5959 let author_threads = can_use_author_threads
@@ -104,7 +104,7 @@ pub fn traverse_commit_graph(
104104 }
105105
106106 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 ) ;
108108
109109 drop ( churn_tx) ;
110110
@@ -174,7 +174,7 @@ fn get_churn_channel(
174174 repo : & gix:: Repository ,
175175 mailmap : & gix:: mailmap:: Snapshot ,
176176 bot_regex_pattern : Option < MyRegex > ,
177- has_commit_graph_traversal_ended : & Arc < AtomicBool > ,
177+ is_traversal_complete : & Arc < AtomicBool > ,
178178 total_number_of_commits : & Arc < AtomicUsize > ,
179179 max_churn_pool_size : Option < usize > ,
180180) -> Result < ( JoinHandle < Result < ChurnPair > > , Sender < ObjectId > ) > {
@@ -183,47 +183,47 @@ fn get_churn_channel(
183183 let repo = repo. clone ( ) ;
184184 let mailmap = mailmap. clone ( ) ;
185185 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 ( ) ;
187187 let total_number_of_commits = total_number_of_commits. clone ( ) ;
188188 move || -> Result < _ > {
189189 let mut number_of_commits_by_file_path = NumberOfCommitsByFilepath :: new ( ) ;
190- let mut number_of_diffs_computed = 0 ;
190+ let mut diffs_computed = 0 ;
191191 while let Ok ( commit_id) = rx. recv ( ) {
192192 let commit = repo. find_object ( commit_id) ?. into_commit ( ) ;
193193 if is_bot_commit ( & commit, & mailmap, bot_regex_pattern. as_ref ( ) ) ? {
194194 continue ;
195195 }
196196 compute_diff_with_parent ( & mut number_of_commits_by_file_path, & commit, & repo) ?;
197- number_of_diffs_computed += 1 ;
197+ diffs_computed += 1 ;
198198 if should_break (
199- has_commit_graph_traversal_ended . load ( Ordering :: Relaxed ) ,
199+ is_traversal_complete . load ( Ordering :: Relaxed ) ,
200200 total_number_of_commits. load ( Ordering :: Relaxed ) ,
201201 max_churn_pool_size,
202- number_of_diffs_computed ,
202+ diffs_computed ,
203203 ) {
204204 break ;
205205 }
206206 }
207207
208- Ok ( ( number_of_commits_by_file_path, number_of_diffs_computed ) )
208+ Ok ( ( number_of_commits_by_file_path, diffs_computed ) )
209209 }
210210 } ) ;
211211
212212 Ok ( ( thread, tx) )
213213}
214214
215215fn should_break (
216- has_commit_graph_traversal_ended : bool ,
216+ is_traversal_complete : bool ,
217217 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 ,
220220) -> bool {
221- if !has_commit_graph_traversal_ended {
221+ if !is_traversal_complete {
222222 return false ;
223223 }
224224
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)
227227 } )
228228}
229229
0 commit comments