Merge branch 'main' into filter-refs-by-spec

Byron · Byron · commit 56ba481f4c48 · 2022-08-31T10:32:50.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -42,6 +42,7 @@ Please see _'Development Status'_ for a listing of all crates and their capabili
     * **mailmap**
         * [x] **entries** - display all entries of the aggregated mailmap git would use for substitution
     * **revision**
+        * [x] **list** - list plain revision hashes from a starting point, similar to a very simple version of `git rev-list`.
         * [x] **explain** - show what would be done while parsing a revision specification like `HEAD~1`
         * [x] **resolve** - show which objects a revspec resolves to, similar to `git rev-parse` but faster and with much better error handling
         * [x] **previous-branches** - list all previously checked out branches, powered by the ref-log.
diff --git a/cargo-smart-release/CHANGELOG.md b/cargo-smart-release/CHANGELOG.md
diff --git a/cargo-smart-release/Cargo.toml b/cargo-smart-release/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-smart-release"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 repository = "https://github.com/Byron/gitoxide"
 description = "Cargo subcommand for fearlessly releasing crates in workspaces."
@@ -32,7 +32,7 @@ cargo_metadata = "0.14.0"
 log = "0.4.14"
 toml_edit = "0.14.0"
 semver = "1.0.4"
-crates-index = "0.18.1"
+crates-index = "0.18.9"
 cargo_toml = "0.11.4"
 nom = { version = "7", default-features = false, features = ["std"]}
 git-conventional = "0.11.1"
diff --git a/cargo-smart-release/src/changelog/mod.rs b/cargo-smart-release/src/changelog/mod.rs
@@ -6,6 +6,8 @@ pub mod init;
 mod merge;
 mod parse;
 pub mod section;
+#[cfg(test)]
+mod tests;
 pub mod write;
 
 pub const DEFAULT_HEADING_LEVEL: usize = 2;
diff --git a/cargo-smart-release/src/changelog/tests.rs b/cargo-smart-release/src/changelog/tests.rs
@@ -0,0 +1,22 @@
+mod repository_url {
+    use crate::changelog::write::RepositoryUrl;
+    use git_repository as git;
+
+    #[test]
+    fn github_https_url() {
+        for input in [
+            "https://github.com/byron/gitoxide",
+            "https://github.com/byron/gitoxide.git",
+            "git://github.com/byron/gitoxide",
+            "git://github.com/byron/gitoxide.git",
+            "git@github.com:byron/gitoxide.git",
+            "git@github.com:byron/gitoxide",
+        ] {
+            let url = RepositoryUrl::from(git::url::parse(input.into()).unwrap());
+            assert_eq!(
+                url.github_https().expect("possible"),
+                "https://github.com/byron/gitoxide"
+            )
+        }
+    }
+}
diff --git a/cargo-smart-release/src/changelog/write.rs b/cargo-smart-release/src/changelog/write.rs
@@ -67,8 +67,9 @@ impl RepositoryUrl {
                 Scheme::Ssh => self
                     .inner
                     .user()
-                    .map(|user| format!("https://github.com{}/{}", user, self.cleaned_path())),
-                Scheme::Ext(_) | Scheme::File => None,
+                    .filter(|user| *user == "git")
+                    .map(|_git| format!("https://github.com{}", self.cleaned_path())),
+                _ => None,
             },
             None | Some(_) => None,
         }
