[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 (3 of 3 files). Show all

Unified · Split

3 files

git-diff/src/visit/changes.rs +16 −5
git-diff/tests/fixtures/make_diff_repo.sh +5 −0
git-diff/tests/visit/mod.rs +17 −0

                         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;

git-diff/tests/fixtures/make_diff_repo.sh+5−0

@@ -79,3 +79,8 @@ touch g/aa · 78 unmodified lines
79	git rm g/a	79	git rm g/a
80	git add g/aa	80	git add g/aa
81	git commit -qam 'rm g/a, add g/aa'	81	git commit -qam 'rm g/a, add g/aa'
		82
		83	git rm ff
		84	touch f
		85	git add f
		86	git commit -qam 'rm /ff, add /f'

git-diff/tests/visit/mod.rs+17−0

@@ -340,6 +340,23 @@ mod changes { · 339 unmodified lines
340	":100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D g/a	340	":100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D g/a
341	:000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A g/aa"	341	:000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A g/aa"
342	);	342	);
		343	assert_eq!(
		344	diff_with_previous_commit_from(&db, &all_commits[18])?,
		345	vec![
		346	recorder::Change::Addition {
		347	entry_mode: EntryMode::Blob,
		348	oid: hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
		349	path: "f".into()
		350	},
		351	recorder::Change::Deletion {
		352	entry_mode: EntryMode::Blob,
		353	oid: hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
		354	path: "ff".into()
		355	},
		356	],
		357	":100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D f
		358	:000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A ff"
		359	);
343	Ok(())	360	Ok(())
344	}	361	}
345	}	362	}