[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

@@ -52,26 +52,38 @@ impl<'a> visit::Changes<'a> { · 51 unmodified lines
52	52	use std::cmp::Ordering::*;
53	53	match lhs.filename.cmp(rhs.filename) {
54	54	Equal => {
	55	+ use tree::EntryMode::*;
55	56	if lhs.oid != rhs.oid \|\| lhs.mode != rhs.mode {
56	57	delegate.update_path_component(
57	58	PathComponent::new(lhs.filename, &mut path_id),
58	59	PathComponentUpdateMode::Replace,
59	60	);
60		− if delegate
61		− .record(Change::Modification {
	61	+ let record_result = if (lhs.mode.is_no_tree() && rhs.mode.is_tree())
	62	+ \|\| (rhs.mode.is_tree() && rhs.mode.is_no_tree())
	63	+ {
	64	+ delegate.record(Change::Deletion {
	65	+ entry_mode: lhs.mode,
	66	+ oid: lhs.oid.to_owned(),
	67	+ path_id,
	68	+ })
	69	+ } else {
	70	+ delegate.record(Change::Modification {
62	71	previous_entry_mode: lhs.mode,
63	72	previous_oid: lhs.oid.to_owned(),
64	73	entry_mode: rhs.mode,
65	74	oid: rhs.oid.to_owned(),
66	75	path_id,
67	76	})
68		− .cancelled()
69		− {
	77	+ };
	78	+ if record_result.cancelled() {
70	79	break Err(Error::Cancelled);
71	80	}
72	81	}
73		− if lhs.mode == tree::EntryMode::Tree \|\| rhs.mode == tree::EntryMode::Tree {
74		− todo!("handle recursion")
	82	+ match (lhs.mode, rhs.mode) {
	83	+ (Tree, Tree) => todo!("recurse tree\|tree"),
	84	+ (lhs, Tree) if !lhs.is_tree() => todo!("recurse non-tree\|tree"),
	85	+ (Tree, rhs) if !rhs.is_tree() => todo!("recurse tree\|non-tree"),
	86	+ _both_are_not_trees => {}
75	87	}
76	88	}
77	89	Less => todo!("entry compares less - catch up"),
@@ -85,8 +97,8 @@ impl<'a> visit::Changes<'a> { · 7 unmodified lines
85	97	);
86	98	if delegate
87	99	.record(Change::Deletion {
88		− previous_entry_mode: lhs.mode,
89		− previous_oid: lhs.oid.to_owned(),
	100	+ entry_mode: lhs.mode,
	101	+ oid: lhs.oid.to_owned(),
90	102	path_id,
91	103	})
92	104	.cancelled()

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

@@ -3,6 +3,7 @@ use git_object::{bstr::BStr, tree}; · 2 unmodified lines
3	3
4	4	pub type PathId = usize;
5	5
	6	+/// `path_id`s are kept for rename or copy tracking to allow referring to a path in the tree more easily.
6	7	pub enum Change {
7	8	Addition {
8	9	entry_mode: tree::EntryMode,
@@ -11,8 +12,8 @@ pub enum Change { · 2 unmodified lines
11	12	},
12	13	Copy,
13	14	Deletion {
14		− previous_entry_mode: tree::EntryMode,
15		− previous_oid: ObjectId,
	15	+ entry_mode: tree::EntryMode,
	16	+ oid: ObjectId,
16	17	path_id: PathId,
17	18	},
18	19	Modification {

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

@@ -13,6 +13,11 @@ pub enum Change { · 12 unmodified lines
13	13	oid: ObjectId,
14	14	path: PathBuf,
15	15	},
	16	+ Deletion {
	17	+ entry_mode: tree::EntryMode,
	18	+ oid: ObjectId,
	19	+ path: PathBuf,
	20	+ },
16	21	Modification {
17	22	previous_entry_mode: tree::EntryMode,
18	23	previous_oid: ObjectId,
@@ -70,6 +75,15 @@ impl record::Record for Recorder { · 51 unmodified lines
70	75	fn record(&mut self, change: record::Change) -> record::Action {
71	76	use record::Change::*;
72	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	87	Addition {
74	88	entry_mode,
75	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