@@ -320,9 +321,10 @@ impl section::Segment {
                 }
                 writeln!(
                     out,
-                    " - {} {} where understood as [conventional](https://www.conventionalcommits.org).",
+                    " - {} {} {} understood as [conventional](https://www.conventionalcommits.org).",
                     conventional_count,
-                    if *conventional_count == 1 { "commit" } else { "commits" }
+                    if *conventional_count == 1 { "commit" } else { "commits" },
+                    if *conventional_count == 1 { "was" } else { "were" }
                 )?;
                 if unique_issues.is_empty() {
                     writeln!(out, " - 0 issues like '(#ID)' where seen in commit messages")?;
diff --git a/cargo-smart-release/src/version.rs b/cargo-smart-release/src/version.rs
@@ -132,7 +132,7 @@ pub(crate) fn bump_package_with_spec(
     let desired_release = v;
     let (latest_release, next_release) = match ctx.crates_index.crate_(&package.name) {
         Some(published_crate) => {
-            let latest_release = semver::Version::parse(published_crate.latest_version().version())
+            let latest_release = semver::Version::parse(published_crate.most_recent_version().version())
                 .expect("valid version in crate index");
             let next_release = if latest_release >= desired_release {
                 desired_release.clone()
diff --git a/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-11.snap b/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-11.snap
@@ -1,8 +1,6 @@
 ---
 source: cargo-smart-release/tests/changelog/write_and_parse/mod.rs
-assertion_line: 183
 expression: buf
-
 ---
 * hello world
 	this
@@ -15,7 +13,7 @@ expression: buf
 
  - 100 commits contributed to the release over the course of 32 calendar days.
  - 60 days passed between releases.
- - 20 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 20 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: #1, Uncategorized, #42
 
 ##### Commit Details
diff --git a/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-2.snap b/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-2.snap
@@ -1,8 +1,6 @@
 ---
 source: cargo-smart-release/tests/changelog/write_and_parse/mod.rs
-assertion_line: 169
 expression: md
-
 ---
 # Changelog
 
@@ -32,7 +30,7 @@ world
 
  - 100 commits contributed to the release over the course of 32 calendar days.
  - 60 days passed between releases.
- - 20 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 20 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: [#1](https://github.com/user/repo/issues/1), Uncategorized, [#42](https://github.com/user/repo/issues/42)
 
 ##### Commit Details
diff --git a/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-5.snap b/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-5.snap
@@ -1,8 +1,6 @@
 ---
 source: cargo-smart-release/tests/changelog/write_and_parse/mod.rs
-assertion_line: 183
 expression: buf
-
 ---
 * hello world
 	this
@@ -15,7 +13,7 @@ expression: buf
 
  - 100 commits contributed to the release over the course of 32 calendar days.
  - 60 days passed between releases.
- - 20 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 20 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: #1, Uncategorized, #42
 
 ##### Commit Details
diff --git a/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-8.snap b/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy-8.snap
@@ -1,8 +1,6 @@
 ---
 source: cargo-smart-release/tests/changelog/write_and_parse/mod.rs
-assertion_line: 183
 expression: buf
-
 ---
 #### 1.0.2-beta.2 (1970-01-01)
 
@@ -21,7 +19,7 @@ expression: buf
 
  - 100 commits contributed to the release over the course of 32 calendar days.
  - 60 days passed between releases.
- - 20 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 20 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: #1, Uncategorized, #42
 
 ##### Commit Details
diff --git a/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy.snap b/cargo-smart-release/tests/changelog/write_and_parse/snapshots/integration__changelog__write_and_parse__all_section_types_round_trips_lossy.snap
@@ -1,8 +1,6 @@
 ---
 source: cargo-smart-release/tests/changelog/write_and_parse/mod.rs
-assertion_line: 169
 expression: md
-
 ---
 # Changelog
 
@@ -32,7 +30,7 @@ world
 
  - 100 commits contributed to the release over the course of 32 calendar days.
  - 60 days passed between releases.
- - 20 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 20 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: #1, Uncategorized, #42
 
 ##### Commit Details
diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace-changelog/crate-a-released/a/CHANGELOG.md b/cargo-smart-release/tests/snapshots/triple-depth-workspace-changelog/crate-a-released/a/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <csr-read-only-do-not-edit/>
 
  - 1 commit contributed to the release.
- - 0 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' where seen in commit messages
 
 ### Commit Details
diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <csr-read-only-do-not-edit/>
 
  - 1 commit contributed to the release.
- - 0 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' where seen in commit messages
 
 ### Commit Details
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - initial (0189fce)
+    - initial (515b164)
 </details>
 
 ## v0.8.0 (2021-09-09)
diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/a/CHANGELOG.md b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/a/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <csr-read-only-do-not-edit/>
 
  - 1 commit contributed to the release.
- - 0 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' where seen in commit messages
 
 ### Commit Details
diff --git a/deny.toml b/deny.toml
@@ -40,7 +40,7 @@ allow = [
     "BSD-3-Clause",
     "MIT",
     "ISC",
-    "CC-PDDC",
+    "Unicode-DFS-2016",
 ]
 # Lint level for licenses considered copyleft
 copyleft = "allow"
diff --git a/gitoxide-core/src/repository/revision/list.rs b/gitoxide-core/src/repository/revision/list.rs
@@ -0,0 +1,34 @@
+use anyhow::{bail, Context};
+use git_repository as git;
+use git_repository::prelude::ObjectIdExt;
+use std::ffi::OsString;
+
+use crate::OutputFormat;
+
+pub fn list(
+    mut repo: git::Repository,
+    spec: OsString,
+    mut out: impl std::io::Write,
+    format: OutputFormat,
+) -> anyhow::Result<()> {
+    if format != OutputFormat::Human {
+        bail!("Only human output is currently supported");
+    }
+    repo.object_cache_size_if_unset(4 * 1024 * 1024);
+
+    let spec = git::path::os_str_into_bstr(&spec)?;
+    let id = repo
+        .rev_parse(spec)?
+        .single()
+        .context("Only single revisions are currently supported")?;
+    let commit_id = id
+        .object()?
+        .peel_to_kind(git::object::Kind::Commit)
+        .context("Need commitish as starting point")?
+        .id
+        .attach(&repo);
+    for commit in commit_id.ancestors().all()? {
+        writeln!(out, "{}", commit?.to_hex())?;
+    }
+    Ok(())
+}
diff --git a/gitoxide-core/src/repository/revision/mod.rs b/gitoxide-core/src/repository/revision/mod.rs
@@ -1,8 +1,10 @@
+mod list;
+pub use list::list;
 mod explain;
 pub use explain::explain;
 
 pub mod resolve;
 pub use resolve::function::resolve;
 
 mod previous_branches;
-pub use previous_branches::function as previous_branches;
+pub use previous_branches::previous_branches;
diff --git a/gitoxide-core/src/repository/revision/previous_branches.rs b/gitoxide-core/src/repository/revision/previous_branches.rs
@@ -3,7 +3,11 @@ use git_repository as git;
 
 use crate::OutputFormat;
 
-pub fn function(repo: git::Repository, mut out: impl std::io::Write, format: OutputFormat) -> anyhow::Result<()> {
+pub fn previous_branches(
+    repo: git::Repository,
+    mut out: impl std::io::Write,
+    format: OutputFormat,
+) -> anyhow::Result<()> {
     let branches = repo
         .head()?
         .prior_checked_out_branches()?
diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
@@ -540,6 +540,16 @@ pub fn main() -> Result<()> {
             },
         ),
         Subcommands::Revision(cmd) => match cmd {
+            revision::Subcommands::List { spec } => prepare_and_run(
+                "revision-list",
+                verbose,
+                progress,
+                progress_keep_open,
+                None,
+                move |_progress, out, _err| {
+                    core::repository::revision::list(repository(Mode::Lenient)?, spec, out, format)
+                },
+            ),
             revision::Subcommands::PreviousBranches => prepare_and_run(
                 "revision-previousbranches",
                 verbose,
diff --git a/src/plumbing/options.rs b/src/plumbing/options.rs
@@ -222,6 +222,9 @@ pub mod revision {
     #[derive(Debug, clap::Subcommand)]
     #[clap(visible_alias = "rev", visible_alias = "r")]
     pub enum Subcommands {
+        /// List all commits reachable from the given rev-spec.
+        #[clap(visible_alias = "l")]
+        List { spec: std::ffi::OsString },
         /// Provide the revision specification like `@~1` to explain.
         #[clap(visible_alias = "e")]
         Explain { spec: std::ffi::OsString },
diff --git a/tests/tools/Cargo.toml b/tests/tools/Cargo.toml
@@ -10,6 +10,9 @@ license = "MIT OR Apache-2.0"
 name = "jtt"
 path = "src/main.rs"
 
+[lib]
+doctest = false
+
 [dependencies]
 git-hash = { version = "^0.9.8", path = "../../git-hash" }
 git-lock = { version = "^2.0.0", path = "../../git-lock" }
diff --git a/tests/tools/src/lib.rs b/tests/tools/src/lib.rs
@@ -95,9 +95,12 @@ fn parse_git_version() -> Result<(u8, u8, u8)> {
     let git_program = cfg!(windows).then(|| "git.exe").unwrap_or("git");
     let output = std::process::Command::new(git_program).arg("--version").output()?;
 
-    let mut numbers = output
-        .stdout
-        .split(|b| *b == b' ')
+    git_version_from_bytes(&output.stdout)
+}
+
+fn git_version_from_bytes(bytes: &[u8]) -> Result<(u8, u8, u8)> {
+    let mut numbers = bytes
+        .split(|b| *b == b' ' || *b == b'\n')
         .nth(2)
         .expect("git version <version>")
         .split(|b| *b == b'.')
@@ -115,7 +118,7 @@ fn parse_git_version() -> Result<(u8, u8, u8)> {
     .map_err(|err| {
         format!(
             "Could not parse version from output of 'git --version' ({:?}) with error: {}",
-            output.stdout.to_str_lossy(),
+            bytes.to_str_lossy(),
             err
         )
     })?)
@@ -540,3 +543,22 @@ impl<'a> Drop for Env<'a> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_version() {
+        assert_eq!(git_version_from_bytes(b"git version 2.37.2").unwrap(), (2, 37, 2));
+        assert_eq!(
+            git_version_from_bytes(b"git version 2.32.1 (Apple Git-133)").unwrap(),
+            (2, 32, 1)
+        );
+    }
+
+    #[test]
+    fn parse_version_with_trailing_newline() {
+        assert_eq!(git_version_from_bytes(b"git version 2.37.2\n").unwrap(), (2, 37, 2));
+    }
+}
