[tree-diff] another green test

Sebastian Thiel committed 5 years ago

Commit 2627df01 parent 05e8e4a3 files · +38 −5Browse files

Showing the changes to git-diff/src (1 of 3 files). Show all

Unified · Split

                         Greater => {
                             add_entry_schedule_recursion(rhs, &mut state.trees, delegate)?;
                             'inner_greater: loop {
-                                match rhs_entries.next().transpose()? {
+                                match rhs_entries.peek() {
-                                    Some(rhs) => {
+                                    Some(Ok(rhs)) => match lhs.filename.cmp(rhs.filename) {
-                                        if lhs.filename == rhs.filename {
+                                        Equal => {
+                                            let rhs =
+                                                rhs_entries.next().transpose()?.expect("the peeked item tobe present");
                                             handle_lhs_and_rhs_with_equal_filenames(
                                                 lhs,
                                                 rhs,
                                                 delegate,
                                             )?;
                                             break 'inner_greater;
-                                        } else {
+                                        }
+                                        Greater => {
+                                            let rhs =
+                                                rhs_entries.next().transpose()?.expect("the peeked item tobe present");
                                             delegate.pop_path_component();
                                             add_entry_schedule_recursion(rhs, &mut state.trees, delegate)?;
                                         }
-                                    }
+                                        Less => {
+                                            delegate.pop_path_component();
+                                            delete_entry_schedule_recursion(lhs, &mut state.trees, delegate)?;
+                                            break 'inner_greater;
+                                        }
+                                    },
+                                    Some(Err(err)) => return Err(Error::EntriesDecode(err.to_owned())),
                                     None => {
                                         todo!("GREATER: catchup less: break inner depleted - it never caught up");
                                         // break 'inner;