[tree-diff] A step closer to handling additions in a directory

Sebastian Thiel committed 5 years ago

Commit a11f2101 parent f1a575c6 files · +65 −11Browse files

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

Unified · Split

3 files

git-diff/src/visit/changes.rs +20 −8
git-diff/src/visit/record.rs +3 −2
git-diff/src/visit/recorder.rs +14 −0

                     use std::cmp::Ordering::*;
                     match lhs.filename.cmp(rhs.filename) {
                         Equal => {
+                            use tree::EntryMode::*;
                             if lhs.oid != rhs.oid || lhs.mode != rhs.mode {
                                 delegate.update_path_component(
                                     PathComponent::new(lhs.filename, &mut path_id),
                                     PathComponentUpdateMode::Replace,
                                 );
-                                if delegate
+                                let record_result = if (lhs.mode.is_no_tree() && rhs.mode.is_tree())
-                                    .record(Change::Modification {
+                                    || (rhs.mode.is_tree() && rhs.mode.is_no_tree())
+                                {
+                                    delegate.record(Change::Deletion {
+                                        entry_mode: lhs.mode,
+                                        oid: lhs.oid.to_owned(),
+                                        path_id,
+                                    })
+                                } else {
+                                    delegate.record(Change::Modification {
                                         previous_entry_mode: lhs.mode,
                                         previous_oid: lhs.oid.to_owned(),
                                         entry_mode: rhs.mode,
                                         oid: rhs.oid.to_owned(),
                                         path_id,
                                     })
-                                    .cancelled()
+                                };
-                                {
+                                if record_result.cancelled() {
                                     break Err(Error::Cancelled);
                                 }
                             }
-                            if lhs.mode == tree::EntryMode::Tree || rhs.mode == tree::EntryMode::Tree {
+                            match (lhs.mode, rhs.mode) {
-                                todo!("handle recursion")
+                                (Tree, Tree) => todo!("recurse tree|tree"),
+                                (lhs, Tree) if !lhs.is_tree() => todo!("recurse non-tree|tree"),
+                                (Tree, rhs) if !rhs.is_tree() => todo!("recurse tree|non-tree"),
+                                _both_are_not_trees => {}
                             }
                         }
                         Less => todo!("entry compares less - catch up"),
                     );
                     if delegate
                         .record(Change::Deletion {
-                            previous_entry_mode: lhs.mode,
+                            entry_mode: lhs.mode,
-                            previous_oid: lhs.oid.to_owned(),
+                            oid: lhs.oid.to_owned(),
                             path_id,
                         })
                         .cancelled()

git-diff/src/visit/record.rs+3−2

 pub type PathId = usize;
+/// `path_id`s are kept for rename or copy tracking to allow referring to a path in the tree more easily.
 pub enum Change {
     Addition {
         entry_mode: tree::EntryMode,
     },
     Copy,
     Deletion {
-        previous_entry_mode: tree::EntryMode,
+        entry_mode: tree::EntryMode,
-        previous_oid: ObjectId,
+        oid: ObjectId,
         path_id: PathId,
     },
     Modification {

git-diff/src/visit/recorder.rs+14−0

@@ -13,6 +13,11 @@ pub enum Change { · 12 unmodified lines
13	oid: ObjectId,	13	oid: ObjectId,
14	path: PathBuf,	14	path: PathBuf,
15	},	15	},
		16	Deletion {
		17	entry_mode: tree::EntryMode,
		18	oid: ObjectId,
		19	path: PathBuf,
		20	},
16	Modification {	21	Modification {
17	previous_entry_mode: tree::EntryMode,	22	previous_entry_mode: tree::EntryMode,
18	previous_oid: ObjectId,	23	previous_oid: ObjectId,
@@ -70,6 +75,15 @@ impl record::Record for Recorder { · 51 unmodified lines
70	fn record(&mut self, change: record::Change) -> record::Action {	75	fn record(&mut self, change: record::Change) -> record::Action {
71	use record::Change::*;	76	use record::Change::*;
72	self.records.push(match change {	77	self.records.push(match change {
		78	Deletion {
		79	entry_mode,
		80	oid,
		81	path_id: _,
		82	} => Change::Deletion {
		83	entry_mode,
		84	oid,
		85	path: self.path_buf(),
		86	},
73	Addition {	87	Addition {
74	entry_mode,	88	entry_mode,
75	oid,	89	oid,

[tree-diff] A step closer to handling additions in a directory

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code