History

[tree-diff] less todos (that break tests if present)

Sebastian Thiel committed 5 years ago

Commit 03f87fe1 parent b23012e1 file · +12 −2Browse files

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

Unified · Split

git-diff/src/visit/changes.rs+12−2
@@ -92,7 +92,12 @@ impl<'a> visit::Changes<'a> { · 91 unmodified lines
92 match lhs_entries.next().transpose()? {92 match lhs_entries.next().transpose()? {
93 Some(lhs) => {93 Some(lhs) => {
94 if lhs.filename == rhs.filename {94 if lhs.filename == rhs.filename {
95 // todo!("LESS: inner loop handle equality and type");95 handle_lhs_and_rhs_with_equal_filenames(
96 lhs,
97 rhs,
98 &mut state.trees,
99 delegate,
100 )?;
96 break 'inner_less;101 break 'inner_less;
97 } else {102 } else {
98 todo!("need test: inner loop handle cursor next");103 todo!("need test: inner loop handle cursor next");
@@ -113,7 +118,12 @@ impl<'a> visit::Changes<'a> { · 14 unmodified lines
113 match rhs_entries.next().transpose()? {118 match rhs_entries.next().transpose()? {
114 Some(rhs) => {119 Some(rhs) => {
115 if lhs.filename == rhs.filename {120 if lhs.filename == rhs.filename {
116 // todo!("GREATER: inner loop handle equality and type");121 handle_lhs_and_rhs_with_equal_filenames(
122 lhs,
123 rhs,
124 &mut state.trees,
125 delegate,
126 )?;
117 break 'inner_greater;127 break 'inner_greater;
118 } else {128 } else {
119 delegate.pop_path_component();129 delegate.pop_path_component();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t