smart-release: refactor (#198)

Sebastian Thiel committed 5 years ago

Commit 87ebacc1 parent 4b48a143 files · +27 −24Browse files

Unified · Split

3 files

cargo-smart-release/src/command/changelog/git.rs +6 −23
cargo-smart-release/src/command/changelog/history.rs +14 −0
cargo-smart-release/src/command/changelog/mod.rs +7 −1

cargo-smart-release/src/command/changelog/git.rs+6−23

     prelude::{CacheAccessExt, ObjectAccessExt, ReferenceAccessExt, ReferenceExt},
 };
+use crate::command::changelog_impl::{history, History};
 use crate::utils::{component_to_bytes, is_tag_name, is_tag_version, package_by_name, tag_prefix};
 use std::cell::RefCell;
-/// A head reference will all commits that are 'governed' by it, that is are in its exclusive ancestry.
-pub struct Segment<'a> {
-    _head: git::refs::Reference,
-    /// only relevant history items, that is those that change code in the respective crate.
-    history: Vec<&'a HistoryItem>,
-}
-pub struct History {
-    head: git::refs::Reference,
-    items: Vec<HistoryItem>,
-}
-pub struct HistoryItem {
-    id: git::hash::ObjectId,
-    _message: git::bstr::BString,
-    tree_data: Vec<u8>,
-}
 pub fn commit_history(repo: &git::Easy) -> anyhow::Result<Option<History>> {
     let start = Instant::now();
     let prev = repo.object_cache_size(64 * 1024)?;
             (commit.message.to_owned(), commit.tree())
         };
-        items.push(HistoryItem {
+        items.push(history::Item {
             id: commit_id.detach(),
             _message: message,
             tree_data: repo.find_object(tree_id)?.data.to_owned(),
 }
 /// Return the head reference followed by all tags affecting `crate_name` as per our tag name rules, ordered by ancestry.
-pub fn crate_references_descending<'h>(
+pub fn ref_segments<'h>(
     crate_name: &str,
     ctx: &crate::Context,
     history: &'h History,
-) -> anyhow::Result<Vec<Segment<'h>>> {
+) -> anyhow::Result<Vec<history::Segment<'h>>> {
     let meta = &ctx.meta;
     let package = package_by_name(meta, crate_name)?;
     let tag_prefix = tag_prefix(package, &ctx.repo);
     let start = Instant::now();
     let mut segments = Vec::new();
-    let mut segment = Segment {
+    let mut segment = history::Segment {
         _head: history.head.to_owned(),
         history: vec![],
     };
             },
             Some(next_ref) => segments.push(std::mem::replace(
                 &mut segment,
-                Segment {
+                history::Segment {
                     _head: next_ref,
                     history: vec![item],
                 },

cargo-smart-release/src/command/changelog/history.rs+14−0

@@ -0,0 +1,14 @@
	1	use git_repository as git;
	2
	3	/// A head reference will all commits that are 'governed' by it, that is are in its exclusive ancestry.
	4	pub struct Segment<'a> {
	5	pub _head: git::refs::Reference,
	6	/// only relevant history items, that is those that change code in the respective crate.
	7	pub history: Vec<&'a Item>,
	8	}
	9
	10	pub struct Item {
	11	pub id: git::hash::ObjectId,
	12	pub _message: git::bstr::BString,
	13	pub tree_data: Vec<u8>,
	14	}

cargo-smart-release/src/command/changelog/mod.rs+7−1

 use crate::command::changelog::Options;
 mod git;
+mod history;
+pub struct History {
+    head: git_repository::refs::Reference,
+    items: Vec<history::Item>,
+}
 pub fn changelog(options: Options, crates: Vec<String>) -> anyhow::Result<()> {
     let ctx = crate::Context::new(crates)?;
         Some(history) => history,
     };
     for crate_name in &crate_names {
-        git::crate_references_descending(crate_name, &ctx, &history)?;
+        let _segments = git::ref_segments(crate_name, &ctx, &history)?;
     }
     Ok(())