@@ -4,10 +4,11 @@ use crate::cli::MyRegex;
4
4
use anyhow:: Result ;
5
5
use gix:: bstr:: ByteSlice ;
6
6
use gix:: bstr:: { BString , Utf8Error } ;
7
- use gix:: object:: tree:: diff:: change :: Event ;
7
+ use gix:: object:: tree:: diff:: Change ;
8
8
use gix:: object:: tree:: diff:: Action ;
9
9
use gix:: prelude:: ObjectIdExt ;
10
- use gix:: traverse:: commit:: simple:: Sorting ;
10
+ use gix:: revision:: walk:: Sorting ;
11
+ use gix:: traverse:: commit:: simple:: CommitTimeOrder ;
11
12
use gix:: { Commit , ObjectId } ;
12
13
use std:: collections:: HashMap ;
13
14
use std:: sync:: atomic:: { AtomicBool , AtomicUsize , Ordering } ;
@@ -41,7 +42,7 @@ pub fn traverse_commit_graph(
41
42
. head_commit ( ) ?
42
43
. id ( )
43
44
. ancestors ( )
44
- . sorting ( Sorting :: ByCommitTimeNewestFirst )
45
+ . sorting ( Sorting :: ByCommitTime ( CommitTimeOrder :: NewestFirst ) )
45
46
. use_commit_graph ( can_use_author_threads)
46
47
. with_commit_graph ( commit_graph)
47
48
. all ( ) ?;
@@ -264,10 +265,10 @@ fn compute_diff_with_parent(
264
265
. track_rewrites ( None )
265
266
. for_each_to_obtain_tree ( & commit. tree ( ) ?, |change| {
266
267
let is_file_change = match change. event {
267
- Event :: Addition { entry_mode, .. } | Event :: Modification { entry_mode, .. } => {
268
+ Change :: Addition { entry_mode, .. } | Change :: Modification { entry_mode, .. } => {
268
269
entry_mode. is_blob ( )
269
270
}
270
- Event :: Deletion { .. } | Event :: Rewrite { .. } => false ,
271
+ Change :: Deletion { .. } | Change :: Rewrite { .. } => false ,
271
272
} ;
272
273
if is_file_change {
273
274
let path = change. location ;
0 commit comments